Mon Jan 6 15:28:35 2014 UTC ()
Disable SDL2 PKG_OPTION and associated logic since it's not detected
correctly during configure if SDL is present. Reported to upstream.


(rodent)
diff -r1.3 -r1.4 pkgsrc/emulators/yabause/options.mk
cvs diff -r1.3 -r1.4 pkgsrc/emulators/yabause/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/yabause/options.mk 2014/01/06 04:44:16 1.3
+++ pkgsrc/emulators/yabause/options.mk 2014/01/06 15:28:35 1.4
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: options.mk,v 1.3 2014/01/06 04:44:16 rodent Exp $ 1# $NetBSD: options.mk,v 1.4 2014/01/06 15:28:35 rodent Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.yabause 3PKG_OPTIONS_VAR= PKG_OPTIONS.yabause
4PKG_SUPPORTED_OPTIONS= openal opengl 4PKG_SUPPORTED_OPTIONS= openal opengl sdl
5PKG_OPTIONS_OPTIONAL_GROUPS= GUI SDL 5PKG_OPTIONS_OPTIONAL_GROUPS= GUI #SDL
6PKG_OPTIONS_GROUP.GUI= gtk qt 6PKG_OPTIONS_GROUP.GUI= gtk qt
7PKG_OPTIONS_GROUP.SDL= sdl sdl2 7#PKG_OPTIONS_GROUP.SDL= sdl sdl2
8 8
9PKG_SUGGESTED_OPTIONS= qt sdl 9PKG_SUGGESTED_OPTIONS= qt sdl
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13#.if !empty(PKG_OPTIONS:Mdoxygen) 13#.if !empty(PKG_OPTIONS:Mdoxygen)
14#BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen 14#BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen
15#.endif 15#.endif
16 16
17.if !empty(PKG_OPTIONS:Mqt) 17.if !empty(PKG_OPTIONS:Mqt)
18CONFIGURE_ENV+= YAB_PORTS=qt 18CONFIGURE_ENV+= YAB_PORTS=qt
19CMAKE_ARGS+= -DYAB_PORTS=qt 19CMAKE_ARGS+= -DYAB_PORTS=qt
20.include "../../x11/qt4-tools/buildlink3.mk" 20.include "../../x11/qt4-tools/buildlink3.mk"
@@ -35,20 +35,20 @@ CMAKE_ARGS+= -DYAB_WANT_OPENAL=ON @@ -35,20 +35,20 @@ CMAKE_ARGS+= -DYAB_WANT_OPENAL=ON
35CMAKE_ARGS+= -DYAB_WANT_OPENAL=OFF 35CMAKE_ARGS+= -DYAB_WANT_OPENAL=OFF
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Mopengl) 38.if !empty(PKG_OPTIONS:Mopengl)
39.include "../../graphics/glut/buildlink3.mk" 39.include "../../graphics/glut/buildlink3.mk"
40CMAKE_ARGS+= -DYAB_WANT_OPENGL=ON 40CMAKE_ARGS+= -DYAB_WANT_OPENGL=ON
41.else 41.else
42CMAKE_ARGS+= -DYAB_WANT_OPENGL=OFF 42CMAKE_ARGS+= -DYAB_WANT_OPENGL=OFF
43.endif 43.endif
44 44
45.if !empty(PKG_OPTIONS:Msdl) 45.if !empty(PKG_OPTIONS:Msdl)
46.include "../../devel/SDL/buildlink3.mk" 46.include "../../devel/SDL/buildlink3.mk"
47CMAKE_ARGS+= -DYAB_WANT_SDL=ON 47CMAKE_ARGS+= -DYAB_WANT_SDL=ON
48.elif !empty(PKG_OPTIONS:Msdl2) 48#.elif !empty(PKG_OPTIONS:Msdl2)
49.include "../../devel/SDL2/buildlink3.mk" 49#.include "../../devel/SDL2/buildlink3.mk"
50CMAKE_ARGS+= -DYAB_WANT_SDL=ON 50#CMAKE_ARGS+= -DYAB_WANT_SDL=ON
51BUILDLINK_TRANSFORM+= l:SDL:SDL2 51#BUILDLINK_TRANSFORM+= l:SDL:SDL2
52.else 52.else
53CMAKE_ARGS+= -DYAB_WANT_SDL=OFF 53CMAKE_ARGS+= -DYAB_WANT_SDL=OFF
54.endif 54.endif