Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7299
Modified Files: libxine1.info Added Files: libxine1-10.6.info libxine1.patch Log Message: libxine 10.6 fixes, OKd by maintainer --- NEW FILE: libxine1-10.6.info --- Package: libxine1 Version: 1.1.13 Revision: 13 Description: Xine video/media player library License: GPL Maintainer: Justin F. Hallett <the...@users.sourceforge.net> ## left as a check: if anybody gets a different list it means bdeps are missing # # otool_deps libxine1-shlibs # a52dec-shlibs, aalib-shlibs, amrnb-shlibs, arts-shlibs, audiofile-shlibs, bzip2-shlibs, dbus-shlibs, esound-shlibs, # expat1-shlibs, faac-shlibs, fontconfig2-shlibs, freetype219-shlibs, gconf2-shlibs, glib2-shlibs, gnome-vfs2-unified-shlibs, # gtk+2-shlibs, imagemagick1-shlibs, jack-shlibs, lame-shlibs, lcms-shlibs, libavahi-client3-shlibs, libavahi-common3-shlibs, # libavahi-glib1-shlibs, libavcodec51-shlibs, libavutil49-shlibs, libcaca-shlibs, libcdio7-shlibs, libdvdnav4-shlibs, # libfaad1-shlibs, libflac8, libgettext3-shlibs, libgnugetopt-shlibs, libiconv, libiso96605-shlibs, libjpeg-shlibs, # libmad-shlibs, libmng2-shlibs, libmpcdec5-shlibs, libncurses5-shlibs, libncursesw5-shlibs, libogg-shlibs, # libpostproc51-shlibs, libtheora0-shlibs, libtiff-shlibs, libtool2-shlibs, libvcd0-shlibs, libvorbis0-shlibs, libx264-57-shlibs, # libxml2-shlibs, orbit2-shlibs, sdl-shlibs, slang-shlibs, speex3-shlibs, wavpack1-shlibs, xorg-shlibs, xvidcore-shlibs ## removed lipng3, qt3 from deps and bdeps. popt ?.. to be checked more carefully.. Distribution: 10.6 Depends: %N-shlibs (= %v-%r) BuildDepends: << a52dec-dev, aalib, amrnb-dev, arts-dev (>= 1.5.9-1), audiofile, avahi-dev, bzip2-dev, dbus-dev (>= 1.0-1), esound (>= 0.2.38-1), expat1, faac-dev, fink (>= 0.26.0-1), ffmpeg-dev, fink (>= 0.24-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.5-1), gconf2-dev (>= 2.20.0-1), gettext-bin, gettext-tools, glib2-dev (>= 2.14.0-1), gnome-vfs2-unified-dev (>= 1:2.20.0-1), gsm, gtk+2-dev (>= 2.12.0-1), imagemagick1-dev, jack-dev, lame-dev, lcms, libavahi-glib1-dev, libavcodec-dev, libavutil-dev, libbonobo2-dev (>= 2.20.0-1), libcaca-dev (>= 0.99-1), libcdio-dev, libdvdnav, libfaad1-dev, libflac8-dev, libgettext3-dev, libgnugetopt, libiconv-dev, libiso9660-dev, libjpeg, libmad, libmng2, libmpcdec5, libncurses5 (>= 5.4-20041023-1006), libncursesw5, libogg, libpostproc-dev, libtheora0, libtiff, libtool2, libvcd-dev (>= 0.7.21-10), libvorbis0, libx264-dev, libxml2 (>= 2.6.30-1), orbit2-dev (>= 2.14.9-1), pkgconfig (>= 0.22-3), popt, pth2-dev, sdl (>= 1.2.9-1001), slang, speex3, wavpack1-dev, x11-dev, xvidcore, system-sdk-10.5 << Provides: libxine Conflicts: libxine, libxine-docs Replaces: libxine, libxine-shlibs, libxine-docs Recommends: libdvdcss-shlibs BuildDependsOnly: true Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2 Source-MD5: b94512098dde28dc230f5a24037d2e18 PatchFile: libxine1.patch PatchFile-MD5: e08124ef6914ad89087b253862135a75 SetLDFLAGS: -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib SetMACOSX_DEPLOYMENT_TARGET: 10.5 ConfigureParams: << --libexecdir=%p/lib/libxine --mandir=%p/share/man (%m = powerpc) --enable-altivec \ --disable-dependency-tracking --enable-static --enable-shared --enable-ipv6 --enable-coreaudio --enable-macosx-video \ --with-arts --with-wavpack --with-libflac --with-x --with-fontconfig --with-freetype --enable-antialiasing \ --with-external-dvdnav --with-external-ffmpeg --with-external-a52dec --with-external-libmad --with-external-libmpcdec << CompileScript: << #!/bin/sh -ev export CPATH=%p/include:/usr/X11R6/include export PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:/usr/X11R6/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure %c echo "#define HAVE_DARWIN_CDROM 1" >> config.h make << InstallScript: make -j1 install DESTDIR=%d DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO SplitOff: << Package: %N-shlibs Depends: << a52dec-shlibs, aalib-shlibs, amrnb-shlibs, arts-shlibs (>= 1.5.9-1), audiofile-shlibs, bzip2-shlibs, dbus-shlibs (>= 1.0-1), esound-shlibs (>= 0.2.38-1), expat1-shlibs, faac-shlibs, fontconfig2-shlibs (>= 2.4.1-1), freetype219-shlibs (>= 2.3.5-1), gconf2-shlibs (>= 2.20.0-1), glib2-shlibs (>= 2.14.0-1), gnome-vfs2-unified-shlibs (>= 1:2.20.0-1), gtk+2-shlibs (>= 2.12.0-1), imagemagick1-shlibs, jack-shlibs, lame-shlibs, lcms-shlibs, libavahi-client3-shlibs, libavahi-common3-shlibs, libavahi-glib1-shlibs, libavcodec51-shlibs, libavutil49-shlibs, libbonobo2-shlibs (>= 2.20.0-1), libcaca-shlibs (>= 0.99-1), libcdio7-shlibs, libdvdnav4-shlibs, libfaad1-shlibs, libflac8, libgettext3-shlibs, libgnugetopt-shlibs, libiconv, libiso96605-shlibs, libjpeg-shlibs, libmad-shlibs, libmng2-shlibs, libmpcdec5-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006), libncursesw5-shlibs, libogg-shlibs, libpostproc51-shlibs, libtheora0-shlibs, libtiff-shlibs, libtool2-shlibs, libvcd0-shlibs (>= 0.7.21-10), libvorbis0-shlibs, libx264-57-shlibs, libxml2-shlibs (>= 2.6.30-1), orbit2-shlibs (>= 2.14.9-1), sdl-shlibs (>= 1.2.9-1001), slang-shlibs, speex3-shlibs, wavpack1-shlibs, x11-shlibs, xvidcore-shlibs << Provides: libxine-shlibs Conflicts: libxine-shlibs Replaces: libxine-shlibs, libxine DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README Files: << lib/libxine*.*.dylib lib/xine share/xine << Shlibs: << %p/lib/libxine.1.dylib 24.0.0 %n (>= 1.1.13-12) %p/lib/libxineMacOSXVideo.1.dylib 24.0.0 %n (>= 1.1.13-12) << << Homepage: http://xine.sourceforge.net/ DescDetail: << Libxine provides the complete infrastructure for a video/media player. It supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you can use it to play DVDs, (S)VCDs and most video files out there. It supports network streams, subtitles and even mp3 files. It's extensible to your heart's content via plugins for audio_out, video_out, input media, demuxers (stream types), audio/video and subtitle codecs. Building a GUI (or text based) frontend around this should be quite easy. The xine-ui package provides one for your convenience, so you can just start watching your VCDs ;-) << Index: libxine1.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.info,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- libxine1.info 5 Oct 2008 18:00:19 -0000 1.28 +++ libxine1.info 10 Oct 2009 13:26:54 -0000 1.29 @@ -1,6 +1,6 @@ Package: libxine1 Version: 1.1.13 -Revision: 12 +Revision: 13 Description: Xine video/media player library License: GPL Maintainer: Justin F. Hallett <the...@users.sourceforge.net> @@ -17,6 +17,7 @@ # libxml2-shlibs, orbit2-shlibs, sdl-shlibs, slang-shlibs, speex3-shlibs, wavpack1-shlibs, xorg-shlibs, xvidcore-shlibs ## removed lipng3, qt3 from deps and bdeps. popt ?.. to be checked more carefully.. +Distribution: 10.4, 10.5 Depends: %N-shlibs (= %v-%r) BuildDepends: << a52dec-dev, --- NEW FILE: libxine1.patch --- diff -Nurd xine-lib-1.1.13/configure xine-lib-1.1.13-new/configure --- xine-lib-1.1.13/configure 2008-06-14 19:16:03.000000000 -0400 +++ xine-lib-1.1.13-new/configure 2009-10-09 23:33:06.000000000 -0400 @@ -30693,10 +30693,10 @@ #define LIBX11_SO "${x_lib_location:-libX11.so}" _ACEOF -x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"* "${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed -e \"${soname_script}\"`" +x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.dylib"* "${x_libraries:-/usr/lib}/libXv.dylib"* 2>/dev/null | sed -e \"${soname_script}\"`" cat >>confdefs.h <<_ACEOF -#define LIBXV_SO "${x_lib_location:-libXv.so}" +#define LIBXV_SO "${x_lib_location:-libXv.dylib}" _ACEOF @@ -32278,20 +32278,20 @@ if test "x$xv_prefer_shared" = "xyes"; then - { echo "$as_me:$LINENO: checking for libXv.so" >&5 -echo $ECHO_N "checking for libXv.so... $ECHO_C" >&6; } - if test -f "$xv_path/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in $xv_path" >&5 -echo "${ECHO_T}found libXv.so in $xv_path" >&6; } - XV_LIBS="libXv.so" + { echo "$as_me:$LINENO: checking for libXv.dylib" >&5 +echo $ECHO_N "checking for libXv.dylib... $ECHO_C" >&6; } + if test -f "$xv_path/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in $xv_path" >&5 +echo "${ECHO_T}found libXv.dylib in $xv_path" >&6; } + XV_LIBS="libXv.dylib" else - if test -f "/usr/lib/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5 -echo "${ECHO_T}found libXv.so in /usr/lib" >&6; } - XV_LIBS="libXv.so" + if test -f "/usr/lib/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5 +echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; } + XV_LIBS="libXv.dylib" else - { echo "$as_me:$LINENO: result: libXv.so not found in $xv_path" >&5 -echo "${ECHO_T}libXv.so not found in $xv_path" >&6; } + { echo "$as_me:$LINENO: result: libXv.dylib not found in $xv_path" >&5 +echo "${ECHO_T}libXv.dylib not found in $xv_path" >&6; } fi fi @@ -32320,20 +32320,20 @@ if test x$XV_LIBS = x; then if ! test "x$xv_prefer_shared" = "xyes"; then - { echo "$as_me:$LINENO: checking for libXv.so" >&5 -echo $ECHO_N "checking for libXv.so... $ECHO_C" >&6; } - if test -f "$xv_path/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in $xv_path" >&5 -echo "${ECHO_T}found libXv.so in $xv_path" >&6; } - XV_LIBS="libXv.so" + { echo "$as_me:$LINENO: checking for libXv.dylib" >&5 +echo $ECHO_N "checking for libXv.dylib... $ECHO_C" >&6; } + if test -f "$xv_path/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in $xv_path" >&5 +echo "${ECHO_T}found libXv.dylib in $xv_path" >&6; } + XV_LIBS="libXv.dylib" else - if test -f "/usr/lib/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5 -echo "${ECHO_T}found libXv.so in /usr/lib" >&6; } - XV_LIBS="libXv.so" + if test -f "/usr/lib/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5 +echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; } + XV_LIBS="libXv.dylib" else - { echo "$as_me:$LINENO: result: libXv.so not found in $xv_path" >&5 -echo "${ECHO_T}libXv.so not found in $xv_path" >&6; } + { echo "$as_me:$LINENO: result: libXv.dylib not found in $xv_path" >&5 +echo "${ECHO_T}libXv.dylib not found in $xv_path" >&6; } fi fi @@ -32441,8 +32441,8 @@ ac_have_xv_static="yes" XV_LIBS="$xv_path/$XV_LIBS" ;; - x*.so) - XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'` + x*.dylib) + XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/.dylib$//'` ;; *) { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIBS" >&5 @@ -32475,20 +32475,20 @@ if test "x$xv_prefer_shared" = "xyes"; then - { echo "$as_me:$LINENO: checking for libXv.so" >&5 -echo $ECHO_N "checking for libXv.so... $ECHO_C" >&6; } - if test -f "$xv_path/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in $xv_path" >&5 -echo "${ECHO_T}found libXv.so in $xv_path" >&6; } - XV_LIBS="libXv.so" + { echo "$as_me:$LINENO: checking for libXv.dylib" >&5 +echo $ECHO_N "checking for libXv.dylib... $ECHO_C" >&6; } + if test -f "$xv_path/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in $xv_path" >&5 +echo "${ECHO_T}found libXv.dylib in $xv_path" >&6; } + XV_LIBS="libXv.dylib" else - if test -f "/usr/lib/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5 -echo "${ECHO_T}found libXv.so in /usr/lib" >&6; } - XV_LIBS="libXv.so" + if test -f "/usr/lib/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5 +echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; } + XV_LIBS="libXv.dylib" else - { echo "$as_me:$LINENO: result: libXv.so not found in $xv_path" >&5 -echo "${ECHO_T}libXv.so not found in $xv_path" >&6; } + { echo "$as_me:$LINENO: result: libXv.dylib not found in $xv_path" >&5 +echo "${ECHO_T}libXv.dylib not found in $xv_path" >&6; } fi fi @@ -32517,20 +32517,20 @@ if test x$XV_LIBS = x; then if ! test "x$xv_prefer_shared" = "xyes"; then - { echo "$as_me:$LINENO: checking for libXv.so" >&5 -echo $ECHO_N "checking for libXv.so... $ECHO_C" >&6; } - if test -f "$xv_path/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in $xv_path" >&5 -echo "${ECHO_T}found libXv.so in $xv_path" >&6; } - XV_LIBS="libXv.so" + { echo "$as_me:$LINENO: checking for libXv.dylib" >&5 +echo $ECHO_N "checking for libXv.dylib... $ECHO_C" >&6; } + if test -f "$xv_path/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in $xv_path" >&5 +echo "${ECHO_T}found libXv.dylib in $xv_path" >&6; } + XV_LIBS="libXv.dylib" else - if test -f "/usr/lib/libXv.so"; then - { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5 -echo "${ECHO_T}found libXv.so in /usr/lib" >&6; } - XV_LIBS="libXv.so" + if test -f "/usr/lib/libXv.dylib"; then + { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5 +echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; } + XV_LIBS="libXv.dylib" else - { echo "$as_me:$LINENO: result: libXv.so not found in $xv_path" >&5 -echo "${ECHO_T}libXv.so not found in $xv_path" >&6; } + { echo "$as_me:$LINENO: result: libXv.dylib not found in $xv_path" >&5 +echo "${ECHO_T}libXv.dylib not found in $xv_path" >&6; } fi fi @@ -32638,8 +32638,8 @@ ac_have_xv_static="yes" XV_LIBS="$xv_path/$XV_LIBS" ;; - x*.so) - XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'` + x*.dylib) + XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/.dylib$//'` ;; *) { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIBS" >&5 @@ -32695,7 +32695,7 @@ hppa*) if test "x$ac_have_xv_static" = "xyes"; then echo "warning: hppa linker - disabling static libXv" - XV_LIBS="libXv.so" + XV_LIBS="libXv.dylib" fi ;; diff -Nurd xine-lib-1.1.13/src/audio_out/Makefile.in xine-lib-1.1.13-new/src/audio_out/Makefile.in --- xine-lib-1.1.13/src/audio_out/Makefile.in 2008-06-14 19:15:47.000000000 -0400 +++ xine-lib-1.1.13-new/src/audio_out/Makefile.in 2009-10-09 23:33:13.000000000 -0400 @@ -639,11 +639,11 @@ # The "-Wl,-framework -Wl,..." is needed for libtool versions before # 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) xineplug_ao_out_coreaudio_la_LDFLAGS = \ - -Wl,-framework -Wl,Cocoa -framework CoreAudio \ + -Wl,-framework -Wl,Cocoa -isysroot /Developer/SDKs/MacOSX10.5.sdk -framework CoreAudio \ -Wl,-framework -Wl,AudioUnit -framework AudioUnit \ -avoid-version -module -xineplug_ao_out_coreaudio_la_CFLAGS = -framework CoreAudio -framework AudioUnit $(VISIBILITY_FLAG) +xineplug_ao_out_coreaudio_la_CFLAGS = -isysroot /Developer/SDKs/MacOSX10.5.sdk -framework CoreAudio -framework AudioUnit $(VISIBILITY_FLAG) xineplug_ao_out_pulseaudio_la_SOURCES = audio_pulse_out.c xineplug_ao_out_pulseaudio_la_LIBADD = $(XINE_LIB) $(PULSEAUDIO_LIBS) $(LTLIBINTL) xineplug_ao_out_pulseaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(PULSEAUDIO_CFLAGS) diff -Nurd xine-lib-1.1.13/src/post/deinterlace/plugins/Makefile.in xine-lib-1.1.13-new/src/post/deinterlace/plugins/Makefile.in --- xine-lib-1.1.13/src/post/deinterlace/plugins/Makefile.in 2008-06-14 19:15:57.000000000 -0400 +++ xine-lib-1.1.13-new/src/post/deinterlace/plugins/Makefile.in 2009-10-09 23:30:57.000000000 -0400 @@ -66,9 +66,7 @@ libdeinterlaceplugins_la-linearblend.lo \ libdeinterlaceplugins_la-vfir.lo \ libdeinterlaceplugins_la-weave.lo \ - libdeinterlaceplugins_la-greedy2frame.lo \ libdeinterlaceplugins_la-scalerbob.lo \ - libdeinterlaceplugins_la-kdetv_greedyh.lo \ libdeinterlaceplugins_la-kdetv_tomsmocomp.lo libdeinterlaceplugins_la_OBJECTS = \ $(am_libdeinterlaceplugins_la_OBJECTS) @@ -418,7 +416,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -EXTRA_DIST = greedy2frame_template.c greedyh.asm \ +EXTRA_DIST = greedyh.asm \ tomsmocomp/SearchLoop0A.inc tomsmocomp/SearchLoopBottom.inc \ tomsmocomp/SearchLoopEdgeA.inc tomsmocomp/SearchLoopEdgeA8.inc \ tomsmocomp/SearchLoopOddA.inc tomsmocomp/SearchLoopOddA2.inc \ @@ -442,9 +440,7 @@ linearblend.c \ vfir.c \ weave.c \ - greedy2frame.c \ scalerbob.c \ - kdetv_greedyh.c \ kdetv_tomsmocomp.c libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) @@ -503,8 +499,6 @@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-double....@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-greedy....@am__quote@ -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-greedy2frame....@am__quote@ -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_greedyh....@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_tomsmocomp....@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-linear....@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-linearblend....@am__quote@ ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs