Mon Jan 20 21:34:01 2020 UTC ()
mplayer-share: Remove esound support.


(nia)
diff -r1.66 -r1.67 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.66 -r1.67 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2019/11/03 17:12:03 1.66
+++ pkgsrc/multimedia/mplayer-share/options.mk 2020/01/20 21:34:01 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.66 2019/11/03 17:12:03 rillig Exp $ 1# $NetBSD: options.mk,v 1.67 2020/01/20 21:34:01 nia 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 10
11.include "../../multimedia/libvdpau/available.mk" 11.include "../../multimedia/libvdpau/available.mk"
12.include "../../comms/lirc/available.mk" 12.include "../../comms/lirc/available.mk"
13 13
14# ------------------------------------------------------------------------- 14# -------------------------------------------------------------------------
@@ -23,27 +23,27 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C @@ -23,27 +23,27 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C
23 23
24# Options supported by both mplayer* or mencoder*. 24# Options supported by both mplayer* or mencoder*.
25 25
26PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug 26PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug
27PKG_SUPPORTED_OPTIONS+= dvdread dvdnav libmpg123 opus 27PKG_SUPPORTED_OPTIONS+= dvdread dvdnav libmpg123 opus
28. if ${OSS_TYPE} != "none" 28. if ${OSS_TYPE} != "none"
29PKG_SUPPORTED_OPTIONS+= oss 29PKG_SUPPORTED_OPTIONS+= oss
30. endif 30. endif
31 31
32PKG_SUPPORTED_OPTIONS+= faad 32PKG_SUPPORTED_OPTIONS+= faad
33 33
34# Set options based on the specific package being built. 34# Set options based on the specific package being built.
35. if !empty(PKGNAME:M*mplayer*) 35. if !empty(PKGNAME:M*mplayer*)
36PKG_SUPPORTED_OPTIONS+= aalib alsa caca esound ggi mplayer-menu nas pulseaudio sdl 36PKG_SUPPORTED_OPTIONS+= aalib alsa caca ggi mplayer-menu nas pulseaudio sdl
37 37
38. if ${VDPAU_AVAILABLE} == "yes" 38. if ${VDPAU_AVAILABLE} == "yes"
39PKG_SUPPORTED_OPTIONS+= vdpau 39PKG_SUPPORTED_OPTIONS+= vdpau
40. endif 40. endif
41 41
42. if ${LIRC_AVAILABLE} == "yes" 42. if ${LIRC_AVAILABLE} == "yes"
43PKG_SUPPORTED_OPTIONS+= lirc 43PKG_SUPPORTED_OPTIONS+= lirc
44. endif 44. endif
45 45
46. elif !empty(PKGNAME:M*mencoder*) 46. elif !empty(PKGNAME:M*mencoder*)
47PKG_SUPPORTED_OPTIONS+= faac lame 47PKG_SUPPORTED_OPTIONS+= faac lame
48. endif 48. endif
49 49
@@ -159,33 +159,26 @@ CONFIGURE_ARGS+= --disable-libdv @@ -159,33 +159,26 @@ CONFIGURE_ARGS+= --disable-libdv
159. include "../../multimedia/libdvdread/buildlink3.mk" 159. include "../../multimedia/libdvdread/buildlink3.mk"
160. else 160. else
161CONFIGURE_ARGS+= --disable-dvdread 161CONFIGURE_ARGS+= --disable-dvdread
162. endif 162. endif
163 163
164. if !empty(PKG_OPTIONS:Mdvdnav) 164. if !empty(PKG_OPTIONS:Mdvdnav)
165CONFIGURE_ARGS+= --enable-dvdnav 165CONFIGURE_ARGS+= --enable-dvdnav
166. include "../../multimedia/libdvdnav/buildlink3.mk" 166. include "../../multimedia/libdvdnav/buildlink3.mk"
167#CFLAGS+= -I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav 167#CFLAGS+= -I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav
168. else 168. else
169CONFIGURE_ARGS+= --disable-dvdnav 169CONFIGURE_ARGS+= --disable-dvdnav
170. endif 170. endif
171 171
172. if !empty(PKG_OPTIONS:Mesound) 
173CONFIGURE_ARGS+= --enable-esd 
174. include "../../audio/esound/buildlink3.mk" 
175. else 
176CONFIGURE_ARGS+= --disable-esd 
177. endif 
178 
179. if !empty(PKG_OPTIONS:Mfaac) 172. if !empty(PKG_OPTIONS:Mfaac)
180CONFIGURE_ARGS+= --enable-faac 173CONFIGURE_ARGS+= --enable-faac
181EXTRA_LIBS+= -lfaac 174EXTRA_LIBS+= -lfaac
182. include "../../audio/faac/buildlink3.mk" 175. include "../../audio/faac/buildlink3.mk"
183. else 176. else
184CONFIGURE_ARGS+= --disable-faac 177CONFIGURE_ARGS+= --disable-faac
185. endif 178. endif
186 179
187. if !empty(PKG_OPTIONS:Mfaad) 180. if !empty(PKG_OPTIONS:Mfaad)
188CONFIGURE_ARGS+= --enable-faad 181CONFIGURE_ARGS+= --enable-faad
189. include "../../audio/faad2/buildlink3.mk" 182. include "../../audio/faad2/buildlink3.mk"
190. else 183. else
191CONFIGURE_ARGS+= --disable-faad 184CONFIGURE_ARGS+= --disable-faad