retroarch: Update to 1.6.1 - patches upstreamed, translation updates, etc

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: retroarch: Update to 1.6.1 - patches upstreamed, translation updates, etc
From: Nia Alarie <nia.alarie%gmail.com@localhost>
Date: Sun, 25 Jun 2017 12:35:41 +0000
Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Sun Jun 25 13:35:41 2017 +0100
Changeset:	51c7a1fa2b9d32cf8b1e16e90cdce4db9fc1d012

Modified Files:
	retroarch/Makefile
	retroarch/distinfo
Removed Files:
	retroarch/patches/patch-Makefile.common
	retroarch/patches/patch-frontend_drivers_platform__linux.c
	retroarch/patches/patch-frontend_frontend__driver.c
	retroarch/patches/patch-griffin_griffin.c

Log Message:
retroarch: Update to 1.6.1 - patches upstreamed, translation updates, etc

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

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

diffstat:
 retroarch/Makefile                                 |  2 +-
 retroarch/distinfo                                 | 12 ++--
 retroarch/patches/patch-Makefile.common            | 28 ---------
 .../patch-frontend_drivers_platform__linux.c       | 68 ----------------------
 .../patches/patch-frontend_frontend__driver.c      | 20 -------
 retroarch/patches/patch-griffin_griffin.c          | 18 ------
 6 files changed, 5 insertions(+), 143 deletions(-)

diffs:
diff --git a/retroarch/Makefile b/retroarch/Makefile
index f4291e65f3..4b3057628a 100644
--- a/retroarch/Makefile
+++ b/retroarch/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.6 2015/04/25 14:20:47 tnn Exp $
 
-DISTNAME=	retroarch-1.6.0
+DISTNAME=	retroarch-1.6.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
 
diff --git a/retroarch/distinfo b/retroarch/distinfo
index fd75fcb441..6f967b7217 100644
--- a/retroarch/distinfo
+++ b/retroarch/distinfo
@@ -1,12 +1,8 @@
 $NetBSD: distinfo,v 1.4 2015/11/03 20:31:01 agc Exp $
 
-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 (retroarch-1.6.1.tar.gz) = 4a14384c75a9365e8e881d241b42deb1a52ef3ee
+RMD160 (retroarch-1.6.1.tar.gz) = 3b301a4e17fd156e5ffcce61a0b5c19811705184
+SHA512 (retroarch-1.6.1.tar.gz) = d97c88fa1c748629c53948c153a3b96278da02a6fa503a5f3aa1fe46c75af532d2739eef44f6c028118c71d6cfc38c3a886643e7d2c36ad4eb93eba4608fff8a
+Size (retroarch-1.6.1.tar.gz) = 16358704 bytes
 SHA1 (patch-Makefile) = 0a573beb9a95ab822eaa4056ccd260a0961b2d7b
-SHA1 (patch-Makefile.common) = 35ba9348f382c4c892ffd3e04729d5066d34977f
-SHA1 (patch-frontend_drivers_platform__linux.c) = 1a7c56461c05c2da905141cffd129c4cda0aa7d7
-SHA1 (patch-frontend_frontend__driver.c) = 1a92efc8ae1f4308afc4f21159c4cf467b6bba06
-SHA1 (patch-griffin_griffin.c) = 805a94274ad4a2118e9b2690bbc522caaa7551fc
 SHA1 (patch-qb_qb.libs.sh) = bd92a7016e45fd6ee5a47300516c4028227384b2
