- ptrdiff.m4 replaced by proper update added to am_fixes patch

- one more fix needed for libtool 1.4d added to the same patch
- -opengl Requires: OpenGL

Changed files:
    ptrdiff.m4 -> 1.2
    xine-lib-am_fixes.patch -> 1.3
    xine-lib.spec -> 1.53

diff --git a/ptrdiff.m4 b/ptrdiff.m4
deleted file mode 100644 (file)
index 687b655..0000000
--- a/ptrdiff.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# From Ulrich Drepper.
-
-# serial 1
-
-AC_DEFUN([AM_TYPE_PTRDIFF_T],
-  [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t,
-     [AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
-                    am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
-   if test $am_cv_type_ptrdiff_t = yes; then
-     AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type])
-   fi
-])

diff --git a/xine-lib-am_fixes.patch b/xine-lib-am_fixes.patch
index 2ee37ad9b17a322d8406a8cd785ebea8d43d9ecd..03ef0e1de77f540d54ac6bcc21e43ce182ac80d1 100644 (file)
--- a/xine-lib-am_fixes.patch
+++ b/xine-lib-am_fixes.patch
@@ -24,3 +24,25 @@
  mostlyclean-generic:
        -rm -f *~ \#* .*~ .\#*
  
+--- xine-lib-0.9.12/configure.in.orig  Wed Jun 26 22:50:01 2002
++++ xine-lib-0.9.12/configure.in       Wed Jun 26 22:53:40 2002
+@@ -155,7 +155,7 @@
+ AC_C_ALWAYS_INLINE
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
+-AM_TYPE_PTRDIFF_T
++AC_CHECK_TYPES([ptrdiff_t])
+ 
+ dnl
+ dnl debug cflags
+--- xine-lib-0.9.12/src/libw32dll/wine/Makefile.am.orig        Tue Mar 26 00:07:17 2002
++++ xine-lib-0.9.12/src/libw32dll/wine/Makefile.am     Wed Jun 26 23:45:53 2002
+@@ -33,7 +33,7 @@
+                wineacm.h     winestring.h resource.h ldt_keeper.h com.h
+ 
+ stubs.lo: stubs.s
+-      $(CC) -c $(srcdir)/stubs.s -o stubs.lo
++      $(LIBTOOL) $(CC) -c $(srcdir)/stubs.s -o stubs.lo
+ 
+ debug:
+       @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"

diff --git a/xine-lib.spec b/xine-lib.spec
index 5a3c046817970fcffe6ffd1e120f2b831f5cc548..aa2fc808671afd7e7e155b3894e0012fc70aff1d 100644 (file)
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -28,8 +28,6 @@ Release:      2
 License:       GPL
 Group:         Libraries
 Source0:       http://xine.sourceforge.net/files/%{name}-%{version}.tar.gz
-# taken from automake 1.5
-Source1:       ptrdiff.m4
 Patch0:                %{name}-am_fixes.patch
 Patch1:                %{name}-noopt.patch
 Patch2:                %{name}-automake_as.patch
@@ -294,6 +292,7 @@ Summary:    XINE - OpenGL video output
 Summary(pl):   XINE - wy¶wietlanie OpenGL
 Group:         Libraries
 Requires:      %{name} = %{version}
+Requires:      OpenGL
 
 %description opengl
 XINE plugin using OpenGL for video output.
@@ -341,7 +340,6 @@ plugins para o xine e o xine-ui.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-cat %SOURCE1 >> acinclude.m4
 
 %build
 rm -f missing