Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv12047
Modified Files:
libxine1-10.6.info libxine1-10.6.patch
Log Message:
new libxine1 1.1.20.1 for 10.6
Index: libxine1-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxine1-10.6.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxine1-10.6.info 27 Jan 2012 03:38:28 -0000 1.2
+++ libxine1-10.6.info 14 Jun 2012 11:04:17 -0000 1.3
@@ -1,7 +1,7 @@
Info4: <<
Package: libxine1
-Version: 1.1.19
-Revision: 102
+Version: 1.1.20.1
+Revision: 202
Distribution: 10.6
Description: Xine video/media player library
License: LGPL
@@ -11,17 +11,15 @@
BuildDepends: <<
a52dec-dev,
aalib,
- amrnb-dev,
audiofile,
bzip2-dev,
dbus1.3-dev (>= 1.2.24-1),
dbus-glib1.2-dev (>= 0.84-1),
esound (>= 0.2.38-1),
expat1,
- faac-dev,
+# faac-dev,
fink (>= 0.30.0-1),
fink-package-precedence (>= 0.7-1),
- ffmpeg-dev,
fontconfig2-dev (>= 2.8.0-6),
freetype219 (>= 2.4.4-2),
gconf2-dev (>= 2.20.0-1),
@@ -30,21 +28,21 @@
glib2-dev (>= 2.22.0-1),
gnome-vfs2-unified-dev (>= 1:2.24.2-1),
gtk+2-dev (>= 2.18.0-1),
- imagemagick1-dev,
+ imagemagick2-dev,
jack-dev,
lame-dev,
lcms,
libavahi-client3-dev,
libavahi-common3-dev,
libavahi-glib1-dev,
- libavcodec-dev,
- libavutil-dev,
+ libavcodec53-dev (>= 0.8.11),
+ libavutil51-dev (>= 0.8.11),
libbonobo2-dev (>= 2.20.0-1),
libcaca-dev (>= 0.99.beta16-1),
libcdio-dev,
libdvdnav,
libdvdread.3,
- libfaad1-dev,
+ libfaad2-dev,
libflac8-dev,
libgettext8-dev,
libgnugetopt,
@@ -60,59 +58,69 @@
libncursesw5,
libogg,
libopencore-amr0,
- libpostproc-dev,
+ libpostproc51-dev (>= 0.8.11),
+ libspeex1,
libtheora0,
libtiff,
libtool2,
- libvcd-dev (>= 0.7.21-10),
+# libvcd-dev (>= 0.7.21-10),
libvorbis0,
- libx264-98-dev,
+ libx264-115-dev,
libxml2 (>= 2.6.32-1),
orbit2-dev (>= 2.14.9-1),
pkgconfig (>= 0.23-1),
popt,
pth2-dev,
sdl (>= 1.2.9-1001),
- slang,
- speex3,
+ slang2,
wavpack1-dev,
x11-dev,
xvidcore
<<
-Provides: libxine
Conflicts: <<
libxine,
- libxine-docs
+ libxine-docs,
+ libxine1,
+ libxine2
<<
Replaces: <<
libxine,
libxine-shlibs,
- libxine-docs
+ libxine-docs,
+ libxine1,
+ libxine2
<<
Recommends: libdvdcss-shlibs
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
-Source-MD5: a410a0f0617e1d6309f0cbe907f73f8a
+Source-MD5: acdb036192169fc311af81b7dd33175a
PatchScript: <<
+ #!/bin/sh -ev
%{default_script}
- perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),;
s,s/\\\.so\$//,s/\.dylib\$//,' configure
- if [ "%m" = "x86_64" ]; then perl -pi -e 's, deinterlace , ,'
src/post/Makefile.in; fi
+ #perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),;
s,s/\\\.so\$//,s/\.dylib\$//,' configure
+ ### On 10.6, have assembly error
+ ### tomsmocomp/SearchLoopTop.inc:85: error: can't find a register in
class 'GENERAL_REGS' while reloading 'asm'
+ ### tomsmocomp/SearchLoopTop.inc:85: error: 'asm' operand has
impossible constraints
+ ### This is different than the asm error in libxine1-1.1.19 that was
occuring under x86_64,
+ ### but solution is the same: deactivate deinterlace for this platform
+ if [[ $(sw_vers -productVersion | cut -d. -f1-2) = 10.6 ]]; then
+ if [ "%m" = "i386" ]; then perl -pi -e 's, deinterlace , ,'
src/post/Makefile.in; fi
+ fi
<<
-PatchFile: libxine1-10.6.patch
-PatchFile-MD5: 096d62d92f03ddc0632580997974808a
+PatchFile: %n-10.6.patch
+PatchFile-MD5: 26ee3e5441802f4b957454d89c9d66ca
-SetCFLAGS: -Os -fomit-frame-pointer -fexpensive-optimizations -ffast-math
-I%p/lib/fontconfig2/include
-SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L%p/lib/fontconfig2/lib
-UseMaxBuildJobs: true
+#SetCFLAGS: -Os -fomit-frame-pointer -fexpensive-optimizations -ffast-math
-I%p/lib/fontconfig2/include
+#SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L%p/lib/fontconfig2/lib
+UseMaxBuildJobs: false
ConfigureParams: <<
--target=%m-apple-darwin`uname -r|cut -f1 -d.` \
--libexecdir=%p/lib/libxine \
--mandir=%p/share/man \
---enable-static \
+--disable-static \
--enable-shared \
--enable-antialiasing \
---disable-optimizations \
\
--without-arts \
--disable-dts \
@@ -155,22 +163,21 @@
--enable-nosefart \
--enable-opengl \
--enable-real-codecs \
---enable-vcd
+--disable-vcd
<<
CompileScript: <<
#!/bin/sh -ev
- export
CPATH=%p/lib/fontconfig2/include:%p/include:/usr/X11R6/include:/usr/X11/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}
+# export
CPATH=%p/lib/fontconfig2/include:%p/include:/usr/X11R6/include:/usr/X11/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}
[ "%m" = "powerpc" ] && export EXTRA_CONFIG_PARAMS="--enable-altivec"
./configure %c $EXTRA_CONFIG_PARAMS
- make
- fink-package-precedence --prohibit-bdep %N .
+ make -w
+ fink-package-precedence --prohibit-bdep=libxine1,libxine2 .
<<
InstallScript: <<
make -j1 install DESTDIR=%d
perl -pi -e 's/-framework /-Wl,-framework,/g' %i/lib/*.la
-rm -f %i/lib/*.la
<<
DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
SplitOff: <<
@@ -178,34 +185,33 @@
Depends: <<
a52dec-shlibs,
aalib-shlibs,
- amrnb-shlibs,
audiofile-shlibs,
bzip2-shlibs,
dbus1.3-shlibs (>= 1.2.24-1),
esound-shlibs (>= 0.2.38-1),
expat1-shlibs,
- faac-shlibs,
+# faac-shlibs,
fontconfig2-shlibs (>= 2.8.0-6),
freetype219-shlibs (>= 2.4.4-2),
gconf2-shlibs (>= 2.20.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-vfs2-unified-shlibs (>= 1:2.24.2-1),
gtk+2-shlibs (>= 2.18.0-1),
- imagemagick1-shlibs,
+ imagemagick2-shlibs,
jack-shlibs,
lame-shlibs,
lcms-shlibs,
libavahi-client3-shlibs,
libavahi-common3-shlibs,
libavahi-glib1-shlibs,
- libavcodec51-shlibs,
- libavutil49-shlibs,
+ libavcodec53-shlibs (>= 0.8.11),
+ libavutil51-shlibs (>= 0.8.11),
libbonobo2-shlibs (>= 2.20.0-1),
libcaca-shlibs (>= 0.99.beta16-1),
libcdio7-shlibs,
libdvdnav4-shlibs,
libdvdread.3-shlibs,
- libfaad1-shlibs,
+ libfaad2-shlibs,
libflac8,
libgettext8-shlibs,
libgnugetopt-shlibs,
@@ -221,23 +227,22 @@
libncursesw5-shlibs,
libogg-shlibs,
libopencore-amr0-shlibs,
- libpostproc51-shlibs,
+ libpostproc51-shlibs (>= 0.8.11),
+ libspeex1-shlibs,
libtheora0-shlibs,
libtiff-shlibs,
libtool2-shlibs,
- libvcd0-shlibs (>= 0.7.21-10),
+# libvcd0-shlibs (>= 0.7.21-10),
libvorbis0-shlibs,
- libx264-98-shlibs,
+ libx264-115-shlibs,
libxml2-shlibs (>= 2.6.32-1),
orbit2-shlibs (>= 2.14.9-1),
sdl-shlibs (>= 1.2.9-1001),
- slang-shlibs,
- speex3-shlibs,
+ slang2-shlibs,
wavpack1-shlibs,
x11-shlibs,
xvidcore-shlibs
<<
- Provides: libxine-shlibs
Conflicts: libxine-shlibs
Replaces: <<
libxine-shlibs,
@@ -250,8 +255,8 @@
share/xine
<<
Shlibs: <<
- %p/lib/libxine.1.dylib 31.0.0 %n (>= 1.1.19-1)
- %p/lib/libxineMacOSXVideo.1.dylib 31.0.0 %n (>= 1.1.19-1)
+ %p/lib/libxine.1.dylib 32.0.0 %n (>= 1.1.20.1-1)
+ %p/lib/libxineMacOSXVideo.1.dylib 32.0.0 %n (>= 1.1.20.1-1)
<<
<<
@@ -267,13 +272,14 @@
The xine-ui package provides one for your convenience, so you can just
start watching your VCDs ;-)
<<
-DescPackaging: <<
-Had to disable the deinterlacer on x86_64, because of asm issues beyond
-my capabilities to solve. If anyone wants to look at it, remove the
-perl -pi on Makefile.in in PatchScript. :)
-
+DescPort: <<
+ Assembly failure on 10.6/i386 in the deinterlace code. Different than
+ the failure seen for libxine1-1.1.19 in 10.6/x86_64.
+
Add missing #include to avoid needing older OSX SDKs. See:
https://trac.macports.org/ticket/23102
+
+ libxineposix.a disabled on 10.7 because all functions that are tested
for
+ it already are in the system. This avoids building an empty .a with ar.
<<
<<
-
Index: libxine1-10.6.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxine1-10.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxine1-10.6.patch 19 Oct 2011 15:43:22 -0000 1.1
+++ libxine1-10.6.patch 14 Jun 2012 11:04:17 -0000 1.2
@@ -1,7 +1,7 @@
diff -Nurd xine-lib-1.1.19/configure xine-lib-1.1.19-new/configure
--- xine-lib-1.1.19/configure 2010-07-25 10:40:24.000000000 -0400
+++ xine-lib-1.1.19-new/configure 2010-10-03 18:15:19.000000000 -0400
-@@ -19871,7 +19871,7 @@
+@@ -20772,7 +20772,7 @@
@@ -13,21 +13,19 @@
diff -Nurd xine-lib-1.1.19/src/audio_out/Makefile.in
xine-lib-1.1.19-new/src/audio_out/Makefile.in
--- xine-lib-1.1.19/src/audio_out/Makefile.in 2010-07-25 10:40:01.000000000
-0400
+++ xine-lib-1.1.19-new/src/audio_out/Makefile.in 2010-10-03
18:38:36.000000000 -0400
-@@ -691,11 +691,10 @@
+@@ -689,9 +689,9 @@
# 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 = \
+ xineplug_ao_out_coreaudio_la_LDFLAGS = $(AM_LDFLAGS) \
- -Wl,-framework -Wl,Cocoa -framework CoreAudio \
- -Wl,-framework -Wl,AudioUnit -framework AudioUnit \
-- -avoid-version -module
-+ -Wl,-framework,Cocoa -Wl,-framework,CoreAudio \
-+ -Wl,-framework,AudioUnit -avoid-version -module
-
-xineplug_ao_out_coreaudio_la_CFLAGS = -framework CoreAudio -framework
AudioUnit $(VISIBILITY_FLAG)
++ -Wl,-framework,Cocoa -Wl,-framework,CoreAudio \
++ -Wl,-framework,AudioUnit \
+xineplug_ao_out_coreaudio_la_CFLAGS = -Wl,-framework,CoreAudio
-Wl,-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.19/src/audio_out/audio_coreaudio_out.c
xine-lib-1.1.19-new/src/audio_out/audio_coreaudio_out.c
--- xine-lib-1.1.19/src/audio_out/audio_coreaudio_out.c 2010-03-09
17:17:05.000000000 -0500
+++ xine-lib-1.1.19-new/src/audio_out/audio_coreaudio_out.c 2011-06-07
11:33:04.000000000 -0400
@@ -42,7 +40,7 @@
diff -Nurd xine-lib-1.1.19/src/libxinevdec/Makefile.in
xine-lib-1.1.19-new/src/libxinevdec/Makefile.in
--- xine-lib-1.1.19/src/libxinevdec/Makefile.in 2010-07-25
10:40:16.000000000 -0400
+++ xine-lib-1.1.19-new/src/libxinevdec/Makefile.in 2010-10-03
18:18:03.000000000 -0400
-@@ -483,7 +483,7 @@
+@@ -490,7 +490,7 @@
xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
AM_CFLAGS = $(VISIBILITY_FLAG)
@@ -64,7 +62,7 @@
libdeinterlaceplugins_la-kdetv_tomsmocomp.lo
libdeinterlaceplugins_la_OBJECTS = \
$(am_libdeinterlaceplugins_la_OBJECTS)
-@@ -463,9 +461,7 @@
+@@ -470,9 +468,7 @@
linearblend.c \
vfir.c \
weave.c \
@@ -74,7 +72,7 @@
kdetv_tomsmocomp.c
libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
-@@ -525,8 +521,6 @@
+@@ -532,8 +528,6 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-double.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy.Plo@am__quote@
@@ -86,7 +84,7 @@
diff -Nurd xine-lib-1.1.19/src/xine-engine/Makefile.in
xine-lib-1.1.19-new/src/xine-engine/Makefile.in
--- xine-lib-1.1.19/src/xine-engine/Makefile.in 2010-07-25
10:40:20.000000000 -0400
+++ xine-lib-1.1.19-new/src/xine-engine/Makefile.in 2010-10-03
21:22:15.000000000 -0400
-@@ -441,7 +441,7 @@
+@@ -448,7 +448,7 @@
vidixdir = $(XINE_PLUGINDIR)/vidix
LIBXINEPOSIX = $(top_builddir)/lib/libxineposix.la
AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
@@ -126,3 +124,25 @@
/*
* Flush audio and video buffers. It is called from demuxers on
* seek/stop, and may be useful when user input changes a stream and
+--- a/src/demuxers/demux_qt.c 2011-10-04 18:40:59.000000000 -0400
++++ b/src/demuxers/demux_qt.c 2012-04-19 19:18:44.000000000 -0400
+@@ -129,7 +129,7 @@
+ #define QTIM_ATOM QT_ATOM('q', 't', 'i', 'm')
+
+ /* placeholder for cutting and pasting */
+-#define _ATOM QT_ATOM('', '', '', '')
++/* #define _ATOM QT_ATOM('', '', '', '') */
+
+ #define ATOM_PREAMBLE_SIZE 8
+ #define PALETTE_COUNT 256
+--- a/src/xine-engine/post.h
++++ b/src/xine-engine/post.h
+@@ -377,7 +377,7 @@ static xine_post_api_parameter_t temp_p[
+
+ #define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \
+ { param_type, #var, sizeof(temp_s.var), \
+- (char*)&temp_s.var-(char*)&temp_s, enumv, min, max, readonly, descr },
++ offsetof(__typeof__(temp_s), var), enumv, min, max, readonly, descr },
+
+ #define END_PARAM_DESCR( name ) \
+ { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
