Build against libdvdnav 5.0 API.

Re-enable the inhibited DVD related options.

Bump PKGREVISION on the principle of least surprise.

8 files changed, 69 insertions, 28 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index e9d38a32138..78a2873364a 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2015/02/24 08:43:31 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2015/04/05 08:27:08 dsainty Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -8,7 +8,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_VERSION}
-PKGREVISION=	23
+PKGREVISION=	24
 
 SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 		http://www2.mplayerhq.hu/MPlayer/skins/		\
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 72bc0c1e40b..013119a0c08 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2015/03/31 15:51:42 joerg Exp $
+$NetBSD: distinfo,v 1.91 2015/04/05 08:27:08 dsainty Exp $
 
 SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -66,18 +66,19 @@ Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes
 SHA1 (patch-.._MPlayer-1.1.1_ffmpeg_libavcodec_arm_asm.S) = 33085da1b4a2b235c02ea645f7950e2be26e8c60
 SHA1 (patch-.._MPlayer-1.1.1_ffmpeg_libavcodec_arm_simple__idct__arm.S) = ae43f230cc19896d1284e46d5b219dcdcc74d6e7
 SHA1 (patch-CVE-2014-4610) = 855276c8e301494942a03e13712cc53615d8f4d5
-SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7
+SHA1 (patch-aa) = abe6709d87c0a1b4f4da15e93a5bc4d923ed0793
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
 SHA1 (patch-ffmpeg_libavcodec_arm_asm.S) = dfe8670bcbb6e6dc17b65bf6459b9550da06f73f
 SHA1 (patch-ffmpeg_libavcodec_arm_simple__idct__arm.S) = 7ffa3a0dc52afe28a6c184a72586a1392719d885
 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90
-SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000
+SHA1 (patch-gui_interface.c) = b5b1b2da84aaa7555e9ff8b75186684e2439717d
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
 SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
 SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
 SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
+SHA1 (patch-stream_stream__dvdnav.c) = 25215d7764fe481f7cec85b30dc554aeda448fd0
 SHA1 (patch-sub_osd.c) = 00dceec6ddd10d5ccb6561a18663fe1ca0635be5
 SHA1 (patch-sub_subreader.c) = dc653c1e1cc9583a7e0998b4000e87859a4753a0
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index da85295cfc9..f3902a312f5 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.87 2015/03/24 14:27:20 joerg Exp $
+$NetBSD: distinfo,v 1.88 2015/04/05 08:27:08 dsainty Exp $
 
 SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1
 RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1
 Size (mplayer/MPlayer-1.1.1.tar.xz) = 11202492 bytes
 SHA1 (patch-CVE-2014-4610) = 855276c8e301494942a03e13712cc53615d8f4d5
-SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7
+SHA1 (patch-aa) = abe6709d87c0a1b4f4da15e93a5bc4d923ed0793
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
 SHA1 (patch-ffmpeg_libavcodec_arm_asm.S) = dfe8670bcbb6e6dc17b65bf6459b9550da06f73f
 SHA1 (patch-ffmpeg_libavcodec_arm_simple__idct__arm.S) = 7ffa3a0dc52afe28a6c184a72586a1392719d885
 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90
-SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000
+SHA1 (patch-gui_interface.c) = b5b1b2da84aaa7555e9ff8b75186684e2439717d
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
 SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
 SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
 SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
+SHA1 (patch-stream_stream__dvdnav.c) = 25215d7764fe481f7cec85b30dc554aeda448fd0
 SHA1 (patch-sub_osd.c) = 00dceec6ddd10d5ccb6561a18663fe1ca0635be5
 SHA1 (patch-sub_subreader.c) = dc653c1e1cc9583a7e0998b4000e87859a4753a0
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index cd91b811e1f..22eedfb1786 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.51 2014/10/03 15:26:14 wiz Exp $
+# $NetBSD: options.mk,v 1.52 2015/04/05 08:27:08 dsainty Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -24,7 +24,7 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 # Options supported by both mplayer* or mencoder*.
 
 PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv png theora vorbis x264 debug
-#PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
+PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
 .if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=	oss
 .endif
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 4d9067b9336..25fa6c940d5 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.31 2013/01/12 11:55:35 jmcneill Exp $
+$NetBSD: patch-aa,v 1.32 2015/04/05 08:27:08 dsainty Exp $
 
 o Handle properly sh3 and evbarm ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
@@ -10,7 +10,7 @@ o Add support for dvb capture on NetBSD.
 
 --- configure.orig	2012-05-22 14:01:51.000000000 -0400
 +++ configure	2013-01-11 22:15:07.000000000 -0500
-@@ -1519,8 +1519,9 @@ if test -z "$_target" ; then
+@@ -1519,8 +1519,9 @@
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -22,7 +22,7 @@ o Add support for dvb capture on NetBSD.
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
        *mips*) host_arch=mips ;;
-@@ -1674,7 +1675,7 @@ else
+@@ -1674,7 +1675,7 @@
        cc_name=$cc_name_tmp
        echocheck "$_cc version"
        cc_vendor=gnu
