gentoo resync : 14.07.2018

3 files changed, 154 insertions, 0 deletions

diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
new file mode 100644
index 000000000000..7a0fe8a8bde8
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
@@ -0,0 +1,38 @@
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.1 $])
+ 
+ AC_CONFIG_SRCDIR([unix.cpp])
+ 
+-AC_CANONICAL_TARGET
++AC_CANONICAL_HOST
+ 
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
+ 				return (argc);
+ 			}
+ 		],
+-		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
++		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"], [snes9x_cv_option_$2="yes"])
+ 	])
+ 
+ 	CXXFLAGS="[$]OLD_CXXFLAGS"
+@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
+ 
+ AC_CACHE_VAL([snes9x_cv_linux_os],
+ [
+-	case "$target" in
++	case "$host" in
+ 		*-*-linux*)
+ 			snes9x_cv_linux_os="yes"
+ 			;;
+@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
+ 			return (i < 0 ? 0 : 1);
+ 		}
+ 	],
+-	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
++	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
+ 
+ 	CXXFLAGS="[$]OLD_CXXFLAGS"
+ 
diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
new file mode 100644
index 000000000000..30811ef421e0
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
@@ -0,0 +1,63 @@
+--- a/gtk/configure.ac
++++ b/gtk/configure.ac
+@@ -33,7 +33,7 @@
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
++snes9xlocaledir='$(localedir)'
+ AC_SUBST(snes9xlocaledir)
+ 
+ AC_ARG_WITH(debug,
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -56,49 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+ 
+-# Remove -g and -O2 flags manually.
+-
+-if test "x$CFLAGS" != "x"; then
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-if test "x$CXXFLAGS" != "x"; then
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+-	[AS_HELP_STRING([--enable-debug],
+-		[leave debug information in the final binary (default: no)])],
+-	[], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+-	AC_S9X_COMPILER_FLAG([-g],  [g])
+-	AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+-	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+-	[AS_HELP_STRING([--enable-mtune],
+-		[use the specified value for the -mtune/-mcpu flag (default: no)])],
+-	[], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+-	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+-	[
+-		AC_MSG_WARN([-mtune failed, trying -mcpu...])
+-		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+-			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+-	])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])
diff --git a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
new file mode 100644
index 000000000000..d2ee182cb7cd
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
@@ -0,0 +1,53 @@
+--- snes9x-1.56/gtk/configure.ac
++++ snes9x-1.56/gtk/configure.ac
+@@ -33,8 +33,8 @@
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
+-snes9xdatadir='${prefix}/${DATADIRNAME}/snes9x'
++snes9xlocaledir='$(localedir)'
++snes9xdatadir='$(datadir)/snes9x'
+ 
+ AC_SUBST(snes9xlocaledir)
+ AC_SUBST(snes9xdatadir)
+--- snes9x-1.56/unix/configure.ac
++++ snes9x-1.56/unix/configure.ac
+@@ -56,37 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+ 
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+-	[AS_HELP_STRING([--enable-debug],
+-		[leave debug information in the final binary (default: no)])],
+-	[], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+-	AC_S9X_COMPILER_FLAG([-g],  [g])
+-	AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+-	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+-	[AS_HELP_STRING([--enable-mtune],
+-		[use the specified value for the -mtune/-mcpu flag (default: no)])],
+-	[], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+-	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+-	[
+-		AC_MSG_WARN([-mtune failed, trying -mcpu...])
+-		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+-			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+-	])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])