commit: 3ac343d0a65b278c32e2206edab370854d2c7e59 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed May 3 10:11:15 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 3 10:11:15 2023 +0000 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 <sam <AT> 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..000000000000 --- 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 <s...@gentoo.org> -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 <s...@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -2728,6 +2728,7 @@ CheckInputKD() - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <linux/kd.h> - #include <linux/keyboard.h> -+ #include <sys/ioctl.h> - ]], [[ - 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..000000000000 --- 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 <anonymous.maar...@gmail.com> -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._]+)" _sdl2_libraries "${_sdl2_libraries}") -+# Convert _sdl2_libraries to list and keep only libraries + library directories -+string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries_in}") - string(REGEX REPLACE "^-l" "" _sdl2_libraries "${_sdl2_libraries}") - string(REGEX REPLACE ";-l" ";" _sdl2_libraries "${_sdl2_libraries}") -+string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_libdirs "${_sdl2_libraries_in}") -+string(REGEX REPLACE "^-L" "" _sdl2_libdirs "${_sdl2_libdirs}") -+string(REGEX REPLACE ";-L" ";" _sdl2_libdirs "${_sdl2_libdirs}") -+list(APPEND _sdl2_libdirs "${SDL2_LIBDIR}") - --# Convert _sdl2_static_private_libs to list and keep only libraries --string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)" _sdl2_static_private_libs "${_sdl2_static_private_libs}") -+# Convert _sdl2_static_private_libs to list and keep only libraries + library directories -+string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)|(-pthread)" _sdl2_static_private_libs "${_sdl2_static_private_libs_in}") - string(REGEX REPLACE "^-l" "" _sdl2_static_private_libs "${_sdl2_static_private_libs}") - string(REGEX REPLACE ";-l" ";" _sdl2_static_private_libs "${_sdl2_static_private_libs}") -+string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_static_private_libdirs "${_sdl2_static_private_libs_in}") -+string(REGEX REPLACE "^-L" "" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}") -+string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}") - - if(_sdl2_libraries MATCHES ".*SDL2main.*") - list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main) -@@ -103,6 +110,7 @@ if(WIN32) - set_target_properties(SDL2::SDL2 PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}" -+ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_IMPLIB "${_sdl2_implib}" - IMPORTED_LOCATION "${_sdl2_dll}" -@@ -122,6 +130,7 @@ else() - set_target_properties(SDL2::SDL2 PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}" -+ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${_sdl2_shared}" - ) -@@ -142,6 +151,7 @@ if(EXISTS "${_sdl2_static}") - IMPORTED_LOCATION "${_sdl2_static}" - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries};${_sdl2_static_private_libs}" -+ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs};${_sdl2_static_private_libdirs}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - ) - endif() - -From: Anonymous Maarten <anonymous.maar...@gmail.com> -Date: Wed, 24 Aug 2022 04:14:52 +0200 -Subject: [PATCH] cmake: always create SDL2::SDL2main target in autotools' - cmake config script - ---- a/sdl2-config.cmake.in -+++ b/sdl2-config.cmake.in -@@ -62,38 +62,39 @@ string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_priv - if(_sdl2_libraries MATCHES ".*SDL2main.*") - list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main) - list(INSERT SDL2_STATIC_LIBRARIES 0 SDL2::SDL2main) -- set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}) -- if(EXISTS "${_sdl2main_library}") -- set(SDL2MAIN_LIBRARY SDL2::SDL2main) -- if(NOT TARGET SDL2::SDL2main) -- add_library(SDL2::SDL2main STATIC IMPORTED) -- set_target_properties(SDL2::SDL2main -- PROPERTIES -- IMPORTED_LOCATION "${_sdl2main_library}" -- ) -- if(WIN32) -- # INTERFACE_LINK_OPTIONS needs CMake 3.13 -- cmake_minimum_required(VERSION 3.13) -- # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker. -- if(CMAKE_SIZEOF_VOID_P EQUAL 4) -- set_target_properties(SDL2::SDL2main -- PROPERTIES -- INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16" -- ) -- else() -- set_target_properties(SDL2::SDL2main -- PROPERTIES -- INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain" -- ) -- endif() -+endif() -+ -+set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}) -+if(EXISTS "${_sdl2main_library}") -+ set(SDL2MAIN_LIBRARY SDL2::SDL2main) -+ if(NOT TARGET SDL2::SDL2main) -+ add_library(SDL2::SDL2main STATIC IMPORTED) -+ set_target_properties(SDL2::SDL2main -+ PROPERTIES -+ IMPORTED_LOCATION "${_sdl2main_library}" -+ ) -+ if(WIN32) -+ # INTERFACE_LINK_OPTIONS needs CMake 3.13 -+ cmake_minimum_required(VERSION 3.13) -+ # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker. -+ if(CMAKE_SIZEOF_VOID_P EQUAL 4) -+ set_target_properties(SDL2::SDL2main -+ PROPERTIES -+ INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16" -+ ) -+ else() -+ set_target_properties(SDL2::SDL2main -+ PROPERTIES -+ INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain" -+ ) - endif() - endif() -- set(SDL2_SDL2main_FOUND TRUE) -- else() -- set(SDL2_SDL2main_FOUND FALSE) - endif() -- unset(_sdl2main_library) -+ set(SDL2_SDL2main_FOUND TRUE) -+else() -+ set(SDL2_SDL2main_FOUND FALSE) - endif() -+unset(_sdl2main_library) - - # Remove SDL2 since this is the "central" library - # Remove SDL2main since this will be provided by SDL2::SDL2main (if available) - diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch deleted file mode 100644 index 0370f66ef8c9..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch +++ /dev/null @@ -1,32 +0,0 @@ -# https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51 -From 71fb91f7e43c5f046a037bf5ca59214d93fe2d51 Mon Sep 17 00:00:00 2001 -From: Cameron Gutman <aicomman...@gmail.com> -Date: Mon, 26 Sep 2022 21:38:09 -0500 -Subject: [PATCH] evdev: Fix build with libudev and joystick subsystem disabled - ---- - src/core/linux/SDL_evdev_capabilities.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/core/linux/SDL_evdev_capabilities.h b/src/core/linux/SDL_evdev_capabilities.h -index 26fa7400485b..990ebe01b872 100644 ---- a/src/core/linux/SDL_evdev_capabilities.h -+++ b/src/core/linux/SDL_evdev_capabilities.h -@@ -25,8 +25,6 @@ - #ifndef SDL_evdev_capabilities_h_ - #define SDL_evdev_capabilities_h_ - --#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) -- - #include <linux/input.h> - - /* A device can be any combination of these classes */ -@@ -53,8 +51,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)], - unsigned long bitmask_key[NBITS(KEY_MAX)], - unsigned long bitmask_rel[NBITS(REL_MAX)]); - --#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */ -- - #endif /* SDL_evdev_capabilities_h_ */ - - /* vi: set ts=4 sw=4 expandtab: */ diff --git a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch deleted file mode 100644 index 6727a3e4f4bc..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 <frank.praz...@gmail.com> -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 <libdecor.h> - #endif - diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild deleted file mode 100644 index 6ca1a8b7d87a..000000000000 --- a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# 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}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch - "${FILESDIR}"/${PN}-2.24.0-clang-15-configure.patch - "${FILESDIR}"/${P}-cmake-target-fixes.patch - "${FILESDIR}"/${P}-fix-build-without-joystick.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads pthreads) - --enable-timers - --enable-file - --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 oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable X video-x11-xfixes) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" 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 - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.24.2.ebuild b/media-libs/libsdl2/libsdl2-2.24.2.ebuild deleted file mode 100644 index fa38ef1023de..000000000000 --- a/media-libs/libsdl2/libsdl2-2.24.2.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# 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}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch - "${FILESDIR}"/${PN}-2.24.0-fix-build-without-joystick.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads pthreads) - --enable-timers - --enable-file - --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 oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable X video-x11-xfixes) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" 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 - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.26.0.ebuild b/media-libs/libsdl2/libsdl2-2.26.0.ebuild deleted file mode 100644 index c65bbfda6547..000000000000 --- a/media-libs/libsdl2/libsdl2-2.26.0.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# 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}] ) - 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}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch - "${FILESDIR}"/${P}-wayland.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-system-iconv - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads pthreads) - --enable-timers - --enable-file - --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 oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - --disable-werror - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable X video-x11-xfixes) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" 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 - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -}
