Sun Oct 19 22:05:54 2008 UTC ()
Fix a bug when configure is looking for glx when option -x11 set.


(ahoka)
diff -r1.8 -r1.9 pkgsrc/multimedia/vlc/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/vlc/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/options.mk 2008/09/27 22:33:20 1.8
+++ pkgsrc/multimedia/vlc/options.mk 2008/10/19 22:05:54 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.8 2008/09/27 22:33:20 ahoka Exp $ 1# $NetBSD: options.mk,v 1.9 2008/10/19 22:05:54 ahoka Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.vlc 3PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
4PKG_SUPPORTED_OPTIONS= debug faad arts dbus skins sdl esound x11 gnome 4PKG_SUPPORTED_OPTIONS= debug faad arts dbus skins sdl esound x11 gnome
5PKG_SUGGESTED_OPTIONS= x11 esound 5PKG_SUGGESTED_OPTIONS= x11 esound
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
10 10
11## ESOUND audio backend 11## ESOUND audio backend
12 12
13.if !empty(PKG_OPTIONS:Mesound) 13.if !empty(PKG_OPTIONS:Mesound)
14CONFIGURE_ARGS+= --enable-esd 14CONFIGURE_ARGS+= --enable-esd
@@ -71,32 +71,34 @@ CONFIGURE_ARGS+= --disable-skins2 @@ -71,32 +71,34 @@ CONFIGURE_ARGS+= --disable-skins2
71 71
72## X11 dependecy and QT4 frontend 72## X11 dependecy and QT4 frontend
73 73
74.if !empty(PKG_OPTIONS:Mx11) 74.if !empty(PKG_OPTIONS:Mx11)
75DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf 75DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
76.include "../../graphics/freetype2/buildlink3.mk" 76.include "../../graphics/freetype2/buildlink3.mk"
77.include "../../x11/libXv/buildlink3.mk" 77.include "../../x11/libXv/buildlink3.mk"
78.include "../../x11/libXxf86vm/buildlink3.mk" 78.include "../../x11/libXxf86vm/buildlink3.mk"
79.include "../../x11/libXdamage/buildlink3.mk" 79.include "../../x11/libXdamage/buildlink3.mk"
80.include "../../x11/libXinerama/buildlink3.mk" 80.include "../../x11/libXinerama/buildlink3.mk"
81.include "../../graphics/MesaLib/buildlink3.mk" 81.include "../../graphics/MesaLib/buildlink3.mk"
82.include "../../graphics/glu/buildlink3.mk" 82.include "../../graphics/glu/buildlink3.mk"
83.include "../../x11/qt4-libs/buildlink3.mk" 83.include "../../x11/qt4-libs/buildlink3.mk"
84CONFIGURE_ARGS+= --enable-qt4 84CONFIGURE_ARGS+= --enable-qt4 \
85CONFIGURE_ARGS+= --enable-x11 85 --enable-x11 \
 86 --enable-glx
86PLIST.x11= yes 87PLIST.x11= yes
87.else 88.else
88CONFIGURE_ARGS+= --disable-x11 89CONFIGURE_ARGS+= --disable-x11 \
89CONFIGURE_ARGS+= --disable-qt4 90 --disable-qt4 \
 91 --disable-glx
90.endif 92.endif
91 93
92## FAAD support (faad is non-redistributable) 94## FAAD support (faad is non-redistributable)
93 95
94.if !empty(PKG_OPTIONS:Mfaad) 96.if !empty(PKG_OPTIONS:Mfaad)
95CONFIGURE_ARGS+= --enable-faad 97CONFIGURE_ARGS+= --enable-faad
96PLIST.faad= yes 98PLIST.faad= yes
97.include "../../audio/faad2/buildlink3.mk" 99.include "../../audio/faad2/buildlink3.mk"
98.else 100.else
99CONFIGURE_ARGS+= --disable-faad 101CONFIGURE_ARGS+= --disable-faad
100.endif 102.endif
101 103
102## ARTS audio system support 104## ARTS audio system support