pkgsrc-WIP-changes archive

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

retroarch: Update paths to not search $PREFIX for things pkgsrc no longer installs (cheats are downloaded by RetroArch to ~/.config/retroarch).



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed May 23 10:58:10 2018 +0100
Changeset:	65c720fe71e4717e949925b65fc093df88427fd3

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

Log Message:
retroarch: Update paths to not search $PREFIX for things pkgsrc
no longer installs (cheats are downloaded by RetroArch to
~/.config/retroarch).

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

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

diffstat:
 retroarch/distinfo                                        |  2 +-
 retroarch/patches/patch-frontend_drivers_platform__unix.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs:
diff --git a/retroarch/distinfo b/retroarch/distinfo
index 2cbaf86976..45e5810af2 100644
--- a/retroarch/distinfo
+++ b/retroarch/distinfo
@@ -5,4 +5,4 @@ RMD160 (retroarch-1.7.3.tar.gz) = c3203c559cda925a9e76ab7df7ed491ea0f89a85
 SHA512 (retroarch-1.7.3.tar.gz) = f6e3f82465d301450e7f9a947e3e50a0b972c2ae4ad52d41640c0933185988e910892ab04dd93d1f6bed485a406356233ea81f8468041f3425cd286670fb97b1
 Size (retroarch-1.7.3.tar.gz) = 19382106 bytes
 SHA1 (patch-Makefile) = e40570eaf260e527442264c2ba424f2d7f499885
-SHA1 (patch-frontend_drivers_platform__unix.c) = ad47823cdec50cc36e97f78b540d35a5ccf2d994
+SHA1 (patch-frontend_drivers_platform__unix.c) = 090b82414411067409167c2b144f3d1ecac4d21c
diff --git a/retroarch/patches/patch-frontend_drivers_platform__unix.c b/retroarch/patches/patch-frontend_drivers_platform__unix.c
index f2b6344691..1d1fd830a8 100644
--- a/retroarch/patches/patch-frontend_drivers_platform__unix.c
+++ b/retroarch/patches/patch-frontend_drivers_platform__unix.c
@@ -2,9 +2,9 @@ $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.orig	2018-05-04 03:45:22.000000000 +0000
 +++ frontend/drivers/platform_unix.c
-@@ -1775,32 +1775,15 @@ static void frontend_unix_get_env(int *a
+@@ -1818,32 +1818,15 @@ static void frontend_unix_get_env(int *a
     else
        snprintf(base_path, sizeof(base_path), "retroarch");
  
@@ -43,7 +43,7 @@ Pick up paths from pkgsrc.
  
     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
+@@ -1856,12 +1839,12 @@ 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]));
@@ -53,16 +53,12 @@ Pick up paths from pkgsrc.
 -         "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_CHEATS], base_path,
+          "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