@@ -31,7 +31,7 @@ o Add support for dvb capture on NetBSD.
        case $cc_version in
          2.96*)
            cc_fail=yes
-@@ -1798,7 +1799,7 @@ if x86 ; then
+@@ -1798,7 +1799,7 @@
    # gather more CPU information
    pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
    pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
@@ -40,7 +40,7 @@ o Add support for dvb capture on NetBSD.
    pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
    pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
  
-@@ -2274,7 +2275,12 @@ case "$host_arch" in
+@@ -2274,7 +2275,12 @@
      test $_fast_clz = "auto" && _fast_clz=yes
      ;;
  
@@ -54,7 +54,7 @@ o Add support for dvb capture on NetBSD.
      arch='sh4'
      iproc='sh4'
      ;;
-@@ -2591,7 +2597,7 @@ fi # if darwin && test "$cc_vendor" = "g
+@@ -2591,7 +2597,7 @@
  # Checking for CFLAGS
  _install_strip="-s"
  if test "$_profile" != "" || test "$_debug" != "" ; then
@@ -63,7 +63,7 @@ o Add support for dvb capture on NetBSD.
    WARNFLAGS="-W -Wall"
    _install_strip=
  elif test -z "$CFLAGS" ; then
-@@ -4288,7 +4294,11 @@ if test "$_x11" = auto && test "$_x11_he
+@@ -4288,7 +4294,11 @@
             -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
             -L/usr/lib ; do
      if netbsd; then
@@ -76,7 +76,7 @@ o Add support for dvb capture on NetBSD.
      else
        ld_tmp="$I -lXext -lX11 $ld_pthread"
      fi
-@@ -4669,6 +4679,8 @@ if test "$_aa" = yes ; then
+@@ -4669,6 +4679,8 @@
    def_aa='#define CONFIG_AA 1'
    if cygwin ; then
      libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
@@ -85,7 +85,7 @@ o Add support for dvb capture on NetBSD.
    fi
    vomodules="aa $vomodules"
  else
-@@ -4756,7 +4768,6 @@ EOF
+@@ -4756,7 +4768,6 @@
        extra_cflags="$extra_cflags $inc_tmp" && break
    done
  fi
@@ -93,7 +93,7 @@ o Add support for dvb capture on NetBSD.
  if test "$_dvb" = yes ; then
    _dvbin=yes
    inputmodules="dvb $inputmodules"
-@@ -4765,14 +4776,29 @@ if test "$_dvb" = yes ; then
+@@ -4765,14 +4776,29 @@
    aomodules="mpegpes(dvb) $aomodules"
    vomodules="mpegpes(dvb) $vomodules"
  else
@@ -129,3 +129,14 @@ o Add support for dvb capture on NetBSD.
  
  if darwin; then
  
+@@ -7764,8 +7790,8 @@
+     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 a/multimedia/mplayer-share/patches/patch-gui_interface.c b/multimedia/mplayer-share/patches/patch-gui_interface.c
index 5afe010441a..cb7ee203e7b 100644
--- a/multimedia/mplayer-share/patches/patch-gui_interface.c
+++ b/multimedia/mplayer-share/patches/patch-gui_interface.c
@@ -1,14 +1,18 @@
-$NetBSD: patch-gui_interface.c,v 1.1 2014/10/09 14:48:51 martin Exp $
+$NetBSD: patch-gui_interface.c,v 1.2 2015/04/05 08:27:08 dsainty Exp $
 
 Add missing global variable to avoid link error.
 
+If DVD support is compiled in, dvd_angle is provided by stream_dvd.c
+instead.
+
 --- gui/interface.c.orig	2012-05-21 20:46:25.000000000 +0200
 +++ gui/interface.c	2014-10-09 16:10:41.000000000 +0200
-@@ -62,6 +62,7 @@ guiInterface_t guiInfo = {
- };
+@@ -54,6 +54,8 @@
  
- static int initialized;
+ #ifdef CONFIG_DVDREAD
+ #include "stream/stream_dvd.h"
++#else
 +int dvd_angle = 1;
+ #endif
  
- /* MPlayer -> GUI */
- 
+ guiInterface_t guiInfo = {
diff --git a/multimedia/mplayer-share/patches/patch-stream_stream__dvdnav.c b/multimedia/mplayer-share/patches/patch-stream_stream__dvdnav.c
new file mode 100644
index 00000000000..0469bb5b309
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-stream_stream__dvdnav.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-stream_stream__dvdnav.c,v 1.1 2015/04/05 08:27:08 dsainty Exp $
+
+Build against libdvdnav 5.0 API.
+
+--- stream/stream_dvdnav.c.orig	2015-04-02 19:11:45.639187166 +1300
++++ stream/stream_dvdnav.c	2015-04-02 19:15:31.431196527 +1300
+@@ -737,13 +737,13 @@
+ 
+   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;
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 96420ea5a17..1f0a6110f46 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2015/02/22 09:52:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.97 2015/04/05 08:27:08 dsainty Exp $
 
 PKGNAME=	mplayer-${MPLAYER_VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 
 COMMENT=	Fast, cross-platform movie player