diff options
Diffstat (limited to 'media-libs')
16 files changed, 7 insertions, 1412 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex eb5cf360905f..c8cdc2884ed4 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index 0af5b400b91a..e76fd2b1d0af 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,13 +1,7 @@ AUX libsdl-1.2.15-gamma.patch 1339 BLAKE2B 83e0d10fc4396ce992c8f59043e2380921a44dac84d305cd3108dc6989de23aef7f1442b162c8f8392846630c3df6a725bb54cf1ead9d6ce2ffe3bc6df735a38 SHA512 0717e8eea7a9a1bcadb56c4a51023142d57718ccfff4e372faba3e28ce17b3e32caa8a8ffc8054c8b49bab566a44fd46f5eaf97b778ba6ec991d845d4ae464ce AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d832d68d611c1cd4fb20fa70b5bee641204a4ff7b51eff47f6a4e94193d1cad2f82bdb64a4d73582c932a3661870e3cb SHA512 95af8c3dac4fdea5bad92c044a311efaae02a46e1c5bfa84dadee7b3fab6b48f4dcf12ca6e581429decb479de21ec6167c59b215fb3a398fb82151aa4c3fb432 -AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66c81a70e7ab7366cedc38d11641f7ab68699d5fa2ea466a2e99c5cd778bb949114a5c5a4190e37f8fc86060962a8bf4 SHA512 e020a8d9a4fe2e74884b0aa8e69778dbbf2b60c70181767f84404038a07ca55956794b19ad8d3a4e5211bf6ecf05ec65712a588076fe9467442f21b99baca4fe -AUX libsdl-1.2.15-strict-prototypes.patch 10377 BLAKE2B d0c029a3a4ecade9300d5ca4bb40a962fe0a89c1468ee9109e0552975153f8f9d8a5bf6c7a387af52513b75dc74cf53c6c727e1da372aedb85dd1ff69eb25249 SHA512 2c4c6b5aa8cdda8b49718457e25a7d86de3371be5589c061358a221d2c99fec1e8cb4b27e6850b4353f7ec36b1e226c4c553ed39927f30d8692481d5c21774e6 -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 -EBUILD libsdl-1.2.15_p20210224.ebuild 5059 BLAKE2B 1dc2cdebb3c5053b32b575abb49193c0feeaf1007c7446bb5e1c023b267785cf92c0503793572b840de822ead7936bc3387b890b80370eca5e8b20fc2a83398b SHA512 f676a7866500b2ee49e7da7b7b0d922b51dd9ae2477f847961590a88211655394537f0ddac7fab0b3cf4b52973e192bc15788841f92459d53407392369eb47b2 -EBUILD libsdl-1.2.15_p20221103.ebuild 4960 BLAKE2B 3464a6523798271f547da6a856910d75a123f5f200e36ffb04f4ca77b94d42c7739cd8c6e8e02be0b3a31c381ed485e43d250c2539a8e0ffeaa7dccecdccc5b4 SHA512 ed05b921ae942f7843bf970f9a7d082582eb742980cfdf25556847182ec7cd71bd006108b27e15d9575b4b66f9b04dae3252f76e153f21e221cb3297ee2f06a0 EBUILD libsdl-1.2.15_p20221201.ebuild 4953 BLAKE2B 54575a80085622fdc111be48175dfe19ee9c95a7bc82291dafaef72bef8333eb8ce6a70338572a73390c6cff74973c27b92fb645236e9fbebe02fcbf4683329b SHA512 dfa19a7c9ff3a75ef79249a8cd15a51127e8b1b735338346746f59854907e56cd67030545a5e94834fb67620987e83edadfbd778d6a0ba8604f6843a8820a35b -EBUILD libsdl-1.2.60.ebuild 1010 BLAKE2B ce0348dd6a384d9085715916175f0b7b692b6819e2168af98c92ba8900fc9280f39242d9eef7c9973662cedfeed074734b6fffb3b21c407862fcc23f02a4860d SHA512 9b3ff3720c6719809faca291e94cd3316a6dc879398b5e47adea92b5a719f3a29b1cbc22e16f72c90f7ec55715156832b1a521a25fad3133fe67864e356e815e +EBUILD libsdl-1.2.60.ebuild 1047 BLAKE2B ce2d1dfa6ccfc577b55a59d993291dcecef2bb238d411b6558e93f84ac9f3cb4fd77e04d3db35227d2751b96429194c15e5fc28806451cbe59c9d64c3bbf6aa1 SHA512 bb5e8f36c9f028173f2796d211f6ea7811ad8425a223b5d5f5cc22c8a25af0f85f01c36111e405fa97f5135f80067f2fb0b64e9d525bfd3e3d33fc5ae3f08e36 MISC metadata.xml 1499 BLAKE2B 8dd0fbe5e6f71338330483fa433316564c420e0cb9f52297fcb6c34a452bae23e25963effd2caa43c099e11759eca3c65dff64b5957460271d27b188688887cc SHA512 be99021a150b521998a455243f68d89c980bf5610bb67d1475746d7b64b009baa83294c1b2ddc101f3c164e22765ce073b9e27c07ca5bbbe9eaa4f75dc4fd305 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 -} diff --git a/media-libs/libsdl/libsdl-1.2.60.ebuild b/media-libs/libsdl/libsdl-1.2.60.ebuild index 2e5682244867..731d90f20e97 100644 --- a/media-libs/libsdl/libsdl-1.2.60.ebuild +++ b/media-libs/libsdl/libsdl-1.2.60.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${ LICENSE="ZLIB" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv" # IUSE dropped from real SDL1: aalib custom-cflags dga fbcon libcaca nas oss pulseaudio static-libs tslib xinerama xv IUSE="alsa +joystick opengl +sound test +video X" REQUIRED_USE="test? ( joystick opengl sound video )" diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 017ac04317f1..0fda7f7a533b 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,16 +1,8 @@ AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad357093bc08a5c1767edb1c81c9099fd27aadbf0525ab0666a560a3c728983f425864f1f513693801a8fa50edde5d32a3703 SHA512 f578e5ab1852705cfad4bf8b4a8aa36fb34637f3b26b83a9821716d08fc1152d7ea18daea623f540c860cd7a7566c4b8902b2cac2ae6d541e36e7bd15363d58a -AUX libsdl2-2.24.0-clang-15-configure.patch 768 BLAKE2B f21f01da86fed778f5ef88cfc692b0588d1ea6de1bd05c0f6d1b9b480175c79a1f7bcc62cca123beb387f174fcf70676997f1e37b6b2baef59143b9222db0d5d SHA512 7d1822a05fae900f572809ba7de7a46cffaa03be7ec2f6d4b1cfa3b164a468ad7c4bea2606da32598519d2f8abb0d9bfcc3268f2cb7858de784244dbe0a68804 -AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15 -AUX libsdl2-2.24.0-fix-build-without-joystick.patch 1263 BLAKE2B 9421e7056496fb46393b53e0d7da85ae0169e5dc769fc5b2be045127eaab13d69ab5d5e00f1a4f2c2223e03bc2cf58fe17f377dad39f35afcccd7ef4f69a94df SHA512 2c24c90503b62c30bd3aa47285d4cbb6372beacc5561390ad998a44fd5342a50ade2983e0731a3a63696c03f5b348ae711ea6e8ab59d5ada64afd0079e5d6d22 -AUX libsdl2-2.26.0-wayland.patch 963 BLAKE2B 643115ddc40ebd6a35e6411d3db02ffc6c76c96f50c0a68df7cacf900f5d1df8d34b90c63607f1369a1bb3b5735a061779a0682ecb919b306c974a7f07a1077d SHA512 e5c4c41858945d8b6e0e5e7f167935e56360f732330832a66afd1fdc9b52db2700a0602ac1136e65380f9c9a0b444d2ae773b8c6c9312223fa48cbf290b05a9f -DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 -DIST SDL2-2.24.2.tar.gz 7525041 BLAKE2B bdd6fdffca8f5360b96bba31b2f64e5b01f1081c184070fba6a0a52b7ee5f6d08ca5d647a40bbfb9b2ba49374ce7d7f21bc60e798017fa79d673ab048f5a281c SHA512 6f3ce5c4121a17d4e85a087c9010fdff37eb4e381517dc0d64fff955cf7041016aa1f37ac2f14a335bfaac13cb92031431eb31bfa0f00a6827c177b5a671f841 -DIST SDL2-2.26.0.tar.gz 8085459 BLAKE2B 4971cef0d34706dd02eff5277fd58b35523ee3b1d860999b37ddf4dbc463f493859a43325c4faa9bd048c519d49788adb3dd7f38e6b29eb635c0e0e405c944e9 SHA512 b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf DIST SDL2-2.26.2.tar.gz 8084120 BLAKE2B 84a972c634a084350173fcc5da69cc9b402f83b969e6611aa47cc81dc01520508ba813e5910299702c7139a0426462e607e97524510f61afe91d46a7cc9da8dc SHA512 5af6f40790560651a7c6c1f7dae3b97d55c5ab372f02dc6024cb7ad3c996a6fac8a7aba1d510ad994cc5d4ba91efd03010d8678104ed44f55ef948011bc66d28 DIST SDL2-2.26.3.tar.gz 8084159 BLAKE2B aa6f98bb83cc9774a51bd0de58b3076f553fca23142f1875e455c6c0e2d098cae442cfdb538c714494d36c5eb9e25c6a7063b06e6dd4cb210bbe34f58dafb95e SHA512 26c10fe004e47a498878ff2aa80bab7f57798d6b0f950b085409818d4c758010be7b49f5e0f43dd0afe2b9d18f94ad52d1e212a1d55505ce6d7fcc371fdda7d8 -EBUILD libsdl2-2.24.0-r2.ebuild 6525 BLAKE2B 6643135d04b333c6837736b50cd0a4367dc8982886e76fb1830c58df1b2bcd0649cf7e2870c5b638f89d9839710d5feb68d647d7e08602995c7a7fbbcd7e6666 SHA512 5d019cd23df2edb4a4906520040d1aa81477f9860cdcb867e7393549a33bb0685f7f8918ae19550d7a44fb6aa5de37b654b4439f4810be6d6b85b4abcf3c59bd -EBUILD libsdl2-2.24.2.ebuild 6435 BLAKE2B 97824c177ba5283e4aa4a76df8b08e5ce1b76e328bcabd94e55f2c6dbac4a9992e2f2d2e6a63554746a8101b4435cd4ea31930c0c3e992a393c3e48794d0bb01 SHA512 bc2c3a8833b68ee6f4504ccb319cc389f72ab5ec92a125669d42f0ea83e1ffb254f1e412e25b55432df370440b7ba38904f895bdec38ffb8431ac95445e2cf56 -EBUILD libsdl2-2.26.0.ebuild 6496 BLAKE2B 4efe9b4a44056e23aad1d1d5eb11887b8773451869c2332123b6d8bbb91d3324501cb52841b1d8d4c86fd5783e113ed3f55e953c3bcdd5a6ba25f12f01536044 SHA512 a735efb376e357093e0b530e88d04ff35c44c4fed386e12e2334f6d5dc7d125963fc0de55b047b76318a111a0d06d068bc9b957943c0a4ad10957f351416077c -EBUILD libsdl2-2.26.2.ebuild 6456 BLAKE2B da09a54fc11f42e5ea220aa1ad489973847dc122642b2bffa98b1c4f5666bd7052934caa68b8d6b71ce264e27c494ecd570cb1930c5098d2b499b745173067ac SHA512 dd53f32f90e0c5a3ae2e451570323887855d6f9595871fdd70e632ee419ba9dcc09385ba87e16634a876a39e3c317332fb561c8433e279b65064871f5fc5f924 +DIST SDL2-2.26.5.tar.gz 8085012 BLAKE2B f0363306ee031d399001259ac32e62cea2130d7aafb4594d8a11b76e073630aa43b7abe288eed54c77c46604f2fd4e4fcd455cccf29e847d963ff50153d8d707 SHA512 0f37b443950bc89c3f3add2fc9a9970f42b47e933c106a1d676d1715c520125d5725ffcb9ff85bcf66ac3ff78d9d43d994f9c1935b7c0fd7951e10e251936bcc +EBUILD libsdl2-2.26.2.ebuild 6455 BLAKE2B 64dfa0734239285ddbd8fcfc49269f5b414b0723e3b6008bdfcf8bac838c2b1901ef0dc512c7eba91b9a163e1c72c69686180c6abd55c7758916359b6e9ad0bb SHA512 42be25f63355669f5b9de0b3b001e756795b689c55884377a3ea44f9797e3345417fc11a6f7ea597ebd4322da51f09bf1247433ef5cf1d5fdeaf2e9ec3654971 EBUILD libsdl2-2.26.3.ebuild 6462 BLAKE2B a121f982cefc81f7f1531ca10f93d77da636cb306f62dc7a2884aecc3e6cb920f4ed64098493bfafa1b25e7a8dbc64e3437dac8d7a46e5516b729773c4a81e89 SHA512 54df550b8b14b9570a3f79a0766bc53fdcdb4aef8128b028e85307c833f0d424a6c460b5f25cb0b08cbcdfdca95c7b4be084011bf7ec1feccaf6a7ce03e8c9e6 +EBUILD libsdl2-2.26.5.ebuild 6462 BLAKE2B a121f982cefc81f7f1531ca10f93d77da636cb306f62dc7a2884aecc3e6cb920f4ed64098493bfafa1b25e7a8dbc64e3437dac8d7a46e5516b729773c4a81e89 SHA512 54df550b8b14b9570a3f79a0766bc53fdcdb4aef8128b028e85307c833f0d424a6c460b5f25cb0b08cbcdfdca95c7b4be084011bf7ec1feccaf6a7ce03e8c9e6 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1 diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch deleted file mode 100644 index f5dc8ea6b50b..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/libsdl-org/SDL/pull/6217 - -From 04b9178a6746cfe9e4f8708befd3e00f95912a18 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Mon, 12 Sep 2022 18:02:21 +0100 -Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15 - (implicit function declarations) - -Clang 15 makes implicit function declarations fatal by default which -leads to some configure tests silently failing/returning -the wrong result. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -2728,6 +2728,7 @@ CheckInputKD() - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <linux/kd.h> - #include <linux/keyboard.h> -+ #include <sys/ioctl.h> - ]], [[ - struct kbentry kbe; - kbe.kb_table = KG_CTRL; - diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch deleted file mode 100644 index 59353b98e06d..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch +++ /dev/null @@ -1,145 +0,0 @@ -https://github.com/libsdl-org/SDL/commit/329794daf3f58088b56a64bdfa36b2021903be20 -https://github.com/libsdl-org/SDL/commit/62302d08f13ca5303135505c6b355afbbf069745 - -From: Anonymous Maarten <anonymous.maarten@gmail.com> -Date: Sun, 21 Aug 2022 04:03:32 +0200 -Subject: [PATCH] cmake: add library directories & pthread to imported targets - of sdl2-config.cmake - -This fixes linking to SDL2::SDL2-static on systems where external libraries such as X11 are not in a standard location. -Pthread also needs special care. ---- a/sdl2-config.cmake.in -+++ b/sdl2-config.cmake.in -@@ -39,18 +39,25 @@ unset(bindir) - unset(libdir) - unset(includedir) - --set(_sdl2_libraries "@SDL_LIBS@") --set(_sdl2_static_private_libs "@SDL_STATIC_LIBS@") -+set(_sdl2_libraries_in "@SDL_LIBS@") -+set(_sdl2_static_private_libs_in "@SDL_STATIC_LIBS@") - --# Convert _sdl2_libraries to list and keep only libraries --string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries}") -+# Convert _sdl2_libraries to list and keep only libraries + library directories -+string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries_in}") - string(REGEX REPLACE "^-l" "" _sdl2_libraries "${_sdl2_libraries}") - string(REGEX REPLACE ";-l" ";" _sdl2_libraries "${_sdl2_libraries}") -+string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_libdirs "${_sdl2_libraries_in}") -+string(REGEX REPLACE "^-L" "" _sdl2_libdirs "${_sdl2_libdirs}") -+string(REGEX REPLACE ";-L" ";" _sdl2_libdirs "${_sdl2_libdirs}") -+list(APPEND _sdl2_libdirs "${SDL2_LIBDIR}") - --# Convert _sdl2_static_private_libs to list and keep only libraries --string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)" _sdl2_static_private_libs "${_sdl2_static_private_libs}") -+# Convert _sdl2_static_private_libs to list and keep only libraries + library directories -+string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)|(-pthread)" _sdl2_static_private_libs "${_sdl2_static_private_libs_in}") - string(REGEX REPLACE "^-l" "" _sdl2_static_private_libs "${_sdl2_static_private_libs}") - string(REGEX REPLACE ";-l" ";" _sdl2_static_private_libs "${_sdl2_static_private_libs}") -+string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_static_private_libdirs "${_sdl2_static_private_libs_in}") -+string(REGEX REPLACE "^-L" "" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}") -+string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}") - - if(_sdl2_libraries MATCHES ".*SDL2main.*") - list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main) -@@ -103,6 +110,7 @@ if(WIN32) - set_target_properties(SDL2::SDL2 PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}" -+ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_IMPLIB "${_sdl2_implib}" - IMPORTED_LOCATION "${_sdl2_dll}" -@@ -122,6 +130,7 @@ else() - set_target_properties(SDL2::SDL2 PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}" -+ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${_sdl2_shared}" - ) -@@ -142,6 +151,7 @@ if(EXISTS "${_sdl2_static}") - IMPORTED_LOCATION "${_sdl2_static}" - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries};${_sdl2_static_private_libs}" -+ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs};${_sdl2_static_private_libdirs}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - ) - endif() - -From: Anonymous Maarten <anonymous.maarten@gmail.com> -Date: Wed, 24 Aug 2022 04:14:52 +0200 -Subject: [PATCH] cmake: always create SDL2::SDL2main target in autotools' - cmake config script - ---- a/sdl2-config.cmake.in -+++ b/sdl2-config.cmake.in -@@ -62,38 +62,39 @@ string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_priv - if(_sdl2_libraries MATCHES ".*SDL2main.*") - list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main) - list(INSERT SDL2_STATIC_LIBRARIES 0 SDL2::SDL2main) -- set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}) -- if(EXISTS "${_sdl2main_library}") -- set(SDL2MAIN_LIBRARY SDL2::SDL2main) -- if(NOT TARGET SDL2::SDL2main) -- add_library(SDL2::SDL2main STATIC IMPORTED) -- set_target_properties(SDL2::SDL2main -- PROPERTIES -- IMPORTED_LOCATION "${_sdl2main_library}" -- ) -- if(WIN32) -- # INTERFACE_LINK_OPTIONS needs CMake 3.13 -- cmake_minimum_required(VERSION 3.13) -- # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker. -- if(CMAKE_SIZEOF_VOID_P EQUAL 4) -- set_target_properties(SDL2::SDL2main -- PROPERTIES -- INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16" -- ) -- else() -- set_target_properties(SDL2::SDL2main -- PROPERTIES -- INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain" -- ) -- endif() -+endif() -+ -+set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}) -+if(EXISTS "${_sdl2main_library}") -+ set(SDL2MAIN_LIBRARY SDL2::SDL2main) -+ if(NOT TARGET SDL2::SDL2main) -+ add_library(SDL2::SDL2main STATIC IMPORTED) -+ set_target_properties(SDL2::SDL2main -+ PROPERTIES -+ IMPORTED_LOCATION "${_sdl2main_library}" -+ ) -+ if(WIN32) -+ # INTERFACE_LINK_OPTIONS needs CMake 3.13 -+ cmake_minimum_required(VERSION 3.13) -+ # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker. -+ if(CMAKE_SIZEOF_VOID_P EQUAL 4) -+ set_target_properties(SDL2::SDL2main -+ PROPERTIES -+ INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16" -+ ) -+ else() -+ set_target_properties(SDL2::SDL2main -+ PROPERTIES -+ INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain" -+ ) - endif() - endif() -- set(SDL2_SDL2main_FOUND TRUE) -- else() -- set(SDL2_SDL2main_FOUND FALSE) - endif() -- unset(_sdl2main_library) -+ set(SDL2_SDL2main_FOUND TRUE) -+else() -+ set(SDL2_SDL2main_FOUND FALSE) - endif() -+unset(_sdl2main_library) - - # Remove SDL2 since this is the "central" library - # Remove SDL2main since this will be provided by SDL2::SDL2main (if available) - diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch deleted file mode 100644 index 0370f66ef8c9..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch +++ /dev/null @@ -1,32 +0,0 @@ -# https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51 -From 71fb91f7e43c5f046a037bf5ca59214d93fe2d51 Mon Sep 17 00:00:00 2001 -From: Cameron Gutman <aicommander@gmail.com> -Date: Mon, 26 Sep 2022 21:38:09 -0500 -Subject: [PATCH] evdev: Fix build with libudev and joystick subsystem disabled - ---- - src/core/linux/SDL_evdev_capabilities.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/core/linux/SDL_evdev_capabilities.h b/src/core/linux/SDL_evdev_capabilities.h -index 26fa7400485b..990ebe01b872 100644 ---- a/src/core/linux/SDL_evdev_capabilities.h -+++ b/src/core/linux/SDL_evdev_capabilities.h -@@ -25,8 +25,6 @@ - #ifndef SDL_evdev_capabilities_h_ - #define SDL_evdev_capabilities_h_ - --#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) -- - #include <linux/input.h> - - /* A device can be any combination of these classes */ -@@ -53,8 +51,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)], - unsigned long bitmask_key[NBITS(KEY_MAX)], - unsigned long bitmask_rel[NBITS(REL_MAX)]); - --#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */ -- - #endif /* SDL_evdev_capabilities_h_ */ - - /* vi: set ts=4 sw=4 expandtab: */ diff --git a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch deleted file mode 100644 index 6727a3e4f4bc..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/libsdl-org/SDL/pull/6608 -https://github.com/libsdl-org/SDL/issues/6589 - -From e99b5df49ec3bddd1d72889d682fedfe0da91307 Mon Sep 17 00:00:00 2001 -From: Frank Praznik <frank.praznik@gmail.com> -Date: Wed, 23 Nov 2022 23:11:25 -0500 -Subject: [PATCH] wayland: Fix build when not using the shared Wayland - libraries - -Explicitly include the Wayland protocol headers when statically linking against the Wayland libraries or older system headers might be used instead of the local versions. ---- a/src/video/wayland/SDL_waylanddyn.h -+++ b/src/video/wayland/SDL_waylanddyn.h -@@ -166,6 +166,13 @@ void SDL_WAYLAND_UnloadSymbols(void); - - #else /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ - -+/* -+ * These must be included before libdecor.h, otherwise the libdecor header -+ * pulls in the system Wayland protocol headers instead of ours. -+ */ -+#include "wayland-client-protocol.h" -+#include "wayland-egl.h" -+ - #ifdef HAVE_LIBDECOR_H - #include <libdecor.h> - #endif - diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild deleted file mode 100644 index 6ca1a8b7d87a..000000000000 --- a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild +++ /dev/null @@ -1,230 +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 - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - vulkan? ( video ) - wayland? ( gles2 ) - xscreensaver? ( X )" - -CDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] ) - gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -RDEPEND="${CDEPEND} - vulkan? ( media-libs/vulkan-loader )" -DEPEND="${CDEPEND} - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch - "${FILESDIR}"/${PN}-2.24.0-clang-15-configure.patch - "${FILESDIR}"/${P}-cmake-target-fixes.patch - "${FILESDIR}"/${P}-fix-build-without-joystick.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads pthreads) - --enable-timers - --enable-file - --enable-loadso - --enable-cpuinfo - --enable-assembly - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_sse ssemath) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable X video-x11-xfixes) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # Do not delete the static .a libraries here as some are - # mandatory. They may be needed even when linking dynamically. - find "${ED}" -type f -name "*.la" -delete || die - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.24.2.ebuild b/media-libs/libsdl2/libsdl2-2.24.2.ebuild deleted file mode 100644 index fa38ef1023de..000000000000 --- a/media-libs/libsdl2/libsdl2-2.24.2.ebuild +++ /dev/null @@ -1,228 +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 - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - vulkan? ( video ) - wayland? ( gles2 ) - xscreensaver? ( X )" - -CDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] ) - gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -RDEPEND="${CDEPEND} - vulkan? ( media-libs/vulkan-loader )" -DEPEND="${CDEPEND} - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch - "${FILESDIR}"/${PN}-2.24.0-fix-build-without-joystick.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads pthreads) - --enable-timers - --enable-file - --enable-loadso - --enable-cpuinfo - --enable-assembly - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_sse ssemath) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable X video-x11-xfixes) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # Do not delete the static .a libraries here as some are - # mandatory. They may be needed even when linking dynamically. - find "${ED}" -type f -name "*.la" -delete || die - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.26.2.ebuild b/media-libs/libsdl2/libsdl2-2.26.2.ebuild index 2e20bdd6b4fe..96d91442f200 100644 --- a/media-libs/libsdl2/libsdl2-2.26.2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.26.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" REQUIRED_USE=" diff --git a/media-libs/libsdl2/libsdl2-2.26.0.ebuild b/media-libs/libsdl2/libsdl2-2.26.5.ebuild index c65bbfda6547..c442077bf23e 100644 --- a/media-libs/libsdl2/libsdl2-2.26.0.ebuild +++ b/media-libs/libsdl2/libsdl2-2.26.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -96,7 +96,6 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${PN}-2.0.16-static-libs.patch - "${FILESDIR}"/${P}-wayland.patch ) S="${WORKDIR}/${MY_P}" |