SOURCES: xine-lib-sparc.patch, xine-lib-win32-path.patch - updated...

[qboosh]

Author: qboosh                       Date: Tue Jul 11 14:28:08 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.1.2

---- Files affected:
SOURCES:
   xine-lib-sparc.patch (1.7 -> 1.8) , xine-lib-win32-path.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/xine-lib-sparc.patch
diff -u SOURCES/xine-lib-sparc.patch:1.7 SOURCES/xine-lib-sparc.patch:1.8
--- SOURCES/xine-lib-sparc.patch:1.7	Wed Apr 12 13:56:08 2006
+++ SOURCES/xine-lib-sparc.patch	Tue Jul 11 16:28:02 2006
@@ -1,6 +1,6 @@
---- 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 @@
+--- xine-lib-1.1.2/configure.ac.orig	2006-07-11 12:28:38.744440000 +0200
++++ xine-lib-1.1.2/configure.ac	2006-07-11 12:44:30.944440000 +0200
+@@ -1951,6 +1951,8 @@
  enable_ffmmx="no"
  enable_armv4l="no"
  
@@ -9,17 +9,17 @@
  case "$host_or_hostalias" in
    i?86-* | k?-* | athlon-* | pentium*-)
      dnl enable x86 specific parts of the code
-@@ -1933,6 +1935,7 @@
+@@ -2016,6 +2018,7 @@
      fi
      ;;
    sparc*-*-linux*)
 +    arch_sparc="yes"
-     if test x$enable_vis = xyes; then
-       AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
+     if test x$enable_vis != xno; then
+       has_vis=yes
      fi
-@@ -1982,6 +1985,7 @@
+@@ -2066,6 +2069,7 @@
  fi
- AC_SUBST(W32DLL_DEP)
+ AM_CONDITIONAL(ENABLE_VIS, test x"$has_vis" = "xyes")
  
 +AM_CONDITIONAL([ARCH_SPARC], test x"$arch_sparc" = "xyes")
  AM_CONDITIONAL(HAVE_FFMMX, test x"$enable_ffmmx" = "xyes")
@@ -51,14 +51,3 @@
 +	$(LTCOMPILE) -c -o $@ $< -mcpu=ultrasparc
 +endif
 +	
-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	2006-04-12 06:25:56.000000000 +0000
-+++ xine-lib-1.1.0/src/libffmpeg/libavcodec/sparc/Makefile.am	2006-04-12 07:34:04.000000000 +0000
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/misc/Makefile.common
- 
--AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
-+AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
- ASFLAGS =
- 
- noinst_LTLIBRARIES = libavcodec_sparc.la

================================================================
Index: SOURCES/xine-lib-win32-path.patch
diff -u SOURCES/xine-lib-win32-path.patch:1.4 SOURCES/xine-lib-win32-path.patch:1.5
--- SOURCES/xine-lib-win32-path.patch:1.4	Sun Nov 20 01:14:07 2005
+++ SOURCES/xine-lib-win32-path.patch	Tue Jul 11 16:28:03 2006
@@ -1,11 +1,13 @@
---- 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/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;
+--- xine-lib-1.1.2/src/libw32dll/common.c.orig	2006-06-11 17:09:47.000000000 +0200
++++ xine-lib-1.1.2/src/libw32dll/common.c	2006-07-11 13:26:13.304440000 +0200
+@@ -6,9 +6,8 @@
+   DIR                *dir;
+   char               *path, *cfgpath;
+   char               *listpath[] = { "",
+-                                     "/usr/lib/codecs", 
++                                     WIN32_PATH, 
+                                      "/usr/local/lib/codecs",
+-                                     "/usr/lib/win32",
+                                      "/usr/local/lib/win32",
+                                      NULL };
+   int                 i = 0;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/xine-lib-sparc.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/xine-lib-win32-path.patch?r1=1.4&r2=1.5&f=u