Update of /cvsroot/fink/experimental/thesin/test
In directory usw-pr-cvs1:/tmp/cvs-serv24168
Modified Files:
libxine-0.9.12-1.info libxine-0.9.12-1.patch
Removed Files:
libxine.patch
Log Message:
now libxine compiles, on to xine-ui
Index: libxine-0.9.12-1.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/test/libxine-0.9.12-1.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxine-0.9.12-1.info 3 Jul 2002 22:50:45 -0000 1.3
+++ libxine-0.9.12-1.info 5 Jul 2002 16:53:08 -0000 1.4
@@ -2,8 +2,8 @@
Version: 0.9.12
Revision: 1
###
-Depends: dlcompat, libiconv, x11, pth, aalib-shlibs, libogg-shlibs, libvorbis-shlibs,
esound-shlibs, libfame-shlibs, zlib, %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.9.9), gettext, aalib, libogg, libvorbis, esound, pkgconfig,
libfame, automake
+Depends: dlcompat, libiconv, x11, pth, aalib-shlibs, libogg-shlibs, libvorbis-shlibs,
+esound-shlibs, libfame-shlibs, zlib, sdl-shlibs, %N-shlibs (= %v-%r)
+BuildDepends: fink (>= 0.9.9), gettext, aalib, libogg, libvorbis, esound, pkgconfig,
+libfame, automake, sdl
BuildDependsOnly: true
###
Source: http://xine.sourceforge.net/files/xine-lib-%v.tar.gz
@@ -11,7 +11,7 @@
###
Patch: %f.patch
###
-ConfigureParams: --disable-altivec --with-x --with-pic --enable-shared
--enable-static --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
+ConfigureParams: --disable-altivec --enable-fpic --disable-alsa --disable-dxr3
+--with-x --with-pic --enable-shared --enable-static --mandir=%i/share/man
+--infodir=%p/share/info --libexecdir=%p/lib
###
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -Ddlsym=dlsym_auto_underscore
Index: libxine-0.9.12-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/test/libxine-0.9.12-1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxine-0.9.12-1.patch 3 Jul 2002 22:50:45 -0000 1.2
+++ libxine-0.9.12-1.patch 5 Jul 2002 16:53:08 -0000 1.3
@@ -152,6 +152,21 @@
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
+diff -ruN xine-lib-0.9.12.orig/src/libffmpeg/Makefile.in
+xine-lib-0.9.12/src/libffmpeg/Makefile.in
+--- xine-lib-0.9.12.orig/src/libffmpeg/Makefile.in Sun Jun 23 03:52:01 2002
++++ xine-lib-0.9.12/src/libffmpeg/Makefile.in Thu Jul 4 13:39:14 2002
+@@ -315,7 +315,10 @@
+ maintainer-clean-libtool:
+
+ xineplug_decode_ff.la: $(xineplug_decode_ff_la_OBJECTS)
+$(xineplug_decode_ff_la_DEPENDENCIES)
+- $(LINK) -rpath $(libdir) $(xineplug_decode_ff_la_LDFLAGS)
+$(xineplug_decode_ff_la_OBJECTS) $(xineplug_decode_ff_la_LIBADD) $(LIBS)
++# $(LINK) -rpath $(libdir) $(xineplug_decode_ff_la_LDFLAGS)
+$(xineplug_decode_ff_la_OBJECTS) $(xineplug_decode_ff_la_LIBADD) $(LIBS)
++ mkdir -p .libs
++ rm -fr .libs/xineplug_decode_ff.la .libs/xineplug_decode_ff.*
+.libs/xineplug_decode_ff.*
++ $(CC) -bundle -flat_namespace -multiply_defined suppress -undefined suppress
+-o .libs/xineplug_decode_ff.so xine_decoder.lo -all_load $(CFLAGS) $(LDFLAGS)
+../../src/libffmpeg/libavcodec/.libs/libavcodec.al -lc -install_name
+$(libdir)/xineplug_decode_ff.so
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
diff -ruN xine-lib-0.9.12.orig/src/libmpeg2/Makefile.in
xine-lib-0.9.12/src/libmpeg2/Makefile.in
--- xine-lib-0.9.12.orig/src/libmpeg2/Makefile.in Sun Jun 23 03:51:54 2002
+++ xine-lib-0.9.12/src/libmpeg2/Makefile.in Wed Jul 3 15:38:09 2002
@@ -245,6 +260,36 @@
libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) -lm
libxine_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+diff -ruN xine-lib-0.9.12.orig/src/xine-engine/load_plugins.c
+xine-lib-0.9.12/src/xine-engine/load_plugins.c
+--- xine-lib-0.9.12.orig/src/xine-engine/load_plugins.c Sat Jun 15 12:00:44
+2002
++++ xine-lib-0.9.12/src/xine-engine/load_plugins.c Thu Jul 4 08:56:13 2002
+@@ -132,7 +132,7 @@
+ plugin_name = str;
+
+ if(!(plugin = dlopen (str, RTLD_LAZY))) {
+- char *dl_error_msg = dlerror();
++ char *dl_error_msg = (char*)dlerror();
+
+ xine_log (this, XINE_LOG_PLUGIN,
+ _("load_plugins: cannot open demux plugin %s:\n%s\n"),
+@@ -294,7 +294,7 @@
+ plugin_name = str;
+
+ if(!(plugin = dlopen (str, RTLD_LAZY))) {
+- char *dl_error_msg = dlerror();
++ char *dl_error_msg = (char*)dlerror();
+
+ xine_log (this, XINE_LOG_PLUGIN,
+ _("load_plugins: cannot open input plugin %s:\n%s\n"),
+@@ -514,7 +514,7 @@
+ plugin_name = str;
+
+ if(!(plugin = dlopen (str, RTLD_LAZY))) {
+- char *dl_error_msg = dlerror();
++ char *dl_error_msg = (char*)dlerror();
+
+ xine_log (this, XINE_LOG_PLUGIN,
+ _("load_plugins: failed to load plugin %s:\n%s\n"),
diff -ruN xine-lib-0.9.12.orig/src/xine-utils/Makefile.in
xine-lib-0.9.12/src/xine-utils/Makefile.in
--- xine-lib-0.9.12.orig/src/xine-utils/Makefile.in Sun Jun 23 03:51:31 2002
+++ xine-lib-0.9.12/src/xine-utils/Makefile.in Wed Jul 3 13:57:18 2002
--- libxine.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Bringing you mounds of caffeinated joy.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
