- updated for 1.1.1

Changed files:
    xine-lib-sparc.patch -> 1.6
    xine-lib-syncfb.patch -> 1.3
    xine-lib-win32-path.patch -> 1.4

diff --git a/xine-lib-sparc.patch b/xine-lib-sparc.patch
index 85fc480a008c758c2789511988482bc168521757..33039fe930a0da32e94c2192aae3dd5924a5616d 100644 (file)
--- a/xine-lib-sparc.patch
+++ b/xine-lib-sparc.patch
@@ -1,24 +1,23 @@
-diff -urbB 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 13:24:01.605143392 +0200
-@@ -1749,6 +1749,8 @@
+--- xine-lib-1.1.1/configure.ac.orig   2005-11-19 23:50:49.494038504 +0100
++++ xine-lib-1.1.1/configure.ac        2005-11-20 00:07:16.747953096 +0100
+@@ -1869,6 +1869,8 @@
  enable_ffmmx="no"
  enable_armv4l="no"
  
 +arch_sparc="no"
 +
  case "$host_or_hostalias" in
-   i386-*-freebsd*)
-     CFLAGS="-pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops $INLINE_FUNCTIONS $CFLAGS"
-@@ -1942,6 +1944,7 @@
+   i?86-* | k?-* | athlon-* | pentium*-)
+     dnl enable x86 specific parts of the code
+@@ -1933,6 +1935,7 @@
+     fi
      ;;
- 
    sparc*-*-linux*)
 +    arch_sparc="yes"
-     case $host_alias in
-     sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-     sparc64-*)
-@@ -2092,6 +2095,7 @@
+     if test x$enable_vis = xyes; then
+       AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
+     fi
+@@ -1982,6 +1985,7 @@
  fi
  AC_SUBST(W32DLL_DEP)
  
@@ -26,7 +25,6 @@ diff -urbB xine-lib-1.1.0.org/configure.ac xine-lib-1.1.0/configure.ac
  AM_CONDITIONAL(HAVE_FFMMX, test x"$enable_ffmmx" = "xyes")
  
  dnl ---------------------------------------------
-Tylko w xine-lib-1.1.0: configure.ac~
 diff -urbB 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

diff --git a/xine-lib-syncfb.patch b/xine-lib-syncfb.patch
index 6944c46dc60c9ba5dd7355f50f0129563ee355aa..725912a9db3cd27100624ddb785896ff495689df 100644 (file)
--- a/xine-lib-syncfb.patch
+++ b/xine-lib-syncfb.patch
@@ -1,6 +1,6 @@
---- xine-lib-1-rc8/configure.ac.orig   2004-12-14 23:06:47.000000000 +0100
-+++ xine-lib-1-rc8/configure.ac        2004-12-21 21:03:55.484299736 +0100
-@@ -460,21 +460,6 @@
+--- xine-lib-1.1.1/configure.ac.orig   2005-11-14 13:34:45.000000000 +0100
++++ xine-lib-1.1.1/configure.ac        2005-11-19 23:50:02.836131584 +0100
+@@ -517,22 +517,6 @@
  AM_PATH_OPENGL()
  
  
@@ -10,7 +10,9 @@
 -
 -case "$host_or_hostalias" in
 -  *linux* )
--    have_syncfb="yes"
+-    AC_ARG_ENABLE([fb],
+-      AC_HELP_STRING([--disable-fb], [do not build syncfb plugins]),
+-      have_syncfb=$enableval, have_syncfb="yes")
 -    ;;
 -  *)
 -    have_syncfb="no"
@@ -18,11 +20,10 @@
 -esac
 -AM_CONDITIONAL(HAVE_SYNCFB, test x"$have_syncfb" = "xyes")
 -
--
+ 
  dnl ----------------------------------------------
  dnl Check for usable video-for-linux (v4l) support
- dnl ----------------------------------------------
-@@ -555,6 +540,21 @@
+@@ -614,6 +598,22 @@
  esac
  AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes")
  
@@ -32,19 +33,20 @@
 +
 +case "$host_or_hostalias" in
 +  *linux* )
-+    have_syncfb="yes"
++    AC_ARG_ENABLE([fb],
++      AC_HELP_STRING([--disable-fb], [do not build syncfb plugins]),
++      have_syncfb=$enableval, have_syncfb="yes")
 +    ;;
 +  *)
 +    have_syncfb="no"
 +    ;;
 +esac
 +AM_CONDITIONAL(HAVE_SYNCFB, test x"$have_syncfb" = "xyes")
-+
 +
  dnl
  dnl Check if we can enable the xxmc plugin.
  dnl
-@@ -2451,7 +2451,7 @@
+@@ -2543,7 +2543,7 @@
  if test x"$no_x" != "xyes"; then
    echo "   - XShm (X11 shared memory)"
    dnl synfb

diff --git a/xine-lib-win32-path.patch b/xine-lib-win32-path.patch
index 01c2fe0f8cfb883cc3625369e393131195b23dcc..33df3e4ad47aed248f8271fc8f50e8cea5062f7c 100644 (file)
--- a/xine-lib-win32-path.patch
+++ b/xine-lib-win32-path.patch
@@ -1,11 +1,11 @@
---- xine-lib-1-rc6a.orig/src/libw32dll/wine/module.c   2004-08-13 03:16:55.000000000 +0200
-+++ xine-lib-1-rc6a/src/libw32dll/wine/module.c        2004-10-18 23:20:26.300937920 +0200
-@@ -354,7 +354,7 @@
+--- xine-lib-1.1.1/src/libw32dll/wine/module.c.orig    2005-10-23 00:09:47.000000000 +0200
++++ xine-lib-1.1.1/src/libw32dll/wine/module.c 2005-11-20 00:11:42.102613056 +0100
+@@ -362,7 +362,7 @@
  HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
  {
        WINE_MODREF *wm = 0;
--      char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 };
-+      char* listpath[] = { "", "", WIN32_PATH, "/usr/local/lib/win32", 0 };
+-      char* listpath[] = { "", "", "/usr/lib/codecs", "/usr/local/lib/codecs", "/usr/lib/win32", "/usr/local/lib/win32", 0 };
++      char* listpath[] = { "", "", WIN32_PATH, "/usr/local/lib/codecs", "/usr/local/lib/win32", 0 };
        char path[512];
        char checked[2000];
          int i = -1;