pkgsrc-WIP-changes archive

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

retroarch: Disable unsupported/deprecated cg2glsl script. Allows removing Python dependency.



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed Jun 7 16:02:58 2017 +0100
Changeset:	972df7cd30c31c44c8de607888fbbce36d0d0a16

Modified Files:
	retroarch/Makefile
	retroarch/PLIST
	retroarch/distinfo
	retroarch/patches/patch-Makefile

Log Message:
retroarch: Disable unsupported/deprecated cg2glsl script. Allows
removing Python dependency.

(This has never worked in pkgsrc since it needs nvidia-cg-toolkit)

https://www.libretro.com/index.php/shader-changes/

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

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

diffstat:
 retroarch/Makefile               |  4 ----
 retroarch/PLIST                  |  2 --
 retroarch/distinfo               |  2 +-
 retroarch/patches/patch-Makefile | 25 +++++++++++++++++--------
 4 files changed, 18 insertions(+), 15 deletions(-)

diffs:
diff --git a/retroarch/Makefile b/retroarch/Makefile
index 844051d61c..c805a11637 100644
--- a/retroarch/Makefile
+++ b/retroarch/Makefile
@@ -24,9 +24,6 @@ CONFIGURE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config gmake
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27
-REPLACE_PYTHON=	tools/cg2glsl.py
-
 DEPENDS+=	libretro-core-info>0:../../wip/libretro-core-info
 DEPENDS+=	retroarch-assets>0:../../wip/retroarch-assets
 
@@ -54,7 +51,6 @@ CONFIGURE_ARGS+=	--disable-thread_storage
 .endif
 
 .include "options.mk"
-.include "../../lang/python/application.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/retroarch/PLIST b/retroarch/PLIST
index db2da5c3d2..bdc2cabcca 100644
--- a/retroarch/PLIST
+++ b/retroarch/PLIST
@@ -1,7 +1,5 @@
 @comment $NetBSD$
 bin/retroarch
-bin/retroarch-cg2glsl
-man/man6/retroarch-cg2glsl.6
 man/man6/retroarch.6
 share/applications/retroarch.desktop
 share/examples/retroarch/retroarch.cfg
diff --git a/retroarch/distinfo b/retroarch/distinfo
index 19936ab3b8..aaeada095a 100644
--- a/retroarch/distinfo
+++ b/retroarch/distinfo
@@ -4,7 +4,7 @@ SHA1 (retroarch-1.6.0.tar.gz) = 8ec39a5e54dec3eea837d7d4c4d48bc8c430afc3
 RMD160 (retroarch-1.6.0.tar.gz) = 4798e0c1195137ce7f7fe611a0f5444fa42162e5
 SHA512 (retroarch-1.6.0.tar.gz) = 4cb180d78885103b8b607414fbac6d859ba916b2b7e77f661b5b1d5a0838a4bb09c3b79301d0b272845e3bbd7dc4f90c890adb5ec23600fa08e8f8062441ae51
 Size (retroarch-1.6.0.tar.gz) = 16299774 bytes
-SHA1 (patch-Makefile) = 32832b6861c05c95f86a94a0cc0bd8ace7c59846
+SHA1 (patch-Makefile) = 0a573beb9a95ab822eaa4056ccd260a0961b2d7b
 SHA1 (patch-Makefile.common) = 35ba9348f382c4c892ffd3e04729d5066d34977f
 SHA1 (patch-frontend_frontend__driver.c) = 1a92efc8ae1f4308afc4f21159c4cf467b6bba06
 SHA1 (patch-griffin_griffin.c) = 805a94274ad4a2118e9b2690bbc522caaa7551fc
diff --git a/retroarch/patches/patch-Makefile b/retroarch/patches/patch-Makefile
index 6791e0d03b..6a1a8552fc 100644
--- a/retroarch/patches/patch-Makefile
+++ b/retroarch/patches/patch-Makefile
@@ -1,10 +1,12 @@
 $NetBSD$
 
-Install retroarch.cfg to examples
+Install retroarch.cfg to examples.
 
---- Makefile.orig	2017-03-09 00:50:27.000000000 +0000
+Don't install deprecated and unsupported cg2glsl script.
+
+--- Makefile.orig	2017-05-31 23:25:41.000000000 +0000
 +++ Makefile
-@@ -181,13 +181,13 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
+@@ -186,16 +186,14 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
  install: $(TARGET)
  	rm -f $(OBJDIR)/git_version.o
  	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
@@ -14,18 +16,25 @@ Install retroarch.cfg to examples
  	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
  	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
  	install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
- 	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+-	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 -	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 +	install -m644 retroarch.cfg $(DESTDIR)$(PREFIX)/share/examples/retroarch/retroarch.cfg
  	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
  	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
- 	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
-@@ -211,7 +211,7 @@ install: $(TARGET)
+-	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
+ 	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
+ 	@if test -d media/assets; then \
+ 		echo "Installing media assets..."; \
+@@ -215,11 +213,9 @@ install: $(TARGET)
+ 
  uninstall:
  	rm -f $(DESTDIR)$(BIN_DIR)/retroarch
- 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+-	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 -	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 +	rm -f $(DESTDIR)$(PREFIX)/share/examples/retroarch/retroarch.cfg
  	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
  	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
- 	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
+-	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
+ 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg
+ 	rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch
+ 


Home | Main Index | Thread Index | Old Index