pkgsrc-WIP-changes archive

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

retroarch: Use "Linux" frontend on BSD. Makes command line options work.



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed Jun 7 15:37:39 2017 +0100
Changeset:	1f131d76be56a42d9b1aef071432ee052213082e

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

Log Message:
retroarch: Use "Linux" frontend on BSD. Makes command line options work.

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

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

diffstat:
 retroarch/distinfo                                  |  4 +++-
 retroarch/patches/patch-Makefile.common             | 17 ++++++++++++++---
 retroarch/patches/patch-frontend_frontend__driver.c | 20 ++++++++++++++++++++
 retroarch/patches/patch-griffin_griffin.c           | 18 ++++++++++++++++++
 4 files changed, 55 insertions(+), 4 deletions(-)

diffs:
diff --git a/retroarch/distinfo b/retroarch/distinfo
index c7a0c3661c..19936ab3b8 100644
--- a/retroarch/distinfo
+++ b/retroarch/distinfo
@@ -5,5 +5,7 @@ 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.common) = 298fc9fef815d972aa76355c1c5610c6b5fff4c3
+SHA1 (patch-Makefile.common) = 35ba9348f382c4c892ffd3e04729d5066d34977f
+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
index 4237810d3d..45f2d0af43 100644
--- a/retroarch/patches/patch-Makefile.common
+++ b/retroarch/patches/patch-Makefile.common
@@ -1,10 +1,21 @@
 $NetBSD$
 
-Don't build the OSS driver twice
+Use the Linux frontend on BSD since the BSD frontend is incomplete.
 
---- Makefile.common.orig	2016-07-16 23:05:18.000000000 +0000
+Don't build the OSS driver twice.
+
+--- Makefile.common.orig	2017-05-31 23:25:41.000000000 +0000
 +++ Makefile.common
-@@ -321,9 +321,7 @@ endif
+@@ -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
diff --git a/retroarch/patches/patch-frontend_frontend__driver.c b/retroarch/patches/patch-frontend_frontend__driver.c
new file mode 100644
index 0000000000..11531259a8
--- /dev/null
+++ b/retroarch/patches/patch-frontend_frontend__driver.c
@@ -0,0 +1,20 @@
+$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
new file mode 100644
index 0000000000..18088dc413
--- /dev/null
+++ b/retroarch/patches/patch-griffin_griffin.c
@@ -0,0 +1,18 @@
+$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


Home | Main Index | Thread Index | Old Index