Sun Nov 29 11:48:29 2015 UTC ()
Do not "force" dvdread option via "--enable-dvdread" (but let the MPlayer's
configure script to autorecognise it).

In that way pkg-config will be used to set the CFLAGS and LDFLAGS (while this
does not happen via --enable-* for various options).

Pointed out by Joyent SmartOS bulk builds.


(leot)
diff -r1.53 -r1.54 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.53 -r1.54 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2015/11/21 09:47:23 1.53
+++ pkgsrc/multimedia/mplayer-share/options.mk 2015/11/29 11:48:29 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.53 2015/11/21 09:47:23 leot Exp $ 1# $NetBSD: options.mk,v 1.54 2015/11/29 11:48:29 leot 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# -------------------------------------------------------------------------
@@ -158,27 +158,26 @@ INSTALL_UNSTRIPPED= yes @@ -158,27 +158,26 @@ INSTALL_UNSTRIPPED= yes
158. include "../../audio/libdca/buildlink3.mk" 158. include "../../audio/libdca/buildlink3.mk"
159.else 159.else
160CONFIGURE_ARGS+= --disable-libdca 160CONFIGURE_ARGS+= --disable-libdca
161.endif 161.endif
162 162
163.if !empty(PKG_OPTIONS:Mdv) 163.if !empty(PKG_OPTIONS:Mdv)
164CONFIGURE_ARGS+= --enable-libdv 164CONFIGURE_ARGS+= --enable-libdv
165. include "../../multimedia/libdv/buildlink3.mk" 165. include "../../multimedia/libdv/buildlink3.mk"
166.else 166.else
167CONFIGURE_ARGS+= --disable-libdv 167CONFIGURE_ARGS+= --disable-libdv
168.endif 168.endif
169 169
170.if !empty(PKG_OPTIONS:Mdvdread) 170.if !empty(PKG_OPTIONS:Mdvdread)
171CONFIGURE_ARGS+= --enable-dvdread 
172. include "../../multimedia/libdvdread/buildlink3.mk" 171. include "../../multimedia/libdvdread/buildlink3.mk"
173.else 172.else
174CONFIGURE_ARGS+= --disable-dvdread 173CONFIGURE_ARGS+= --disable-dvdread
175.endif 174.endif
176 175
177.if !empty(PKG_OPTIONS:Mdvdnav) 176.if !empty(PKG_OPTIONS:Mdvdnav)
178CONFIGURE_ARGS+= --enable-dvdnav 177CONFIGURE_ARGS+= --enable-dvdnav
179. include "../../multimedia/libdvdnav/buildlink3.mk" 178. include "../../multimedia/libdvdnav/buildlink3.mk"
180#CFLAGS+= -I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav 179#CFLAGS+= -I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav
181.else 180.else
182CONFIGURE_ARGS+= --disable-dvdnav 181CONFIGURE_ARGS+= --disable-dvdnav
183.endif 182.endif
184 183