* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/, media-libs/libsdl/files/
@ 2021-04-01 23:04 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-04-01 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 5b3bd8ff50ff76c0c29c9b922658ef7c74aeffe7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 1 22:49:56 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 1 23:03:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3bd8ff
media-libs/libsdl: fix (parallel) build with slibtool
Patch is upstream for libsdl2 and will be for libsdl soon.
Thanks-to: orbea <orbea <AT> riseup.net>
Closes: https://bugs.gentoo.org/779445
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libsdl/files/libsdl-1.2.15-slibtool.patch | 56 ++++++++++++++++++++++
media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild | 1 +
2 files changed, 57 insertions(+)
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
new file mode 100644
index 00000000000..3066e9fc8b0
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/779445
+
+commit ed1030d9b6a98e06aa293d18c49da18169918b8b
+Author: orbea <orbea@riseup.net>
+Date: Tue Mar 30 18:57:37 2021 -0700
+
+ Fix the build with parallel make and slibtool.
+
+ There is no dependency on the $(OBJECTS) files on the 'build'
+ directory which causes slibtool to fail when the directory
+ does not yet exist. GNU libtool avoids this by being slower
+ than mkdir(1).
+
+diff --git a/Makefile.in b/Makefile.in
+index ab51035..90940d4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -51,7 +51,7 @@ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+
+ $(srcdir)/configure: $(srcdir)/configure.in
+ @echo "Warning, configure.in is out of date"
+@@ -61,8 +61,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
+ Makefile: $(srcdir)/Makefile.in
+ $(SHELL) config.status $@
+
+-$(objects):
+- $(SHELL) $(auxdir)/mkinstalldirs $@
++$(objects)/.created:
++ $(SHELL) $(auxdir)/mkinstalldirs $(objects)
++ touch $@
+
+ .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
+ depend:
+@@ -71,6 +72,8 @@ depend:
+
+ include $(depend)
+
++$(OBJECTS) $(SDLMAIN_OBJECTS): $(objects)/.created
++
+ $(objects)/$(TARGET): $(OBJECTS)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+
+@@ -88,7 +91,7 @@ install-hdrs:
+ $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
+ done
+ $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
+-install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
++install-lib: $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 5e79c923cb0..4b61e3b581f 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -65,6 +65,7 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
+ "${FILESDIR}"/${PN}-$(ver_cut 1-3)-slibtool.patch
)
DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/, media-libs/libsdl/files/
@ 2021-07-25 1:36 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-07-25 1:36 UTC (permalink / raw
To: gentoo-commits
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 <slouken@libsdl.org>
-# 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 <azamat.hackimov@gmail.com>
-# 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 <acaudwell@gmail.com>
-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 ./
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/, media-libs/libsdl/files/
@ 2022-10-16 12:16 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2022-10-16 12:16 UTC (permalink / raw
To: gentoo-commits
commit: b77c839a9479cc93c732831accd0846897112dc0
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Oct 16 00:46:03 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 12:14:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77c839a
media-libs/libsdl: Fix -Werror,-Wdeprecated-non-prototype
Fixes the build for clang 16.
reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
Upstream-PR: https://github.com/libsdl-org/SDL-1.2/pull/869
Upstream-Commit: https://github.com/libsdl-org/SDL-1.2/commit/ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe
Upstream-Commit: https://github.com/libsdl-org/SDL-1.2/commit/e738cfffced8a006094d55337d917386582ada47
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/27801
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/libsdl-1.2.15-strict-prototypes.patch | 316 +++++++++++++++++++++
media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild | 1 +
2 files changed, 317 insertions(+)
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-strict-prototypes.patch b/media-libs/libsdl/files/libsdl-1.2.15-strict-prototypes.patch
new file mode 100644
index 000000000000..65a98670adfe
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-strict-prototypes.patch
@@ -0,0 +1,316 @@
+https://github.com/libsdl-org/SDL-1.2/pull/869
+https://github.com/libsdl-org/SDL-1.2/commit/ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe
+https://github.com/libsdl-org/SDL-1.2/commit/e738cfffced8a006094d55337d917386582ada47
+
+From ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 15 Oct 2022 14:35:38 -0700
+Subject: [PATCH 1/2] Xxf86vm: Fix function definitions without a prototype
+
+This is not supported with the upcoming clang 16.
+
+error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
+
+reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+---
+ src/video/Xext/Xxf86vm/XF86VMode.c | 128 +++++++++++++++--------------
+ 1 file changed, 65 insertions(+), 63 deletions(-)
+
+diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c
+index 5cb21905a..c3bd26716 100644
+--- a/src/video/Xext/Xxf86vm/XF86VMode.c
++++ b/src/video/Xext/Xxf86vm/XF86VMode.c
+@@ -102,9 +102,11 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info)
+ *****************************************************************************/
+
+ Bool
+-SDL_NAME(XF86VidModeQueryExtension) (dpy, event_basep, error_basep)
+- Display *dpy;
+- int *event_basep, *error_basep;
++SDL_NAME(XF86VidModeQueryExtension)(
++ Display *dpy,
++ int *event_basep,
++ int *error_basep
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+
+@@ -118,10 +120,11 @@ SDL_NAME(XF86VidModeQueryExtension) (dpy, event_basep, error_basep)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeQueryVersion)(dpy, majorVersion, minorVersion)
+- Display* dpy;
+- int* majorVersion;
+- int* minorVersion;
++SDL_NAME(XF86VidModeQueryVersion)(
++ Display *dpy,
++ int *majorVersion,
++ int *minorVersion
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeQueryVersionReply rep;
+@@ -215,11 +218,12 @@ SDL_NAME(XF86VidModeGetGamma)(Display *dpy, int screen, SDL_NAME(XF86VidModeGamm
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
+- Display* dpy;
+- int screen;
+- int* dotclock;
+- SDL_NAME(XF86VidModeModeLine)* modeline;
++SDL_NAME(XF86VidModeGetModeLine)(
++ Display *dpy,
++ int screen,
++ int *dotclock,
++ SDL_NAME(XF86VidModeModeLine) *modeline
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeGetModeLineReply rep;
+@@ -292,11 +296,12 @@ SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeGetAllModeLines)(dpy, screen, modecount, modelinesPtr)
+- Display* dpy;
+- int screen;
+- int* modecount;
+- SDL_NAME(XF86VidModeModeInfo) ***modelinesPtr;
++SDL_NAME(XF86VidModeGetAllModeLines)(
++ Display *dpy,
++ int screen,
++ int *modecount,
++ SDL_NAME(XF86VidModeModeInfo) ***modelinesPtr
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeGetAllModeLinesReply rep;
+@@ -456,11 +461,12 @@ SDL_NAME(XF86VidModeGetAllModeLines)(dpy, screen, modecount, modelinesPtr)
+ #endif
+
+ Bool
+-SDL_NAME(XF86VidModeAddModeLine) (dpy, screen, newmodeline, aftermodeline)
+- Display *dpy;
+- int screen;
+- SDL_NAME(XF86VidModeModeInfo)* newmodeline;
+- SDL_NAME(XF86VidModeModeInfo)* aftermodeline;
++SDL_NAME(XF86VidModeAddModeLine)(
++ Display *dpy,
++ int screen,
++ SDL_NAME(XF86VidModeModeInfo) *newmodeline,
++ SDL_NAME(XF86VidModeModeInfo) *aftermodeline
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeAddModeLineReq *req;
+@@ -569,10 +575,11 @@ SDL_NAME(XF86VidModeAddModeLine) (dpy, screen, newmodeline, aftermodeline)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeDeleteModeLine) (dpy, screen, modeline)
+- Display *dpy;
+- int screen;
+- SDL_NAME(XF86VidModeModeInfo)* modeline;
++SDL_NAME(XF86VidModeDeleteModeLine)(
++ Display *dpy,
++ int screen,
++ SDL_NAME(XF86VidModeModeInfo) *modeline
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeDeleteModeLineReq *req;
+@@ -633,10 +640,11 @@ SDL_NAME(XF86VidModeDeleteModeLine) (dpy, screen, modeline)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeModModeLine) (dpy, screen, modeline)
+- Display *dpy;
+- int screen;
+- SDL_NAME(XF86VidModeModeLine)* modeline;
++SDL_NAME(XF86VidModeModModeLine)(
++ Display *dpy,
++ int screen,
++ SDL_NAME(XF86VidModeModeLine) *modeline
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeModModeLineReq *req;
+@@ -695,10 +703,11 @@ SDL_NAME(XF86VidModeModModeLine) (dpy, screen, modeline)
+ }
+
+ Status
+-SDL_NAME(XF86VidModeValidateModeLine) (dpy, screen, modeline)
+- Display *dpy;
+- int screen;
+- SDL_NAME(XF86VidModeModeInfo)* modeline;
++SDL_NAME(XF86VidModeValidateModeLine)(
++ Display *dpy,
++ int screen,
++ SDL_NAME(XF86VidModeModeInfo) *modeline
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeValidateModeLineReq *req;
+@@ -766,10 +775,7 @@ SDL_NAME(XF86VidModeValidateModeLine) (dpy, screen, modeline)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeSwitchMode)(dpy, screen, zoom)
+- Display* dpy;
+- int screen;
+- int zoom;
++SDL_NAME(XF86VidModeSwitchMode)(Display *dpy, int screen, int zoom)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeSwitchModeReq *req;
+@@ -788,10 +794,11 @@ SDL_NAME(XF86VidModeSwitchMode)(dpy, screen, zoom)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeSwitchToMode)(dpy, screen, modeline)
+- Display* dpy;
+- int screen;
+- SDL_NAME(XF86VidModeModeInfo)* modeline;
++SDL_NAME(XF86VidModeSwitchToMode)(
++ Display *dpy,
++ int screen,
++ SDL_NAME(XF86VidModeModeInfo) *modeline
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeSwitchToModeReq *req;
+@@ -877,10 +884,7 @@ SDL_NAME(XF86VidModeSwitchToMode)(dpy, screen, modeline)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeLockModeSwitch)(dpy, screen, lock)
+- Display* dpy;
+- int screen;
+- int lock;
++SDL_NAME(XF86VidModeLockModeSwitch)(Display *dpy, int screen, int lock)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeLockModeSwitchReq *req;
+@@ -899,10 +903,11 @@ SDL_NAME(XF86VidModeLockModeSwitch)(dpy, screen, lock)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeGetMonitor)(dpy, screen, monitor)
+- Display* dpy;
+- int screen;
+- SDL_NAME(XF86VidModeMonitor)* monitor;
++SDL_NAME(XF86VidModeGetMonitor)(
++ Display *dpy,
++ int screen,
++ SDL_NAME(XF86VidModeMonitor) *monitor
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeGetMonitorReply rep;
+@@ -1000,10 +1005,7 @@ SDL_NAME(XF86VidModeGetMonitor)(dpy, screen, monitor)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeGetViewPort)(dpy, screen, x, y)
+- Display* dpy;
+- int screen;
+- int *x, *y;
++SDL_NAME(XF86VidModeGetViewPort)(Display *dpy, int screen, int *x, int *y)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeGetViewPortReply rep;
+@@ -1053,10 +1055,7 @@ SDL_NAME(XF86VidModeGetViewPort)(dpy, screen, x, y)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeSetViewPort)(dpy, screen, x, y)
+- Display* dpy;
+- int screen;
+- int x, y;
++SDL_NAME(XF86VidModeSetViewPort)(Display *dpy, int screen, int x, int y)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeSetViewPortReq *req;
+@@ -1077,11 +1076,14 @@ SDL_NAME(XF86VidModeSetViewPort)(dpy, screen, x, y)
+ }
+
+ Bool
+-SDL_NAME(XF86VidModeGetDotClocks)(dpy, screen,
+- flagsPtr, numclocksPtr, maxclocksPtr, clocksPtr)
+- Display* dpy;
+- int screen;
+- int *flagsPtr, *numclocksPtr, *maxclocksPtr, *clocksPtr[];
++SDL_NAME(XF86VidModeGetDotClocks)(
++ Display *dpy,
++ int screen,
++ int *flagsPtr,
++ int *numclocksPtr,
++ int *maxclocksPtr,
++ int *clocksPtr[]
++)
+ {
+ XExtDisplayInfo *info = find_display (dpy);
+ xXF86VidModeGetDotClocksReply rep;
+
+From e738cfffced8a006094d55337d917386582ada47 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 15 Oct 2022 15:10:48 -0700
+Subject: [PATCH 2/2] Xext: Fix function declarations without a prototype
+
+This is not supported with the upcoming clang 16.
+
+error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Werror,-Wdeprecated-non-prototype]
+
+reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+---
+ src/video/Xext/XME/xme.c | 2 +-
+ src/video/Xext/Xinerama/Xinerama.c | 3 ++-
+ src/video/Xext/Xv/Xv.c | 6 +++---
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c
+index 2cead35ad..bb8d04d48 100644
+--- a/src/video/Xext/XME/xme.c
++++ b/src/video/Xext/XME/xme.c
+@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME;
+ /*
+ * find_display - locate the display info block
+ */
+-static int XiGMiscCloseDisplay();
++static int XiGMiscCloseDisplay(Display*, XExtCodes*);
+
+ static XExtensionHooks xigmisc_extension_hooks = {
+ NULL, /* create_gc */
+diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c
+index 4ff42ebfe..57f64b9c3 100644
+--- a/src/video/Xext/Xinerama/Xinerama.c
++++ b/src/video/Xext/Xinerama/Xinerama.c
+@@ -50,7 +50,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
+ #define PanoramiXSimpleCheckExtension(dpy,i) \
+ XextSimpleCheckExtension (dpy, i, panoramiX_extension_name)
+
+-static int close_display();
++static int close_display(Display*, XExtCodes*);
++
+ static /* const */ XExtensionHooks panoramiX_extension_hooks = {
+ NULL, /* create_gc */
+ NULL, /* copy_gc */
+diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c
+index 7147b9e8c..c254a1dc2 100644
+--- a/src/video/Xext/Xv/Xv.c
++++ b/src/video/Xext/Xv/Xv.c
+@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName;
+ #define XvCheckExtension(dpy, i, val) \
+ XextCheckExtension(dpy, i, xv_extension_name, val)
+
+-static char *xv_error_string();
+-static int xv_close_display();
+-static Bool xv_wire_to_event();
++static char *xv_error_string(Display*, int, XExtCodes*, char*, int);
++static int xv_close_display(Display*, XExtCodes*);
++static Bool xv_wire_to_event(Display*, XEvent*, xEvent*);
+
+ static XExtensionHooks xv_extension_hooks = {
+ NULL, /* create_gc */
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 6ec8a3afc8c0..93b741554ec3 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
"${FILESDIR}"/${PN}-$(ver_cut 1-3)-slibtool.patch
+ "${FILESDIR}"/${PN}-$(ver_cut 1-3)-strict-prototypes.patch
)
DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/, media-libs/libsdl/files/
@ 2023-05-03 10:12 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-03 10:12 UTC (permalink / raw
To: gentoo-commits
commit: b3b8e0793d95de99d8a67a96c3d6c7480fc72ad1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 10:12:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 3 10:12:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b8e079
media-libs/libsdl: drop 1.2.15_p20210224, 1.2.15_p20221103
Bug: https://bugs.gentoo.org/861809
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libsdl/Manifest | 2 -
.../libsdl/files/libsdl-1.2.15-slibtool.patch | 56 ----
.../files/libsdl-1.2.15-strict-prototypes.patch | 316 ---------------------
media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild | 166 -----------
media-libs/libsdl/libsdl-1.2.15_p20221103.ebuild | 166 -----------
5 files changed, 706 deletions(-)
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 78721ce1df25..738ae976dad3 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,4 +1,2 @@
-DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
-DIST SDL-1.2.15_p20221103.tar.gz 4002891 BLAKE2B 2329cec3579a2eb226ee7c8566f7f995b21b4f7fac3a0b40f237cf2d13576347a001dac96caf35d7da0fa95b4ee1684fbb9972a82e2691e4c83c1c0984b46029 SHA512 bd2cf4119dd9be99094d3379b15067817d4d40490d894e2338da9c365378d79edcfe2d7df03f57ac948f5fd1f949e5acb5b2233be484084a828c98af350f1830
DIST SDL-1.2.15_p20221201.tar.gz 4002787 BLAKE2B 87b729cb16cfb36efa2b66166ef21d4c5c8bc99f8c8b4683885f04699122945a60512c5875d0c8425ddfe33b2eb901d11f27afbd9e3656cde3f30de5a5f1537c SHA512 5e70977cf5beaffebb28ae84f778e08d3cf56b2badda125ec1f08ac26c6b4e60a148d9ca9b2d7efee8a5fbc0b1a343d1d27a05be1c08e5d9251da67aea209659
DIST libsdl-1.2.60.tar.gz 438381 BLAKE2B 32f00c8f5dc51780bfb48cdfa41ca46ab64dc4cd7d0a2a042e920569ea2d5fe3238e9e95b4bb34954a0f7b84a384cdbbc9859f20e2706192297a7e9d8696ee52 SHA512 4eae573054bb98d11356425392f352bf9c54b6406548d225bc8e8e042011e40edaaab6726ddc24e68f3e07cd21d95432df614f5381f1d3d5d0808686ea950732
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
deleted file mode 100644
index 3066e9fc8b03..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/779445
-
-commit ed1030d9b6a98e06aa293d18c49da18169918b8b
-Author: orbea <orbea@riseup.net>
-Date: Tue Mar 30 18:57:37 2021 -0700
-
- Fix the build with parallel make and slibtool.
-
- There is no dependency on the $(OBJECTS) files on the 'build'
- directory which causes slibtool to fail when the directory
- does not yet exist. GNU libtool avoids this by being slower
- than mkdir(1).
-
-diff --git a/Makefile.in b/Makefile.in
-index ab51035..90940d4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -51,7 +51,7 @@ LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
-+all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
-
- $(srcdir)/configure: $(srcdir)/configure.in
- @echo "Warning, configure.in is out of date"
-@@ -61,8 +61,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
- Makefile: $(srcdir)/Makefile.in
- $(SHELL) config.status $@
-
--$(objects):
-- $(SHELL) $(auxdir)/mkinstalldirs $@
-+$(objects)/.created:
-+ $(SHELL) $(auxdir)/mkinstalldirs $(objects)
-+ touch $@
-
- .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
- depend:
-@@ -71,6 +72,8 @@ depend:
-
- include $(depend)
-
-+$(OBJECTS) $(SDLMAIN_OBJECTS): $(objects)/.created
-+
- $(objects)/$(TARGET): $(OBJECTS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-
-@@ -88,7 +91,7 @@ install-hdrs:
- $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
- done
- $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
--install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
-+install-lib: $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
- $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
- $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-strict-prototypes.patch b/media-libs/libsdl/files/libsdl-1.2.15-strict-prototypes.patch
deleted file mode 100644
index 65a98670adfe..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.15-strict-prototypes.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-https://github.com/libsdl-org/SDL-1.2/pull/869
-https://github.com/libsdl-org/SDL-1.2/commit/ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe
-https://github.com/libsdl-org/SDL-1.2/commit/e738cfffced8a006094d55337d917386582ada47
-
-From ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sat, 15 Oct 2022 14:35:38 -0700
-Subject: [PATCH 1/2] Xxf86vm: Fix function definitions without a prototype
-
-This is not supported with the upcoming clang 16.
-
-error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
-
-reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
----
- src/video/Xext/Xxf86vm/XF86VMode.c | 128 +++++++++++++++--------------
- 1 file changed, 65 insertions(+), 63 deletions(-)
-
-diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c
-index 5cb21905a..c3bd26716 100644
---- a/src/video/Xext/Xxf86vm/XF86VMode.c
-+++ b/src/video/Xext/Xxf86vm/XF86VMode.c
-@@ -102,9 +102,11 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info)
- *****************************************************************************/
-
- Bool
--SDL_NAME(XF86VidModeQueryExtension) (dpy, event_basep, error_basep)
-- Display *dpy;
-- int *event_basep, *error_basep;
-+SDL_NAME(XF86VidModeQueryExtension)(
-+ Display *dpy,
-+ int *event_basep,
-+ int *error_basep
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
-
-@@ -118,10 +120,11 @@ SDL_NAME(XF86VidModeQueryExtension) (dpy, event_basep, error_basep)
- }
-
- Bool
--SDL_NAME(XF86VidModeQueryVersion)(dpy, majorVersion, minorVersion)
-- Display* dpy;
-- int* majorVersion;
-- int* minorVersion;
-+SDL_NAME(XF86VidModeQueryVersion)(
-+ Display *dpy,
-+ int *majorVersion,
-+ int *minorVersion
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeQueryVersionReply rep;
-@@ -215,11 +218,12 @@ SDL_NAME(XF86VidModeGetGamma)(Display *dpy, int screen, SDL_NAME(XF86VidModeGamm
- }
-
- Bool
--SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
-- Display* dpy;
-- int screen;
-- int* dotclock;
-- SDL_NAME(XF86VidModeModeLine)* modeline;
-+SDL_NAME(XF86VidModeGetModeLine)(
-+ Display *dpy,
-+ int screen,
-+ int *dotclock,
-+ SDL_NAME(XF86VidModeModeLine) *modeline
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeGetModeLineReply rep;
-@@ -292,11 +296,12 @@ SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
- }
-
- Bool
--SDL_NAME(XF86VidModeGetAllModeLines)(dpy, screen, modecount, modelinesPtr)
-- Display* dpy;
-- int screen;
-- int* modecount;
-- SDL_NAME(XF86VidModeModeInfo) ***modelinesPtr;
-+SDL_NAME(XF86VidModeGetAllModeLines)(
-+ Display *dpy,
-+ int screen,
-+ int *modecount,
-+ SDL_NAME(XF86VidModeModeInfo) ***modelinesPtr
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeGetAllModeLinesReply rep;
-@@ -456,11 +461,12 @@ SDL_NAME(XF86VidModeGetAllModeLines)(dpy, screen, modecount, modelinesPtr)
- #endif
-
- Bool
--SDL_NAME(XF86VidModeAddModeLine) (dpy, screen, newmodeline, aftermodeline)
-- Display *dpy;
-- int screen;
-- SDL_NAME(XF86VidModeModeInfo)* newmodeline;
-- SDL_NAME(XF86VidModeModeInfo)* aftermodeline;
-+SDL_NAME(XF86VidModeAddModeLine)(
-+ Display *dpy,
-+ int screen,
-+ SDL_NAME(XF86VidModeModeInfo) *newmodeline,
-+ SDL_NAME(XF86VidModeModeInfo) *aftermodeline
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeAddModeLineReq *req;
-@@ -569,10 +575,11 @@ SDL_NAME(XF86VidModeAddModeLine) (dpy, screen, newmodeline, aftermodeline)
- }
-
- Bool
--SDL_NAME(XF86VidModeDeleteModeLine) (dpy, screen, modeline)
-- Display *dpy;
-- int screen;
-- SDL_NAME(XF86VidModeModeInfo)* modeline;
-+SDL_NAME(XF86VidModeDeleteModeLine)(
-+ Display *dpy,
-+ int screen,
-+ SDL_NAME(XF86VidModeModeInfo) *modeline
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeDeleteModeLineReq *req;
-@@ -633,10 +640,11 @@ SDL_NAME(XF86VidModeDeleteModeLine) (dpy, screen, modeline)
- }
-
- Bool
--SDL_NAME(XF86VidModeModModeLine) (dpy, screen, modeline)
-- Display *dpy;
-- int screen;
-- SDL_NAME(XF86VidModeModeLine)* modeline;
-+SDL_NAME(XF86VidModeModModeLine)(
-+ Display *dpy,
-+ int screen,
-+ SDL_NAME(XF86VidModeModeLine) *modeline
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeModModeLineReq *req;
-@@ -695,10 +703,11 @@ SDL_NAME(XF86VidModeModModeLine) (dpy, screen, modeline)
- }
-
- Status
--SDL_NAME(XF86VidModeValidateModeLine) (dpy, screen, modeline)
-- Display *dpy;
-- int screen;
-- SDL_NAME(XF86VidModeModeInfo)* modeline;
-+SDL_NAME(XF86VidModeValidateModeLine)(
-+ Display *dpy,
-+ int screen,
-+ SDL_NAME(XF86VidModeModeInfo) *modeline
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeValidateModeLineReq *req;
-@@ -766,10 +775,7 @@ SDL_NAME(XF86VidModeValidateModeLine) (dpy, screen, modeline)
- }
-
- Bool
--SDL_NAME(XF86VidModeSwitchMode)(dpy, screen, zoom)
-- Display* dpy;
-- int screen;
-- int zoom;
-+SDL_NAME(XF86VidModeSwitchMode)(Display *dpy, int screen, int zoom)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeSwitchModeReq *req;
-@@ -788,10 +794,11 @@ SDL_NAME(XF86VidModeSwitchMode)(dpy, screen, zoom)
- }
-
- Bool
--SDL_NAME(XF86VidModeSwitchToMode)(dpy, screen, modeline)
-- Display* dpy;
-- int screen;
-- SDL_NAME(XF86VidModeModeInfo)* modeline;
-+SDL_NAME(XF86VidModeSwitchToMode)(
-+ Display *dpy,
-+ int screen,
-+ SDL_NAME(XF86VidModeModeInfo) *modeline
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeSwitchToModeReq *req;
-@@ -877,10 +884,7 @@ SDL_NAME(XF86VidModeSwitchToMode)(dpy, screen, modeline)
- }
-
- Bool
--SDL_NAME(XF86VidModeLockModeSwitch)(dpy, screen, lock)
-- Display* dpy;
-- int screen;
-- int lock;
-+SDL_NAME(XF86VidModeLockModeSwitch)(Display *dpy, int screen, int lock)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeLockModeSwitchReq *req;
-@@ -899,10 +903,11 @@ SDL_NAME(XF86VidModeLockModeSwitch)(dpy, screen, lock)
- }
-
- Bool
--SDL_NAME(XF86VidModeGetMonitor)(dpy, screen, monitor)
-- Display* dpy;
-- int screen;
-- SDL_NAME(XF86VidModeMonitor)* monitor;
-+SDL_NAME(XF86VidModeGetMonitor)(
-+ Display *dpy,
-+ int screen,
-+ SDL_NAME(XF86VidModeMonitor) *monitor
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeGetMonitorReply rep;
-@@ -1000,10 +1005,7 @@ SDL_NAME(XF86VidModeGetMonitor)(dpy, screen, monitor)
- }
-
- Bool
--SDL_NAME(XF86VidModeGetViewPort)(dpy, screen, x, y)
-- Display* dpy;
-- int screen;
-- int *x, *y;
-+SDL_NAME(XF86VidModeGetViewPort)(Display *dpy, int screen, int *x, int *y)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeGetViewPortReply rep;
-@@ -1053,10 +1055,7 @@ SDL_NAME(XF86VidModeGetViewPort)(dpy, screen, x, y)
- }
-
- Bool
--SDL_NAME(XF86VidModeSetViewPort)(dpy, screen, x, y)
-- Display* dpy;
-- int screen;
-- int x, y;
-+SDL_NAME(XF86VidModeSetViewPort)(Display *dpy, int screen, int x, int y)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeSetViewPortReq *req;
-@@ -1077,11 +1076,14 @@ SDL_NAME(XF86VidModeSetViewPort)(dpy, screen, x, y)
- }
-
- Bool
--SDL_NAME(XF86VidModeGetDotClocks)(dpy, screen,
-- flagsPtr, numclocksPtr, maxclocksPtr, clocksPtr)
-- Display* dpy;
-- int screen;
-- int *flagsPtr, *numclocksPtr, *maxclocksPtr, *clocksPtr[];
-+SDL_NAME(XF86VidModeGetDotClocks)(
-+ Display *dpy,
-+ int screen,
-+ int *flagsPtr,
-+ int *numclocksPtr,
-+ int *maxclocksPtr,
-+ int *clocksPtr[]
-+)
- {
- XExtDisplayInfo *info = find_display (dpy);
- xXF86VidModeGetDotClocksReply rep;
-
-From e738cfffced8a006094d55337d917386582ada47 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sat, 15 Oct 2022 15:10:48 -0700
-Subject: [PATCH 2/2] Xext: Fix function declarations without a prototype
-
-This is not supported with the upcoming clang 16.
-
-error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Werror,-Wdeprecated-non-prototype]
-
-reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
----
- src/video/Xext/XME/xme.c | 2 +-
- src/video/Xext/Xinerama/Xinerama.c | 3 ++-
- src/video/Xext/Xv/Xv.c | 6 +++---
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c
-index 2cead35ad..bb8d04d48 100644
---- a/src/video/Xext/XME/xme.c
-+++ b/src/video/Xext/XME/xme.c
-@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME;
- /*
- * find_display - locate the display info block
- */
--static int XiGMiscCloseDisplay();
-+static int XiGMiscCloseDisplay(Display*, XExtCodes*);
-
- static XExtensionHooks xigmisc_extension_hooks = {
- NULL, /* create_gc */
-diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c
-index 4ff42ebfe..57f64b9c3 100644
---- a/src/video/Xext/Xinerama/Xinerama.c
-+++ b/src/video/Xext/Xinerama/Xinerama.c
-@@ -50,7 +50,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
- #define PanoramiXSimpleCheckExtension(dpy,i) \
- XextSimpleCheckExtension (dpy, i, panoramiX_extension_name)
-
--static int close_display();
-+static int close_display(Display*, XExtCodes*);
-+
- static /* const */ XExtensionHooks panoramiX_extension_hooks = {
- NULL, /* create_gc */
- NULL, /* copy_gc */
-diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c
-index 7147b9e8c..c254a1dc2 100644
---- a/src/video/Xext/Xv/Xv.c
-+++ b/src/video/Xext/Xv/Xv.c
-@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName;
- #define XvCheckExtension(dpy, i, val) \
- XextCheckExtension(dpy, i, xv_extension_name, val)
-
--static char *xv_error_string();
--static int xv_close_display();
--static Bool xv_wire_to_event();
-+static char *xv_error_string(Display*, int, XExtCodes*, char*, int);
-+static int xv_close_display(Display*, XExtCodes*);
-+static Bool xv_wire_to_event(Display*, XEvent*, xEvent*);
-
- static XExtensionHooks xv_extension_hooks = {
- NULL, /* create_gc */
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
deleted file mode 100644
index 93b741554ec3..000000000000
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-MY_COMMIT="99d7f1d1c5492f0fb3c799255042ca7a3f4a5de4"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://libsdl.org/"
-SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SDL-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 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="aalib alsa custom-cflags dga fbcon +joystick libcaca nas opengl oss pulseaudio +sound static-libs tslib +video X xinerama xv"
-
-RDEPEND="
- aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
- nas? (
- >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- )
- opengl? (
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- )
- tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- nas? ( x11-base/xorg-proto )
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- pulseaudio? ( virtual/pkgconfig )
- x86? (
- || (
- >=dev-lang/yasm-0.6.0
- >=dev-lang/nasm-0.98.39-r3
- )
- )"
-
-S=${WORKDIR}/SDL-1.2-${MY_COMMIT}
-
-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
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
- "${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
- "${FILESDIR}"/${PN}-$(ver_cut 1-3)-slibtool.patch
- "${FILESDIR}"/${PN}-$(ver_cut 1-3)-strict-prototypes.patch
-)
-
-DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
-
-HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
-
-src_prepare() {
- default
-
- if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
- # GCC at least has no idea what -fpascal-strings is
- sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die
- # We have trouble building against Frameworks with GCC for now (no Blocks support, etc)
- # error: unknown type name ‘CGImageSourceAnimationBlock’
- sed -i \
- -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \
- -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \
- configure.ac || die
- fi
-
- AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=
-
- if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
- # We can't build against Cocoa because we lack Blocks + Objective C++ support in
- # GCC (for now)
- use video && myconf="${myconf} --disable-video-cocoa"
- # CD support drags in audio
- myconf="${myconf} --disable-cdrom"
- else
- myconf="${myconf} --enable-cdrom"
- fi
-
- 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-threads \
- --enable-timers \
- --enable-file \
- --enable-cpuinfo \
- --disable-alsa-shared \
- --disable-esd-shared \
- --disable-sndio \
- --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() {
- use static-libs || find "${ED}" -type f -name "*.la" -delete || die
- einstalldocs
-}
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20221103.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20221103.ebuild
deleted file mode 100644
index 7ce5e30fd66f..000000000000
--- a/media-libs/libsdl/libsdl-1.2.15_p20221103.ebuild
+++ /dev/null
@@ -1,166 +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 toolchain-funcs
-
-MY_COMMIT="b637671eff3d7c8e7a527ad72b1108824c1eee8b"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://libsdl.org/"
-SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SDL-${PV}.tar.gz"
-S="${WORKDIR}"/SDL-1.2-${MY_COMMIT}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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="aalib alsa custom-cflags dga fbcon +joystick libcaca nas opengl oss pulseaudio +sound static-libs tslib +video X xinerama xv"
-
-RDEPEND="
- aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
- nas? (
- >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- )
- opengl? (
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- )
- tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="
- ${RDEPEND}
- nas? ( x11-base/xorg-proto )
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="
- pulseaudio? ( virtual/pkgconfig )
- x86? (
- || (
- >=dev-lang/yasm-0.6.0
- >=dev-lang/nasm-0.98.39-r3
- )
- )"
-
-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
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
- "${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
-)
-
-DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
-
-HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
-
-src_prepare() {
- default
-
- if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
- # GCC at least has no idea what -fpascal-strings is
- sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die
- # We have trouble building against Frameworks with GCC for now (no Blocks support, etc)
- # error: unknown type name ‘CGImageSourceAnimationBlock’
- sed -i \
- -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \
- -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \
- configure.ac || die
- fi
-
- AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=
-
- if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
- # We can't build against Cocoa because we lack Blocks + Objective C++ support in
- # GCC (for now)
- use video && myconf="${myconf} --disable-video-cocoa"
- # CD support drags in audio
- myconf="${myconf} --disable-cdrom"
- else
- myconf="${myconf} --enable-cdrom"
- fi
-
- 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-threads \
- --enable-timers \
- --enable-file \
- --enable-cpuinfo \
- --disable-alsa-shared \
- --disable-esd-shared \
- --disable-sndio \
- --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() {
- use static-libs || find "${ED}" -type f -name "*.la" -delete || die
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-03 10:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-16 12:16 [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/, media-libs/libsdl/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2023-05-03 10:12 Sam James
2021-07-25 1:36 Ionen Wolkens
2021-04-01 23:04 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox