pkgsrc-WIP-changes archive

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

retroarch: Disable legacy xml shader support by default



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Mon Jun 5 12:11:04 2017 +0100
Changeset:	d1497b4dfdeab8e336e960c03fd56cbe2d0f01cf

Modified Files:
	retroarch/Makefile
	retroarch/options.mk

Log Message:
retroarch: Disable legacy xml shader support by default

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

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

diffstat:
 retroarch/Makefile   |  1 -
 retroarch/options.mk | 10 +++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs:
diff --git a/retroarch/Makefile b/retroarch/Makefile
index dd2d468ff4..9c642e2454 100644
--- a/retroarch/Makefile
+++ b/retroarch/Makefile
@@ -63,5 +63,4 @@ CONFIGURE_ARGS+=	--disable-thread_storage
 .include "../../lang/python/application.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/retroarch/options.mk b/retroarch/options.mk
index e15a9d153c..f4fa6855c4 100644
--- a/retroarch/options.mk
+++ b/retroarch/options.mk
@@ -3,7 +3,7 @@
 .include "../../mk/bsd.fast.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.retroarch
-PKG_SUPPORTED_OPTIONS+=	sdl2 alsa ffmpeg freetype
+PKG_SUPPORTED_OPTIONS+=	sdl2 alsa ffmpeg freetype libxml2
 PKG_SUGGESTED_OPTIONS+=	sdl2 ffmpeg freetype
 
 .if !empty(MACHINE_ARCH:M*arm*)
@@ -19,6 +19,14 @@ PKG_SUGGESTED_OPTIONS.Linux+=	alsa
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
 .endif
 
+# Legacy shader support
+.if !empty(PKG_OPTIONS:Mlibxml2)
+CONFIGURE_ARGS+=	--enable-libxml2
+.include "../../textproc/libxml2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-libxml2
+.endif
+
 .if !empty(PKG_OPTIONS:Msdl2)
 CONFIGURE_ARGS+=	--enable-sdl2
 .include "../../devel/SDL2/buildlink3.mk"


Home | Main Index | Thread Index | Old Index