Build fix - libdvdnav no longer ships dvdnav-config

3 files changed, 42 insertions, 5 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 2aeb9e9a359..8878fde57b6 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2014/10/04 12:49:06 wiz Exp $
+# $NetBSD: Makefile,v 1.177 2014/11/17 11:38:10 prlw1 Exp $
 
 DISTNAME=		vlc-${VLC_VERSION}
 PKGREVISION=		48
@@ -134,6 +134,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../multimedia/ffmpeg010/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
 .include "../../multimedia/libdvbpsi0/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libdvdnav+=	libdvdnav>=5.0
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
@@ -147,6 +148,7 @@ BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.3.5
 BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201
 .include "../../multimedia/x264-devel/buildlink3.mk"
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 4d9c4bef134..dba5648ef56 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2014/03/25 16:04:11 prlw1 Exp $
+$NetBSD: distinfo,v 1.64 2014/11/17 11:38:10 prlw1 Exp $
 
 SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
@@ -17,7 +17,7 @@ SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = d4fe7ba15a64c28f97a2800fe0bcae304ce0fa2d
 SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78
-SHA1 (patch-configure.ac) = db79a1e99bf2859eeb2615359db9a30a3eadfb2d
+SHA1 (patch-configure.ac) = 14eed94268866b39672bbdd28cac978f91e2e43b
 SHA1 (patch-include_vlc__fixups.h) = b6001b92238e365ccd8e5daf3683f919e472b61d
 SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
 SHA1 (patch-modules_codec_flac.c) = 962783164f505a8b9e5c1be18e162dfdc7917cb3
diff --git a/multimedia/vlc/patches/patch-configure.ac b/multimedia/vlc/patches/patch-configure.ac
index a0d6d53e53b..4ef27f221b8 100644
--- a/multimedia/vlc/patches/patch-configure.ac
+++ b/multimedia/vlc/patches/patch-configure.ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.3 2013/04/30 08:42:22 prlw1 Exp $
+$NetBSD: patch-configure.ac,v 1.4 2014/11/17 11:38:10 prlw1 Exp $
 
-automake-1.13 compat.
+- automake-1.13 compat
+- dvdnav-config was replaced by dvdnav.pc
 
 --- configure.ac.orig	2011-12-20 15:24:09.000000000 +0000
 +++ configure.ac
@@ -13,3 +14,37 @@ automake-1.13 compat.
  
  # Disable with "./configure --disable-silent-rules" or "make V=1"
  m4_ifdef([AM_SILENT_RULES], [
+@@ -1966,23 +1966,16 @@ then
+   dnl prepend -ldvdcss on OS that need it
+   AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
+ 
+-  DVDNAV_PATH="${PATH}"
+-  AC_ARG_WITH(dvdnav-config-path,
+-    [  --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
+-    [ if test "${with_dvdnav_config_path}" != "no"
+-      then
+-        DVDNAV_PATH="${with_dvdnav_config_path}:${PATH}"
+-      fi ])
+-  AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no, ${DVDNAV_PATH})
+-  if test "${DVDNAV_CONFIG}" != "no"
+-  then
+-    VLC_ADD_PLUGIN([dvdnav])
+-    VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`])
+-    VLC_ADD_LIBS([dvdnav],[`${DVDNAV_CONFIG} --libs`])
+-    AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution,
+-		AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]),
+-		[], [${LIBS_dvdnav}])
+-  fi
++  PKG_CHECK_MODULES(DVDNAV, dvdnav,
++    [ VLC_ADD_PLUGIN([dvdnav])
++      VLC_ADD_CFLAGS([dvdnav],[${DVDNAV_CFLAGS}])
++      VLC_ADD_LIBS([dvdnav],[${DVDNAV_LIBS}])
++      AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution,
++		  AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]),
++		  [], [${LIBS_dvdnav}])
++    ],
++    [AC_MSG_ERROR([Couldn't find dvdnav, install libdvdnav ?])]
++  )
+ fi
+ 
+ dnl