[93398] trunk/dports/multimedia/xine-lib
jmr at macports.org
jmr at macports.org
Mon May 21 10:38:52 PDT 2012
Revision: 93398
https://trac.macports.org/changeset/93398
Author: jmr at macports.org
Date: 2012-05-21 10:38:52 -0700 (Mon, 21 May 2012)
Log Message:
-----------
xine-lib: update to 1.2.1
Modified Paths:
--------------
trunk/dports/multimedia/xine-lib/Portfile
trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff
Added Paths:
-----------
trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
Removed Paths:
-------------
trunk/dports/multimedia/xine-lib/files/_cdio_osx.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 2012-05-21 17:34:15 UTC (rev 93397)
+++ trunk/dports/multimedia/xine-lib/Portfile 2012-05-21 17:38:52 UTC (rev 93398)
@@ -3,7 +3,7 @@
PortSystem 1.0
name xine-lib
-version 1.1.19
+version 1.2.1
description xine-lib is a free multimedia engine, released under the GPL.
long_description ${description}
maintainers nomaintainer
@@ -14,9 +14,9 @@
homepage http://www.xine-project.org
master_sites sourceforge:project/xine/xine-lib/${version}
use_xz yes
-checksums md5 d0969c067dc32f33c5ea431e5e2106ce \
- sha1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d \
- rmd160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3
+checksums md5 6884ba356ebd7f0ccf900f91ebf15a65 \
+ sha1 ebb2648456504ff4ce08c34de258d3125832bb94 \
+ sha256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e
depends_build port:libtool \
port:pkgconfig
depends_lib port:aalib \
@@ -24,38 +24,35 @@
port:faad2 \
path:lib/libavcodec.dylib:ffmpeg \
port:flac \
+ port:fontconfig \
+ port:libcdio \
+ port:libmpcdec \
port:libogg \
port:libvorbis \
- port:zlib \
+ port:vcdimager \
port:xorg-libXinerama \
port:xorg-libXt \
port:xorg-libXvMC \
- port:fontconfig \
- port:libpng \
port:xorg-xcb-util
# bad register name `%rax'
universal_variant no
-configure.env-append LIBTOOL=glibtool
-configure.args --with-external-libfaad \
- --with-external-ffmpeg
+configure.args --disable-silent-rules
if {${os.platform} == "darwin" && [string match *64 $build_arch]} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
+build.args V=1
+platform darwin {
+ # fix "ar: no archive members specified"
+ patchfiles-append src_xine-engine_Makefile.in.diff
+}
+
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
- }
}
livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
Deleted: trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff 2012-05-21 17:34:15 UTC (rev 93397)
+++ trunk/dports/multimedia/xine-lib/files/_cdio_osx.c.diff 2012-05-21 17:38:52 UTC (rev 93398)
@@ -1,20 +0,0 @@
---- 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>
Modified: trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff 2012-05-21 17:34:15 UTC (rev 93397)
+++ trunk/dports/multimedia/xine-lib/files/audio_coreaudio_out.c.diff 2012-05-21 17:38:52 UTC (rev 93398)
@@ -6,5 +6,5 @@
#include <AudioUnit/AudioOutputUnit.h>
+#include <CoreServices/CoreServices.h>
- #define AO_OUT_COREAUDIO_IFACE_VERSION 8
+ #define AO_OUT_COREAUDIO_IFACE_VERSION 9
Deleted: trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff 2012-05-21 17:34:15 UTC (rev 93397)
+++ trunk/dports/multimedia/xine-lib/files/disable_deinterlace_kdetv_tomsmocomp.diff 2012-05-21 17:38:52 UTC (rev 93398)
@@ -1,30 +0,0 @@
---- 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@
Added: trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff 2012-05-21 17:38:52 UTC (rev 93398)
@@ -0,0 +1,15 @@
+--- src/xine-engine/Makefile.in.orig 2012-02-05 00:09:37.000000000 +1100
++++ src/xine-engine/Makefile.in 2012-05-22 03:17:50.000000000 +1000
+@@ -606,7 +606,11 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libxine-interface.la: $(libxine_interface_la_OBJECTS) $(libxine_interface_la_DEPENDENCIES)
+- $(AM_V_CCLD)$(libxine_interface_la_LINK) $(libxine_interface_la_OBJECTS) $(libxine_interface_la_LIBADD) $(LIBS)
++ if test -n "$(libxine_interface_la_OBJECTS)" ; then \
++ $(AM_V_CCLD)$(libxine_interface_la_LINK) $(libxine_interface_la_OBJECTS) $(libxine_interface_la_LIBADD) $(LIBS); \
++ else \
++ touch $@; \
++ fi
+ libxine.la: $(libxine_la_OBJECTS) $(libxine_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libxine_la_LINK) -rpath $(libdir) $(libxine_la_OBJECTS) $(libxine_la_LIBADD) $(LIBS)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120521/8034f14e/attachment.html>
More information about the macports-changes
mailing list