diff options
author | spz <spz> | 2016-06-19 17:03:04 +0000 |
---|---|---|
committer | spz <spz> | 2016-06-19 17:03:04 +0000 |
commit | 7164ea9db2e19392ac1c6f383932673462aa0578 (patch) | |
tree | 80aa0aa7fe2b05fdee58c85a6a3a07f4fff3c885 | |
parent | c80d794bccf9c5604ca31df773d6e5c159866f89 (diff) | |
download | pkgsrc-7164ea9db2e19392ac1c6f383932673462aa0578.tar.gz |
Pullup ticket #5043 - requested by jperkin
multimedia/xine-lib: dependency fix
Revisions pulled up:
- multimedia/xine-lib/Makefile 1.140
- multimedia/xine-lib/PLIST.common 1.39
- multimedia/xine-lib/options.mk 1.1-1.2
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: jperkin
Date: Tue Apr 19 10:41:14 UTC 2016
Modified Files:
pkgsrc/multimedia/xine-lib: Makefile
Added Files:
pkgsrc/multimedia/xine-lib: options.mk
Log Message:
Remove dependency on audio/faac (appears unused) and move audio/libdca
dependency to options.mk, defaulting to disabled. Both these packages
are marked NO_BIN_ON_* so xine-lib couldn't previously be distributed
in binary package sets.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/xine-lib/options.mk
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: jperkin
Date: Tue Apr 19 13:48:31 UTC 2016
Modified Files:
pkgsrc/multimedia/xine-lib: PLIST.common options.mk
Log Message:
Handle dts PLIST entries correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/multimedia/xine-lib/PLIST.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/xine-lib/options.mk
-rw-r--r-- | multimedia/xine-lib/Makefile | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/PLIST.common | 6 | ||||
-rw-r--r-- | multimedia/xine-lib/options.mk | 16 |
3 files changed, 23 insertions, 7 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index ab60c007797..eec727baee7 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.139 2015/11/18 14:19:47 ryoon Exp $ +# $NetBSD: Makefile,v 1.139.4.1 2016/06/19 17:03:04 spz Exp $ -PKGREVISION= 3 +PKGREVISION= 4 .include "Makefile.common" COMMENT= Multimedia player library @@ -55,13 +55,13 @@ PLIST.oss= yes CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE LDFLAGS.SunOS+= -lresolv +.include "options.mk" + # flac is supported internally; don't know what the plugin is good for # but until autodetection is turned off, force external flac for now. .include "../../audio/flac/buildlink3.mk" -.include "../../audio/faac/buildlink3.mk" .include "../../audio/faad2/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" -.include "../../audio/libdca/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" #.include "../../audio/libmpcdec/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index 4b5123f544d..aa4b2c24c5a 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.38 2014/04/17 13:53:47 wiz Exp $ +@comment $NetBSD: PLIST.common,v 1.38.16.1 2016/06/19 17:03:04 spz Exp $ bin/xine-config bin/xine-list-1.2 include/xine.h @@ -68,8 +68,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.so -lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.a -lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.so +${PLIST.dts}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.a +${PLIST.dts}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_faad.a diff --git a/multimedia/xine-lib/options.mk b/multimedia/xine-lib/options.mk new file mode 100644 index 00000000000..b66752a96c5 --- /dev/null +++ b/multimedia/xine-lib/options.mk @@ -0,0 +1,16 @@ +# $NetBSD: options.mk,v 1.2.2.2 2016/06/19 17:03:04 spz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.xine-lib + +PKG_SUPPORTED_OPTIONS= dts + +.include "../../mk/bsd.options.mk" + +# Marked NO_BIN_ON_*. Only enable if you don't want to distribute packages. +PLIST_VARS+= dts +.if !empty(PKG_OPTIONS:Mdts) +.include "../../audio/libdca/buildlink3.mk" +PLIST.dts= yes +.else +CONFIGURE_ARGS+= --disable-dts +.endif |