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

[ryandesign at macports.org]

Revision: 111534
          https://trac.macports.org/changeset/111534
Author:   ryandesign at macports.org
Date:     2013-09-25 01:30:03 -0700 (Wed, 25 Sep 2013)
Log Message:
-----------
xine-lib: update to 1.2.4

Modified Paths:
--------------
    trunk/dports/multimedia/xine-lib/Portfile
    trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff

Added Paths:
-----------
    trunk/dports/multimedia/xine-lib/files/patch-src-combined-ffmpeg-Makefile.in.diff

Modified: trunk/dports/multimedia/xine-lib/Portfile
===================================================================
--- trunk/dports/multimedia/xine-lib/Portfile	2013-09-25 00:37:17 UTC (rev 111533)
+++ trunk/dports/multimedia/xine-lib/Portfile	2013-09-25 08:30:03 UTC (rev 111534)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		xine-lib
-version         1.2.3
-revision        1
+version         1.2.4
 description	xine-lib is a free multimedia engine, released under the GPL.
 long_description        ${description}
 maintainers	ryandesign openmaintainer
@@ -16,8 +15,8 @@
 master_sites    sourceforge:project/xine/xine-lib/${version}
 use_xz      yes
 
-checksums       rmd160  ba0853cd5d49999aa1b2f9ccee1a414b7d29b3b9 \
-                sha256  e06a9e01d2632530e694d4a96bba71810e2f447f9ac036d2a150c43baa27852a
+checksums       rmd160  9c4b151730a4ede46013fb127545fbb59d56f8b6 \
+                sha256  9c5b1b4ef7bd0591962c322a3afa709eeaa5bae664678548f1340e64f43abbdd
 
 depends_build port:libtool \
             port:pkgconfig
@@ -41,6 +40,9 @@
 # "error: initializer element is not a compile-time constant"
 patchfiles  src_demuxers_demux_qt.c.diff patch-include-xine-post.h
 
+# fix "make[3]: *** No rule to make target `\', needed by `avcodec_video.list'.  Stop."
+patchfiles-append patch-src-combined-ffmpeg-Makefile.in.diff
+
 if {[string match "*clang*" ${configure.compiler}]} {
     # disable use of MMX in this file; workaround for
     # "error: clobbers must be last on the x87 stack"
@@ -51,7 +53,7 @@
 universal_variant       no
 
 configure.args  --disable-silent-rules
-if {${os.platform} == "darwin" && [string match *64 $build_arch]} {
+if {${os.platform} eq "darwin" && [string match *64 $build_arch]} {
     configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
 }
 build.args  V=1

Added: trunk/dports/multimedia/xine-lib/files/patch-src-combined-ffmpeg-Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/patch-src-combined-ffmpeg-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/patch-src-combined-ffmpeg-Makefile.in.diff	2013-09-25 08:30:03 UTC (rev 111534)
@@ -0,0 +1,14 @@
+--- src/combined/ffmpeg/Makefile.in.orig	2013-09-23 15:58:14.000000000 -0500
++++ src/combined/ffmpeg/Makefile.in	2013-09-25 03:25:33.000000000 -0500
+@@ -995,10 +995,7 @@
+ avcodec_audio.list: AV_CODECS:=/CODEC_ID_PCM_S16LE/,/CODEC_ID_DVD_SUBTITLE/
+ avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/CODEC_ID_PCM_S16LE/
+ 
+-# that weird shell call just yields full path of the avcodec.h file
+-avcodec_audio.list avcodec_video.list: $(shell \
+- echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) -M - |\
+- sed -e 's/ \+/\n/g;' | sed -n -e '/avcodec\.h/p;')
++avcodec_audio.list avcodec_video.list:
+ 	$(AM_V_GEN)echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
+ 	  sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@
+ 

Modified: trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff	2013-09-25 00:37:17 UTC (rev 111533)
+++ trunk/dports/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff	2013-09-25 08:30:03 UTC (rev 111534)
@@ -1,15 +1,15 @@
---- src/xine-engine/Makefile.in.orig	2012-06-09 12:44:05.000000000 -0500
-+++ src/xine-engine/Makefile.in	2012-07-21 06:16:59.000000000 -0500
-@@ -607,7 +607,11 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
+--- src/xine-engine/Makefile.in.orig	2013-09-23 15:58:19.000000000 -0500
++++ src/xine-engine/Makefile.in	2013-09-24 19:12:24.000000000 -0500
+@@ -693,7 +693,11 @@
+ 	}
+ 
  libxine-interface.la: $(libxine_interface_la_OBJECTS) $(libxine_interface_la_DEPENDENCIES) $(EXTRA_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); \
++		$(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) $(EXTRA_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/20130925/f75d2033/attachment.html>