Add option "lirc" and enable it by default when available, tested on RHEL-6

6 files changed, 43 insertions, 8 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 4fb5fd1a69d..9f372a3cea5 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.152 2013/04/12 13:44:59 drochner Exp $
+# $NetBSD: Makefile,v 1.153 2013/04/14 22:14:42 cheusov Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		24
+PKGREVISION=		25
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index c82b86d97be..ebc2fda7e46 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2013/01/19 20:34:37 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.53 2013/04/14 22:14:42 cheusov Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -173,6 +173,7 @@ ${PLIST.dbus}lib/vlc/plugins/control/libdbus_plugin.la
 lib/vlc/plugins/control/libgestures_plugin.la
 ${PLIST.x11}lib/vlc/plugins/control/libglobalhotkeys_plugin.la
 lib/vlc/plugins/control/libhotkeys_plugin.la
+${PLIST.lirc}lib/vlc/plugins/control/liblirc_plugin.la
 lib/vlc/plugins/control/libmotion_plugin.la
 lib/vlc/plugins/control/libnetsync_plugin.la
 lib/vlc/plugins/control/liboldhttp_plugin.la
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 6ba750b091f..3c5583d316c 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2013/04/14 01:02:08 cheusov Exp $
+# $NetBSD: options.mk,v 1.27 2013/04/14 22:14:42 cheusov Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad dbus hal skins sdl pulseaudio x11 gnome dts
@@ -11,6 +11,13 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=	vaapi
 .endif
 
+### Add LIRC if it is available
+.include "../../comms/lirc/available.mk"
+.if ${LIRC_AVAILABLE} == "yes"
+PKG_SUPPORTED_OPTIONS+= lirc
+PKG_SUGGESTED_OPTIONS+=	lirc
+.endif
+
 ###
 .include "../../mk/bsd.options.mk"
 
@@ -160,3 +167,12 @@ CONFIGURE_ARGS+=	--enable-libva
 .else
 CONFIGURE_ARGS+=	--disable-libva
 .endif
+
+## LIRC support
+.if !empty(PKG_OPTIONS:Mlirc)
+CONFIGURE_ARGS+=	--enable-lirc
+PLIST.lirc=	yes
+.include "../../comms/lirc/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-lirc
+.endif
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index 5d6ec9c4dc6..2f2d88dd1c6 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2013/04/14 12:35:25 cheusov Exp $
+# $NetBSD: Makefile,v 1.29 2013/04/14 22:10:23 cheusov Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc2/PLIST b/multimedia/vlc2/PLIST
index 4163f2fb6e4..de42527a297 100644
--- a/multimedia/vlc2/PLIST
+++ b/multimedia/vlc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/04/12 13:40:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/04/14 22:10:23 cheusov Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -192,6 +192,7 @@ lib/vlc/plugins/control/libdummy_plugin.la
 lib/vlc/plugins/control/libgestures_plugin.la
 ${PLIST.x11}lib/vlc/plugins/control/libglobalhotkeys_plugin.la
 lib/vlc/plugins/control/libhotkeys_plugin.la
+${PLIST.lirc}lib/vlc/plugins/control/liblirc_plugin.la
 lib/vlc/plugins/control/libmotion_plugin.la
 lib/vlc/plugins/control/libnetsync_plugin.la
 lib/vlc/plugins/control/liboldrc_plugin.la
diff --git a/multimedia/vlc2/options.mk b/multimedia/vlc2/options.mk
index 47efd8d44dc..a111e842f39 100644
--- a/multimedia/vlc2/options.mk
+++ b/multimedia/vlc2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2013/04/14 12:35:25 cheusov Exp $
+# $NetBSD: options.mk,v 1.6 2013/04/14 22:10:23 cheusov Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad skins sdl pulseaudio x11
@@ -14,6 +14,14 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=	vaapi
 .endif
 
+### Add LIRC if it is available
+.include "../../comms/lirc/available.mk"
+.if ${LIRC_AVAILABLE} == "yes"
+PKG_SUPPORTED_OPTIONS+= lirc
+PKG_SUGGESTED_OPTIONS+=	lirc
+.endif
+
+###
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
@@ -164,3 +172,12 @@ CONFIGURE_ARGS+=	--enable-libva
 .else
 CONFIGURE_ARGS+=	--disable-libva
 .endif
+
+## LIRC support
+.if !empty(PKG_OPTIONS:Mlirc)
+CONFIGURE_ARGS+=	--enable-lirc
+PLIST.lirc=	yes
+.include "../../comms/lirc/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-lirc
+.endif