[143051] trunk/dports/multimedia/MPlayer

[jeremyhu at macports.org]

Revision: 143051
          https://trac.macports.org/changeset/143051
Author:   jeremyhu at macports.org
Date:     2015-12-02 09:04:08 -0800 (Wed, 02 Dec 2015)
Log Message:
-----------
mplayer: Bump to 1.2

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

Added Paths:
-----------
    trunk/dports/multimedia/MPlayer/files/configure.vorbis.patch

Removed Paths:
-------------
    trunk/dports/multimedia/MPlayer/files/vo_corevideo.m.patch

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2015-12-02 15:31:32 UTC (rev 143050)
+++ trunk/dports/multimedia/MPlayer/Portfile	2015-12-02 17:04:08 UTC (rev 143051)
@@ -6,8 +6,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                MPlayer
-version             1.1
-revision            9
+version             1.2
 categories          multimedia
 license             GPL-2+
 maintainers         jeremyhu openmaintainer
@@ -27,16 +26,16 @@
 depends_build       port:pkgconfig port:yasm
 depends_lib \
     port:jpeg port:openjpeg15 port:lame port:libiconv port:libmad \
-    port:libogg port:libpng port:libtheora port:libvorbis \
-    port:lzo2 port:ncurses port:zlib port:bzip2 port:liboil
+    port:libogg port:libopus port:libpng port:libtheora port:libvorbis \
+    port:lzo2 port:ncurses port:zlib port:bzip2 port:liboil port:libass
 
 master_sites    http://www.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp.mplayerhq.hu/MPlayer/releases/ 
 use_xz          yes
 
-checksums           sha1    913a4bbeab7cbb515c2f43ad39bc83071b2efd75 \
-                    rmd160  3722aac0847c4e2cd1e704c6ec610784a6b7a477 \
-                    sha256  76cb47eadb52b420ca028276ebd8112114ad0ab3b726af60f07fb2f39dae6c9c
+checksums           sha1    64fad840dfae466ab5ef3be2b6c74058892cd981 \
+                    rmd160  6d4c83370affbc7a1f79e59af8d78a2346a2b846 \
+                    sha256  ffe7f6f10adf2920707e8d6c04f0d3ed34c307efc6cd90ac46593ee8fba2e2b6
 
 # Do not use the following environment variables, otherwise the build phase
 # will fail.
@@ -57,7 +56,7 @@
     --confdir=${prefix}/etc/${name} \
     --mandir=${prefix}/share/man \
     --enable-png --enable-jpeg --enable-liblzo \
-    --enable-theora --enable-libvorbis --enable-mad
+    --enable-theora --enable-libvorbis --enable-libopus --enable-mad
 
 # MPlayer autodetects many support libs.  To prevent undeclared
 # dependencies, explicitly disable everything optional first.
@@ -77,13 +76,16 @@
     --disable-libschroedinger-lavc --disable-liba52  \
     --disable-gif
 
-patchfiles configure.x11.patch vo_corevideo.m.patch
+patchfiles configure.x11.patch configure.vorbis.patch
 
 post-patch {
     # https://trac.macports.org/ticket/38935
     reinplace "s|-maltivec|-faltivec -maltivec|g" \
         ${worksrcpath}/configure \
         ${worksrcpath}/ffmpeg/configure
+
+    # Newer libvorbis doesn't implicitly provide vorbis as a vorbisenc dependency
+    reinplace "s|libs vorbisenc|libs vorbisenc vorbis|" ${worksrcpath}/configure
 }
 
 post-destroot {

Added: trunk/dports/multimedia/MPlayer/files/configure.vorbis.patch
===================================================================
--- trunk/dports/multimedia/MPlayer/files/configure.vorbis.patch	                        (rev 0)
+++ trunk/dports/multimedia/MPlayer/files/configure.vorbis.patch	2015-12-02 17:04:08 UTC (rev 143051)
@@ -0,0 +1,12 @@
+--- configure.orig	2013-04-01 00:55:08.000000000 -0700
++++ configure	2013-04-01 01:08:51.000000000 -0700
+@@ -6415,6 +6415,9 @@ if test "$_tremor" = auto; then
+   _tremor=no
+   statement_check tremor/ivorbiscodec.h 'vorbis_synthesis(0, 0)' -logg -lvorbisidec && _tremor=yes && _libvorbis=no
+ fi
++if test "$_libvorbis" = yes; then
++  vorbislibs=$($_pkg_config --libs vorbisenc)
++fi
+ if test "$_libvorbis" = auto; then
+   _libvorbis=no
+   for vorbislibs in '-lvorbisenc -lvorbis -logg' '-lvorbis -logg' ; do

Deleted: trunk/dports/multimedia/MPlayer/files/vo_corevideo.m.patch
===================================================================
--- trunk/dports/multimedia/MPlayer/files/vo_corevideo.m.patch	2015-12-02 15:31:32 UTC (rev 143050)
+++ trunk/dports/multimedia/MPlayer/files/vo_corevideo.m.patch	2015-12-02 17:04:08 UTC (rev 143051)
@@ -1,10 +0,0 @@
---- libvo/vo_corevideo.m.~1~   2012-05-23 16:03:07.000000000 -0400
-+++ libvo/vo_corevideo.m       2013-10-30 18:25:39.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <sys/mman.h>
- #include <unistd.h>
- #include <CoreServices/CoreServices.h>
-+#include <OpenGL/gl.h>
- //special workaround for Apple bug #6267445
- //(OSServices Power API disabled in OSServices.h for 64bit systems)
- #ifndef __POWER__
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/fc9d4c99/attachment.html>