commit: 74e12610ae4c66545f127e400e0a08bd7bc5a0d0 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Jul 25 00:43:10 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Jul 25 01:35:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e12610
media-libs/libsdl: drop vulnerable 1.2.15-r9 Bug: https://bugs.gentoo.org/692388 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/libsdl/Manifest | 1 - .../files/libsdl-1.2.15-SDL_EnableUNICODE.patch | 47 ------- .../libsdl/files/libsdl-1.2.15-bsd-joystick.patch | 28 ----- media-libs/libsdl/files/libsdl-1.2.15-caca.patch | 26 ---- .../libsdl/files/libsdl-1.2.15-const-xdata32.patch | 58 --------- .../libsdl/files/libsdl-1.2.15-joystick.patch | 13 -- .../libsdl/files/libsdl-1.2.15-resizing.patch | 60 --------- media-libs/libsdl/libsdl-1.2.15-r9.ebuild | 135 --------------------- 8 files changed, 368 deletions(-) diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index f155eac13db..4024ceafbd4 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,2 +1 @@ -DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006 diff --git a/media-libs/libsdl/files/libsdl-1.2.15-SDL_EnableUNICODE.patch b/media-libs/libsdl/files/libsdl-1.2.15-SDL_EnableUNICODE.patch deleted file mode 100644 index bf68b2e44f4..00000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-SDL_EnableUNICODE.patch +++ /dev/null @@ -1,47 +0,0 @@ - -diff -r 22a7f096bb9d -r 0aade9c0203f src/video/x11/SDL_x11events.c ---- a/src/video/x11/SDL_x11events.c Sun Dec 01 00:00:17 2013 -0500 -+++ b/src/video/x11/SDL_x11events.c Thu Apr 17 22:36:14 2014 -0700 -@@ -395,6 +395,8 @@ - { - int posted; - XEvent xevent; -+ int orig_event_type; -+ KeyCode orig_keycode; - - SDL_memset(&xevent, '\0', sizeof (XEvent)); /* valgrind fix. --ryan. */ - XNextEvent(SDL_Display, &xevent); -@@ -410,9 +412,29 @@ - #ifdef X_HAVE_UTF8_STRING - /* If we are translating with IM, we need to pass all events - to XFilterEvent, and discard those filtered events immediately. */ -+ orig_event_type = xevent.type; -+ if (orig_event_type == KeyPress || orig_event_type == KeyRelease) { -+ orig_keycode = xevent.xkey.keycode; -+ } else { -+ orig_keycode = 0; -+ } - if ( SDL_TranslateUNICODE - && SDL_IM != NULL - && XFilterEvent(&xevent, None) ) { -+ if (orig_keycode) { -+ SDL_keysym keysym; -+ static XComposeStatus state; -+ char keybuf[32]; -+ -+ keysym.scancode = xevent.xkey.keycode; -+ keysym.sym = X11_TranslateKeycode(SDL_Display, xevent.xkey.keycode); -+ keysym.mod = KMOD_NONE; -+ keysym.unicode = 0; -+ if (orig_event_type == KeyPress && XLookupString(&xevent.xkey, keybuf, sizeof(keybuf), NULL, &state)) -+ keysym.unicode = (Uint8)keybuf[0]; -+ -+ SDL_PrivateKeyboard(orig_event_type == KeyPress ? SDL_PRESSED : SDL_RELEASED, &keysym); -+ } - return 0; - } - #endif - - - - diff --git a/media-libs/libsdl/files/libsdl-1.2.15-bsd-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.15-bsd-joystick.patch deleted file mode 100644 index 0f3542529ba..00000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-bsd-joystick.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga <[email protected]> -# Date 1329357968 18000 -# Node ID 62ff1c0a103f685774450be2e5338824a22078bd -# Parent 8e98c714bb2ab96de4100a335dacf042963d5068 -FreeBSD compile fix - -Robert Millan - -src/joystick/bsd/SDL_sysjoystick.c makes the invalid assumption that -__FreeBSD_kernel__ implies presence of "ucr_data" struct member. This -breaks recent versions of FreeBSD 10-CURRENT, FreeBSD 9-STABLE and -Debian GNU/kFreeBSD "wheezy/sid". - -diff -r 8e98c714bb2a -r 62ff1c0a103f src/joystick/bsd/SDL_sysjoystick.c ---- a/src/joystick/bsd/SDL_sysjoystick.c Sat Feb 04 18:12:20 2012 -0500 -+++ b/src/joystick/bsd/SDL_sysjoystick.c Wed Feb 15 21:06:08 2012 -0500 -@@ -148,7 +148,7 @@ - static int report_alloc(struct report *, struct report_desc *, int); - static void report_free(struct report *); - --#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__) -+#if defined(USBHID_UCR_DATA) - #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data) - #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) - #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data) - diff --git a/media-libs/libsdl/files/libsdl-1.2.15-caca.patch b/media-libs/libsdl/files/libsdl-1.2.15-caca.patch deleted file mode 100644 index faf5ae132a9..00000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-caca.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- SDL-1.2.15/configure.in -+++ SDL-1.2.15/configure.in -@@ -1507,11 +1507,10 @@ - , enable_video_caca=no) - if test x$enable_video = xyes -a x$enable_video_caca = xyes; then - video_caca=no -- AC_PATH_PROG(CACACONFIG, caca-config, no) -- if test x$CACACONFIG != xno; then -+ PKG_PROG_PKG_CONFIG([0.20]) -+ PKG_CHECK_MODULES(CACA, caca, has_caca_pc=yes, has_caca_pc=no]) -+ if test x$has_caca_pc == xyes; then - AC_MSG_CHECKING(for libcaca support) -- CACA_CFLAGS=`$CACACONFIG --cflags` -- CACA_LDFLAGS=`$CACACONFIG --libs` - save_CFLAGS="$CFLAGS" - AC_TRY_COMPILE([ - #include <caca.h> -@@ -1524,7 +1523,7 @@ - if test x$video_caca = xyes; then - AC_DEFINE(SDL_VIDEO_DRIVER_CACA) - EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LIBS" - SOURCES="$SOURCES $srcdir/src/video/caca/*.c" - fi - fi diff --git a/media-libs/libsdl/files/libsdl-1.2.15-const-xdata32.patch b/media-libs/libsdl/files/libsdl-1.2.15-const-xdata32.patch deleted file mode 100644 index ffe55348a6c..00000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-const-xdata32.patch +++ /dev/null @@ -1,58 +0,0 @@ -# HG changeset patch -# User Azamat H. Hackimov <[email protected]> -# Date 1370184533 -21600 -# Branch SDL-1.2 -# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8 -# Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268 -Fix compilation with libX11 >= 1.5.99.902. - -These changes fixes bug #1769 for SDL 1.2 -(http://bugzilla.libsdl.org/show_bug.cgi?id=1769). - -diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in ---- a/configure.in Wed Apr 17 00:56:53 2013 -0700 -+++ b/configure.in Sun Jun 02 20:48:53 2013 +0600 -@@ -1169,6 +1169,17 @@ - if test x$definitely_enable_video_x11_xrandr = xyes; then - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) - fi -+ AC_MSG_CHECKING(for const parameter to _XData32) -+ have_const_param_xdata32=no -+ AC_TRY_COMPILE([ -+ #include <X11/Xlibint.h> -+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); -+ ],[ -+ ],[ -+ have_const_param_xdata32=yes -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) -+ ]) -+ AC_MSG_RESULT($have_const_param_xdata32) - fi - fi - } -diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in ---- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700 -+++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600 -@@ -283,6 +283,7 @@ - #undef SDL_VIDEO_DRIVER_WINDIB - #undef SDL_VIDEO_DRIVER_WSCONS - #undef SDL_VIDEO_DRIVER_X11 -+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 - #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT -diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h ---- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700 -+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600 -@@ -165,7 +165,11 @@ - */ - #ifdef LONG64 - SDL_X11_MODULE(IO_32BIT) -+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) -+#else - SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) -+#endif - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) - #endif - diff --git a/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch deleted file mode 100644 index 70e585e5013..00000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/joystick/linux/SDL_sysjoystick.c.org -+++ src/joystick/linux/SDL_sysjoystick.c -@@ -1106,6 +1106,10 @@ static __inline__ void EV_HandleEvents(S - } - break; - case EV_ABS: -+ if (code >= ABS_MISC) { -+ break; -+ } -+ - switch (code) { - case ABS_HAT0X: - case ABS_HAT0Y: diff --git a/media-libs/libsdl/files/libsdl-1.2.15-resizing.patch b/media-libs/libsdl/files/libsdl-1.2.15-resizing.patch deleted file mode 100644 index 5112137a5a1..00000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-resizing.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Revert change that breaks window corner resizing - http://bugzilla.libsdl.org/show_bug.cgi?id=1430 -Author: Andrew Caudwell <[email protected]> -Last-Update: 2012-04-10 -Bug-Debian: http://bugs.debian.org/665779 - ---- a/src/video/x11/SDL_x11events.c -+++ b/src/video/x11/SDL_x11events.c -@@ -57,12 +57,6 @@ - static SDLKey MISC_keymap[256]; - SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); - --/* -- Pending resize target for ConfigureNotify (so outdated events don't -- cause inappropriate resize events) --*/ --int X11_PendingConfigureNotifyWidth = -1; --int X11_PendingConfigureNotifyHeight = -1; - - #ifdef X_HAVE_UTF8_STRING - Uint32 Utf8ToUcs4(const Uint8 *utf8) -@@ -825,16 +819,6 @@ - #ifdef DEBUG_XEVENTS - printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); - #endif -- if ((X11_PendingConfigureNotifyWidth != -1) && -- (X11_PendingConfigureNotifyHeight != -1)) { -- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && -- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { -- /* Event is from before the resize, so ignore. */ -- break; -- } -- X11_PendingConfigureNotifyWidth = -1; -- X11_PendingConfigureNotifyHeight = -1; -- } - if ( SDL_VideoSurface ) { - if ((xevent.xconfigure.width != SDL_VideoSurface->w) || - (xevent.xconfigure.height != SDL_VideoSurface->h)) { ---- a/src/video/x11/SDL_x11events_c.h -+++ b/src/video/x11/SDL_x11events_c.h -@@ -27,8 +27,3 @@ - extern void X11_InitOSKeymap(_THIS); - extern void X11_PumpEvents(_THIS); - extern void X11_SetKeyboardState(Display *display, const char *key_vec); -- --/* Variables to be exported */ --extern int X11_PendingConfigureNotifyWidth; --extern int X11_PendingConfigureNotifyHeight; -- ---- a/src/video/x11/SDL_x11video.c -+++ b/src/video/x11/SDL_x11video.c -@@ -1182,8 +1182,6 @@ - current = NULL; - goto done; - } -- X11_PendingConfigureNotifyWidth = width; -- X11_PendingConfigureNotifyHeight = height; - } else { - if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { - current = NULL; diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild deleted file mode 100644 index 4ec34594ed5..00000000000 --- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools flag-o-matic multilib toolchain-funcs epatch multilib-minimal - -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://libsdl.org/"; -SRC_URI="https://libsdl.org/release/SDL-${PV}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -# WARNING: -# If you turn on the custom-cflags use flag in USE and something breaks, -# you pick up the pieces. Be prepared for bug reports to be marked INVALID. -IUSE="oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs" - -RDEPEND=" - sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] ) - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - ) - aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - nas? ( x11-base/xorg-proto ) - X? ( x11-base/xorg-proto ) - x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" - -S=${WORKDIR}/SDL-${PV} - -pkg_setup() { - if use custom-cflags ; then - ewarn "Since you've chosen to use possibly unsafe CFLAGS," - ewarn "don't bother filing libsdl-related bugs until trying to remerge" - ewarn "libsdl without the custom-cflags use flag in USE." - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-sdl-config.patch \ - "${FILESDIR}"/${P}-resizing.patch \ - "${FILESDIR}"/${P}-joystick.patch \ - "${FILESDIR}"/${P}-bsd-joystick.patch \ - "${FILESDIR}"/${P}-gamma.patch \ - "${FILESDIR}"/${P}-const-xdata32.patch \ - "${FILESDIR}"/${P}-caca.patch \ - "${FILESDIR}"/${P}-SDL_EnableUNICODE.patch - AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - local myconf= - if use !x86 && use !x86-linux ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || strip-flags - use sound || myconf="${myconf} --disable-audio" - use video \ - && myconf="${myconf} --enable-video-dummy" \ - || myconf="${myconf} --disable-video" - use joystick || myconf="${myconf} --disable-joystick" - - ECONF_SOURCE="${S}" econf \ - $(use_enable prefix rpath) \ - --disable-arts \ - --disable-esd \ - --enable-events \ - --enable-cdrom \ - --enable-threads \ - --enable-timers \ - --enable-file \ - --enable-cpuinfo \ - --disable-alsa-shared \ - --disable-esd-shared \ - --disable-pulseaudio-shared \ - --disable-arts-shared \ - --disable-nas-shared \ - --disable-osmesa-shared \ - $(use_enable oss) \ - $(use_enable alsa) \ - $(use_enable pulseaudio) \ - $(use_enable nas) \ - $(use_enable X video-x11) \ - $(use_enable dga) \ - $(use_enable xv video-x11-xv) \ - $(use_enable xinerama video-x11-xinerama) \ - $(use_enable X video-x11-xrandr) \ - $(use_enable dga video-dga) \ - $(use_enable fbcon video-fbcon) \ - --disable-video-ggi \ - --disable-video-svga \ - $(use_enable aalib video-aalib) \ - $(use_enable libcaca video-caca) \ - $(use_enable opengl video-opengl) \ - --disable-video-ps3 \ - $(use_enable tslib input-tslib) \ - $(use_with X x) \ - $(use_enable static-libs static) \ - --disable-video-x11-xme \ - --disable-video-directfb \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew - dohtml -r ./ -}
