- update; allow to be applied unconditionally

Changed files:
    xine-lib-sparc.patch -> 1.4

diff --git a/xine-lib-sparc.patch b/xine-lib-sparc.patch
index de238dad6acab365bc3bc517d28a7406195bde15..4a5ef67788872414c831972714ba3ed5fca81026 100644 (file)
--- a/xine-lib-sparc.patch
+++ b/xine-lib-sparc.patch
@@ -1,19 +1,37 @@
---- xine-lib-1-rc4a/src/libffmpeg/libavcodec/sparc/Makefile.am.orig    2004-04-25 18:59:58.000000000 +0000
-+++ xine-lib-1-rc4a/src/libffmpeg/libavcodec/sparc/Makefile.am 2004-06-07 20:33:46.000000000 +0000
-@@ -13,3 +13,7 @@
+diff -urN xine-lib-1.1.0.org/configure.ac xine-lib-1.1.0/configure.ac
+--- xine-lib-1.1.0.org/configure.ac    2005-07-21 23:10:10.000000000 +0200
++++ xine-lib-1.1.0/configure.ac        2005-09-16 12:32:43.769045600 +0200
+@@ -1942,6 +1942,7 @@
+     ;;
+ 
+   sparc*-*-linux*)
++    AM_CONDITIONAL([ARCH_SPARC], TRUE)
+     case $host_alias in
+     sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
+     sparc64-*)
+diff -urN xine-lib-1.1.0.org/src/libffmpeg/libavcodec/sparc/Makefile.am xine-lib-1.1.0/src/libffmpeg/libavcodec/sparc/Makefile.am
+--- xine-lib-1.1.0.org/src/libffmpeg/libavcodec/sparc/Makefile.am      2004-04-25 20:59:58.000000000 +0200
++++ xine-lib-1.1.0/src/libffmpeg/libavcodec/sparc/Makefile.am  2005-09-16 12:31:05.607968352 +0200
+@@ -13,3 +13,9 @@
  sparc_modules = $(libavcodec_sparc_src)
  
  libavcodec_sparc_la_SOURCES = $(sparc_modules) $(libavcodec_sparc_dummy)
 +
++if ARCH_SPARC
 +# this file needs 64 float regs (ultrasparc) and is not executed on !ultra
 +dsputil_vis.lo: dsputil_vis.c
 +      $(LTCOMPILE) -c -o $@ $< -mcpu=ultrasparc
---- xine-lib-1-rc8/src/libmpeg2/Makefile.am.orig       2004-11-13 20:32:52.000000000 +0100
-+++ xine-lib-1-rc8/src/libmpeg2/Makefile.am    2004-12-21 23:06:51.224016864 +0100
-@@ -29,3 +29,6 @@
- xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++endif
+diff -urN xine-lib-1.1.0.org/src/libmpeg2/Makefile.am xine-lib-1.1.0/src/libmpeg2/Makefile.am
+--- xine-lib-1.1.0.org/src/libmpeg2/Makefile.am        2005-04-26 00:44:22.000000000 +0200
++++ xine-lib-1.1.0/src/libmpeg2/Makefile.am    2005-09-16 12:31:36.309301040 +0200
+@@ -31,3 +31,9 @@
  
- noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h
+ noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h \
+       libmpeg2_accel.h
 +
++if ARCH_SPARC
 +motion_comp_vis.lo: motion_comp_vis.c
 +      $(LTCOMPILE) -c -o $@ $< -mcpu=ultrasparc
++endif
++