Update to 0.1.3.

Prompted by:	MANY

1 files changed, 42 insertions, 31 deletions

diff --git a/multimedia/xmps/files/patch-aa b/multimedia/xmps/files/patch-aa
index a7d89a3e518e..c859c119338c 100644
--- a/multimedia/xmps/files/patch-aa
+++ b/multimedia/xmps/files/patch-aa
@@ -1,43 +1,62 @@
---- configure.orig	Wed May 17 23:43:36 2000
-+++ configure	Thu Jun 15 13:32:11 2000
-@@ -1536,6 +1536,7 @@
+--- configure.orig	Tue Dec 19 16:40:13 2000
++++ configure	Tue Dec 19 16:49:08 2000
+@@ -3803,7 +3803,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lsmpeg  $LIBS"
++LIBS="-lsmpeg $SDL_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3809 "configure"
+ #include "confdefs.h"
+@@ -3833,7 +3833,7 @@
+ #define $ac_tr_lib 1
+ EOF
  
+-  LIBS="-lsmpeg $LIBS"
++  LIBS="-lsmpeg $SDL_LIBS $LIBS"
  
- STRETCHER_SRC=
-+STRETCHER_OBJ=
- # Extract the first word of "nasm", so it can be a program name with args.
- set dummy nasm; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -1568,6 +1569,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+@@ -3848,7 +3848,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lsmpeg  $LIBS"
++LIBS="-lsmpeg $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3854 "configure"
+ #include "confdefs.h"
+@@ -3919,7 +3919,7 @@
+ rm -f conftest*
+ echo "$ac_t""$opengl" 1>&6
  
- if test "$have_nasm" = "yes"; then
-  STRETCHER_SRC="stretch.h stretch.c stretchblt.asm"
-+ STRETCHER_OBJ="stretch.lo stretchblt.o"
-  cat >> confdefs.h <<\EOF
- #define AS_STRETCHER 1
- EOF
-@@ -4060,16 +4062,16 @@
+-if test x$opengl = xyes; then
++if test x$opengl = x"Manually disabled ;)"; then
+ 	OPENGL=OpenGL
+ 	CFLAGS="$CFLAGS -DHAVE_OPENGL"
+ 	GL_LIBS="$X_PRELIBS -lGL -lGLU -lICE -lSM $X_LIBS"
+@@ -3974,8 +3974,8 @@
  { echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
  fi
  
 -ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
--echo "configure:4066: checking for sys/dir.h" >&5
 +ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-+echo "configure:4066: checking for dirent.h" >&5
+ echo "configure:3980: checking for sys/dir.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
- else
+@@ -3983,7 +3983,7 @@
    cat > conftest.$ac_ext <<EOF
- #line 4071 "configure"
+ #line 3985 "configure"
  #include "confdefs.h"
 -#include <sys/dir.h>
 +#include <dirent.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:4076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -4091,7 +4093,7 @@
+ { (eval echo configure:3990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -4005,7 +4005,7 @@
    :
  else
    echo "$ac_t""no" 1>&6
@@ -46,7 +65,7 @@
  fi
  
  
-@@ -6001,7 +6003,7 @@
+@@ -5915,7 +5915,7 @@
  	< $srcdir/po/POTFILES.in > po/POTFILES
    
  
@@ -55,11 +74,3 @@
  
  
  CODEC_PLUGINS_DIR=Codecs
-@@ -6188,6 +6190,7 @@
- s%@LIBTOOL@%$LIBTOOL%g
- s%@have_nasm@%$have_nasm%g
- s%@STRETCHER_SRC@%$STRETCHER_SRC%g
-+s%@STRETCHER_OBJ@%$STRETCHER_OBJ%g
- s%@CPP@%$CPP%g
- s%@X_CFLAGS@%$X_CFLAGS%g
- s%@X_PRE_LIBS@%$X_PRE_LIBS%g