gentoo resync : 16.09.2020

5 files changed, 43 insertions, 60 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 0c883c4a1a37..7698b8fd055b 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,8 +1,7 @@
-AUX libsdl2-2.0.10-static-libs.patch 2388 BLAKE2B 84d6a6fe3a2630ca899aa01c6d16bfa5f43fdd82281e8022db62c30bfed671298f9011bbf2bbb59d6613dd9fe6e118ec71cb98b9d976c96c5d046fea46156d15 SHA512 bab5b6788b1f09f60a2686ce385496b31b6dcc4c5d76fb8abaeb5f2eb4d2fc6cdada8295e555c1f1527a70465452b0263ea54a0eea5f626f3faa266049b25119
+AUX libsdl2-2.0.12-egl-detection.patch 744 BLAKE2B cfcb6db61505e7f8dbd327c73098c2df88860c336438af531905aba5f8de1f696b41cbbab7a09a6a1fc067a39c3178aebbc2e86146f45e2d3ddac8ab1e6bb892 SHA512 1640c71d5a5c86e99d60123b3c5c8e60a9e1bcdf886662d9d2c8f2fda994cba873c5ac515cdf41e5e81663a895e6e2db08ea5e180999a5cebac8e08d2438d59b
 AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1848b46835e99dec20a325fd6e4e30ff44ae1966292f8b0cf95e3356e6a6d2787e90ea51c47fd92948cba2943c6ecbfb8c3 SHA512 d0f6a3f8282275f9ae63bfb363a357deb804d079be6feeaa0d8c749b79df1ad195da59b0da22f1eae4f527eecd63ceef210f52c1f303229a7aa13b71c3d711b0
 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e
-DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
-EBUILD libsdl2-2.0.10-r1.ebuild 5322 BLAKE2B 7687d35d0c741bf72b64ec3ed3571e386ed9f15a210eccd18a97f65dea4c0808c40cba2e1e26bfba3b3e2e96b972b331db027a8a5f61f36767061ade72116681 SHA512 87ec70467329f2d0d41396628c538a4dc60e072b58398fd8cfbc9b79479654691932d1fc550cc36b48d8ce71c37e4fc8b80b0c8fceb8f4ef2a21f1addbed4d13
-EBUILD libsdl2-2.0.12-r1.ebuild 5508 BLAKE2B d846f3ab33097028ae25afc6dd04833ae2ed2f88a6e559daba2837ea530ae2a02f3ee3f5ff6e202e03f1be611146a3a9ee9470d2d501fb2b094aa7e68b28c39a SHA512 79c127ba76eecb68fbbd65efe1fb468dcb0323393e583b3e40562e16a88202d4ad3e461f4e4f3ba498bd693e1ed34d2268f881ba4d225356c7f6ebe6a9846f19
+EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
+EBUILD libsdl2-2.0.12-r2.ebuild 5562 BLAKE2B b917b751b8cc48afceee10ff1116ffd4b9c862f724099e4bc8ec748f151e64d6a90fe00164d8ed27e445c78ffa30337eb7b0b76bffebcb97142ce0cfc87c26ee SHA512 1193f903aa778197997f23d19612542a081bc05515174885f4f2f26ce61835cd7eff9558d7f05f8d5e4fdf9583a8e0bab6cd7a63a481380e4dbe5c3087a074ca
 MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
deleted file mode 100644
index 0b01568af6ad..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- SDL2-2.0.10/configure.ac
-+++ SDL2-2.0.10/configure.ac
-@@ -3648,7 +3648,7 @@
-         if test -f /lib/w32api/libuuid.a; then
-             LIBUUID=/lib/w32api/libuuid.a
-         else
--            LIBUUID=-luuid
-+            LIBUUID=-Wl,-luuid
-         fi
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
-         # The Windows platform requires special setup
-@@ -4069,10 +4069,10 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
--\\$(objects)/\\2.o: \\1/\\2.rc\\\\
--	\\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
-+	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
---- SDL2-2.0.10/Makefile.in
-+++ SDL2-2.0.10/Makefile.in
-@@ -147,13 +147,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
new file mode 100644
index 000000000000..7655ca674947
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
@@ -0,0 +1,24 @@
+Fix wayland support on systems without X11.
+
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5270
+
+--- a/configure	Tue Aug 25 04:05:36 2020 +0200
++++ a/configure	Tue Aug 25 06:40:03 2020 -0700
+@@ -22306,6 +22306,7 @@
+           #define LINUX
+           #define EGL_API_FB
+           #define MESA_EGL_NO_X11_HEADERS
++          #define EGL_NO_X11
+           #include <EGL/egl.h>
+           #include <EGL/eglext.h>
+
+--- a/configure.ac	Tue Aug 25 04:05:36 2020 +0200
++++ a/configure.ac	Tue Aug 25 06:40:03 2020 -0700
+@@ -2373,6 +2373,7 @@
+           #define LINUX
+           #define EGL_API_FB
+           #define MESA_EGL_NO_X11_HEADERS
++          #define EGL_NO_X11
+           #include <EGL/egl.h>
+           #include <EGL/eglext.h>
+         ],[
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
index 5f291b9eeab7..4c094388884f 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsdl2/libsdl2-2.0.10-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
index 972572986682..2d3f0b847348 100644
--- a/media-libs/libsdl2/libsdl2-2.0.10-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
@@ -6,17 +6,18 @@ inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P="SDL2-${PV}"
 DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles2 haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
 	gles2? ( video )
+	jack? ( sound )
 	nas? ( sound )
 	opengl? ( video )
 	pulseaudio? ( sound )
@@ -29,6 +30,7 @@ CDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	kms? (
 		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
 		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
@@ -78,8 +80,9 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	"${FILESDIR}"/${PN}-2.0.10-static-libs.patch
+	"${FILESDIR}"/${PN}-2.0.12-static-libs.patch
+	"${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch
+	"${FILESDIR}"/${PN}-2.0.12-egl-detection.patch
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -88,7 +91,7 @@ src_prepare() {
 	default
 
 	# Unbundle some headers.
-	rm -rv src/video/khronos || die
+	rm -r src/video/khronos || die
 	ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die
 
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
@@ -115,15 +118,17 @@ multilib_src_configure() {
 		--enable-loadso
 		--enable-cpuinfo
 		--enable-assembly
+		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable cpu_flags_x86_sse ssemath)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_3dnow 3dnow)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable altivec)
 		$(use_enable oss)
 		$(use_enable alsa)
 		--disable-alsa-shared
+		$(use_enable jack)
+		--disable-jack-shared
 		--disable-esd
 		$(use_enable pulseaudio)
 		--disable-pulseaudio-shared
@@ -181,9 +186,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+	# Do not delete the static .a libraries here as some are
+	# mandatory. They may be needed even when linking dynamically.
 	find "${ED}" -type f -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.a" -delete || die
-	fi
 	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
 }