[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 3ac343d0a65b278c32e2206edab370854d2c7e59 Author: Sam James gentoo org> AuthorDate: Wed May 3 10:11:15 2023 + Commit: Sam James gentoo org> CommitDate: Wed May 3 10:11:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac343d0 media-libs/libsdl2: drop 2.24.0-r2, 2.24.2, 2.26.0 Bug: https://bugs.gentoo.org/890614 Signed-off-by: Sam James gentoo.org> media-libs/libsdl2/Manifest| 3 - .../files/libsdl2-2.24.0-clang-15-configure.patch | 24 --- .../files/libsdl2-2.24.0-cmake-target-fixes.patch | 145 - ...libsdl2-2.24.0-fix-build-without-joystick.patch | 32 --- .../libsdl2/files/libsdl2-2.26.0-wayland.patch | 27 --- media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild| 230 media-libs/libsdl2/libsdl2-2.24.2.ebuild | 228 media-libs/libsdl2/libsdl2-2.26.0.ebuild | 231 - 8 files changed, 920 deletions(-) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 0e639635626a..bcd282f13f9f 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,5 +1,2 @@ -DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 -DIST SDL2-2.24.2.tar.gz 7525041 BLAKE2B bdd6fdffca8f5360b96bba31b2f64e5b01f1081c184070fba6a0a52b7ee5f6d08ca5d647a40bbfb9b2ba49374ce7d7f21bc60e798017fa79d673ab048f5a281c SHA512 6f3ce5c4121a17d4e85a087c9010fdff37eb4e381517dc0d64fff955cf7041016aa1f37ac2f14a335bfaac13cb92031431eb31bfa0f00a6827c177b5a671f841 -DIST SDL2-2.26.0.tar.gz 8085459 BLAKE2B 4971cef0d34706dd02eff5277fd58b35523ee3b1d860999b37ddf4dbc463f493859a43325c4faa9bd048c519d49788adb3dd7f38e6b29eb635c0e0e405c944e9 SHA512 b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf DIST SDL2-2.26.2.tar.gz 8084120 BLAKE2B 84a972c634a084350173fcc5da69cc9b402f83b969e6611aa47cc81dc01520508ba813e5910299702c7139a0426462e607e97524510f61afe91d46a7cc9da8dc SHA512 5af6f40790560651a7c6c1f7dae3b97d55c5ab372f02dc6024cb7ad3c996a6fac8a7aba1d510ad994cc5d4ba91efd03010d8678104ed44f55ef948011bc66d28 DIST SDL2-2.26.3.tar.gz 8084159 BLAKE2B aa6f98bb83cc9774a51bd0de58b3076f553fca23142f1875e455c6c0e2d098cae442cfdb538c714494d36c5eb9e25c6a7063b06e6dd4cb210bbe34f58dafb95e SHA512 26c10fe004e47a498878ff2aa80bab7f57798d6b0f950b085409818d4c758010be7b49f5e0f43dd0afe2b9d18f94ad52d1e212a1d55505ce6d7fcc371fdda7d8 diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch deleted file mode 100644 index f5dc8ea6b50b.. --- a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/libsdl-org/SDL/pull/6217 - -From 04b9178a6746cfe9e4f8708befd3e00f95912a18 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 12 Sep 2022 18:02:21 +0100 -Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15 - (implicit function declarations) - -Clang 15 makes implicit function declarations fatal by default which -leads to some configure tests silently failing/returning -the wrong result. - -Signed-off-by: Sam James a/configure.ac -+++ b/configure.ac -@@ -2728,6 +2728,7 @@ CheckInputKD() - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include -+ #include - ]], [[ - struct kbentry kbe; - kbe.kb_table = KG_CTRL; - diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch deleted file mode 100644 index 59353b98e06d.. --- a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch +++ /dev/null @@ -1,145 +0,0 @@ -https://github.com/libsdl-org/SDL/commit/329794daf3f58088b56a64bdfa36b2021903be20 -https://github.com/libsdl-org/SDL/commit/62302d08f13ca5303135505c6b355afbbf069745 - -From: Anonymous Maarten -Date: Sun, 21 Aug 2022 04:03:32 +0200 -Subject: [PATCH] cmake: add library directories & pthread to imported targets - of sdl2-config.cmake - -This fixes linking to SDL2::SDL2-static on systems where external libraries such as X11 are not in a standard location. -Pthread also needs special care. a/sdl2-config.cmake.in -+++ b/sdl2-config.cmake.in -@@ -39,18 +39,25 @@ unset(bindir) - unset(libdir) - unset(includedir) - --set(_sdl2_libraries "@SDL_LIBS@") --set(_sdl2_static_private_libs "@SDL_STATIC_LIBS@") -+set(_sdl2_libraries_in "@SDL_LIBS@") -+set(_sdl2_static_private_libs_in "@SDL_STATIC_LIBS@") - --# Convert _sdl2_libraries to list and keep only libraries --string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sd
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
commit: cb17fbe3cfdc620aefd1017f500810d69a2bccb9 Author: Carlos Eduardo gmail com> AuthorDate: Mon Jan 16 02:09:13 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:21:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb17fbe3 media-libs/libsdl2: fix build with slibtool + clang Closes: https://bugs.gentoo.org/890744 Signed-off-by: Carlos Eduardo gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29129 Signed-off-by: Sam James gentoo.org> media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch index d57c7b8f1c6b..ec0db40c0b3d 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch @@ -21,7 +21,7 @@ Bug: https://github.com/gentoo/gentoo/pull/20087 $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 2a1349cde33d2d766431c766ce081cf9be3a5abc Author: Sam James gentoo org> AuthorDate: Thu Nov 24 05:22:48 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 24 05:22:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1349cd media-libs/libsdl2: add 2.26.0 Signed-off-by: Sam James gentoo.org> media-libs/libsdl2/Manifest| 1 + .../libsdl2/files/libsdl2-2.26.0-wayland.patch | 27 +++ media-libs/libsdl2/libsdl2-2.26.0.ebuild | 231 + 3 files changed, 259 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 18ffc7264276..fdaafb4057c0 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,2 +1,3 @@ DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 DIST SDL2-2.24.2.tar.gz 7525041 BLAKE2B bdd6fdffca8f5360b96bba31b2f64e5b01f1081c184070fba6a0a52b7ee5f6d08ca5d647a40bbfb9b2ba49374ce7d7f21bc60e798017fa79d673ab048f5a281c SHA512 6f3ce5c4121a17d4e85a087c9010fdff37eb4e381517dc0d64fff955cf7041016aa1f37ac2f14a335bfaac13cb92031431eb31bfa0f00a6827c177b5a671f841 +DIST SDL2-2.26.0.tar.gz 8085459 BLAKE2B 4971cef0d34706dd02eff5277fd58b35523ee3b1d860999b37ddf4dbc463f493859a43325c4faa9bd048c519d49788adb3dd7f38e6b29eb635c0e0e405c944e9 SHA512 b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf diff --git a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch new file mode 100644 index ..6727a3e4f4bc --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch @@ -0,0 +1,27 @@ +https://github.com/libsdl-org/SDL/pull/6608 +https://github.com/libsdl-org/SDL/issues/6589 + +From e99b5df49ec3bddd1d72889d682fedfe0da91307 Mon Sep 17 00:00:00 2001 +From: Frank Praznik +Date: Wed, 23 Nov 2022 23:11:25 -0500 +Subject: [PATCH] wayland: Fix build when not using the shared Wayland + libraries + +Explicitly include the Wayland protocol headers when statically linking against the Wayland libraries or older system headers might be used instead of the local versions. +--- a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h +@@ -166,6 +166,13 @@ void SDL_WAYLAND_UnloadSymbols(void); + + #else /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ + ++/* ++ * These must be included before libdecor.h, otherwise the libdecor header ++ * pulls in the system Wayland protocol headers instead of ours. ++ */ ++#include "wayland-client-protocol.h" ++#include "wayland-egl.h" ++ + #ifdef HAVE_LIBDECOR_H + #include + #endif + diff --git a/media-libs/libsdl2/libsdl2-2.26.0.ebuild b/media-libs/libsdl2/libsdl2-2.26.0.ebuild new file mode 100644 index ..c65bbfda6547 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.26.0.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal + +MY_P="SDL2-${PV}" +DESCRIPTION="Simple Direct Media Layer" +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 ~loong ~ppc ~ppc64 ~riscv ~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 doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" +REQUIRED_USE=" + alsa? ( sound ) + fcitx4? ( dbus ) + gles1? ( video ) + gles2? ( video ) + haptic? ( joystick ) + ibus? ( dbus ) + jack? ( sound ) + nas? ( sound ) + opengl? ( video ) + pulseaudio? ( sound ) + sndio? ( sound ) + vulkan? ( video ) + wayland? ( gles2 ) + xscreensaver? ( X )" + +CDEPEND=" + virtual/libiconv[${MULTILIB_USEDEP}] + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + fcitx4? ( app-i18n/fcitx:4 ) + gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] ) + gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) + ibus? ( app-i18n/ibus ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + kms? ( + >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] + ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) +
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 23a22803043bc6b7c9e5d2fffbfcf9aeb676c725 Author: Sam James gentoo org> AuthorDate: Mon Sep 12 17:08:09 2022 + Commit: Sam James gentoo org> CommitDate: Mon Sep 12 17:08:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a22803 media-libs/libsdl2: fix configure tests with Clang 15 Signed-off-by: Sam James gentoo.org> .../files/libsdl2-2.24.0-clang-15-configure.patch | 24 +++ media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild| 229 + 2 files changed, 253 insertions(+) diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch new file mode 100644 index ..f5dc8ea6b50b --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch @@ -0,0 +1,24 @@ +https://github.com/libsdl-org/SDL/pull/6217 + +From 04b9178a6746cfe9e4f8708befd3e00f95912a18 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 12 Sep 2022 18:02:21 +0100 +Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15 + (implicit function declarations) + +Clang 15 makes implicit function declarations fatal by default which +leads to some configure tests silently failing/returning +the wrong result. + +Signed-off-by: Sam James +--- a/configure.ac b/configure.ac +@@ -2728,6 +2728,7 @@ CheckInputKD() + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ++ #include + ]], [[ + struct kbentry kbe; + kbe.kb_table = KG_CTRL; + diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild new file mode 100644 index ..78a8adc8cfe1 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal + +MY_P="SDL2-${PV}" +DESCRIPTION="Simple Direct Media Layer" +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 ~loong ~ppc ~ppc64 ~riscv ~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 doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" +REQUIRED_USE=" + alsa? ( sound ) + fcitx4? ( dbus ) + gles1? ( video ) + gles2? ( video ) + haptic? ( joystick ) + ibus? ( dbus ) + jack? ( sound ) + nas? ( sound ) + opengl? ( video ) + pulseaudio? ( sound ) + sndio? ( sound ) + vulkan? ( video ) + wayland? ( gles2 ) + xscreensaver? ( X )" + +CDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + fcitx4? ( app-i18n/fcitx:4 ) + gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] ) + gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) + ibus? ( app-i18n/ibus ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + kms? ( + >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] + ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) + nas? ( + >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + ) + opengl? ( + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] + >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] + ) + pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland] + >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] + ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] + xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + )" +RDEPEND="${CDEPEND} + vulkan? ( media-libs/vulkan-loader )" +DEPEND="${CDEPEND} + ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 97a89516d141ca133cc34200b0c5422c3821a2a5 Author: James Le Cuirot gentoo org> AuthorDate: Tue Aug 10 20:35:35 2021 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Aug 10 20:36:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a89516 media-libs/libsdl2: Version bump to 2.0.16, EAPI 8 This version adds PipeWire support. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: James Le Cuirot gentoo.org> media-libs/libsdl2/Manifest| 1 + .../libsdl2/files/libsdl2-2.0.16-static-libs.patch | 35 media-libs/libsdl2/libsdl2-2.0.16.ebuild | 213 + media-libs/libsdl2/metadata.xml| 1 + 4 files changed, 250 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index d4a910d2b22..580340a47af 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1 +1,2 @@ DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee +DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f diff --git a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch new file mode 100644 index 000..d57c7b8f1c6 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch @@ -0,0 +1,35 @@ +Fix --disable-static. + +Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 +Bug: https://github.com/gentoo/gentoo/pull/20087 + +--- a/configure.ac 2021-08-06 20:36:54.0 +0100 b/configure.ac 2021-08-10 20:59:58.74082 +0100 +@@ -3920,7 +3920,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" + BUILD_LDFLAGS="$BUILD_LDFLAGS -Wc,-static-libgcc" +--- a/Makefile.in 2021-08-06 20:36:54.0 +0100 b/Makefile.in 2021-08-10 21:03:44.144233884 +0100 +@@ -154,13 +154,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=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + + $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static + + $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static + + install: all install-bin install-hdrs install-lib install-data + install-bin: diff --git a/media-libs/libsdl2/libsdl2-2.0.16.ebuild b/media-libs/libsdl2/libsdl2-2.0.16.ebuild new file mode 100644 index 000..3cbbf819aa3 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.16.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs multilib-minimal + +MY_P="SDL2-${PV}" +DESCRIPTION="Simple Direct Media Layer" +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 ~riscv ~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 fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
commit: 47d07116a90fe9265a90573fb9eb7355facf9e2b Author: Ulrich Müller gentoo org> AuthorDate: Tue May 18 20:13:12 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Tue May 18 20:13:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d07116 Revert "Revert "media-libs/libsdl2: Fix --disable-static patch for slibtool."" Re-revert older (trivial) commit. This reverts commit 8d35efd215c730c194c7534e0352a50b6dfebd27. Signed-off-by: Ulrich Müller gentoo.org> media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch index 01b9c513437..0d4dfdcb445 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch @@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 $(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 ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -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 ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static install: all install-bin install-hdrs install-lib install-data install-bin:
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
commit: 8d35efd215c730c194c7534e0352a50b6dfebd27 Author: Ulrich Müller gentoo org> AuthorDate: Tue May 18 20:03:03 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Tue May 18 20:05:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d35efd2 Revert "media-libs/libsdl2: Fix --disable-static patch for slibtool." Invalid signoff, violation of GLEP 76 copyright policy. This reverts commit ca4dcf1bce51ecf5887036985092732300367924. Signed-off-by: Ulrich Müller gentoo.org> media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch index 0d4dfdcb445..01b9c513437 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch @@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 $(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) -static ++ $(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) -static ++ $(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:
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
commit: ca4dcf1bce51ecf5887036985092732300367924 Author: orbea riseup net> AuthorDate: Tue Mar 23 23:12:42 2021 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Apr 23 22:39:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4dcf1b media-libs/libsdl2: Fix --disable-static patch for slibtool. With slibtool both libSDL2main.a and libSDL2_test.a fail to install. This was fixed in slibtool here. https://dev.midipix.org/cross/slibtool/c/9a5f9681f88126c47e11ef49e7fb01c604c90986?branch=main However using it still does not work in gentoo with -all-static, but works fine if its changed back to -static as is done upstream in SDL2. GNU libtool does not seem to behave any differently here and its unclear why this was ever changed? Also see this slibtool issue: https://dev.midipix.org/cross/slibtool/issue/28 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/20087 Signed-off-by: James Le Cuirot gentoo.org> media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch index 01b9c513437..0d4dfdcb445 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch @@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 $(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 ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -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 ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static install: all install-bin install-hdrs install-lib install-data install-bin:
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: f348c75259048a39b2e8f7496b53627644e6282b Author: Lars Wendler gentoo org> AuthorDate: Tue Dec 22 17:30:41 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Dec 22 17:30:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f348c752 media-libs/libsdl2: Bump to version 2.0.14 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> media-libs/libsdl2/Manifest| 1 + .../libsdl2/files/libsdl2-2.0.14-static-libs.patch | 34 .../libsdl2/files/libsdl2-2.0.14-vulkan.patch | 13 ++ media-libs/libsdl2/libsdl2-2.0.14.ebuild | 207 + 4 files changed, 255 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 13e81b9f1b2..fef6b59307f 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1 +1,2 @@ DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 +DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch new file mode 100644 index 000..01b9c513437 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch @@ -0,0 +1,34 @@ +Fix --disable-static. + +Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 + +--- SDL2-2.0.14/configure.ac SDL2-2.0.14/configure.ac +@@ -3863,7 +3863,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 +--- SDL2-2.0.14/Makefile.in SDL2-2.0.14/Makefile.in +@@ -151,13 +151,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.14-vulkan.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch new file mode 100644 index 000..948f68fe234 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch @@ -0,0 +1,13 @@ +--- SDL2-2.0.14/src/video/SDL_vulkan_utils.c SDL2-2.0.14/src/video/SDL_vulkan_utils.c +@@ -91,8 +91,10 @@ + return "VK_ERROR_VALIDATION_FAILED_EXT"; + case VK_ERROR_INVALID_SHADER_NV: + return "VK_ERROR_INVALID_SHADER_NV"; ++#if VK_HEADER_VERSION < 162 + case VK_ERROR_INCOMPATIBLE_VERSION_KHR: + return "VK_ERROR_INCOMPATIBLE_VERSION_KHR"; ++#endif + case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT: + return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT"; + case VK_ERROR_NOT_PERMITTED_EXT: diff --git a/media-libs/libsdl2/libsdl2-2.0.14.ebuild b/media-libs/libsdl2/libsdl2-2.0.14.ebuild new file mode 100644 index 000..4002370c79e --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.14.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs multilib-minimal + +MY_P="SDL2-${PV}" +DESCRIPTION="Simple Direc
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 7cf54bdeb9936fbbe013e776c397933e7d04543b Author: James Le Cuirot gentoo org> AuthorDate: Sat Jul 11 13:38:33 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Jul 11 13:39:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf54bde media-libs/libsdl2: Fix building against the latest Vulkan headers Closes: https://bugs.gentoo.org/721954 Package-Manager: Portage-2.3.103, Repoman-2.3.22 Signed-off-by: James Le Cuirot gentoo.org> .../libsdl2/files/libsdl2-2.0.12-static-libs.patch | 4 .../libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch | 17 + media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch index 595d8a51fd3..f80dc6c222c 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch @@ -1,3 +1,7 @@ +Fix --disable-static. + +Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 + --- SDL2-2.0.12/configure.ac +++ SDL2-2.0.12/configure.ac @@ -3751,7 +3751,7 @@ diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch new file mode 100644 index 000..717e5b5db38 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch @@ -0,0 +1,17 @@ +Fix building against the latest Vulkan headers. + +Bug: https://bugs.gentoo.org/721954 +Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5227 + +--- a/src/video/SDL_vulkan_utils.c 2020-03-10 21:36:18.0 -0400 b/src/video/SDL_vulkan_utils.c 2020-06-14 21:49:15.780898839 -0400 +@@ -85,7 +85,9 @@ + case VK_ERROR_INVALID_SHADER_NV: + return "VK_ERROR_INVALID_SHADER_NV"; + case VK_RESULT_MAX_ENUM: ++#if VK_HEADER_VERSION < 140 + case VK_RESULT_RANGE_SIZE: ++#endif + break; + } + if(result < 0) diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild index cae1b46a7eb..894a2e23e7a 100644 --- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild @@ -80,8 +80,8 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 "${FILESDIR}"/${PN}-2.0.12-static-libs.patch + "${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch ) S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: d8354a4d2592083155299b5ee82744322cdc90b4 Author: Lars Wendler gentoo org> AuthorDate: Wed Mar 11 15:51:12 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Mar 11 15:51:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8354a4d media-libs/libsdl2: Bump to version 2.0.12 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> media-libs/libsdl2/Manifest| 1 + .../libsdl2/files/libsdl2-2.0.12-static-libs.patch | 44 + media-libs/libsdl2/libsdl2-2.0.12.ebuild | 192 + 3 files changed, 237 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index fafaf0238e8..50f7dae1564 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,2 +1,3 @@ DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 +DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch new file mode 100644 index 000..595d8a51fd3 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch @@ -0,0 +1,44 @@ +--- SDL2-2.0.12/configure.ac SDL2-2.0.12/configure.ac +@@ -3751,7 +3751,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 +@@ -4194,10 +4194,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 \\$(objects)/.created +- \\$(WINDRES) \\$< \\$@,g"` ++\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created ++ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` + + SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` + SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` +--- SDL2-2.0.12/Makefile.in SDL2-2.0.12/Makefile.in +@@ -148,13 +148,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/libsdl2-2.0.12.ebuild b/media-libs/libsdl2/libsdl2-2.0.12.ebuild new file mode 100644 index 000..9c8910e8500 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.12.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs multilib-m
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 8092bac2a7300bb3a8f0918b0e8e6d08a707a556 Author: Lars Wendler gentoo org> AuthorDate: Fri Jul 26 11:35:09 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jul 26 11:35:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8092bac2 media-libs/libsdl2: Removed old. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> media-libs/libsdl2/Manifest| 1 - .../files/libsdl2-2.0.8-rework-variables.patch | 68 .../files/libsdl2-2.0.8-wayland-headers.patch | 21 --- media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild | 181 - 4 files changed, 271 deletions(-) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index e75ffdfd92e..fafaf0238e8 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,3 +1,2 @@ DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 -DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch deleted file mode 100644 index 9fc43f2b38c..000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch +++ /dev/null @@ -1,68 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga -# Date 1524545759 25200 -# Node ID 28be2719184c8177899d96b696bcf5e28451266f -# Parent 2a7839691e3d88c0480c4a855126d5fa03f9ff6a -Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc - - Azamat H. Hackimov - -When you try use SDL2 2.0.8 in CMake project in Linux, it complains about trailing spaces in sdl2.pc: - -CMake Error at CMakeLists.txt:147 (add_executable): - Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has - leading or trailing whitespace. This is now an error according to policy - CMP0004. - -diff -r 2a7839691e3d -r 28be2719184c configure a/configureMon Apr 23 21:50:03 2018 -0700 -+++ b/configureMon Apr 23 21:55:59 2018 -0700 -@@ -15752,10 +15752,17 @@ - #fi - #done - SDL_CFLAGS="$BASE_CFLAGS" --SDL_LIBS="-lSDL2 $BASE_LDFLAGS" --CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" --CFLAGS="$CFLAGS $EXTRA_CFLAGS" --LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+SDL_LIBS="-lSDL2" -+if "$BASE_LDFLAGS" != "" ; then -+SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" -+fi -+if "$EXTRA_CFLAGS" != "" ; then -+CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -+CFLAGS="$CFLAGS $EXTRA_CFLAGS" -+fi -+if "$EXTRA_LDFLAGS" != "" ; then -+LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+fi - - base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` - -diff -r 2a7839691e3d -r 28be2719184c configure.in a/configure.in Mon Apr 23 21:50:03 2018 -0700 -+++ b/configure.in Mon Apr 23 21:55:59 2018 -0700 -@@ -123,10 +123,17 @@ - #fi - #done - SDL_CFLAGS="$BASE_CFLAGS" --SDL_LIBS="-lSDL2 $BASE_LDFLAGS" --CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" --CFLAGS="$CFLAGS $EXTRA_CFLAGS" --LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+SDL_LIBS="-lSDL2" -+if [ "$BASE_LDFLAGS" != "" ]; then -+SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" -+fi -+if [ "$EXTRA_CFLAGS" != "" ]; then -+CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -+CFLAGS="$CFLAGS $EXTRA_CFLAGS" -+fi -+if [ "$EXTRA_LDFLAGS" != "" ]; then -+LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+fi - - dnl set this to use on systems that use lib64 instead of lib - base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` - diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch deleted file mode 100644 index 95dd1730481..000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/configure.in b/configure.in a/configure.in 2018-03-01 16:34:41.0 + -+++ b/configure.in 2018-09-21 21:02:34.823834390 +0100 -@@ -1411,7 +1411,8 @@ - - WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6" - --SOURCES="$SOURCES $srcdir/src/video/wayland/*.c" -+WAYLAND_SOURCES="$srcdir/src/video/wayland/*
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: ca5358d650f11d045615aa19edbed5f5781a4480 Author: James Le Cuirot gentoo org> AuthorDate: Fri Sep 21 20:22:35 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Sep 21 20:22:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5358d6 media-libs/libsdl2: Patch in missing Wayland header dependencies Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=3977 Closes: https://github.com/gentoo/gentoo/pull/9904 Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../files/libsdl2-2.0.8-wayland-headers.patch | 21 + media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild | 2 ++ 2 files changed, 23 insertions(+) diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch new file mode 100644 index 000..95dd1730481 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch @@ -0,0 +1,21 @@ +diff -Naur a/configure.in b/configure.in +--- a/configure.in 2018-03-01 16:34:41.0 + b/configure.in 2018-09-21 21:02:34.823834390 +0100 +@@ -1411,7 +1411,8 @@ + + WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6" + +-SOURCES="$SOURCES $srcdir/src/video/wayland/*.c" ++WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c" ++SOURCES="$SOURCES $WAYLAND_SOURCES" + EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)" + AC_ARG_ENABLE(wayland-shared, + AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[default=maybe]]]), +@@ -4003,6 +4004,7 @@ + $WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS + $WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS + $WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE ++`echo ; for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in $WAYLAND_PROTOCOLS_UNSTABLE ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; done ; echo ; done ; echo` + " + fi + diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild index 59e84df973a..adab5ba5df2 100644 --- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild @@ -75,6 +75,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.0.6-static-libs.patch # https://bugzilla.libsdl.org/show_bug.cgi?id=4144 "${FILESDIR}"/${P}-rework-variables.patch + # https://bugzilla.libsdl.org/show_bug.cgi?id=3977 + "${FILESDIR}"/${P}-wayland-headers.patch ) S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 930a4fa456fbd85849a0e638324aaa35ac642f96 Author: Pacho Ramos gentoo org> AuthorDate: Wed Apr 18 18:36:14 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Apr 18 18:37:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930a4fa4 media-libs/libsdl2: Drop old Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-libs/libsdl2/Manifest| 2 - .../libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch | 48 -- .../libsdl2/files/libsdl2-2.0.5-static-libs.patch | 89 --- media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild | 158 --- media-libs/libsdl2/libsdl2-2.0.5.ebuild| 157 --- media-libs/libsdl2/libsdl2-2.0.7.ebuild| 170 - media-libs/libsdl2/libsdl2-2.0.8.ebuild| 170 - 7 files changed, 794 deletions(-) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 6d0acba2019..6f3ef4735ad 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,4 +1,2 @@ DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 -DIST SDL2-2.0.5.tar.gz 4209352 BLAKE2B c0a040e39117ac355e49950434a96b790dba2af13116071bdad6e50131b8f62f494463ec5fff5e4aff370733ac226888033ba189e431cc527cb3149076548159 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 -DIST SDL2-2.0.7.tar.gz 4432499 BLAKE2B 730c6001a11922720975453059602a28116ae046da25cfa3a2b2f29be306b8807cc720f17dff9f0c944d4cbf9c1340a19085b17d23e1e594e7b63b514e736cf1 SHA512 eed5477843086a0e66552eb197a5c4929134522bc366d873732361ea0df5fb841ef7e2b1913e21d1bae69e6fd3152ee630492e615c58cbe903e7d6e47b587410 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch deleted file mode 100644 index 34455663a56..000 --- a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/joystick/SDL_gamecontrollerdb.h b/src/joystick/SDL_gamecontrollerdb.h -index 1e623cb..ae84c6d 100644 a/src/joystick/SDL_gamecontrollerdb.h -+++ b/src/joystick/SDL_gamecontrollerdb.h -@@ -47,6 +47,8 @@ static const char *s_ControllerMappings [] = - "4c056802504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", - "25090500504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,", - "4c05c405504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+"4c05cc09504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+"4c05a00b504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - #endif - #if defined(__MACOSX__) - "10280900,8Bitdo SFC30 GamePad Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", -@@ -62,6 +64,10 @@ static const char *s_ControllerMappings [] = - "11012014,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", - "11011714,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,r
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 8646ba708a609540a181a627c35017e13a581436 Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 11 08:49:21 2017 + Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 11 08:49:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8646ba70 media-libs/libsdl2: Bump to version 2.0.6 Package-Manager: Portage-2.3.11, Repoman-2.3.3 media-libs/libsdl2/Manifest| 1 + .../libsdl2/files/libsdl2-2.0.6-static-libs.patch | 44 ++ media-libs/libsdl2/libsdl2-2.0.6.ebuild| 170 + 3 files changed, 215 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 9441874a093..350dca78224 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,2 +1,3 @@ DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574 DIST SDL2-2.0.5.tar.gz 4209352 SHA256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 WHIRLPOOL 77aff6af67c29aab175f812be0aebbb65a757bd942de872b8330cb7cfabcd4abe0abd0c21b56bd409fb623b97c71981be5807e47dc03bf773aac85361582b796 +DIST SDL2-2.0.6.tar.gz 4420311 SHA256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SHA512 ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830 WHIRLPOOL ad39ec811ac6f305a58352e1f332e9c29a34587c0eb2c9f163e76f93565418bd910210aea8113f53ca46bc745975ed8cc7b228f517af0a99d782fef44c4e0783 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch new file mode 100644 index 000..a1427a075b4 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch @@ -0,0 +1,44 @@ +--- SDL2-2.0.6/configure.in SDL2-2.0.6/configure.in +@@ -3546,7 +3546,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 -lversion $LIBUUID -static-libgcc" + # The Windows platform requires special setup +@@ -3956,10 +3956,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.6/Makefile.in SDL2-2.0.6/Makefile.in +@@ -143,13 +143,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/libsdl2-2.0.6.ebuild b/media-libs/libsdl2/libsdl2-2.0.6.ebuild new file mode 100644 index 000..4117b57c829 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.6.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed un
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/
commit: 06c9f04f5ddf1bd16bcac67cf853b60da3d9a9d1 Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 20 12:11:34 2016 + Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 20 12:12:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c9f04f media-libs/libsdl2: Bump to version 2.0.5 Package-Manager: portage-2.3.2 Signed-off-by: Lars Wendler gentoo.org> media-libs/libsdl2/Manifest| 1 + .../libsdl2/files/libsdl2-2.0.5-static-libs.patch | 89 media-libs/libsdl2/libsdl2-2.0.5.ebuild| 158 + 3 files changed, 248 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index b878bc5..9441874 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1 +1,2 @@ DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574 +DIST SDL2-2.0.5.tar.gz 4209352 SHA256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 WHIRLPOOL 77aff6af67c29aab175f812be0aebbb65a757bd942de872b8330cb7cfabcd4abe0abd0c21b56bd409fb623b97c71981be5807e47dc03bf773aac85361582b796 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch new file mode 100644 index ..eed72dc --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch @@ -0,0 +1,89 @@ +--- SDL2-2.0.5/configure.in SDL2-2.0.5/configure.in +@@ -3197,7 +3197,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 -lversion $LIBUUID -static-libgcc" + # The Windows platform requires special setup +@@ -3597,23 +3597,23 @@ + + 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` +-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` ++SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` + SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c, +-\\$(objects)/\\2.o: \\1/\\2.c ++\\$(objects)/\\2.lo: \\1/\\2.c + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` + + SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` + SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` +-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` ++SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` + SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c, +-\\$(objects)/\\2.o: \\1/\\2.c ++\\$(objects)/\\2.lo: \\1/\\2.c + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` + + # Set runtime shared library paths as needed +--- SDL2-2.0.5/Makefile.in SDL2-2.0.5/Makefile.in +@@ -36,10 +36,10 @@ + GEN_OBJECTS = @GEN_OBJECTS@ + VERSION_OBJECTS = @VERSION_OBJECTS@ + +-SDLMAIN_TARGET = libSDL2main.a ++SDLMAIN_TARGET = libSDL2main.la + SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ + +-SDLTEST_TARGET = libSDL2_test.a ++SDLTEST_TARGET = libSDL2_test.la + SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ + + WAYLAND_SCANNER = @WAYLAND_SCANNER@ +@@ -144,15 +144,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_LD