Tue Apr 19 10:41:14 2016 UTC ()
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.


(jperkin)
diff -r1.139 -r1.140 pkgsrc/multimedia/xine-lib/Makefile
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/options.mk
cvs diff -r1.139 -r1.140 pkgsrc/multimedia/xine-lib/Makefile (switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2015/11/18 14:19:47 1.139
+++ pkgsrc/multimedia/xine-lib/Makefile 2016/04/19 10:41:14 1.140
@@ -1,88 +1,88 @@ @@ -1,88 +1,88 @@
1# $NetBSD: Makefile,v 1.139 2015/11/18 14:19:47 ryoon Exp $ 1# $NetBSD: Makefile,v 1.140 2016/04/19 10:41:14 jperkin Exp $
2 2
3PKGREVISION= 3 3PKGREVISION= 4
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Multimedia player library 6COMMENT= Multimedia player library
7 7
8CONFLICTS+= xine-xcb-[0-9]* 8CONFLICTS+= xine-xcb-[0-9]*
9 9
10CONFIGURE_ARGS+= --disable-v4l 10CONFIGURE_ARGS+= --disable-v4l
11CONFIGURE_ARGS+= --disable-v4l2 11CONFIGURE_ARGS+= --disable-v4l2
12CONFIGURE_ARGS+= --disable-real-codecs 12CONFIGURE_ARGS+= --disable-real-codecs
13CONFIGURE_ARGS+= --disable-aalib 13CONFIGURE_ARGS+= --disable-aalib
14CONFIGURE_ARGS+= --disable-mlib 14CONFIGURE_ARGS+= --disable-mlib
15 15
16BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 16BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
17 17
18SUBST_CLASSES+= oss 18SUBST_CLASSES+= oss
19SUBST_STAGE.oss= post-patch 19SUBST_STAGE.oss= post-patch
20SUBST_FILES.oss= src/audio_out/audio_oss_out.c 20SUBST_FILES.oss= src/audio_out/audio_oss_out.c
21SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 21SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
22.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 22.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
23SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" 23SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g"
24.endif 24.endif
25SUBST_MESSAGE.oss= Fixing hardcoded audio device. 25SUBST_MESSAGE.oss= Fixing hardcoded audio device.
26 26
27SUBST_CLASSES+= w32path 27SUBST_CLASSES+= w32path
28SUBST_STAGE.w32path= post-patch 28SUBST_STAGE.w32path= post-patch
29SUBST_FILES.w32path= src/libw32dll/common.c 29SUBST_FILES.w32path= src/libw32dll/common.c
30SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32," 30SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32,"
31SUBST_MESSAGE.w32path= Fixing win32 dll path. 31SUBST_MESSAGE.w32path= Fixing win32 dll path.
32 32
33# Needed to fix build problems under, at least, NetBSD/amd64. 33# Needed to fix build problems under, at least, NetBSD/amd64.
34BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 34BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75
35 35
36.if ${OPSYS} == "FreeBSD" 36.if ${OPSYS} == "FreeBSD"
37PLIST_VARS+= vidix 37PLIST_VARS+= vidix
38.if ${MACHINE_ARCH} == "i386" 38.if ${MACHINE_ARCH} == "i386"
39PLIST.vidix= yes 39PLIST.vidix= yes
40.endif 40.endif
41.endif 41.endif
42 42
43PLIST_VARS+= qtw32 43PLIST_VARS+= qtw32
44.if empty(MACHINE_PLATFORM:MDarwin-*-i386) 44.if empty(MACHINE_PLATFORM:MDarwin-*-i386)
45PLIST.qtw32= yes 45PLIST.qtw32= yes
46.endif 46.endif
47 47
48.if ${OPSYS} == "SunOS" 48.if ${OPSYS} == "SunOS"
49PLIST_VARS+= oss 49PLIST_VARS+= oss
50.if ${OS_VERSION} == "5.11" 50.if ${OS_VERSION} == "5.11"
51PLIST.oss= yes 51PLIST.oss= yes
52.endif 52.endif
53.endif 53.endif
54 54
55CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE 55CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE
56LDFLAGS.SunOS+= -lresolv 56LDFLAGS.SunOS+= -lresolv
57 57
 58.include "options.mk"
 59
58# flac is supported internally; don't know what the plugin is good for 60# flac is supported internally; don't know what the plugin is good for
59# but until autodetection is turned off, force external flac for now. 61# but until autodetection is turned off, force external flac for now.
60.include "../../audio/flac/buildlink3.mk" 62.include "../../audio/flac/buildlink3.mk"
61.include "../../audio/faac/buildlink3.mk" 
62.include "../../audio/faad2/buildlink3.mk" 63.include "../../audio/faad2/buildlink3.mk"
63.include "../../audio/liba52/buildlink3.mk" 64.include "../../audio/liba52/buildlink3.mk"
64.include "../../audio/libdca/buildlink3.mk" 
65.include "../../audio/libmad/buildlink3.mk" 65.include "../../audio/libmad/buildlink3.mk"
66#.include "../../audio/libmpcdec/buildlink3.mk" 66#.include "../../audio/libmpcdec/buildlink3.mk"
67.include "../../audio/libvorbis/buildlink3.mk" 67.include "../../audio/libvorbis/buildlink3.mk"
68.include "../../audio/speex/buildlink3.mk" 68.include "../../audio/speex/buildlink3.mk"
69.include "../../devel/gettext-lib/buildlink3.mk" 69.include "../../devel/gettext-lib/buildlink3.mk"
70# these could be options or (better) extra plugin packages 70# these could be options or (better) extra plugin packages
71#.include "../../devel/SDL/buildlink3.mk" 71#.include "../../devel/SDL/buildlink3.mk"
72#.include "../../graphics/ImageMagick/buildlink3.mk" 72#.include "../../graphics/ImageMagick/buildlink3.mk"
73#.include "../../graphics/Mesa/buildlink3.mk" 73#.include "../../graphics/Mesa/buildlink3.mk"
74CONFIGURE_ARGS+= --disable-opengl 74CONFIGURE_ARGS+= --disable-opengl
75#.include "../../graphics/aalib/buildlink3.mk" 75#.include "../../graphics/aalib/buildlink3.mk"
76.include "../../graphics/mng/buildlink3.mk" 76.include "../../graphics/mng/buildlink3.mk"
77.include "../../graphics/png/buildlink3.mk" 77.include "../../graphics/png/buildlink3.mk"
78.include "../../misc/libcdio/buildlink3.mk" 78.include "../../misc/libcdio/buildlink3.mk"
79CONFIGURE_ARGS+= --with-external-dvdnav 79CONFIGURE_ARGS+= --with-external-dvdnav
80.include "../../multimedia/libdvdnav/buildlink3.mk" 80.include "../../multimedia/libdvdnav/buildlink3.mk"
81.include "../../multimedia/libtheora/buildlink3.mk" 81.include "../../multimedia/libtheora/buildlink3.mk"
82.include "../../sysutils/vcdimager-devel/buildlink3.mk" 82.include "../../sysutils/vcdimager-devel/buildlink3.mk"
83.include "../../x11/libXext/buildlink3.mk" 83.include "../../x11/libXext/buildlink3.mk"
84.include "../../x11/libXt/buildlink3.mk" 84.include "../../x11/libXt/buildlink3.mk"
85.include "../../x11/libX11/buildlink3.mk" 85.include "../../x11/libX11/buildlink3.mk"
86.include "../../x11/libXinerama/buildlink3.mk" 86.include "../../x11/libXinerama/buildlink3.mk"
87.include "../../x11/libxcb/buildlink3.mk" 87.include "../../x11/libxcb/buildlink3.mk"
88.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/multimedia/xine-lib/options.mk
# $NetBSD: options.mk,v 1.1 2016/04/19 10:41:14 jperkin 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.
.if !empty(PKG_OPTIONS:Mdts)
.include "../../audio/libdca/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-dts
.endif