commit: b7123d5088482b6a414f9f3b7da7738360b6d853 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Jul 25 00:39:37 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Jul 25 01:35:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7123d50
media-libs/libsdl2: drop vulnerable 2.0.12-r2 Bug: https://bugs.gentoo.org/766204 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/libsdl2/Manifest | 1 - .../files/libsdl2-2.0.12-egl-detection.patch | 24 --- .../libsdl2/files/libsdl2-2.0.12-static-libs.patch | 48 ----- .../files/libsdl2-2.0.12-vulkan-headers.patch | 17 -- media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild | 204 --------------------- media-libs/libsdl2/metadata.xml | 1 - 6 files changed, 295 deletions(-) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index fef6b59307f..d4a910d2b22 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,2 +1 @@ -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.12-egl-detection.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch deleted file mode 100644 index 7655ca67494..00000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix wayland support on systems without X11. - -Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5270 - ---- a/configure Tue Aug 25 04:05:36 2020 +0200 -+++ a/configure Tue Aug 25 06:40:03 2020 -0700 -@@ -22306,6 +22306,7 @@ - #define LINUX - #define EGL_API_FB - #define MESA_EGL_NO_X11_HEADERS -+ #define EGL_NO_X11 - #include <EGL/egl.h> - #include <EGL/eglext.h> - ---- a/configure.ac Tue Aug 25 04:05:36 2020 +0200 -+++ a/configure.ac Tue Aug 25 06:40:03 2020 -0700 -@@ -2373,6 +2373,7 @@ - #define LINUX - #define EGL_API_FB - #define MESA_EGL_NO_X11_HEADERS -+ #define EGL_NO_X11 - #include <EGL/egl.h> - #include <EGL/eglext.h> - ],[ diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch deleted file mode 100644 index f80dc6c222c..00000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 @@ - 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/files/libsdl2-2.0.12-vulkan-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch deleted file mode 100644 index 717e5b5db38..00000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch +++ /dev/null @@ -1,17 +0,0 @@ -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.000000000 -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-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild deleted file mode 100644 index a2ca8ec4751..00000000000 --- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ppc ppc64 sparc x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles2? ( video ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - vulkan? ( video ) - wayland? ( gles2 ) - xinerama? ( X ) - 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 ) - 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.46[${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}] - ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.0.6[${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/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${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 -" - -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.12-static-libs.patch - "${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch - "${FILESDIR}"/${PN}-2.0.12-egl-detection.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 - - AT_M4DIR="/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) - --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 pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - --disable-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 xinerama video-x11-xinerama) - $(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 X video-x11-vm) - $(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) - --disable-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) - $(use_enable tslib input-tslib) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake 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,README-SDL,TODO,WhatsNew}.txt docs/README*.md -} diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml index 7c587dc6d2e..06de1fd4760 100644 --- a/media-libs/libsdl2/metadata.xml +++ b/media-libs/libsdl2/metadata.xml @@ -33,7 +33,6 @@ <flag name="kms">Build the KMSDRM video driver</flag> <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag> <flag name="sound">Control audio support (disable at your own risk)</flag> - <flag name="tslib">Build with tslib support for touchscreen devices</flag> <flag name="video">Control video support (disable at your own risk)</flag> <flag name="vulkan">Enable Vulkan support</flag> </use>
