diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-05-15 11:10:00 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-05-15 11:10:00 +0000 |
| commit | 6af4884b03bae3059808e50d03abe36b9354980d (patch) | |
| tree | 52e427f2d5c69eee8be1d58f8ec272c335da854d /multimedia | |
| parent | feafb5cbbfdba93fec6f1524d794d1b71a335ee2 (diff) | |
| download | pkgsrc-6af4884b03bae3059808e50d03abe36b9354980d.tar.gz | |
Add a cdrom PLIST var and unset it on SunOS as the native cdio interface
is unsupported.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/vlc/PLIST | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index d5947c72204..98f896df1a5 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -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 diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index a8d1bebbd22..04555022906 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -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_plugin.la ${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 |