[127729] trunk/dports/multimedia/mplayer2

[cal at macports.org]

Revision: 127729
          https://trac.macports.org/changeset/127729
Author:   cal at macports.org
Date:     2014-11-02 02:35:53 -0800 (Sun, 02 Nov 2014)
Log Message:
-----------
mplayer2: fix build against new libdvdnav, closes #45387

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

Added Paths:
-----------
    trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff

Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer2/Portfile	2014-11-02 10:06:15 UTC (rev 127728)
+++ trunk/dports/multimedia/mplayer2/Portfile	2014-11-02 10:35:53 UTC (rev 127729)
@@ -65,7 +65,8 @@
 universal_variant       no
 
 patchfiles              patch-configure.diff \
-                        patch-libmpdemux-demuxer.h.diff
+                        patch-libmpdemux-demuxer.h.diff \
+                        patch-stream_dvdnav.diff
 
 post-patch {
     reinplace "s|#!/usr/bin/env python3|#!$prefix/bin/python3.4|g" \
@@ -178,7 +179,7 @@
                         --disable-static \
                         --extra-cflags=\"${configure.cppflags} ${configure.optflags} [get_canonical_archflags cc] -Wno-pointer-sign\" \
                         --extra-ldflags=\"${configure.ldflags} [get_canonical_archflags ld]\" \
-                        --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lavresample -lswscale -lpostproc -ldv -lxvidcore -lm -ldvdnavmini -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl -llcms2 \"
+                        --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lavresample -lswscale -lpostproc -ldv -lxvidcore -lm -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl -llcms2 \"
 
                         # leave out libass, as configure doesn't handle it correctly
                         # --enable-libass \

Added: trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff
===================================================================
--- trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff	                        (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff	2014-11-02 10:35:53 UTC (rev 127729)
@@ -0,0 +1,51 @@
+From 5ed3bfa479e5c121e8f82e2ab8fc67e81bead2e1 Mon Sep 17 00:00:00 2001
+From: sherpya <sherpya at netfarm.it>
+Date: Wed, 12 Mar 2014 03:11:42 +0100
+Subject: [PATCH 27/29] dvdnav: use dvdnav/read from videolan git
+
+see: https://github.com/sherpya/mplayer-be/blob/master/patches/mp/0027-dvdnav-use-dvdnav-read-from-videolan-git.patch
+
+---
+ configure              | 4 ++--
+ stream/stream_dvdnav.c | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git configure configure
+index de443b1..5aeb761 100755
+--- configure
++++ configure
+@@ -8193,8 +8193,8 @@ if test "$_dvdnav" = yes ; then
+     cflags_libdvdnav="-Ilibdvdnav"
+     inputmodules="dvdnav(internal) $inputmodules"
+   else
+-    extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
+-    extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
++    extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnav)"
++    extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnav)"
+     inputmodules="dvdnav $inputmodules"
+   fi
+ else
+diff --git stream/stream_dvdnav.c stream/stream_dvdnav.c
+index dbf4226..c6b69e7 100644
+--- stream/stream_dvdnav.c
++++ stream/stream_dvdnav.c
+@@ -714,13 +714,13 @@ static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l
+ 
+   format = dvdnav_audio_stream_format(priv->dvdnav, lg);
+   switch(format) {
+-  case DVDNAV_FORMAT_AC3:
++  case DVD_AUDIO_FORMAT_AC3:
+     return index + 128;
+-  case DVDNAV_FORMAT_DTS:
++  case DVD_AUDIO_FORMAT_DTS:
+     return index + 136;
+-  case DVDNAV_FORMAT_LPCM:
++  case DVD_AUDIO_FORMAT_LPCM:
+     return index + 160;
+-  case DVDNAV_FORMAT_MPEGAUDIO:
++  case DVD_AUDIO_FORMAT_MPEG2_EXT:
+     return index;
+   default:
+     return -1;
+-- 
+2.1.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141102/aab7ab8d/attachment.html>