Fri Dec 17 19:05:35 2010 UTC ()
PR/37694: add optional support for libcaca.  Tested on 4.0/i386.


(shattered)
diff -r1.73 -r1.74 pkgsrc/multimedia/mplayer/Makefile
diff -r1.41 -r1.42 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.73 -r1.74 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2010/11/23 12:31:29 1.73
+++ pkgsrc/multimedia/mplayer/Makefile 2010/12/17 19:05:35 1.74
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.73 2010/11/23 12:31:29 tron Exp $ 1# $NetBSD: Makefile,v 1.74 2010/12/17 19:05:35 shattered Exp $
2 2
3PKGNAME= mplayer-${MPLAYER_VERSION} 3PKGNAME= mplayer-${MPLAYER_VERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5 5
6COMMENT= Fast, cross-platform movie player 6COMMENT= Fast, cross-platform movie player
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../multimedia/mplayer-share/Makefile.common" 10.include "../../multimedia/mplayer-share/Makefile.common"
11 11
12USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
13 13
14.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 14.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
15BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm 15BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
16.endif 16.endif
17 17
cvs diff -r1.41 -r1.42 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2010/09/16 18:56:12 1.41
+++ pkgsrc/multimedia/mplayer-share/options.mk 2010/12/17 19:05:35 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.41 2010/09/16 18:56:12 wiz Exp $ 1# $NetBSD: options.mk,v 1.42 2010/12/17 19:05:35 shattered Exp $
2 2
3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) 3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
4 4
5# Note: This expression is the same as ${PKGBASE}, but the latter is 5# Note: This expression is the same as ${PKGBASE}, but the latter is
6# not defined yet, so we cannot use it here. 6# not defined yet, so we cannot use it here.
7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
8 8
9.include "../../mk/oss.buildlink3.mk" 9.include "../../mk/oss.buildlink3.mk"
10.include "../../multimedia/libvdpau/available.mk" 10.include "../../multimedia/libvdpau/available.mk"
11 11
12# ------------------------------------------------------------------------- 12# -------------------------------------------------------------------------
13# Define PKG_SUPPORTED_OPTIONS based on the current package and system. 13# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
14# ------------------------------------------------------------------------- 14# -------------------------------------------------------------------------
@@ -17,27 +17,27 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C @@ -17,27 +17,27 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C
17 17
18PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug 18PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug
19PKG_SUPPORTED_OPTIONS+= dvdread dvdnav 19PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
20.if ${OSS_TYPE} != "none" 20.if ${OSS_TYPE} != "none"
21PKG_SUPPORTED_OPTIONS+= oss 21PKG_SUPPORTED_OPTIONS+= oss
22.endif 22.endif
23 23
24PKG_OPTIONS_OPTIONAL_GROUPS= faadgroup 24PKG_OPTIONS_OPTIONAL_GROUPS= faadgroup
25PKG_OPTIONS_GROUP.faadgroup= faad mplayer-internal-faad 25PKG_OPTIONS_GROUP.faadgroup= faad mplayer-internal-faad
26PKG_SUGGESTED_OPTIONS+= mplayer-internal-faad 26PKG_SUGGESTED_OPTIONS+= mplayer-internal-faad
27 27
28# Set options based on the specific package being built. 28# Set options based on the specific package being built.
29.if !empty(PKGNAME:M*mplayer*) 29.if !empty(PKGNAME:M*mplayer*)
30PKG_SUPPORTED_OPTIONS+= aalib esound ggi mplayer-menu nas pulseaudio sdl 30PKG_SUPPORTED_OPTIONS+= aalib caca esound ggi mplayer-menu nas pulseaudio sdl
31 31
32.if ${VDPAU_AVAILABLE} == "yes" 32.if ${VDPAU_AVAILABLE} == "yes"
33PKG_SUPPORTED_OPTIONS+= vdpau 33PKG_SUPPORTED_OPTIONS+= vdpau
34.endif 34.endif
35 35
36. if ${OPSYS} != "SunOS" 36. if ${OPSYS} != "SunOS"
37PKG_SUPPORTED_OPTIONS+= arts 37PKG_SUPPORTED_OPTIONS+= arts
38. endif 38. endif
39.elif !empty(PKGNAME:M*mencoder*) 39.elif !empty(PKGNAME:M*mencoder*)
40PKG_SUPPORTED_OPTIONS+= faac lame 40PKG_SUPPORTED_OPTIONS+= faac lame
41.endif 41.endif
42 42
43# OS-specific options. 43# OS-specific options.
@@ -105,26 +105,31 @@ EXTRA_LIBS= @@ -105,26 +105,31 @@ EXTRA_LIBS=
105 105
106.if !empty(PKG_OPTIONS:Maalib) 106.if !empty(PKG_OPTIONS:Maalib)
107. include "../../graphics/aalib/buildlink3.mk" 107. include "../../graphics/aalib/buildlink3.mk"
108.endif 108.endif
109 109
110.if !empty(PKG_OPTIONS:Marts) 110.if !empty(PKG_OPTIONS:Marts)
111CONFIGURE_ARGS+= --enable-arts 111CONFIGURE_ARGS+= --enable-arts
112EXTRA_LIBS+= -lartsc 112EXTRA_LIBS+= -lartsc
113. include "../../audio/arts/buildlink3.mk" 113. include "../../audio/arts/buildlink3.mk"
114.else 114.else
115CONFIGURE_ARGS+= --disable-arts 115CONFIGURE_ARGS+= --disable-arts
116.endif 116.endif
117 117
 118.if !empty(PKG_OPTIONS:Mcaca)
 119CONFIGURE_ARGS+= --enable-caca
 120. include "../../graphics/libcaca/buildlink3.mk"
 121.endif
 122
118.if !empty(PKG_OPTIONS:Mcdparanoia) 123.if !empty(PKG_OPTIONS:Mcdparanoia)
119CONFIGURE_ARGS+= --enable-cdparanoia 124CONFIGURE_ARGS+= --enable-cdparanoia
120. include "../../audio/cdparanoia/buildlink3.mk" 125. include "../../audio/cdparanoia/buildlink3.mk"
121CFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia 126CFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
122.else 127.else
123CONFIGURE_ARGS+= --disable-cdparanoia 128CONFIGURE_ARGS+= --disable-cdparanoia
124.endif 129.endif
125 130
126.if !empty(PKG_OPTIONS:Mdebug) 131.if !empty(PKG_OPTIONS:Mdebug)
127CONFIGURE_ARGS+= --enable-debug 132CONFIGURE_ARGS+= --enable-debug
128.endif 133.endif
129 134
130.if !empty(PKG_OPTIONS:Mdts) 135.if !empty(PKG_OPTIONS:Mdts)