[76054] trunk/dports/multimedia/xine-lib

jmr at macports.org jmr at macports.org
Thu Feb 17 02:01:20 PST 2011


Revision: 76054
          http://trac.macports.org/changeset/76054
Author:   jmr at macports.org
Date:     2011-02-17 02:01:18 -0800 (Thu, 17 Feb 2011)
Log Message:
-----------
xine-lib: update to 1.1.19 (#25002), fix build on 10.6 (#23102)

Modified Paths:
--------------
    trunk/dports/multimedia/xine-lib/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/xine-lib/files/
    trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff
    trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff
    trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff

Modified: trunk/dports/multimedia/xine-lib/Portfile
===================================================================
--- trunk/dports/multimedia/xine-lib/Portfile	2011-02-17 09:42:54 UTC (rev 76053)
+++ trunk/dports/multimedia/xine-lib/Portfile	2011-02-17 10:01:18 UTC (rev 76054)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		xine-lib
-version		1.1.16.1
-revision        2
+version		1.1.19
 description	xine-lib is a free multimedia engine, released under the GPL.
 long_description        ${description}
 maintainers	nomaintainer
@@ -12,10 +11,11 @@
 platforms	darwin
 homepage	http://www.xine-project.org
 master_sites    sourceforge:xine
-use_bzip2   yes
-checksums   md5     9de11db7e262c564cfdba9841a092ebe \
-            sha1    82709254a0603e3971058aacf8578926b75d4a20 \
-            rmd160  3c76b12fae8cba87e6d3bceafcbf2fb3ef94e164
+use_xz      yes
+checksums   md5     d0969c067dc32f33c5ea431e5e2106ce \
+            sha1    f65f762d2e16adf04b9d715c91ee0bc02c322a7d \
+            rmd160  7b8c2a4e5bcd0984414360d8d589aa533a9040f3
+depends_build port:libtool
 depends_lib port:aalib	\
             port:esound \
             port:faad2 \
@@ -34,15 +34,22 @@
 configure.env-append    LIBTOOL=glibtool
 configure.args  --with-external-libfaad \
                 --with-external-ffmpeg
-post-configure {
-    # See #17952
-    reinplace "s|#define HAVE_FFMPEG_AVUTIL_H 1|#undef HAVE_FFMPEG_AVUTIL_H|" \
-        ${worksrcpath}/include/configure.h
+if {${os.platform} == "darwin" && [string match *64 $build_arch]} {
+    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
 }
 
 livecheck.distname	${name} (xine core)
 
 platform macosx {
+    patchfiles-append       audio_coreaudio_out.c.diff
     configure.args-append   --enable-macosx-video \
                             --enable-coreaudio
+    if {${os.major} >= 9} {
+        patchfiles-append   _cdio_osx.c.diff
+    }
+    if {${os.major} == 10} {
+        # ld: codegen problem, can't use rel32 to external symbol UVMask in _tomsmocomp_filter_sse from .libs/xineplug_post_tvtime.lax/libdeinterlaceplugins.a/libdeinterlaceplugins_la-kdetv_tomsmocomp.o
+        # possibly rdar://problem/7511396
+        patchfiles-append disable_deinterlace_kdetv_tomsmocomp.diff
+    }
 }

Added: trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff	2011-02-17 10:01:18 UTC (rev 76054)
@@ -0,0 +1,20 @@
+--- src/input/vcd/libcdio/_cdio_osx.c.orig	2008-04-18 02:48:58.000000000 +1000
++++ src/input/vcd/libcdio/_cdio_osx.c	2011-02-17 19:26:11.000000000 +1100
+@@ -53,7 +53,7 @@ static const char _rcsid[] = "$Id: _cdio
+ 
+ #include <mach/mach.h>
+ #include <Carbon/Carbon.h>
+-#include <IOKit/scsi-commands/SCSITaskLib.h>
++#include <IOKit/scsi/SCSITaskLib.h>
+ #include <IOKit/IOCFPlugIn.h>
+ #include <mach/mach_error.h>
+ 
+@@ -72,7 +72,7 @@ static const char _rcsid[] = "$Id: _cdio
+ #include <CoreFoundation/CoreFoundation.h>
+ #include <IOKit/IOKitLib.h>
+ #include <IOKit/IOBSD.h>
+-#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
++#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
+ #include <IOKit/storage/IOCDTypes.h>
+ #include <IOKit/storage/IODVDTypes.h>
+ #include <IOKit/storage/IOMedia.h>

Added: trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff	2011-02-17 10:01:18 UTC (rev 76054)
@@ -0,0 +1,10 @@
+--- src/audio_out/audio_coreaudio_out.c.orig	2008-06-15 09:15:00.000000000 +1000
++++ src/audio_out/audio_coreaudio_out.c	2011-02-17 18:57:25.000000000 +1100
+@@ -51,6 +51,7 @@
+ #include <AudioUnit/AudioUnitProperties.h>
+ #include <AudioUnit/AudioUnitParameters.h>
+ #include <AudioUnit/AudioOutputUnit.h>
++#include <CoreServices/CoreServices.h>
+ 
+ #define AO_OUT_COREAUDIO_IFACE_VERSION 8
+ 

Added: trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff	2011-02-17 10:01:18 UTC (rev 76054)
@@ -0,0 +1,30 @@
+--- src/post/deinterlace/plugins/Makefile.in.orig	2010-07-26 00:40:17.000000000 +1000
++++ src/post/deinterlace/plugins/Makefile.in	2011-02-17 20:52:07.000000000 +1100
+@@ -74,8 +74,7 @@
+ 	libdeinterlaceplugins_la-weave.lo \
+ 	libdeinterlaceplugins_la-greedy2frame.lo \
+ 	libdeinterlaceplugins_la-scalerbob.lo \
+-	libdeinterlaceplugins_la-kdetv_greedyh.lo \
+-	libdeinterlaceplugins_la-kdetv_tomsmocomp.lo
++	libdeinterlaceplugins_la-kdetv_greedyh.lo
+ libdeinterlaceplugins_la_OBJECTS =  \
+ 	$(am_libdeinterlaceplugins_la_OBJECTS)
+ libdeinterlaceplugins_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -465,8 +464,7 @@
+ 	weave.c \
+ 	greedy2frame.c \
+ 	scalerbob.c \
+-	kdetv_greedyh.c \
+-	kdetv_tomsmocomp.c
++	kdetv_greedyh.c
+ 
+ libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
+ libdeinterlaceplugins_la_LDFLAGS = -avoid-version -module
+@@ -527,7 +525,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-greedy.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-greedy2frame.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_greedyh.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_tomsmocomp.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-linear.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-linearblend.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdeinterlaceplugins_la-scalerbob.Plo at am__quote@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110217/84360d33/attachment.html>


More information about the macports-changes mailing list