[93554] trunk/dports/multimedia/mplayer2
cal at macports.org
cal at macports.org
Sat May 26 06:14:30 PDT 2012
Revision: 93554
https://trac.macports.org/changeset/93554
Author: cal at macports.org
Date: 2012-05-26 06:14:30 -0700 (Sat, 26 May 2012)
Log Message:
-----------
mplayer2: Update to current master, disable gif, closes #34546
mplayer2's website says: "Warning: Packages provided by some Linux distributions
are really old (2.0 release). It is not recommended to use such an old version
of mplayer2, and you should notify the distro maintainers to help getting this
resolved."
The distro maintainer (me) recommends to do a proper release instead of
expecting distro maintainers to package some stuff from a random point in time
on master. Apparently, mplayer2 has unfortunately adopted the broken release
policy ("release? build from trunk!") of mplayer. :(
This update also disables giflib, because the API changed and linking fails
against the current giflib in MacPorts.
Modified Paths:
--------------
trunk/dports/multimedia/mplayer2/Portfile
Added Paths:
-----------
trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch
Removed Paths:
-------------
trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch
Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer2/Portfile 2012-05-26 13:08:13 UTC (rev 93553)
+++ trunk/dports/multimedia/mplayer2/Portfile 2012-05-26 13:14:30 UTC (rev 93554)
@@ -4,8 +4,6 @@
PortSystem 1.0
name mplayer2
-version 2.0
-revision 4
categories multimedia
platforms darwin
license Restrictive
@@ -15,19 +13,17 @@
long_description ${description}
homepage http://www.mplayer2.org/
-master_sites http://ftp.mplayer2.org/pub/release
-distname ${name}-build-${version}
-use_xz yes
+version 2.0-20120517
+fetch.type git
+git.url git://git.mplayer2.org/mplayer2-build.git
+git.branch ab6542dbc0130ff8dbede27896eb7dd925332c68
-checksums rmd160 48193cf6a48e16cce7f74d8f0915e64dc4b7d1cd \
- sha256 e0a4dba087ba8c6a916d8bc9c7063bd2fd86d36bb08e31a2bd2d82e56b3c4058
-
conflicts MPlayer mplayer-devel
-depends_build port:pkgconfig \
+depends_build-append port:pkgconfig \
port:yasm
-depends_lib port:xorg-libXv \
+depends_lib-append port:xorg-libXv \
port:xorg-libXvMC \
port:freetype \
port:fontconfig \
@@ -36,7 +32,6 @@
port:libdvdcss \
port:libcddb \
port:fribidi \
- port:giflib \
port:libpng \
port:libmng \
port:jpeg \
@@ -61,9 +56,8 @@
universal_variant no
set mplayercflags "--disable-smb \
- --enable-menu \
--enable-macosx-finder \
- --enable-gif \
+ --disable-gif \
--enable-png \
--enable-mng \
--enable-jpeg \
@@ -74,15 +68,13 @@
--enable-liba52 \
--enable-sdl \
--enable-xv \
- --enable-xvmc \
--enable-corevideo \
- --enable-quartz \
+ --enable-cocoa \
--enable-coreaudio \
--enable-translation \
--language=all"
-set ffmpegcflags "--enable-libdirac \
- --enable-libschroedinger \
+set ffmpegcflags "--enable-libschroedinger \
--enable-libmp3lame \
--enable-libopenjpeg \
--enable-libspeex \
@@ -98,15 +90,15 @@
-I${prefix}/include/dirac \
-I${prefix}/include/schroedinger-1.0
-patchfiles no-cflags-in-cpp-ffmpeg-mt-configure.patch
-
-if {${configure.compiler} == "clang"} {
- patchfiles-append clang-compatibility-mplayer-configure.patch
+post-extract {
+ system -W ${worksrcpath} "./init --shallow"
}
+patchfiles no-cflags-in-cpp-libav-configure.patch
+
pre-build {
set commonconf [open "${worksrcpath}/common_options" "a"]
- set ffmpegconf [open "${worksrcpath}/ffmpeg_options" "a"]
+ set ffmpegconf [open "${worksrcpath}/libav_options" "a"]
set mplayerconf [open "${worksrcpath}/mplayer_options" "a"]
puts $commonconf "--cc=${configure.cc}"
@@ -121,14 +113,14 @@
puts $ffmpegconf $option
}
- puts $mplayerconf "--extra-ldflags=-lintl -lcdio_cdda -lcdio_paranoia -la52"
+ puts $mplayerconf "--extra-ldflags=-lintl -lcdio -lcdio_cdda -lcdio_paranoia -la52"
puts $mplayerconf "--prefix=${prefix}"
close $commonconf
close $ffmpegconf
close $mplayerconf
- reinplace -E "s|'--cpu=host',||" ${worksrcpath}/script/ffmpeg-config
+ reinplace -E "s|'--cpu=host',||" ${worksrcpath}/script/libav-config
}
build.target mplayer
Deleted: trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch
===================================================================
--- trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch 2012-05-26 13:08:13 UTC (rev 93553)
+++ trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch 2012-05-26 13:14:30 UTC (rev 93554)
@@ -1,11 +0,0 @@
---- ffmpeg-mt/configure.orig 2012-01-04 17:47:02.000000000 +0100
-+++ ffmpeg-mt/configure 2012-01-04 17:47:09.000000000 +0100
-@@ -581,7 +581,7 @@
- log check_cpp "$@"
- cat > $TMPC
- log_file $TMPC
-- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
-+ check_cmd $cc $CPPFLAGS "$@" -E -o $TMPO $TMPC
- }
-
- check_as(){
Added: trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch
===================================================================
--- trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch 2012-05-26 13:14:30 UTC (rev 93554)
@@ -0,0 +1,11 @@
+--- libav/configure.orig 2012-05-26 13:52:40.000000000 +0200
++++ libav/configure 2012-05-26 13:53:08.000000000 +0200
+@@ -621,7 +621,7 @@
+ log check_cpp "$@"
+ cat > $TMPC
+ log_file $TMPC
+- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
++ check_cmd $cc $CPPFLAGS "$@" -E -o $TMPO $TMPC
+ }
+
+ check_as(){
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120526/f6792a88/attachment.html>
More information about the macports-changes
mailing list