[93949] trunk/dports/multimedia/mplayer2

4 Jun 2012

Revision: 93949
          https://trac.macports.org/changeset/93949
Author:   cal@macports.org
Date:     2012-06-04 15:41:56 -0700 (Mon, 04 Jun 2012)
Log Message:
-----------
mplayer2: revert update to newer version from git head, because it was broken

Instead of running mplayer some debug-main() from libopenjpeg was executed.

Modified Paths:
--------------
    trunk/dports/multimedia/mplayer2/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch

Removed Paths:
-------------
    trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch

Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================

--- trunk/dports/multimedia/mplayer2/Portfile	2012-06-04 21:43:21 UTC (rev 93948)
+++ trunk/dports/multimedia/mplayer2/Portfile	2012-06-04 22:41:56 UTC (rev 93949)
@@ -4,6 +4,8 @@
 PortSystem              1.0
 
 name                    mplayer2
+epoch                   1
+version                 2.0
 categories              multimedia
 platforms               darwin
 license                 Restrictive
@@ -13,21 +15,19 @@
 long_description        ${description}
 
 homepage                http://www.mplayer2.org/
-version                 2.0-20120517
-fetch.type              git
-git.url                 git://git.mplayer2.org/mplayer2-build.git
-git.branch              ab6542dbc0130ff8dbede27896eb7dd925332c68
+master_sites            http://ftp.mplayer2.org/pub/release
+distname                ${name}-build-${version}
+use_xz                  yes
 
-# disable livecheck, because it seems upstream isn't going to do any releases
-livecheck.type          none
+checksums               rmd160  48193cf6a48e16cce7f74d8f0915e64dc4b7d1cd \
+                        sha256  e0a4dba087ba8c6a916d8bc9c7063bd2fd86d36bb08e31a2bd2d82e56b3c4058
 
 conflicts               MPlayer mplayer-devel
 
-depends_build-append    port:pkgconfig \
-                        port:yasm \
-                        port:autoconf
+depends_build           port:pkgconfig \
+                        port:yasm
 
-depends_lib-append      port:xorg-libXv \
+depends_lib             port:xorg-libXv \
                         port:xorg-libXvMC \
                         port:freetype \
                         port:fontconfig \
@@ -60,6 +60,7 @@
 universal_variant       no
 
 set mplayercflags      "--disable-smb \
+                        --enable-menu \
                         --enable-macosx-finder \
                         --disable-gif \
                         --enable-png \
@@ -72,13 +73,15 @@
                         --enable-liba52 \
                         --enable-sdl \
                         --enable-xv \
+                        --enable-xvmc \
                         --enable-corevideo \
-                        --enable-cocoa \
+                        --enable-quartz \
                         --enable-coreaudio \
                         --enable-translation \
                         --language=all"
 
-set ffmpegcflags       "--enable-libschroedinger \
+set ffmpegcflags       "--enable-libdirac \
+                        --enable-libschroedinger \
                         --enable-libmp3lame \
                         --enable-libopenjpeg \
                         --enable-libspeex \
@@ -94,15 +97,15 @@
                         -I${prefix}/include/dirac \
                         -I${prefix}/include/schroedinger-1.0
 
-post-extract {
-    system -W ${worksrcpath} "./init --shallow"
+patchfiles              no-cflags-in-cpp-ffmpeg-mt-configure.patch
+
+if {${configure.compiler} == "clang"} {
+    patchfiles-append   clang-compatibility-mplayer-configure.patch
 }
 
-patchfiles              no-cflags-in-cpp-libav-configure.patch
-
 pre-build {
     set commonconf  [open "${worksrcpath}/common_options" "a"]
-    set ffmpegconf  [open "${worksrcpath}/libav_options" "a"]
+    set ffmpegconf  [open "${worksrcpath}/ffmpeg_options" "a"]
     set mplayerconf [open "${worksrcpath}/mplayer_options" "a"]
 
     puts $commonconf "--cc=${configure.cc}"
@@ -117,14 +120,14 @@
         puts $ffmpegconf $option
     }
 
-    puts $mplayerconf "--extra-ldflags=-lintl -lcdio -lcdio_cdda -lcdio_paranoia -la52"
+    puts $mplayerconf "--extra-ldflags=-lintl -lcdio_cdda -lcdio_paranoia -la52"
     puts $mplayerconf "--prefix=${prefix}"
 
     close $commonconf
     close $ffmpegconf
     close $mplayerconf
 
-    reinplace -E "s|'--cpu=host',||" ${worksrcpath}/script/libav-config
+    reinplace -E "s|'--cpu=host',||" ${worksrcpath}/script/ffmpeg-config
 }
 
 build.target            mplayer

Copied: trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch (from rev 91852, 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	                        (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch	2012-06-04 22:41:56 UTC (rev 93949)
@@ -0,0 +1,11 @@
+--- 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(){

Deleted: trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch
===================================================================
--- trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch	2012-06-04 21:43:21 UTC (rev 93948)
+++ trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-libav-configure.patch	2012-06-04 22:41:56 UTC (rev 93949)
@@ -1,11 +0,0 @@
---- 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(){

    

cal＠macports.org

tags

participants (1)