commit: e29a6b7894db20886544d7f6c01fc46861feddb0 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Feb 20 21:28:40 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Feb 20 21:28:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29a6b78
media-libs/libsdl2: Drop old 2.28.5-r3 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-libs/libsdl2/Manifest | 1 - .../libsdl2/files/libsdl2-2.0.16-static-libs.patch | 35 --- .../files/libsdl2-2.28.5-fix-libdecor-0.2.patch | 19 -- media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild | 267 --------------------- 4 files changed, 322 deletions(-) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 8ea94e91037c..bbca87f72382 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,4 +1,3 @@ -DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d DIST SDL2-2.30.11.tar.gz 7585207 BLAKE2B e6038cbf79bec299fae9cfdc4b84ff3e28343abe782942af17e052d7da93111ea04a2ae15b063bfa0ad0d13a1810890dd29d895189f7f417f1bccce715badde1 SHA512 cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16 DIST SDL2-2.32.0.tar.gz 7625288 BLAKE2B 491796e2b222a49eaead76e60bb6e58bed881667cc61d0ba81ed0e083134b6b13089ca2c4658f6576b2924ddeaffcc9ff5c7532841e7b0797c6bd1769ad74a53 SHA512 a91b8105125f06118e8bfce2a5553fe053f7158dd02f06a36cfc535f09c401eb7da11072e576c6bf6e41fa2e02b08483b9cc4e11c658578b762e1b6c326a45bb 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 deleted file mode 100644 index ec0db40c0b3d..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch +++ /dev/null @@ -1,35 +0,0 @@ -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.000000000 +0100 -+++ b/configure.ac 2021-08-10 20:59:58.766664082 +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.000000000 +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 $@ $(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) -+ $(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/files/libsdl2-2.28.5-fix-libdecor-0.2.patch b/media-libs/libsdl2/files/libsdl2-2.28.5-fix-libdecor-0.2.patch deleted file mode 100644 index 9ba92e98253b..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.28.5-fix-libdecor-0.2.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix static build with libdecor 0.2.0 - -Backports https://github.com/libsdl-org/SDL/commit/4ce935b9106a0311436e41c5f28f00db30a93de1 to libsdl2-2.28 -Bug: https://bugs.gentoo.org/936443 ---- a/src/video/wayland/SDL_waylandsym.h -+++ b/src/video/wayland/SDL_waylandsym.h -@@ -221,10 +221,10 @@ SDL_WAYLAND_SYM(int, libdecor_dispatch, (struct libdecor *, int)) - - #if defined(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR) || defined(SDL_HAVE_LIBDECOR_VER_0_2_0) - /* Only found in libdecor 0.1.1 or higher, so failure to load them is not fatal. */ --SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_min_content_size, (struct libdecor_frame *,\ -+SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_min_content_size, (const struct libdecor_frame *,\ - int *,\ - int *)) --SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_max_content_size, (struct libdecor_frame *,\ -+SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_max_content_size, (const struct libdecor_frame *,\ - int *,\ - int *)) - #endif diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild deleted file mode 100644 index 3f7518518e08..000000000000 --- a/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2024 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"; -S="${WORKDIR}/${MY_P}" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips 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 fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - alsa? ( sound ) - fcitx? ( 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 ) -" - -COMMON_DEPEND=" - 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}] ) - fcitx? ( app-i18n/fcitx:* ) - 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-libs/libpulse[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - gui-libs/libdecor[${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=" - ${COMMON_DEPEND} - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND=" - ${COMMON_DEPEND} - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - test? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/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.28.5-fix-libdecor-0.2.patch -) - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - if ! use vulkan - then - sed -i '/testvulkan$(EXE) \\/d' "test/Makefile.in" || die - fi - - # 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-libsamplerate-shared - --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 wayland libdecor) - --disable-libdecor-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 fcitx fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ac_cv_header_libunwind_h=no - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if use test; then - # Most of these workarounds courtesy Debian - # https://salsa.debian.org/sdl-team/libsdl2/-/blob/debian/latest/debian/rules - local mytestargs=( - --x-includes="/usr/include" - --x-libraries="/usr/$(get_libdir)" - SDL_CFLAGS="-I${S}/include" - SDL_LIBS="-L${BUILD_DIR}/build/.libs -lSDL2" - ac_cv_lib_SDL2_ttf_TTF_Init=no - CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" - ) - - mkdir "${BUILD_DIR}/test" || die - cd "${BUILD_DIR}/test" || die - ECONF_SOURCE="${S}/test" econf "${mytestargs[@]}" - fi -} - -multilib_src_compile() { - emake all V=1 - use test && emake -C test all V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}/build/.libs" emake -C test check V=1 -} - -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/ -}
