pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

omnispeak: add an option to use SDL-1.2 for display



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Mon Nov 6 08:13:03 2017 +0200
Changeset:	f05539c90cafb4a8a8ddf85e4e5387512de285f4

Modified Files:
	omnispeak/Makefile
Added Files:
	omnispeak/options.mk

Log Message:
omnispeak: add an option to use SDL-1.2 for display

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f05539c90cafb4a8a8ddf85e4e5387512de285f4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 omnispeak/Makefile   |  5 ++---
 omnispeak/options.mk | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diffs:
diff --git a/omnispeak/Makefile b/omnispeak/Makefile
index 005ec60503..00b46e79cf 100644
--- a/omnispeak/Makefile
+++ b/omnispeak/Makefile
@@ -25,13 +25,12 @@ SUBST_FILES.search-path=	src/id_ca.c
 SUBST_SED.search-path=		-e 's,@@PKGSRC_DATA_DIR@@,${PREFIX}/share/omnispeak,g'
 
 BUILD_DIRS=		src
-BUILD_MAKE_FLAGS+=	X11_LDFLAGS=${X11_LDFLAGS:Q}
 INSTALLATION_DIRS+=	bin share/omnispeak
 
 do-install:
 	${INSTALL_GAME} ${WRKSRC}/bin/omnispeak ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/bin/*.* ${DESTDIR}${PREFIX}/share/omnispeak/
 
-.include "../../devel/SDL2/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/omnispeak/options.mk b/omnispeak/options.mk
new file mode 100644
index 0000000000..5285cb5d31
--- /dev/null
+++ b/omnispeak/options.mk
@@ -0,0 +1,23 @@
+PKG_OPTIONS_VAR=		PKG_OPTIONS.omnispeak
+PKG_OPTIONS_OPTIONAL_GROUPS=	sdl
+PKG_OPTIONS_GROUP.sdl=		sdl sdl2
+PKG_SUGGESTED_OPTIONS=		sdl2
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+###
+### SDL support
+###
+
+.if !empty(PKG_OPTIONS:Msdl)
+.  include "../../devel/SDL/buildlink3.mk"
+BUILD_MAKE_FLAGS+=	WITH_SDL2=0
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl2)
+.  include "../../devel/SDL2/buildlink3.mk"
+.  include "../../mk/x11.buildlink3.mk"
+BUILD_MAKE_FLAGS+=	WITH_SDL2=1
+BUILD_MAKE_FLAGS+=	X11_LDFLAGS=${X11_LDFLAGS:Q}
+.endif


Home | Main Index | Thread Index | Old Index