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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 -}
