summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2020-04-05 22:46:14 +0100
committerJames Le Cuirot <chewi@gentoo.org>2020-04-05 23:04:55 +0100
commit64eba6176be0318351a64c50fa588d957948bf13 (patch)
tree0ba71b9447cc638f0953f705d48ae4986c1c77b8 /app-emulation/vice/files
parentdev-python/mongomock: clarify TZ usage (diff)
downloadgentoo-64eba6176be0318351a64c50fa588d957948bf13.tar.gz
gentoo-64eba6176be0318351a64c50fa588d957948bf13.tar.bz2
gentoo-64eba6176be0318351a64c50fa588d957948bf13.zip
app-emulation/vice: Bump 3.4 to rev 37605, add SDL2 pkg-config patch
This includes GCC 10 fixes. Closes: https://bugs.gentoo.org/710990 Package-Manager: Portage-2.3.96, Repoman-2.3.20 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'app-emulation/vice/files')
-rw-r--r--app-emulation/vice/files/vice-pkg-config.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/app-emulation/vice/files/vice-pkg-config.patch b/app-emulation/vice/files/vice-pkg-config.patch
new file mode 100644
index 000000000000..d29eff252fb5
--- /dev/null
+++ b/app-emulation/vice/files/vice-pkg-config.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/p/vice-emu/patches/218/
+
+Index: configure.proto
+===================================================================
+--- a/configure.proto (revision 37525)
++++ b/configure.proto (working copy)
+@@ -1275,6 +1275,14 @@
+ fi
+
+ if test x"$found_sdl2" != "xyes"; then
++ PKG_CHECK_MODULES(SDL2, sdl2, [
++ use_sdl_prefix=no
++ use_sdl2_prefix=no
++ found_sdl2=yes
++ VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
++ VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
++ LIBS="$LIBS $SDL2_LIBS"
++ ], [
+ dnl Check for sdl2-config
+ if test x"$sdl2_config" != "xno"; then
+ user_CFLAGS="$CFLAGS"
+@@ -1311,6 +1319,7 @@
+ CFLAGS="$user_CFLAGS"
+ CXXFLAGS="$user_CXXFLAGS"
+ fi
++ ])
+ fi
+
+ dnl fail if SDL2 ui was requested, otherwise restore flags and continue