CVS commit: pkgsrc/multimedia/vlc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 11:10:00 UTC 2017

Modified Files:
        pkgsrc/multimedia/vlc: Makefile PLIST

Log Message:
Add a cdrom PLIST var and unset it on SunOS as the native cdio interface
is unsupported.


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/multimedia/vlc/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/multimedia/vlc/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/vlc/Makefile
diff -u pkgsrc/multimedia/vlc/Makefile:1.201 pkgsrc/multimedia/vlc/Makefile:1.202
--- pkgsrc/multimedia/vlc/Makefile:1.201        Wed Mar  1 09:02:48 2017
+++ pkgsrc/multimedia/vlc/Makefile      Mon May 15 11:10:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2017/03/01 09:02:48 wiz Exp $
+# $NetBSD: Makefile,v 1.202 2017/05/15 11:10:00 jperkin Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
 PKGREVISION=           6
@@ -24,7 +24,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions
 PTHREAD_OPTS+=         require
 USE_LANGUAGES=         c99 c++
-PLIST_VARS+=           x86simd altivec v4l2 oss
+PLIST_VARS+=           altivec cdrom oss v4l2 x86simd
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -62,7 +62,6 @@ CONFIGURE_ARGS+=      --disable-vnc
 CONFIGURE_ARGS+=       --disable-vsxu
 CONFIGURE_ARGS+=       --disable-zvbi
 
-
 CFLAGS+=               -fPIC
 CXXFLAGS+=             -fPIC
 
@@ -85,6 +84,11 @@ PLIST.altivec=               yes
 CONFIGURE_ARGS+=       --enable-altivec
 .endif
 
+# SunOS cdio interface is unsupported
+.if ${OPSYS} != "SunOS"
+PLIST.cdrom=           yes
+.endif
+
 # Enable when cleanly builds
 .if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h)
 CONFIGURE_ARGS+=       --enable-v4l2

Index: pkgsrc/multimedia/vlc/PLIST
diff -u pkgsrc/multimedia/vlc/PLIST:1.59 pkgsrc/multimedia/vlc/PLIST:1.60
--- pkgsrc/multimedia/vlc/PLIST:1.59    Wed Mar  1 10:42:30 2017
+++ pkgsrc/multimedia/vlc/PLIST Mon May 15 11:10:00 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2017/03/01 10:42:30 maya Exp $
+@comment $NetBSD: PLIST,v 1.60 2017/05/15 11:10:00 jperkin Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -104,7 +104,7 @@ lib/vlc/plugins/access/libaccess_mtp_plu
 ${PLIST.oss}lib/vlc/plugins/access/libaccess_oss_plugin.la
 lib/vlc/plugins/access/libattachment_plugin.la
 lib/vlc/plugins/access/libavio_plugin.la
-lib/vlc/plugins/access/libcdda_plugin.la
+${PLIST.cdrom}lib/vlc/plugins/access/libcdda_plugin.la
 lib/vlc/plugins/access/libdvdnav_plugin.la
 lib/vlc/plugins/access/libdvdread_plugin.la
 lib/vlc/plugins/access/libfilesystem_plugin.la
@@ -122,7 +122,7 @@ lib/vlc/plugins/access/libshm_plugin.la
 lib/vlc/plugins/access/libtcp_plugin.la
 lib/vlc/plugins/access/libtimecode_plugin.la
 lib/vlc/plugins/access/libudp_plugin.la
-lib/vlc/plugins/access/libvcd_plugin.la
+${PLIST.cdrom}lib/vlc/plugins/access/libvcd_plugin.la
 lib/vlc/plugins/access/libvdr_plugin.la
 ${PLIST.x11}lib/vlc/plugins/access/libxcb_screen_plugin.la
 lib/vlc/plugins/access/libzip_plugin.la