- dont link against static libXv

Changed files:
    xine-lib-automake_as.patch -> 1.3

diff --git a/xine-lib-automake_as.patch b/xine-lib-automake_as.patch
index 2a161eec64659ee3e5b4352de4011d385c415949..39f94e0313e78e8c65272d9e7242f8693428497d 100644 (file)
--- a/xine-lib-automake_as.patch
+++ b/xine-lib-automake_as.patch
@@ -1,6 +1,6 @@
---- xine-lib-1-beta0/configure.ac.orig Wed Dec 11 14:01:41 2002
-+++ xine-lib-1-beta0/configure.ac      Sat Dec 14 20:55:28 2002
-@@ -283,7 +283,6 @@
+--- xine-lib-1-rc1/configure.ac.orig   2003-10-05 15:08:36.000000000 +0200
++++ xine-lib-1-rc1/configure.ac        2003-11-16 21:03:53.000000000 +0100
+@@ -326,7 +326,6 @@
  dnl Check for OpenGL & [GLut | GLU]
  dnl ---------------------------------------------
  AC_CHECK_LIB(GL, glBegin,
@@ -8,7 +8,7 @@
               [ ac_have_opengl="yes"
                 OPENGL_LIBS="-lGL" 
               AC_CHECK_LIB(glut, glutInit, dnl check for glut
-@@ -301,9 +300,8 @@
+@@ -344,9 +343,8 @@
                                             [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS])], 
                            [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS])
               ],
@@ -20,3 +20,21 @@
  AC_SUBST(OPENGL_LIBS)
  AC_SUBST(GLUT_LIBS)
  AC_SUBST(GLU_LIBS)
+@@ -414,6 +412,7 @@
+ AC_ARG_WITH(xv-path,[  --with-xv-path=path     Where $xv_lib is installed],
+             xv_path="$withval", xv_path="/usr/X11R6/lib")
+ 
++xv_lib="libXv.so"
+ AC_CHECK_LIB(Xv, XvShmCreateImage, 
+              [ AC_MSG_CHECKING(for $xv_lib location)
+                if test -f "$xv_path/$xv_lib"; then
+@@ -421,9 +420,6 @@
+                  XV_LIB="-L$xv_path -lXv"
+                AC_DEFINE(HAVE_XV,1,[Define this if you have libXv installed])
+                ac_have_xv="yes"
+-               if test x$xv_lib = "xlibXv.a" ; then
+-                 AC_DEFINE(HAVE_XV_STATIC,1,[Define this if you have libXv.a])
+-               fi
+                else
+                  AC_MSG_RESULT(not found in $xv_path)
+                echo