diff --git a/retroarch/patches/patch-Makefile.common b/retroarch/patches/patch-Makefile.common
deleted file mode 100644
index 45f2d0af43..0000000000
--- a/retroarch/patches/patch-Makefile.common
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Use the Linux frontend on BSD since the BSD frontend is incomplete.
-
-Don't build the OSS driver twice.
-
---- Makefile.common.orig	2017-05-31 23:25:41.000000000 +0000
-+++ Makefile.common
-@@ -105,7 +105,7 @@ endif
- 
- ifneq ($(findstring BSD,$(OS)),)
-    BSD_LOCAL_INC += -I/usr/local/include
--   OBJ += frontend/drivers/platform_bsd.o
-+   OBJ += frontend/drivers/platform_linux.o
- endif
- 
- ifneq ($(findstring Darwin,$(OS)),)
-@@ -370,9 +370,7 @@ endif
- 
- ifeq ($(HAVE_OSS), 1)
-    OBJ += audio/drivers/oss.o
--endif
--
--ifeq ($(HAVE_OSS_BSD), 1)
-+else ifeq ($(HAVE_OSS_BSD), 1)
-    OBJ += audio/drivers/oss.o
- endif
- 
diff --git a/retroarch/patches/patch-frontend_drivers_platform__linux.c b/retroarch/patches/patch-frontend_drivers_platform__linux.c
deleted file mode 100644
index b83896521e..0000000000
--- a/retroarch/patches/patch-frontend_drivers_platform__linux.c
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD$
-
-Pick up paths from pkgsrc.
-
---- frontend/drivers/platform_linux.c.orig	2017-05-31 23:25:41.000000000 +0000
-+++ frontend/drivers/platform_linux.c
-@@ -1779,32 +1779,15 @@ static void frontend_linux_get_env(int *
-    else
-       snprintf(base_path, sizeof(base_path), "retroarch");
- 
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], base_path,
--         "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
--         "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], PREFIX,
-+         "lib/libretro", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], PREFIX,
-+         "share/libretro/info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
-    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
-          "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
- 
--   if (path_is_directory("/usr/local/share/retroarch/assets"))
--      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
--            "/usr/local/share/retroarch",
--            "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
--   else if (path_is_directory("/usr/share/retroarch/assets"))
--      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
--            "/usr/share/retroarch",
--            "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
--   else if (path_is_directory("/usr/local/share/games/retroarch/assets"))
--      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
--            "/usr/local/share/games/retroarch",
--            "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
--   else if (path_is_directory("/usr/share/games/retroarch/assets"))
--      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
--            "/usr/share/games/retroarch",
--            "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
--   else
--      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], base_path,
--            "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], PREFIX,
-+         "share/retroarch/assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
- 
-    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], base_path,
-          "config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
-@@ -1817,14 +1800,14 @@ static void frontend_linux_get_env(int *
-          "records_config", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG]));
-    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], base_path,
-          "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT]));
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], base_path,
--         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path,
--         "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path,
--         "shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], base_path,
--         "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], PREFIX,
-+         "share/libretro/database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], PREFIX,
-+         "share/libretro/database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], PREFIX,
-+         "share/libretro/shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
-+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], PREFIX,
-+         "share/libretro/cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
-    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], base_path,
-          "overlay", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY]));
-    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], base_path,
diff --git a/retroarch/patches/patch-frontend_frontend__driver.c b/retroarch/patches/patch-frontend_frontend__driver.c
deleted file mode 100644
index 11531259a8..0000000000
--- a/retroarch/patches/patch-frontend_frontend__driver.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Use the Linux frontend on BSD since the BSD frontend is incomplete.
-
---- frontend/frontend_driver.c.orig	2017-05-31 23:25:41.000000000 +0000
-+++ frontend/frontend_driver.c
-@@ -46,12 +46,9 @@ static frontend_ctx_driver_t *frontend_c
- #if defined(__APPLE__) && defined(__MACH__)
-    &frontend_ctx_darwin,
- #endif
--#if defined(__linux__)
-+#if defined(__linux__) || (defined(BSD) && !defined(__MACH__))
-    &frontend_ctx_linux,
- #endif
--#if defined(BSD) && !defined(__MACH__)
--   &frontend_ctx_bsd,
--#endif
- #if defined(PSP) || defined(VITA)
-    &frontend_ctx_psp,
- #endif
diff --git a/retroarch/patches/patch-griffin_griffin.c b/retroarch/patches/patch-griffin_griffin.c
deleted file mode 100644
index 18088dc413..0000000000
--- a/retroarch/patches/patch-griffin_griffin.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Use the Linux frontend on BSD since the BSD frontend is incomplete.
-
---- griffin/griffin.c.orig	2017-05-31 23:25:41.000000000 +0000
-+++ griffin/griffin.c
-@@ -782,10 +782,8 @@ FRONTEND
- #include "../frontend/drivers/platform_xenon.c"
- #elif defined(__QNX__)
- #include "../frontend/drivers/platform_qnx.c"
--#elif defined(__linux__)
-+#elif defined(__linux__) || (defined(BSD) && !defined(__MACH__))
- #include "../frontend/drivers/platform_linux.c"
--#elif defined(BSD) && !defined(__MACH__)
--#include "../frontend/drivers/platform_bsd.c"
- #elif defined(DJGPP)
- #include "../frontend/drivers/platform_dos.c"
- #endif
Prev by Date: libretro-fbalpha: Use actual version number
Next by Date: retroarch: Clean up options and add sunxi-g2d
Previous by Thread: libretro-fbalpha: Use actual version number
Next by Thread: retroarch: Clean up options and add sunxi-g2d
Indexes:
Home | Main Index | Thread Index | Old Index