Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6680/10.3/unstable/main/finkinfo/libs
Modified Files:
libxine1.info libxine1.patch
Log Message:
new upstream, got maintainer approval a while ago, but forgot to release :P
Index: libxine1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/libxine1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxine1.info 20 Jul 2006 02:49:21 -0000 1.2
+++ libxine1.info 22 Nov 2006 22:32:49 -0000 1.3
@@ -1,49 +1,60 @@
Package: libxine1
-Version: 1.1.1
+Version: 1.1.2
Revision: 11
Description: Xine video/media player library
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.9.9-1), aalib, arts-dev (>= 1.4.0-11), audiofile,
bzip2-shlibs, esound, flac, freetype219, gconf2-dev, gettext-bin,
gettext-tools, glib2-dev, dbus-dev (>= 0.60-1), libhowl-dev, gnome-vfs2-ssl-dev
| gnome-vfs2-dev, imagemagick-dev | imagemagick-nox-dev, lcms, libbonobo2-dev,
libcaca-dev, libcdio5-dev, libgettext3-dev, libiconv-dev, libiso96604-dev,
libjpeg, libmng2, libncurses5, libogg, libpng3, libtheora0, libtiff, libtool14,
libvcd0-dev (>= 0.7.21-10), libvorbis0, libxml2, orbit2-dev, pkgconfig, popt,
pth, qt3 (>= 3.3.6-12), sdl, slang, speex3, x11-dev
+BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-1031), audiofile,
bzip2-shlibs, esound, flac (>= 1.1.1-1011), freetype219, gconf2-dev,
gettext-bin, gettext-tools, glib2-dev (>= 2.8.6-1), gnome-vfs2-ssl-dev |
gnome-vfs2-dev, imagemagick-dev (>= 6.1.8-1002) | imagemagick-nox-dev (>=
6.1.8-1002), lcms, libbonobo2-dev, libcaca-dev, libcdio-dev, libgettext3-dev,
libiconv-dev, libiso9660-dev, libjpeg, libmng2, libncurses5 (>=
5.4-20041023-1006), libogg, libpng3, libtheora0, libtiff, libtool14, libvcd-dev
(>= 0.7.21-10), libvorbis0, libxml2, orbit2-dev, pkgconfig, popt, pth, qt3 (>=
3.3.6-17), sdl (>= 1.2.9-1001), slang, speex3, x11-dev
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.gz
-Source2: http://ranger.befunk.com/fink/libavcodec-20060216.tar.bz2
-Source2ExtractDir: xine-lib-%v/src/libffmpeg
-Source-MD5: b1f42602c776bb93e3cbf127e220cbfd
-Source2-MD5: a65547b0003f89bb653c7767c1120ab0
+Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
+Source-MD5: c4dd262c47caae6f428eb902ac8ec0e8
Patch: %n.patch
PatchScript: <<
- ### Altivec enhancement
perl -pi -e 's,-faltivec,-faltivec -maltivec,g' configure
+ perl -pi -e 's,libX11.so,libX11.dylib,g; s,libXv.so,libXv.dylib,g;'
configure
+ perl -pi -e 's/-avoid-version/-Wl,-read_only_relocs,warning/g;'
src/libffmpeg/Makefile.in src/post/deinterlace/Makefile.in
src/post/planar/Makefile.in
+ find . -name \*.c -o -name \*.h | xargs grep balign | cut -d: -f1 |
sort -u | xargs perl -pi -e 's,.balign 16,.align 4,g; s,.balign 8,.align 3,g;'
+ # -O3 considered harmful on OSX :P
+ perl -pi -e 's,-O3,-Os,g' configure
<<
-SetCPPFLAGS: -no-cpp-precomp -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include
+SetCPPFLAGS: -fno-common -no-cpp-precomp
-I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include
-I/usr/X11R6/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib
SetLIBS: -L%p/lib
+SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-ConfigureParams: --with-pic --enable-static --enable-shared --disable-alsa
--disable-alsatest --disable-dxr3 --enable-macosx-video --enable-coreaudio
--disable-fb --disable-directfb --disable-vis --disable-mlib
--libexecdir=%p/lib/libxine --mandir=%p/share/man --disable-sdltest
+NoSetMAKEFLAGS: true
+ConfigureParams: --enable-fpic --with-pic --enable-static --enable-shared
--disable-alsa --disable-alsatest --disable-dxr3 --enable-macosx-video
--enable-coreaudio --disable-fb --disable-directfb --disable-vis --disable-mlib
--libexecdir=%p/lib/libxine --mandir=%p/share/man --disable-sdltest (%m =
powerpc) --enable-altivec (%m = i386) --disable-altivec --disable-w32dll
CompileScript: <<
#!/bin/sh -e
- export X_LIBS="-L/usr/X11R6/include -lX11"
export PATH="%p/lib/freetype219/bin:$PATH"
export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+ if [ "%m" = "i386" ]; then
+ export CPPFLAGS="$CPPFLAGS -UHAVE_MMX -UHAVE_MMX2"
+ fi
./configure %c
+
+ if [ "%m" = "i386" ]; then
+ echo "#define HAVE_DARWIN_CDROM 1" >> config.h
+ fi
+
make
<<
+InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
SplitOff: <<
Package: %N-shlibs
- Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-11), audiofile-shlibs,
bzip2-shlibs, esound-shlibs, flac-shlibs, freetype219-shlibs, gconf2-shlibs,
glib2-shlibs, gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, imagemagick-shlibs,
lcms-shlibs, libbonobo2-shlibs, libcdio5-shlibs, libgettext3-shlibs, libiconv,
libiso96604-shlibs, libjpeg-shlibs, libmng2-shlibs, libncurses5-shlibs,
libogg-shlibs, libpng3-shlibs, libtheora0-shlibs, libtiff-shlibs,
libtool14-shlibs, libvcd0-shlibs (>= 0.7.21-10), libvorbis0-shlibs,
libxml2-shlibs, orbit2-shlibs, popt-shlibs, qt3-shlibs (>= 3.3.6-12),
sdl-shlibs, slang-shlibs, speex3-shlibs, x11-shlibs
+ Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-1031), audiofile-shlibs,
bzip2-shlibs, esound-shlibs, flac-shlibs (>= 1.1.1-1011), freetype219-shlibs,
gconf2-shlibs, glib2-shlibs (>= 2.8.6-1), gnome-vfs2-ssl-shlibs |
gnome-vfs2-shlibs, imagemagick-shlibs (>= 6.1.8-1002), lcms-shlibs,
libbonobo2-shlibs, libcdio7-shlibs (>= 0.77-12), libgettext3-shlibs, libiconv,
libiso96605-shlibs, libjpeg-shlibs, libmng2-shlibs, libncurses5-shlibs (>=
5.4-20041023-1006), libogg-shlibs, libpng3-shlibs, libtheora0-shlibs,
libtiff-shlibs, libtool14-shlibs, libvcd0-shlibs (>= 0.7.21-10),
libvorbis0-shlibs, libxml2-shlibs, orbit2-shlibs, popt-shlibs, qt3-shlibs (>=
3.3.6-17), sdl-shlibs (>= 1.2.9-1001), slang-shlibs, speex3-shlibs, x11-shlibs
Provides: libxine-shlibs
Conflicts: libxine-shlibs
Replaces: libxine-shlibs, libxine
Index: libxine1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/libxine1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxine1.patch 22 Jun 2006 01:45:19 -0000 1.1
+++ libxine1.patch 22 Nov 2006 22:32:49 -0000 1.2
@@ -1,5 +1,73 @@
---- xine-lib-1.1.1/misc/cdda_server.c 2004-12-12 17:00:50.000000000 -0500
-+++ xine-lib-1.1.1-new/misc/cdda_server.c 2006-02-13 14:58:22.000000000
-0500
+
+--- xine-lib-1.1.2/configure 2006-07-09 10:51:14.000000000 -0400
++++ xine-lib-1.1.2-patched/configure 2006-07-15 10:54:01.000000000 -0400
+@@ -33088,8 +33088,8 @@
+ ac_have_xv_static="yes"
+ XV_LIB="$xv_path/$XV_LIB"
+ ;;
+- x*.so)
+- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
++ x*.dylib)
++ XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.dylib$//'`
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB"
>&5
+@@ -52649,7 +52649,7 @@
+ k7cpu="i686"
+ fi
+
+- CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al
$f_aj $m_wm $m_psb -fexpensive-optimizations $f_si -ffast-math
$INLINE_FUNCTIONS $CFLAGS"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math
$INLINE_FUNCTIONS -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
+
+ DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+
+@@ -52805,7 +52805,7 @@
+ enable_armv4l="no"
+
+ case "$host_or_hostalias" in
+- i?86-* | k?-* | athlon-* | pentium*-)
++ i?86-*-linux* | k?-* | athlon-* | pentium*-)
+
+ cat >>confdefs.h <<_ACEOF
+ #define ARCH_X86
+@@ -52838,7 +52838,7 @@
+
+ enable_ffmmx="yes"
+ ;;
+- *darwin*)
++ *-darwin*)
+ HOST_OS_DARWIN=1
+
+ cat >>confdefs.h <<_ACEOF
+@@ -52848,14 +52848,22 @@
+
+ AS="$CC"
+
+-cat >>confdefs.h <<_ACEOF
++case "$host_or_hostalias" in
++ i?86-*-darwin*)
++ cat >>confdefs.h <<_ACEOF
++#define FPM_INTEL
++#define ARCH_X86
++_ACEOF
++ ;;
++ powerpc-*-darwin*)
++ cat >>confdefs.h <<_ACEOF
+ #define FPM_PPC
++#define ARCH_PPC
+ _ACEOF
++ ;;
++esac
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define ARCH_PPC
+-_ACEOF
+
+
+ OBJC=${CC:-gcc}
+--- xine-lib-1.1.2/misc/cdda_server.c 2006-07-09 10:37:05.000000000 -0400
++++ xine-lib-1.1.2-patched/misc/cdda_server.c 2006-07-15 10:33:12.000000000
-0400
@@ -335,7 +335,9 @@
/* dlopening libdvdcss */
@@ -20,8 +88,8 @@
"this shouldn't happen !\n");
dlclose(dvdcss_library);
}
---- xine-lib-1.1.1/src/input/input_dvd.c 2005-10-14 17:02:16.000000000
-0400
-+++ xine-lib-1.1.1-new/src/input/input_dvd.c 2006-02-13 14:58:29.000000000
-0500
+--- xine-lib-1.1.2/src/input/input_dvd.c 2006-07-09 10:37:35.000000000
-0400
++++ xine-lib-1.1.2-patched/src/input/input_dvd.c 2006-07-15
10:33:12.000000000 -0400
@@ -1784,7 +1784,11 @@
"DVD drive, which you intend to
use for playing DVDs."),
10, device_change_cb, (void
*)this);
@@ -34,9 +102,24 @@
/* we have found libdvdcss, enable the specific config options */
char *raw_device;
static char *decrypt_modes[] = { "key", "disc", "title", NULL };
---- xine-lib-1.1.1/src/input/libdvdnav/dvd_input.c 2004-04-05
14:01:09.000000000 -0400
-+++ xine-lib-1.1.1-new/src/input/libdvdnav/dvd_input.c 2006-02-13
14:57:36.000000000 -0500
-@@ -287,7 +287,9 @@
+--- xine-lib-1.1.2/src/input/libdvdnav/bswap.h 2003-05-26 19:11:44.000000000
-0400
++++ xine-lib-1.1.2-patched/src/input/libdvdnav/bswap.h 2006-07-15
10:33:12.000000000 -0400
+@@ -41,6 +41,12 @@
+ #define B2N_32(x) x = bswap_32(x)
+ #define B2N_64(x) x = bswap_64(x)
+
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define B2N_16(x) x = OSSwapBigToHostInt16(x)
++#define B2N_32(x) x = OSSwapBigToHostInt32(x)
++#define B2N_64(x) x = OSSwapBigToHostInt64(x)
++
+ #elif defined(__NetBSD__)
+ #include <sys/endian.h>
+ #define B2N_16(x) BE16TOH(x)
+--- xine-lib-1.1.2/src/input/libdvdnav/dvd_input.c 2006-07-09
10:37:37.000000000 -0400
++++ xine-lib-1.1.2-patched/src/input/libdvdnav/dvd_input.c 2006-07-15
10:33:12.000000000 -0400
+@@ -364,7 +364,9 @@
#else
/* dlopening libdvdcss */
@@ -47,7 +130,7 @@
dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY);
#else
dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY);
-@@ -323,7 +325,7 @@
+@@ -400,7 +402,7 @@
dvdcss_library = NULL;
} else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek
|| !DVDcss_read || !DVDcss_error || !dvdcss_version) {
@@ -56,40 +139,23 @@
"this shouldn't happen !\n");
dlclose(dvdcss_library);
}
---- xine-lib-1.1.1/src/xine-utils/xine_check.c 2005-03-08 21:05:16.000000000
-0500
-+++ xine-lib-1.1.1-new/src/xine-utils/xine_check.c 2006-02-13
16:26:12.000000000 -0500
-@@ -369,7 +369,11 @@
- /* Majority of thi code was taken from or inspired by the xvinfo.c file of
XFree86 */
+--- xine-lib-1.1.2/src/post/planar/eq.c 2006-07-09 10:40:08.000000000
-0400
++++ xine-lib-1.1.2-patched/src/post/planar/eq.c 2006-07-15
10:33:12.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include "post.h"
+ #include "xineutils.h"
+ #include <pthread.h>
++#undef ARCH_X86
- dlerror(); /* clear error code */
-+#ifdef __APPLE__
-+ x11_handle = dlopen("libX11.6.dylib", RTLD_LAZY);
-+#else
- x11_handle = dlopen("libX11.so", RTLD_LAZY);
-+#endif
- if(!x11_handle) {
- hc->msg = dlerror();
- hc->status = XINE_HEALTH_CHECK_FAIL;
-@@ -395,7 +399,11 @@
- }
-
- dlerror(); /* clear error code */
-+#ifdef __APPLE__
-+ xv_handle = dlopen("libXv.1.dylib", RTLD_LAZY);
-+#else
- xv_handle = dlopen("libXv.so", RTLD_LAZY);
-+#endif
- if(!xv_handle) {
- hc->msg = dlerror();
- /* Xv might still work when linked statically into the output plugin,
---- xine-lib-1.1.1/configure Tue Nov 15 06:40:27 2005
-+++ xine-lib-1.1.1-new/configure Wed Feb 15 16:54:31 2006
-@@ -46268,7 +46268,7 @@
- DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
- ;;
- *darwin*)
-- CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb
-fexpensive-optimizations $f_si $f_nsa -ffast-math $INLINE_FUNCTIONS
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
-+ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
- DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
- ;;
- ppc-*-linux* | powerpc-*)
+
+ #if defined(ARCH_X86) || defined(ARCH_X86_64)
+--- xine-lib-1.1.2/src/post/planar/eq2.c 2006-07-09 10:40:08.000000000
-0400
++++ xine-lib-1.1.2-patched/src/post/planar/eq2.c 2006-07-15
10:33:12.000000000 -0400
+@@ -32,6 +32,7 @@
+ #include "xineutils.h"
+ #include <math.h>
+ #include <pthread.h>
++#undef ARCH_X86
+
+
+ /* Per channel parameters */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
