pkgsrc-WIP-changes archive

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

retroarch: Add back platform patch for paths



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Sun Jun 25 15:30:26 2017 +0100
Changeset:	61e1715eccd5f3270996ae665c77d37fd105c4f1

Modified Files:
	retroarch/distinfo
Added Files:
	retroarch/patches/patch-frontend_drivers_platform__unix.c

Log Message:
retroarch: Add back platform patch for paths

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

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

diffstat:
 retroarch/distinfo                                 |  1 +
 .../patch-frontend_drivers_platform__unix.c        | 68 ++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diffs:
diff --git a/retroarch/distinfo b/retroarch/distinfo
index 6f967b7217..1a9922c673 100644
--- a/retroarch/distinfo
+++ b/retroarch/distinfo
@@ -5,4 +5,5 @@ 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-frontend_drivers_platform__unix.c) = ad47823cdec50cc36e97f78b540d35a5ccf2d994
 SHA1 (patch-qb_qb.libs.sh) = bd92a7016e45fd6ee5a47300516c4028227384b2
diff --git a/retroarch/patches/patch-frontend_drivers_platform__unix.c b/retroarch/patches/patch-frontend_drivers_platform__unix.c
new file mode 100644
index 0000000000..f2b6344691
--- /dev/null
+++ b/retroarch/patches/patch-frontend_drivers_platform__unix.c
@@ -0,0 +1,68 @@
+$NetBSD$
+
+Pick up paths from pkgsrc.
+
+--- frontend/drivers/platform_unix.c.orig	2017-06-22 02:10:15.000000000 +0000
++++ frontend/drivers/platform_unix.c
+@@ -1775,32 +1775,15 @@ static void frontend_unix_get_env(int *a
+    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]));
+@@ -1813,14 +1796,14 @@ static void frontend_unix_get_env(int *a
+          "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,


Home | Main Index | Thread Index | Old Index