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

Fri Apr 18 01:36:35 PDT 2014

Revision: 119153
          https://trac.macports.org/changeset/119153
Author:   ryandesign at macports.org
Date:     2014-04-18 01:36:35 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
xine-lib: update to 1.2.5

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

Removed Paths:
-------------
    trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h
    trunk/dports/multimedia/xine-lib/files/patch-src-combined-ffmpeg-Makefile.in.diff
    trunk/dports/multimedia/xine-lib/files/src_demuxers_demux_qt.c.diff

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

--- trunk/dports/multimedia/xine-lib/Portfile	2014-04-18 08:25:49 UTC (rev 119152)
+++ trunk/dports/multimedia/xine-lib/Portfile	2014-04-18 08:36:35 UTC (rev 119153)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		xine-lib
-version         1.2.4
-revision        3
+version         1.2.5
 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  9c4b151730a4ede46013fb127545fbb59d56f8b6 \
-                sha256  9c5b1b4ef7bd0591962c322a3afa709eeaa5bae664678548f1340e64f43abbdd
+checksums       rmd160  bb9c3a06666f454e8dfda85471eb6605e2dcb685 \
+                sha256  c8ea4090d1fa83f8b6887118730547aa918862d60f43ea670089f9053e54ab7c
 
 depends_build port:libtool \
             port:pkgconfig
@@ -44,18 +43,6 @@
             port:xorg-libXvMC \
             port:xorg-xcb-util
 
-# fix "error: empty character constant" with clang 3.1 and older
-# https://bugs.xine-project.org/show_bug.cgi?id=504
-patchfiles-append src_demuxers_demux_qt.c.diff
-
-# fix "error: initializer element is not a compile-time constant" with clang 3.0 and older
-# https://bugs.xine-project.org/show_bug.cgi?id=505
-patchfiles-append patch-include-xine-post.h
-
-# fix "make[3]: *** No rule to make target `\', needed by `avcodec_video.list'.  Stop."
-# https://bugs.xine-project.org/show_bug.cgi?id=503
-patchfiles-append patch-src-combined-ffmpeg-Makefile.in.diff
-
 if {[string match "*clang*" ${configure.compiler}]} {
     # disable use of MMX in these files; workaround for
     # "error: clobbers must be last on the x87 stack"

Deleted: trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h
===================================================================
--- trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h	2014-04-18 08:25:49 UTC (rev 119152)
+++ trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h	2014-04-18 08:36:35 UTC (rev 119153)
@@ -1,11 +0,0 @@
---- include/xine/post.h.orig
-+++ include/xine/post.h
-@@ -397,7 +397,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 } \

Deleted: 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	2014-04-18 08:25:49 UTC (rev 119152)
+++ trunk/dports/multimedia/xine-lib/files/patch-src-combined-ffmpeg-Makefile.in.diff	2014-04-18 08:36:35 UTC (rev 119153)
@@ -1,14 +0,0 @@
---- 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' >$@
- 

Deleted: trunk/dports/multimedia/xine-lib/files/src_demuxers_demux_qt.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/src_demuxers_demux_qt.c.diff	2014-04-18 08:25:49 UTC (rev 119152)
+++ trunk/dports/multimedia/xine-lib/files/src_demuxers_demux_qt.c.diff	2014-04-18 08:36:35 UTC (rev 119153)
@@ -1,13 +0,0 @@
---- src/demuxers/demux_qt.c.orig	2012-05-26 15:49:59.000000000 -0500
-+++ src/demuxers/demux_qt.c	2012-07-21 06:13:40.000000000 -0500
-@@ -131,8 +131,9 @@
- #define RMVC_ATOM QT_ATOM('r', 'm', 'v', 'c')
- #define QTIM_ATOM QT_ATOM('q', 't', 'i', 'm')
- 
--/* placeholder for cutting and pasting */
-+/* placeholder for cutting and pasting
- #define _ATOM QT_ATOM('', '', '', '')
-+*/
- 
- #define ATOM_PREAMBLE_SIZE 8
- #define PALETTE_COUNT 256
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140418/58e5094d/attachment-0001.html>
