Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] SDL: replace with `sdl12-compat`
@ 2025-02-03 14:09 ahesford
  2025-02-03 14:15 ` [PR PATCH] [Updated] " ahesford
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: ahesford @ 2025-02-03 14:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages sdl12-compat
https://github.com/void-linux/void-packages/pull/54199

SDL: replace with `sdl12-compat`
Especially now that SDL 3 is available, let's completely abandon the dead SDL 1.2 in favor of the official compat library that uses SDL 2 on the backend. This supersedes https://github.com/void-linux/void-packages/pull/53761.

Four packages that depend on SDL fail to build because their distfiles cannot be fetched:
- `agg` (only required by `desumume`)
- `ballerburg` (leaf package, some game)
- `swars` (leaf package, only for `i686`, some game)
- `xrick` (leaf package, restricted)

I've marked the first three broken to highlight the existing issues. Note that, because `sdl12-compat` is ABI compatible with SDL 1.2, people with any of these packages installed should still be able to upgrade seamlessly and we should avoid any shlib staging.

#### Testing the changes
- I tested the changes in this PR: **briefly**, works as expected with `dosbox`.

A patch file from https://github.com/void-linux/void-packages/pull/54199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sdl12-compat-54199.patch --]
[-- Type: text/x-diff, Size: 63768 bytes --]

From 22722da4f52fb33d652feb7e165195270b898111 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 21:49:15 -0500
Subject: [PATCH 01/39] SDL: replace with sdl12-compat

New package: sdl12-compat-1.2.68.
---
 common/shlibs                                 |   2 +-
 srcpkgs/SDL                                   |   1 +
 srcpkgs/SDL-devel                             |   2 +-
 .../patches/SDL-1.2.10-GrabNotViewable.patch  |  22 -
 srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch |  24 --
 srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch    | 375 ------------------
 srcpkgs/SDL/template                          |  44 --
 srcpkgs/sdl12-compat-devel                    |   1 +
 srcpkgs/sdl12-compat/patches/sdl-config.patch |  11 +
 srcpkgs/sdl12-compat/template                 |  46 +++
 10 files changed, 61 insertions(+), 467 deletions(-)
 create mode 120000 srcpkgs/SDL
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
 delete mode 100644 srcpkgs/SDL/template
 create mode 120000 srcpkgs/sdl12-compat-devel
 create mode 100644 srcpkgs/sdl12-compat/patches/sdl-config.patch
 create mode 100644 srcpkgs/sdl12-compat/template

diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..c03c19f37b8cde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -410,7 +410,7 @@ libpostproc.so.55 libpostproc-4.0_1
 libavcodec.so.58 libavcodec-4.0_1
 libavutil.so.56 libavutil-4.0_1
 libavfilter.so.7 libavfilter-4.0_1
-libSDL-1.2.so.0 SDL-1.2.14_1
+libSDL-1.2.so.0 sdl12-compat-1.2.68_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.157 x264-20190507.2245_1
 libopenh264.so.7 openh264-2.4.1_1
diff --git a/srcpkgs/SDL b/srcpkgs/SDL
new file mode 120000
index 00000000000000..901c98ddbd0f94
--- /dev/null
+++ b/srcpkgs/SDL
@@ -0,0 +1 @@
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/SDL-devel b/srcpkgs/SDL-devel
index bf798a56736d19..901c98ddbd0f94 120000
--- a/srcpkgs/SDL-devel
+++ b/srcpkgs/SDL-devel
@@ -1 +1 @@
-SDL
\ No newline at end of file
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch b/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
deleted file mode 100644
index a05c37044c68ca..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
-viewable. Patch provided by <pbonzini@redhat.com>.
-See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
-
---- a/src/video/x11/SDL_x11wm.c	2007-12-31 04:48:13.000000000 +0000
-+++ b/src/video/x11/SDL_x11wm.c	2009-01-15 10:27:14.000000000 +0000
-@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, 
- 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
- 						GrabModeAsync, GrabModeAsync,
- 						SDL_Window, None, CurrentTime);
--			if ( result == GrabSuccess ) {
-+			if ( result == GrabSuccess || result == GrabNotViewable ) {
- 				break;
- 			}
- 			SDL_Delay(100);
- 		}
- 		if ( result != GrabSuccess ) {
- 			/* Uh, oh, what do we do here? */ ;
-+			return(SDL_GRAB_OFF);
- 		}
- 		/* Now grab the keyboard */
- 		XGrabKeyboard(SDL_Display, WMwindow, True,
diff --git a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch b/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
deleted file mode 100644
index 5afa0a4059f91e..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
-+++ b/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
-@@ -3,7 +3,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
--libdir=@libdir@
- 
- @ENABLE_STATIC_FALSE@usage="\
- @ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
-@@ -45,11 +44,11 @@ while test $# -gt 0; do
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
--@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
- @ENABLE_STATIC_TRUE@      ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch b/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
deleted file mode 100644
index 94d13f9223001e..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
+++ /dev/null
@@ -1,375 +0,0 @@
---- a/configure        2012-01-19 07:30:12.000000000 +0100
-+++ b/configure  2018-11-27 22:58:07.344753821 +0100
-@@ -1514,6 +1514,7 @@
-   --disable-esdtest       Do not try to compile and run a test ESD program
-   --enable-esd-shared     dynamically load ESD audio support [default=yes]
-   --enable-pulseaudio     use PulseAudio [default=yes]
-+  --enable-sndio          use SNDIO [default=yes]
-   --enable-pulseaudio-shared
-                           dynamically load PulseAudio support [default=yes]
-   --enable-arts           support the Analog Real Time Synthesizer
-@@ -21000,6 +21001,23 @@
-     fi
- }
-
-+CheckSndio()
-+{
-+# Check whether --enable-sndio was given.
-+if test "${enable_sndio+set}" = set; then
-+  enableval=$enable_sndio;
-+else
-+  enable_sndio=yes
-+fi
-+
-+if test "x${enable_sndio}" = "xyes"; then :
-+  SOURCES="$SOURCES $srcdir/src/audio/sndio/SDL_sndioaudio.c"
-+  EXTRA_CFLAGS="$EXTRA_CFLAGS -DSDL_AUDIO_DRIVER_SNDIO=1"
-+  EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lsndio"
-+  have_audio=yes
-+fi
-+}
-+
- CheckPulseAudio()
- {
-     # Check whether --enable-pulseaudio was given.
-@@ -29550,6 +29568,7 @@
-         CheckMME
-         CheckALSA
-         CheckARTSC
-+        CheckSndio
-         CheckESD
-         CheckPulseAudio
-         CheckNAS
---- a/include/SDL_config.h.in	2018-11-27 21:52:07.645177938 +0100
-+++ b/include/SDL_config.h.in	2018-11-27 22:03:06.217107399 +0100
-@@ -184,6 +184,7 @@
- #undef SDL_AUDIO_DRIVER_QNXNTO
- #undef SDL_AUDIO_DRIVER_SNDMGR
- #undef SDL_AUDIO_DRIVER_SUNAUDIO
-+#undef SDL_AUDIO_DRIVER_SNDIO
- #undef SDL_AUDIO_DRIVER_WAVEOUT
- 
- /* Enable various cdrom drivers */
---- a/src/audio/SDL_audio.c	2018-11-27 21:52:07.646177937 +0100
-+++ b/src/audio/SDL_audio.c	2018-11-27 22:04:37.977097571 +0100
-@@ -42,6 +42,9 @@
- #if SDL_AUDIO_DRIVER_ALSA
- 	&ALSA_bootstrap,
- #endif
-+#if SDL_AUDIO_DRIVER_SNDIO
-+	&SNDIO_bootstrap,
-+#endif
- #if SDL_AUDIO_DRIVER_BSD
- 	&BSD_AUDIO_bootstrap,
- #endif
---- a/src/audio/SDL_sysaudio.h	2018-11-27 21:52:07.647177937 +0100
-+++ b/src/audio/SDL_sysaudio.h	2018-11-27 22:05:13.697093745 +0100
-@@ -105,6 +105,9 @@
- #if SDL_AUDIO_DRIVER_BSD
- extern AudioBootStrap BSD_AUDIO_bootstrap;
- #endif
-+#if SDL_AUDIO_DRIVER_SNDIO
-+extern AudioBootStrap SNDIO_bootstrap;
-+#endif
- #if SDL_AUDIO_DRIVER_PULSE
- extern AudioBootStrap PULSE_bootstrap;
- #endif
---- a/src/audio/sndio/SDL_sndioaudio.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/audio/sndio/SDL_sndioaudio.c	2013-12-19 10:24:18.000000000 +0100
-@@ -0,0 +1,243 @@
-+/*
-+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "SDL_config.h"
-+
-+/* Allow access to a raw mixing buffer */
-+
-+#ifdef HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
-+#include <unistd.h>
-+
-+#include "SDL_timer.h"
-+#include "SDL_audio.h"
-+#include "../SDL_audiomem.h"
-+#include "../SDL_audio_c.h"
-+#include "../SDL_audiodev_c.h"
-+#include "SDL_sndioaudio.h"
-+
-+/* The tag name used by sndio audio */
-+#define SNDIO_DRIVER_NAME         "sndio"
-+
-+/* Audio driver functions */
-+static int SNDIO_OpenAudio(_THIS, SDL_AudioSpec *spec);
-+static void SNDIO_WaitAudio(_THIS);
-+static void SNDIO_PlayAudio(_THIS);
-+static Uint8 *SNDIO_GetAudioBuf(_THIS);
-+static void SNDIO_CloseAudio(_THIS);
-+
-+/* Audio driver bootstrap functions */
-+
-+static int Audio_Available(void)
-+{
-+	struct sio_hdl *this_hdl;
-+	int available = 0;
-+
-+	if ( (this_hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0)) != NULL ) {
-+		sio_close(this_hdl);
-+		available = 1;
-+	}
-+
-+	return available;
-+}
-+
-+static void Audio_DeleteDevice(SDL_AudioDevice *device)
-+{
-+	SDL_free(device->hidden);
-+	SDL_free(device);
-+}
-+
-+static SDL_AudioDevice *Audio_CreateDevice(int devindex)
-+{
-+	SDL_AudioDevice *this;
-+
-+	/* Initialize all variables that we clean on shutdown */
-+	this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice));
-+	if ( this ) {
-+		SDL_memset(this, 0, (sizeof *this));
-+		this->hidden = (struct SDL_PrivateAudioData *)
-+				SDL_malloc((sizeof *this->hidden));
-+	}
-+	if ( (this == NULL) || (this->hidden == NULL) ) {
-+		SDL_OutOfMemory();
-+		if ( this ) {
-+			SDL_free(this);
-+		}
-+		return(0);
-+	}
-+	SDL_memset(this->hidden, 0, (sizeof *this->hidden));
-+
-+	/* Set the function pointers */
-+	this->OpenAudio = SNDIO_OpenAudio;
-+	this->WaitAudio = SNDIO_WaitAudio;
-+	this->PlayAudio = SNDIO_PlayAudio;
-+	this->GetAudioBuf = SNDIO_GetAudioBuf;
-+	this->CloseAudio = SNDIO_CloseAudio;
-+
-+	this->free = Audio_DeleteDevice;
-+
-+	hdl = NULL;
-+
-+	return this;
-+}
-+
-+AudioBootStrap SNDIO_bootstrap = {
-+	SNDIO_DRIVER_NAME, "sndio",
-+	Audio_Available, Audio_CreateDevice
-+};
-+
-+
-+
-+/* This function waits until it is possible to write a full sound buffer */
-+static void SNDIO_WaitAudio(_THIS)
-+{
-+	/* nothing, we're using the blocking api */
-+}
-+
-+static void SNDIO_PlayAudio(_THIS)
-+{
-+	int written;
-+
-+	/* Write the audio data */
-+	written = sio_write(hdl, mixbuf, mixlen);
-+	
-+	/* If we couldn't write, assume fatal error for now */
-+	if ( written == 0 ) {
-+		this->enabled = 0;
-+	}
-+#ifdef DEBUG_AUDIO
-+	fprintf(stderr, "Wrote %d bytes of audio data\n", written);
-+#endif
-+}
-+
-+static Uint8 *SNDIO_GetAudioBuf(_THIS)
-+{
-+	return(mixbuf);
-+}
-+
-+static void SNDIO_CloseAudio(_THIS)
-+{
-+	if ( mixbuf != NULL ) {
-+		SDL_FreeAudioMem(mixbuf);
-+		mixbuf = NULL;
-+	}
-+	if ( hdl != NULL ) {
-+		sio_close(hdl);
-+		hdl = NULL;
-+	}
-+}
-+
-+static int SNDIO_OpenAudio(_THIS, SDL_AudioSpec *spec)
-+{
-+	struct sio_par par;
-+
-+	mixbuf = NULL;
-+
-+	if ((hdl = sio_open(NULL, SIO_PLAY, 0)) == NULL) {
-+		SDL_SetError("sio_open() failed");
-+		return(-1);
-+	}
-+
-+	sio_initpar(&par);
-+
-+	switch (spec->format) {
-+	case AUDIO_S16LSB:
-+		par.bits = 16;
-+		par.sig = 1;
-+		par.le = 1;
-+		break;
-+	case AUDIO_S16MSB:
-+		par.bits = 16;
-+		par.sig = 1;
-+		par.le = 0;
-+		break;
-+	case AUDIO_S8:
-+		par.bits = 8;
-+		par.sig = 1;
-+		break;
-+	case AUDIO_U16LSB:
-+		par.bits = 16;
-+		par.sig = 0;
-+		par.le = 1;
-+		break;
-+	case AUDIO_U16MSB:
-+		par.bits = 16;
-+		par.sig = 0;
-+		par.le = 0;
-+		break;
-+	case AUDIO_U8:
-+		par.bits = 8;
-+		par.sig = 0;
-+		break;
-+	default:
-+		SDL_SetError("SNDIO unknown format");
-+		return(-1);
-+	}
-+
-+	par.rate = spec->freq;
-+	par.pchan = spec->channels;
-+	par.round = spec->samples;
-+	par.appbufsz = par.round * 2;
-+
-+	if (sio_setpar(hdl, &par) == 0) {
-+		SDL_SetError("sio_setpar() failed");
-+		return(-1);
-+	}
-+
-+	if (sio_getpar(hdl, &par) == 0) {
-+		SDL_SetError("sio_getpar() failed");
-+		return(-1);
-+	}
-+
-+	if (par.bits == 16) {
-+		if (par.sig && par.le) {
-+			spec->format = AUDIO_S16LSB;
-+		} else if (par.sig && !par.le) {
-+			spec->format = AUDIO_S16MSB;
-+		} else if (!par.sig && par.le) {
-+			spec->format = AUDIO_U16LSB;
-+		} else 
-+			spec->format = AUDIO_U16MSB;
-+	} else if (par.bits == 8) {
-+		spec->format = par.sig ? AUDIO_S8 : AUDIO_U8;
-+	} else {
-+		SDL_SetError("SNDIO couldn't configure a suitable format");
-+		return(-1);
-+	}
-+
-+	spec->freq = par.rate;
-+	spec->channels = par.pchan;
-+	spec->samples = par.round;
-+
-+	SDL_CalculateAudioSpec(spec);
-+
-+	/* Allocate mixing buffer */
-+	mixlen = spec->size;
-+	mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen);
-+	if ( mixbuf == NULL ) {
-+		return(-1);
-+	}
-+	SDL_memset(mixbuf, spec->silence, spec->size);
-+
-+	if ( sio_start(hdl) == 0 ) {
-+		SDL_SetError("sio_start() failed");
-+		return(-1);
-+	}
-+
-+	/* We're ready to rock and roll. :-) */
-+	return(0);
-+}
---- a/src/audio/sndio/SDL_sndioaudio.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/audio/sndio/SDL_sndioaudio.h	2013-12-15 02:57:55.000000000 +0100
-@@ -0,0 +1,50 @@
-+/*
-+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "SDL_config.h"
-+
-+#ifndef _SDL_sndioaudio_h
-+#define _SDL_sndioaudio_h
-+
-+#include <sndio.h>
-+
-+#include "../SDL_sysaudio.h"
-+
-+/* Hidden "this" pointer for the video functions */
-+#define _THIS	SDL_AudioDevice *this
-+
-+struct SDL_PrivateAudioData {
-+	/* The stream descriptor for the audio device */
-+	struct sio_hdl *hdl;
-+
-+	/* The parent process id, to detect when application quits */
-+	pid_t parent;
-+
-+	/* Raw mixing buffer */
-+	Uint8 *mixbuf;
-+	int    mixlen;
-+
-+};
-+
-+/* Old variable names */
-+#define stream			(this->hidden->stream)
-+#define parent			(this->hidden->parent)
-+#define mixbuf			(this->hidden->mixbuf)
-+#define mixlen			(this->hidden->mixlen)
-+#define hdl			(this->hidden->hdl)
-+
-+#endif /* _SDL_sndioaudio_h */
-+
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
deleted file mode 100644
index ee8447047b42c8..00000000000000
--- a/srcpkgs/SDL/template
+++ /dev/null
@@ -1,44 +0,0 @@
-# Template file for 'SDL'
-pkgname=SDL
-version=1.2.15
-revision=14
-build_style=gnu-configure
-configure_args="--enable-alsa --enable-sndio --disable-esd --disable-rpath
- --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
- --disable-alsa-shared --disable-pulseaudio-shared --disable-video-dga
- --disable-osmesa-shared $(vopt_enable aalib video-aalib)
- $(vopt_enable pulseaudio) $(vopt_enable opengl video-opengl)
- $(vopt_if x11 '-enable-video-x11-xrandr --enable-video-x11-vm --enable-video-x11-xv')"
-hostmakedepends="pkg-config nasm"
-makedepends="alsa-lib-devel sndio-devel $(vopt_if x11 libXrandr-devel)
- $(vopt_if aalib aalib-devel) $(vopt_if opengl glu-devel)
- $(vopt_if pulseaudio pulseaudio-devel)"
-short_desc="Simple Directmedia Layer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://www.libsdl.org/"
-distfiles="https://www.libsdl.org/release/SDL-${version}.tar.gz"
-checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
-
-# Package build options
-build_options="x11 opengl aalib pulseaudio"
-build_options_default="x11 opengl pulseaudio"
-
-if [ "$build_option_opengl" ]; then
-	# libGL.so.1 is dynamically loaded with dlopen.
-	shlib_requires="libGL.so.1"
-	depends="virtual?libGL"
-fi
-
-SDL-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} SDL>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}
diff --git a/srcpkgs/sdl12-compat-devel b/srcpkgs/sdl12-compat-devel
new file mode 120000
index 00000000000000..901c98ddbd0f94
--- /dev/null
+++ b/srcpkgs/sdl12-compat-devel
@@ -0,0 +1 @@
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/sdl12-compat/patches/sdl-config.patch b/srcpkgs/sdl12-compat/patches/sdl-config.patch
new file mode 100644
index 00000000000000..344d5f550e61cf
--- /dev/null
+++ b/srcpkgs/sdl12-compat/patches/sdl-config.patch
@@ -0,0 +1,11 @@
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -31,6 +31,8 @@
+ 
+   case $1 in
+     --prefix=*)
++      [ "${libdir#${prefix}}" = "${libdir}" ] || libdir="${optarg}/${libdir#${prefix}}"
++      [ "${includedir#${prefix}}" = "${includedir}" ] || includedir="${optarg}/${includedir#${prefix}}"
+       prefix=$optarg
+       if test $exec_prefix_set = no ; then
+         exec_prefix=$optarg
diff --git a/srcpkgs/sdl12-compat/template b/srcpkgs/sdl12-compat/template
new file mode 100644
index 00000000000000..54c0d4b84f7776
--- /dev/null
+++ b/srcpkgs/sdl12-compat/template
@@ -0,0 +1,46 @@
+# Template file for 'sdl12-compat'
+pkgname=sdl12-compat
+version=1.2.68
+revision=1
+build_style=cmake
+makedepends="SDL2-devel"
+short_desc="SDL-1.2 compatibility library based on SDL 2.0"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Zlib AND (Public Domain OR MIT-0)"
+homepage="https://github.com/libsdl-org/sdl12-compat"
+distfiles="${homepage}/archive/release-${version}.tar.gz"
+checksum=63c6e4dcc1154299e6f363c872900be7f3dcb3e42b9f8f57e05442ec3d89d02d
+replaces="SDL>=0"
+provides="SDL-${version}_${revision}"
+
+post_install() {
+	vlicense LICENSE.txt
+	ln -s sdl12_compat.pc "${DESTDIR}/usr/lib/pkgconfig/sdl.pc"
+}
+
+sdl12-compat-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	replaces="SDL-devel>=0"
+	provides="SDL-devel-${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}
+
+SDL_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
+
+SDL-devel_package() {
+	depends="SDL-devel>=${version}_${revision}"
+	short_desc+=" - development files (transitional dummy package)"
+	build_style=meta
+}

From 86a22026c0ffdb6f2f8888d344b706e3c8b1e08e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:45 -0500
Subject: [PATCH 02/39] Powermanga: build with new sdl12-compat library

---
 srcpkgs/Powermanga/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Powermanga/template b/srcpkgs/Powermanga/template
index f3b9ef9faf3c15..8e9af6901926ac 100644
--- a/srcpkgs/Powermanga/template
+++ b/srcpkgs/Powermanga/template
@@ -1,10 +1,10 @@
 # Template file for 'Powermanga'
 pkgname=Powermanga
 version=0.93.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="automake libtool SDL-devel"
-makedepends="libpng-devel SDL_mixer-devel SDL_image-devel"
+hostmakedepends="automake libtool pkg-config sdl12-compat-devel"
+makedepends="libpng-devel sdl12-compat-devel SDL_mixer-devel SDL_image-devel"
 short_desc="Arcade 2D shoot-em-up game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From db0b6c15e2b57c63624acc51e4c2456bbe16988b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 03/39] SDL_gfx: build with new sdl12-compat library

---
 srcpkgs/SDL_gfx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_gfx/template b/srcpkgs/SDL_gfx/template
index 5af9730e6143e1..94d5ee80246192 100644
--- a/srcpkgs/SDL_gfx/template
+++ b/srcpkgs/SDL_gfx/template
@@ -1,10 +1,10 @@
 # Template file for 'SDL_gfx'
 pkgname=SDL_gfx
 version=2.0.26
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Graphics drawing primitives for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -27,7 +27,7 @@ post_install() {
 	vlicense LICENSE
 }
 SDL_gfx-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 9c67d5df17fd866c7eb42d374269ee8f6253620d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 04/39] SDL_image: build with new sdl12-compat library

---
 srcpkgs/SDL_image/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index 05681e6da03c10..dbccde7cb3471c 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_image'
 pkgname=SDL_image
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="libpng-devel tiff-devel SDL-devel libwebp-devel"
+makedepends="libpng-devel tiff-devel sdl12-compat-devel libwebp-devel"
 # The following are dlopen(3)ed at runtime.
 depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.4.0"
 short_desc="Load images as SDL surfaces"
@@ -20,7 +20,7 @@ post_install() {
 }
 
 SDL_image-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 1a352f0de37d64f453da99d869f4fa7cec72173e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 05/39] SDL_mixer: build with new sdl12-compat library

---
 srcpkgs/SDL_mixer/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index b4462ef8c1e335..2f29b8c12669a8 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,11 +1,12 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=14
+revision=15
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel fluidsynth-devel"
+makedepends="sdl12-compat-devel libvorbis-devel libmikmod-devel libflac-devel
+ smpeg-devel fluidsynth-devel"
 # The following deps are dlopen(3)ed at runtime.
 depends="libvorbis libmikmod smpeg libflac"
 short_desc="Multi-channel audio mixer library"
@@ -28,7 +29,7 @@ post_install() {
 }
 
 SDL_mixer-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 7372934d246d0ea77fce405ee145e3b7e92dda66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 06/39] SDL_net: build with new sdl12-compat library

---
 srcpkgs/SDL_net/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index 81fadf794bc3c6..978b67785d01e4 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_net'
 pkgname=SDL_net
 version=1.2.8
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Small sample cross-platform networking library for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 SDL_net-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 86d9d6c7535b45bf505028d3b412f6ee7862a97d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 07/39] SDL_sound: build with new sdl12-compat library

---
 srcpkgs/SDL_sound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template
index 19c86987d22f37..391034e0d8c3f7 100644
--- a/srcpkgs/SDL_sound/template
+++ b/srcpkgs/SDL_sound/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_sound'
 pkgname=SDL_sound
 version=1.0.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel libmikmod-devel libvorbis-devel
+makedepends="sdl12-compat-devel libmikmod-devel libvorbis-devel
  libflac-devel speex-devel smpeg-devel"
 short_desc="Library to decode several popular sound file formats"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +15,7 @@ distfiles="http://icculus.org/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df
 
 SDL_sound-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e50de7ecd6b974ddb8804ce1a3abb31d4f5f695f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 08/39] SDL_ttf: build with new sdl12-compat library

---
 srcpkgs/SDL_ttf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index a6856a297bc496..9c4020c2788d77 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_ttf'
 pkgname=SDL_ttf
 version=2.0.11
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="freetype-devel SDL-devel libSM-devel"
+makedepends="freetype-devel sdl12-compat-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 SDL_ttf-devel_package() {
-	depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="freetype-devel sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6bcd1a54266f0b59b968dae84b10c5f83ac6e7ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 09/39] agg: build with new sdl12-compat library

---
 srcpkgs/agg/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template
index 2069096d4cdf03..15ac2b48639a6e 100644
--- a/srcpkgs/agg/template
+++ b/srcpkgs/agg/template
@@ -1,11 +1,11 @@
 # Template file for 'agg'
 pkgname=agg
 version=2.5
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-examples"
-hostmakedepends="SDL-devel automake gettext-devel libtool pkg-config"
-makedepends="SDL-devel freetype-devel"
+hostmakedepends="sdl12-compat-devel automake gettext-devel libtool pkg-config"
+makedepends="sdl12-compat-devel freetype-devel"
 short_desc="High Quality Rendering Engine for C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -13,6 +13,7 @@ homepage="https://agg.sourceforge.net/antigrain.com/"
 distfiles="http://www.antigrain.com/agg-${version}.tar.gz"
 checksum=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
 disable_parallel_build=yes
+broken="unable to fetch source"
 
 pre_configure() {
 	sed -e '/AM_C_PROTOTYPES/d' -i configure.in

From c0d59d2f30dffa96c65638c53e53e9e2264fe49e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 10/39] ballerburg: build with new sdl12-compat library

---
 srcpkgs/ballerburg/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ballerburg/template b/srcpkgs/ballerburg/template
index 986e2db2456124..38fc87372434f4 100644
--- a/srcpkgs/ballerburg/template
+++ b/srcpkgs/ballerburg/template
@@ -1,13 +1,14 @@
 # Template file for 'ballerburg'
 pkgname=ballerburg
 version=1.2.1
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="which cmake SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="which cmake sdl12-compat-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Classical castle combat game"
 maintainer="pulux <pulux@pf4sh.de>"
 license="GPL-3.0-or-later"
 homepage="http://baller.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/baller/$pkgname-$version.tar.gz"
 checksum=3f4ad9465f01c256dd1b37cc62c9fd8cbca372599753dbb21726629f042a6e62
+broken="unable to fetch source"

From bedbc193340d520ded3e790b1347ec9bfa2c3755 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 11/39] boswars: build with new sdl12-compat library

---
 srcpkgs/boswars/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/boswars/template b/srcpkgs/boswars/template
index 42c097d1dcdf23..913bbad6c10759 100644
--- a/srcpkgs/boswars/template
+++ b/srcpkgs/boswars/template
@@ -1,9 +1,10 @@
 # Template file for 'boswars'
 pkgname=boswars
 version=2.8
-revision=1
+revision=2
 hostmakedepends="pkg-config libpng-progs python3"
-makedepends="SDL-devel glu-devel libpng-devel libtheora-devel libvorbis-devel lua51-devel"
+makedepends="sdl12-compat-devel glu-devel libpng-devel
+ libtheora-devel libvorbis-devel lua51-devel"
 depends="${pkgname}-data"
 short_desc="Futuristic real-time strategy game (RTS)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 617e8143f27faa1120d2fbb1faf749b04c4a70f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 12/39] caph: build with new sdl12-compat library

---
 srcpkgs/caph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/caph/template b/srcpkgs/caph/template
index a0d6f8211a03b2..c7d4e94fdbc2b8 100644
--- a/srcpkgs/caph/template
+++ b/srcpkgs/caph/template
@@ -1,13 +1,13 @@
 # Template file for 'caph'
 pkgname=caph
 version=1.1
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="-f caph.mk"
 hostmakedepends="which pkg-config"
-makedepends="SDL-devel libpng-devel"
+makedepends="sdl12-compat-devel libpng-devel"
 short_desc="Drawing and physics sandbox game"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-or-later"

From b783b7ebc9bc77a0bd7faa040a282864d0fde7c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 13/39] crimson: build with new sdl12-compat library

---
 srcpkgs/crimson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crimson/template b/srcpkgs/crimson/template
index 211fc3eeac04e8..2b58ee2cc74e12 100644
--- a/srcpkgs/crimson/template
+++ b/srcpkgs/crimson/template
@@ -1,9 +1,9 @@
 # Template file for 'crimson'
 pkgname=crimson
 version=0.5.3
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="SDL-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel"
 short_desc="Tactical war game in the tradition of the popular Battle Isle"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ca8910d6fd586013aadc77b87701f3d3c7e032c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 14/39] darkplaces: build with new sdl12-compat library

---
 srcpkgs/darkplaces/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darkplaces/template b/srcpkgs/darkplaces/template
index 437bee50ceaf27..5b27327c13442e 100644
--- a/srcpkgs/darkplaces/template
+++ b/srcpkgs/darkplaces/template
@@ -1,10 +1,11 @@
 # Template file for 'darkplaces'
 pkgname=darkplaces
 version=20140513
-revision=3
+revision=4
 create_wrksrc=yes
 hostmakedepends="unzip"
-makedepends="zlib-devel alsa-lib-devel libjpeg-turbo-devel libXpm-devel libXxf86vm-devel SDL-devel MesaLib-devel"
+makedepends="zlib-devel alsa-lib-devel libjpeg-turbo-devel libXpm-devel
+ libXxf86vm-devel sdl12-compat-devel MesaLib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="An advanced Quake 1 game engine"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b4f1a3dfa5568c86c3ef50b61c1e1ca49b45f92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 15/39] dgen-sdl: build with new sdl12-compat library

---
 srcpkgs/dgen-sdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index d32ca6d23948b1..fc7c23b53a6d24 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -1,10 +1,10 @@
 # Template file for 'dgen-sdl'
 pkgname=dgen-sdl
 version=1.33
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config nasm"
-makedepends="SDL-devel libarchive-devel"
+makedepends="sdl12-compat-devel libarchive-devel"
 short_desc="Multi-platform Genesis/Mega Drive Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later"

From 0b2fa300c819fa138161f9508e27c458d294c2d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 16/39] gnuradio: build with new sdl12-compat library

---
 srcpkgs/gnuradio/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a6b0be4640da09..6e6f8b6dd77a54 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
 version=3.10.11.0
-revision=3
+revision=4
 build_style=cmake
 build_helper="python3"
 conf_files="/etc/gnuradio/conf.d/*"
@@ -12,10 +12,10 @@ _pydeps="python3-Mako python3-cairo python3-click python3-click-plugins python3-
  python3-jsonschema python3-numpy python3-pyqtgraph python3-pyzmq python3-scipy python3-yaml"
 hostmakedepends="pkg-config doxygen mathjax2 python3-Sphinx python3-pygccxml
  qt5-host-tools qt5-qmake ${_pydeps}"
-makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel
- gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel
- python3-devel python3-gobject-devel python3-pybind11 python3-pygccxml qwt-devel spdlog
- fmt-devel uhd-devel volk-devel"
+makedepends="sdl12-compat-devel SoapySDR-devel boost-devel codec2-devel cppzmq
+ fftw-devel gmpxx-devel gsl-devel gtk+3-devel jack-devel libgsm-devel
+ libiio-devel libsndfile-devel python3-devel python3-gobject-devel
+ python3-pybind11 python3-pygccxml qwt-devel spdlog fmt-devel uhd-devel volk-devel"
 depends="${_pydeps} python3-cheetah3 python3-lxml python3-matplotlib"
 checkdepends="python3-pytest"
 short_desc="Framework for software defined radio"

From 16e36ea52578c5e95eaf7368450fbf90365ba85a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 17/39] gst-plugins-bad1: build with new sdl12-compat library

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 8cbf2f4f541d51..48901b59976313 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.24.10
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -17,7 +17,7 @@ hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc $(vopt_if wayland wayland-devel)"
 makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
- libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
+ libexif-devel libmpcdec-devel faac-devel sdl12-compat-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
  xvidcore-devel jasper-devel libmodplug-devel libcurl-devel lcms2-devel
  libvdpau-devel libgsm-devel librtmp-devel libass-devel libvpx-devel

From 284729006e860ecebb001a577325ee4c29da3889 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 18/39] hex-a-hop: build with new sdl12-compat library

---
 srcpkgs/hex-a-hop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hex-a-hop/template b/srcpkgs/hex-a-hop/template
index 682cbeba9c9bc4..4f4e3e41e5b219 100644
--- a/srcpkgs/hex-a-hop/template
+++ b/srcpkgs/hex-a-hop/template
@@ -1,9 +1,9 @@
 # Template file for 'hex-a-hop'
 pkgname=hex-a-hop
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="SDL-devel SDL_mixer-devel SDL_ttf-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel SDL_ttf-devel"
 short_desc="Hex-a-Hop is an hexagonal tile-based puzzle game"
 maintainer="David Ferlier <dispertio@gmx.es>"
 license="GPL-2.0-only"

From 64c0bac4eaab0133c46d3c3d53a583778700a738 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 19/39] hyperrogue: build with new sdl12-compat library

---
 srcpkgs/hyperrogue/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index f472f08d2da4e3..69266f969c8556 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,11 +1,11 @@
 # Template file for 'hyperrogue'
 pkgname=hyperrogue
 version=13.0w
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
- SDL_ttf-devel zlib-devel fontconfig-devel"
+makedepends="glew-devel libpng-devel sdl12-compat-devel SDL_gfx-devel
+ SDL_mixer-devel SDL_ttf-devel zlib-devel fontconfig-devel"
 depends="dejavu-fonts-ttf"
 short_desc="SDL rogue-like in a non-euclidean world"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"

From 10365ff6eddae53e892aad92b184e0a87e7631fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 20/39] libmpeg2: build with new sdl12-compat library

---
 srcpkgs/libmpeg2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template
index 83abab0f9779f3..d4d64757b9b98d 100644
--- a/srcpkgs/libmpeg2/template
+++ b/srcpkgs/libmpeg2/template
@@ -1,11 +1,11 @@
 # Template file for 'libmpeg2'
 pkgname=libmpeg2
 version=0.5.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--enable-shared"
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXv-devel SDL-devel"
+makedepends="libXext-devel libXv-devel sdl12-compat-devel"
 short_desc="Library for decoding MPEG-2 and MPEG-1 video streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"

From cdcda5ec7cdf62e35feacfc8ffeeb816589ae8ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 21/39] libvisual: build with new sdl12-compat library

---
 srcpkgs/libvisual/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvisual/template b/srcpkgs/libvisual/template
index ef95a6551adb8a..5ba8e89b212aab 100644
--- a/srcpkgs/libvisual/template
+++ b/srcpkgs/libvisual/template
@@ -1,10 +1,10 @@
 # Template file for 'libvisual'
 pkgname=libvisual
 version=0.4.2
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="pkg-config sdl12-compat-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Abstraction library for audio visualisation plugins"
 maintainer="Piraty <mail@piraty.dev>"
 license="LGPL-2.1-or-later"

From b31b46785b675fef7f20d58ca3de74f330a48292 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 22/39] ltris: build with new sdl12-compat library

---
 srcpkgs/ltris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 9cd52394da35fa..a5742efb440f97 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,11 +1,11 @@
 # Template file for 'ltris'
 pkgname=ltris
 version=1.2.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
 hostmakedepends="bison"
-makedepends="SDL-devel SDL_mixer-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel"
 short_desc="Tetris clone using SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7c4928e3fad2f143a104d16f48624c0cd0af1a3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 23/39] navit: build with new sdl12-compat library

---
 srcpkgs/navit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 0bb5e58a336d0a..257747c2bdb998 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,11 +1,11 @@
 # Template file for 'navit'
 pkgname=navit
 version=0.5.6
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="SDL-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
+makedepends="sdl12-compat-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
  fontconfig-devel zlib-devel libpng-devel qt5-declarative-devel qt5-svg-devel
  qt5-location-devel SDL_ttf-devel SDL_image-devel libfreeglut-devel gtk+-devel
  pango-devel atk-devel gdk-pixbuf-devel qt5-sensors-devel qt5-multimedia-devel

From d906b1beb249246bb43c2bd74534d39ba552ee78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 24/39] netrek-client-cow: build with new sdl12-compat library

---
 srcpkgs/netrek-client-cow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netrek-client-cow/template b/srcpkgs/netrek-client-cow/template
index 10e677c2f27e7c..06fde0e05dc216 100644
--- a/srcpkgs/netrek-client-cow/template
+++ b/srcpkgs/netrek-client-cow/template
@@ -1,11 +1,11 @@
 # Template file for 'netrek-client-cow'
 pkgname=netrek-client-cow
 version=3.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="libX11-devel imlib2-devel libXxf86vm-devel gmp-devel
- SDL_mixer-devel SDL-devel libXpm-devel"
+ SDL_mixer-devel sdl12-compat-devel libXpm-devel"
 short_desc="Netrek Client (C and X11)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT, custom:PublicDomain"

From ddcd6a07377b98bc3680a63f80066b6936f4437b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 25/39] pcsxr: build with new sdl12-compat library

---
 srcpkgs/pcsxr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template
index 3102f23ed5e63c..eeda663d6545dc 100644
--- a/srcpkgs/pcsxr/template
+++ b/srcpkgs/pcsxr/template
@@ -1,11 +1,11 @@
 # Template file for 'pcsxr'
 pkgname=pcsxr
 version=1.9.94
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libcdio --enable-opengl"
 hostmakedepends="pkg-config automake libtool intltool glib-devel gettext-devel nasm"
-makedepends="libXv-devel libXtst-devel libcdio-devel SDL-devel gtk+3-devel
+makedepends="libXv-devel libXtst-devel libcdio-devel sdl12-compat-devel gtk+3-devel
  libXxf86vm-devel"
 depends="desktop-file-utils"
 short_desc="Sony PlayStation (PSX) emulator based on the PCSX-df project"

From 623373bd2831588626700ce3d32bd2d619987ad2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 26/39] povray: build with new sdl12-compat library

---
 srcpkgs/povray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 1bd7309959d35c..1fc3df63f0feba 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
 # Template file for 'povray'
 pkgname=povray
 version=3.7.0.8
-revision=10
+revision=11
 build_style=gnu-configure
 _v=${version%.*.*}
 configure_args="COMPILED_BY=Void --disable-optimiz-arch"
@@ -9,7 +9,7 @@ conf_files="
  /etc/povray/$_v/povray.conf
  /etc/povray/$_v/povray.ini"
 hostmakedepends="git autoconf automake"
-makedepends="boost-devel libpng-devel tiff-devel SDL-devel"
+makedepends="boost-devel libpng-devel tiff-devel sdl12-compat-devel"
 depends="openexr"
 short_desc="Script-based raytracer for 3D graphic production"
 maintainer="Brenton Horne <brentonhorne77@gmail.com>"

From 4d17f0f429e2ee4d091b4911d4fe6e3e92ade730 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 27/39] qodem: build with new sdl12-compat library

---
 srcpkgs/qodem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qodem/template b/srcpkgs/qodem/template
index d1b74cabc04820..2be40c629c5304 100644
--- a/srcpkgs/qodem/template
+++ b/srcpkgs/qodem/template
@@ -1,9 +1,9 @@
 # Template file for 'qodem'
 pkgname=qodem
 version=1.0.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="ncurses-devel gpm-devel miniupnpc-devel SDL-devel"
+makedepends="ncurses-devel gpm-devel miniupnpc-devel sdl12-compat-devel"
 short_desc="Re-implementation of the Qmodem serial communication package"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="CC0-1.0"

From 203c6fbd9cdc087cf45125209ebf96064dff6a7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 28/39] rott: build with new sdl12-compat library

---
 srcpkgs/rott/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 4650d0320e60b8..bb1cfeb6c401fc 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,11 +1,11 @@
 # Template file for 'rott'
 pkgname=rott
 version=1.1.2
-revision=2
+revision=3
 build_wrksrc=rott
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="SDL_mixer-devel SDL-devel"
+makedepends="SDL_mixer-devel sdl12-compat-devel"
 short_desc="Port of Apogee's 3D action title Rise of the Triad"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 13038f742adb36539fa7bcb53c05d0098793fcb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 29/39] smpeg: build with new sdl12-compat library

---
 srcpkgs/smpeg/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template
index d5c403dc826b36..e518ba055f88e8 100644
--- a/srcpkgs/smpeg/template
+++ b/srcpkgs/smpeg/template
@@ -1,12 +1,12 @@
 # Template file for 'smpeg'
 pkgname=smpeg
 version=0.4.5
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr --disable-gtk-player --disable-opengl-player"
+configure_args="--disable-gtk-player --disable-opengl-player"
 make_build_args="LDFLAGS+=-lstdc++"
-hostmakedepends="autoconf automake libtool"
-makedepends="SDL-devel"
+hostmakedepends="pkg-config autoconf automake libtool"
+makedepends="sdl12-compat-devel"
 short_desc="SDL MPEG Player Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -25,7 +25,7 @@ post_install() {
 }
 
 smpeg-devel_package() {
-	depends="SDL-devel smpeg>=${version}_${revision}"
+	depends="sdl12-compat-devel smpeg>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 0a584de094838e6f53bec110a74524c1733d424c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 30/39] sopwith: update to 2.7.0.

---
 .../patches/enable_cross_compilation.patch    | 37 -------------------
 srcpkgs/sopwith/template                      | 17 ++++-----
 2 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sopwith/patches/enable_cross_compilation.patch

diff --git a/srcpkgs/sopwith/patches/enable_cross_compilation.patch b/srcpkgs/sopwith/patches/enable_cross_compilation.patch
deleted file mode 100644
index 8dff50ad6bd258..00000000000000
--- a/srcpkgs/sopwith/patches/enable_cross_compilation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1,4 +1,4 @@
--AC_INIT(src/swmain.c)
-+AC_INIT([sopwith], [1.8.4])
- AC_CONFIG_AUX_DIR(autotools)
- 
- VERSION=1.8.4
-@@ -46,7 +46,8 @@
- 	;;
- esac
- 
--AM_INIT_AUTOMAKE(sopwith,$VERSION)
-+AM_INIT_AUTOMAKE([-Wall foreign])
-+AM_PROG_AR
- 
- AM_CONFIG_HEADER(config.h:config.hin)
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- bin_PROGRAMS = @SOPWITH_BINS@
- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
- 
--CFLAGS = @CFLAGS@ -I..
-+AM_CFLAGS = @CFLAGS@ @SDL_CFLAGS@ -I..
- 
- COMMON_SRC =       \
- video.h	    swcollsn.c  swgames.h   swmain.h    swutil.h 	\
---- a/src/sdl/Makefile.am
-+++ b/src/sdl/Makefile.am
-@@ -1,4 +1,4 @@
--CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
-+AM_CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
- 
- noinst_LIBRARIES = libsdlsopwith.a
- 
diff --git a/srcpkgs/sopwith/template b/srcpkgs/sopwith/template
index aa160fdbb8700b..8763a1bd84bc8b 100644
--- a/srcpkgs/sopwith/template
+++ b/srcpkgs/sopwith/template
@@ -1,19 +1,18 @@
 # Template file for 'sopwith'
 pkgname=sopwith
-version=1.8.4
-revision=2
+version=2.7.0
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="automake pkg-config"
+makedepends="SDL2-devel"
 short_desc="Sidescrolling shoot 'em up game"
-maintainer="beefcurtains <beefcurtains@users.noreply.github.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://sdl-sopwith.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/sdl-sopwith/sdl_sopwith/${version}/sopwith-${version}.tar.gz"
-checksum=a5ecb795a7aeff6be3ebfb99f1c6218054b73048786809f8468a92c952c17bd0
+homepage="https://fragglet.github.io/sdl-sopwith/"
+distfiles="https://github.com/fragglet/sdl-sopwith/archive/sdl-sopwith-${version}.tar.gz"
+checksum=48e90f1c837fbe8c91f639500c70c69493cb6ec22f7e769b2e27d252c167033e
 
 pre_configure() {
-	mv configure.{in,ac}
 	autoreconf -fi
 }
 

From 0b3296d7b8f4cf1e12f1cf7c69dac1f60168c52e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 31/39] spectrum3d: build with new sdl12-compat library

---
 srcpkgs/spectrum3d/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectrum3d/template b/srcpkgs/spectrum3d/template
index 5cdf3e528398f8..fdcc27a5db5c7e 100644
--- a/srcpkgs/spectrum3d/template
+++ b/srcpkgs/spectrum3d/template
@@ -1,10 +1,11 @@
 # Template file for 'spectrum3d'
 pkgname=spectrum3d
 version=2.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gstreamer1-devel gtk+3-devel SDL-devel alsa-lib-devel glu-devel"
+makedepends="gstreamer1-devel gtk+3-devel sdl12-compat-devel
+ alsa-lib-devel glu-devel"
 short_desc="Audio spectrum visualiser in 3D for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 23c2c5d89d1e35463f4cc0f4c3b6a5bb106160e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 32/39] swars: build with new sdl12-compat library

---
 srcpkgs/swars/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swars/template b/srcpkgs/swars/template
index 699361425ae96d..48ea08faf4003d 100644
--- a/srcpkgs/swars/template
+++ b/srcpkgs/swars/template
@@ -6,11 +6,12 @@ lib32mode="full"
 
 pkgname=swars
 version=0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-data-path=/opt/swars/"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel zlib-devel libopenal-devel libpng-devel libvorbis-devel"
+makedepends="sdl12-compat-devel zlib-devel libopenal-devel libpng-devel
+ libvorbis-devel"
 depends="vorbis-tools cdparanoia"
 short_desc="A SDL port of the 1996 DOS game Syndicate Wars"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,6 +19,7 @@ license="GPL-3"
 homepage="http://swars.vexillium.org/"
 distfiles="http://swars.vexillium.org/files/swars-${version}.tar.bz2"
 checksum=01f44e5b792d41b138d361d04810a875cfa5f897c642a2b13d0dde633fabdacb
+broken="unable to fetch source"
 
 post_install() {
 	# remove useless files

From 2fa0666424d5181ff1a762ba960fdbdeaf8215a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 33/39] tworld: build with new sdl12-compat library

---
 srcpkgs/tworld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tworld/template b/srcpkgs/tworld/template
index 11025bcd52fb48..9edd8d027ded16 100644
--- a/srcpkgs/tworld/template
+++ b/srcpkgs/tworld/template
@@ -1,9 +1,9 @@
 # Template file for 'tworld'
 pkgname=tworld
 version=1.3.2
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Emulator for Chip's Challenge game engine"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 20872db7d1642d36279cd17b410a11930493323b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 34/39] urbanterror: build with new sdl12-compat library

---
 srcpkgs/urbanterror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template
index 1ed3b0e49e3034..4d47c6e7a54f6d 100644
--- a/srcpkgs/urbanterror/template
+++ b/srcpkgs/urbanterror/template
@@ -1,8 +1,8 @@
 # Template file for 'urbanterror'
 pkgname=urbanterror
 version=4.3.4
-revision=2
-makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel
+revision=3
+makedepends="sdl12-compat-devel libopenal-devel libcurl-devel libvorbis-devel
  libXxf86vm-devel"
 depends="urbanterror-data>=${version}"
 short_desc="Team tactical shooter based on ioquake"

From 605ac4020b69870480cef12cf1a3dc57f6b46dbc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 35/39] virtualbox-ose: build with new sdl12-compat library

---
 srcpkgs/virtualbox-ose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 914cc5540a012b..4ba4a575929771 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=7.1.6
-revision=1
+revision=2
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, CDDL-1.0"
@@ -19,8 +19,8 @@ hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which gls
 makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
  libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
  libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel
- SDL-devel xorg-server-devel libslirp-devel libtpms-devel libxml2-devel libvncserver-devel
- openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
+ sdl12-compat-devel xorg-server-devel libslirp-devel libtpms-devel libxml2-devel
+ libvncserver-devel openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
  libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
  SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
 

From 0786c6c9666a322e3e05575bcf046e1c1a8bd52d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 36/39] xen: build with new sdl12-compat library

---
 srcpkgs/xen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 8ff41345f7189b..e6558977d722d0 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=12
+revision=13
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
  ghostscript git ocaml ocaml-findlib pandoc pkg-config tar texinfo wget
  python3-Markdown python3-setuptools"
-makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
+makedepends="sdl12-compat-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
  ncurses-devel"

From 8ee48c54dae1c16f9689d0c895a3e7bcbb317fdf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 37/39] xmoto: build with new sdl12-compat library

---
 srcpkgs/xmoto/patches/stdint.patch | 22 ++++++++++++++++++++++
 srcpkgs/xmoto/template             |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xmoto/patches/stdint.patch

diff --git a/srcpkgs/xmoto/patches/stdint.patch b/srcpkgs/xmoto/patches/stdint.patch
new file mode 100644
index 00000000000000..980227a352ed42
--- /dev/null
+++ b/srcpkgs/xmoto/patches/stdint.patch
@@ -0,0 +1,22 @@
+diff -ur a/src/common/DBuffer.cpp b/src/common/DBuffer.cpp
+--- a/src/common/DBuffer.cpp	2020-06-21 15:18:16.000000000 -0400
++++ b/src/common/DBuffer.cpp	2025-02-01 22:25:26.230759197 -0500
+@@ -24,6 +24,7 @@
+ #include "DBuffer.h"
+ #include "helpers/SwapEndian.h"
+ #include <algorithm>
++#include <cstdint>
+ 
+ void DBuffer::_FreeDBuffer(void) {
+   /* Free stuff if anything */
+diff -ur a/src/common/VFileIO.cpp b/src/common/VFileIO.cpp
+--- a/src/common/VFileIO.cpp	2020-06-21 15:18:16.000000000 -0400
++++ b/src/common/VFileIO.cpp	2025-02-01 22:25:38.676782152 -0500
+@@ -48,6 +48,7 @@
+ #include "xmoto/UserConfig.h"
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #ifdef WIN32
+ std::string win32_getHomeDir(bool i_asUtf8 = false) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index a1a159ecc6fbe7..1a25a8175d7f47 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,13 +1,13 @@
 # Template file for 'xmoto'
 pkgname=xmoto
 version=0.6.1
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu"
 configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel-tools desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
- libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
+ libxml2-devel libxdg-basedir-devel glu-devel sdl12-compat-devel SDL_mixer-devel
  SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel
  bzip2-devel gettext-devel"
 depends="${pkgname}-data"

From b7575ce1f5b49b5f2a08b345760f14ab72e8fc5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:55 -0500
Subject: [PATCH 38/39] xrick: build with new sdl12-compat library

---
 srcpkgs/xrick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 3b751dcc67740e..90f615347c29bb 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -1,10 +1,10 @@
 # Template file for 'xrick'
 pkgname=xrick
 version=021212
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=1
-makedepends="SDL-devel zlib-devel"
+makedepends="sdl12-compat-devel zlib-devel"
 short_desc="Clone of Rick Dangerous"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:GPL-ish"

From 9fe3ee23a3095de84dc1582cf6965428461c0bac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:55 -0500
Subject: [PATCH 39/39] zsnes: build with new sdl12-compat library

---
 srcpkgs/zsnes/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zsnes/template b/srcpkgs/zsnes/template
index 78987d9d512ad5..8a7fa1545a5f93 100644
--- a/srcpkgs/zsnes/template
+++ b/srcpkgs/zsnes/template
@@ -3,13 +3,13 @@
 # 32bit
 pkgname=zsnes
 version=1.51
-revision=4
+revision=5
 archs="i686"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="force_arch=i686"
 hostmakedepends="nasm pkg-config"
-makedepends="MesaLib-devel SDL-devel libpng-devel ncurses-devel"
+makedepends="MesaLib-devel sdl12-compat-devel libpng-devel ncurses-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Super Nintendo emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,6 +20,13 @@ checksum=2856dedba272e9eed66cbf68dd4a9ae56797c373686c57371a65c7df35264623
 lib32mode="full"
 
 CFLAGS="-fcommon"
+CXXFLAGS="-fcommon"
+
+do_configure() {
+	# The build system fails to honor -std=c++14 in CXXFLAGS,
+	# so we'll force it in the compiler executable name
+	CXX="${CXX} -std=c++14" ./configure ${configure_args}
+}
 
 post_install() {
 	vmkdir usr/share

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] SDL: replace with `sdl12-compat`
  2025-02-03 14:09 [PR PATCH] SDL: replace with `sdl12-compat` ahesford
@ 2025-02-03 14:15 ` ahesford
  2025-02-03 19:36 ` ahesford
  2025-02-03 19:36 ` [PR PATCH] [Merged]: " ahesford
  2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2025-02-03 14:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages sdl12-compat
https://github.com/void-linux/void-packages/pull/54199

SDL: replace with `sdl12-compat`
Especially now that SDL 3 is available, let's completely abandon the dead SDL 1.2 in favor of the official compat library that uses SDL 2 on the backend. This supersedes https://github.com/void-linux/void-packages/pull/53761.

Four packages that depend on SDL fail to build because their distfiles cannot be fetched:
- `agg` (only required by `desumume`)
- `ballerburg` (leaf package, some game)
- `swars` (leaf package, only for `i686`, some game)
- `xrick` (leaf package, restricted)

I've marked the first three broken to highlight the existing issues. Note that, because `sdl12-compat` is ABI compatible with SDL 1.2, people with any of these packages installed should still be able to upgrade seamlessly and we should avoid any shlib staging.

#### Testing the changes
- I tested the changes in this PR: **briefly**, works as expected with `dosbox` and `tworld`.

A patch file from https://github.com/void-linux/void-packages/pull/54199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sdl12-compat-54199.patch --]
[-- Type: text/x-diff, Size: 64037 bytes --]

From 22722da4f52fb33d652feb7e165195270b898111 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 21:49:15 -0500
Subject: [PATCH 01/39] SDL: replace with sdl12-compat

New package: sdl12-compat-1.2.68.
---
 common/shlibs                                 |   2 +-
 srcpkgs/SDL                                   |   1 +
 srcpkgs/SDL-devel                             |   2 +-
 .../patches/SDL-1.2.10-GrabNotViewable.patch  |  22 -
 srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch |  24 --
 srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch    | 375 ------------------
 srcpkgs/SDL/template                          |  44 --
 srcpkgs/sdl12-compat-devel                    |   1 +
 srcpkgs/sdl12-compat/patches/sdl-config.patch |  11 +
 srcpkgs/sdl12-compat/template                 |  46 +++
 10 files changed, 61 insertions(+), 467 deletions(-)
 create mode 120000 srcpkgs/SDL
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
 delete mode 100644 srcpkgs/SDL/template
 create mode 120000 srcpkgs/sdl12-compat-devel
 create mode 100644 srcpkgs/sdl12-compat/patches/sdl-config.patch
 create mode 100644 srcpkgs/sdl12-compat/template

diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..c03c19f37b8cde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -410,7 +410,7 @@ libpostproc.so.55 libpostproc-4.0_1
 libavcodec.so.58 libavcodec-4.0_1
 libavutil.so.56 libavutil-4.0_1
 libavfilter.so.7 libavfilter-4.0_1
-libSDL-1.2.so.0 SDL-1.2.14_1
+libSDL-1.2.so.0 sdl12-compat-1.2.68_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.157 x264-20190507.2245_1
 libopenh264.so.7 openh264-2.4.1_1
diff --git a/srcpkgs/SDL b/srcpkgs/SDL
new file mode 120000
index 00000000000000..901c98ddbd0f94
--- /dev/null
+++ b/srcpkgs/SDL
@@ -0,0 +1 @@
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/SDL-devel b/srcpkgs/SDL-devel
index bf798a56736d19..901c98ddbd0f94 120000
--- a/srcpkgs/SDL-devel
+++ b/srcpkgs/SDL-devel
@@ -1 +1 @@
-SDL
\ No newline at end of file
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch b/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
deleted file mode 100644
index a05c37044c68ca..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
-viewable. Patch provided by <pbonzini@redhat.com>.
-See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
-
---- a/src/video/x11/SDL_x11wm.c	2007-12-31 04:48:13.000000000 +0000
-+++ b/src/video/x11/SDL_x11wm.c	2009-01-15 10:27:14.000000000 +0000
-@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, 
- 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
- 						GrabModeAsync, GrabModeAsync,
- 						SDL_Window, None, CurrentTime);
--			if ( result == GrabSuccess ) {
-+			if ( result == GrabSuccess || result == GrabNotViewable ) {
- 				break;
- 			}
- 			SDL_Delay(100);
- 		}
- 		if ( result != GrabSuccess ) {
- 			/* Uh, oh, what do we do here? */ ;
-+			return(SDL_GRAB_OFF);
- 		}
- 		/* Now grab the keyboard */
- 		XGrabKeyboard(SDL_Display, WMwindow, True,
diff --git a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch b/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
deleted file mode 100644
index 5afa0a4059f91e..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
-+++ b/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
-@@ -3,7 +3,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
--libdir=@libdir@
- 
- @ENABLE_STATIC_FALSE@usage="\
- @ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
-@@ -45,11 +44,11 @@ while test $# -gt 0; do
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
--@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
- @ENABLE_STATIC_TRUE@      ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch b/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
deleted file mode 100644
index 94d13f9223001e..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
+++ /dev/null
@@ -1,375 +0,0 @@
---- a/configure        2012-01-19 07:30:12.000000000 +0100
-+++ b/configure  2018-11-27 22:58:07.344753821 +0100
-@@ -1514,6 +1514,7 @@
-   --disable-esdtest       Do not try to compile and run a test ESD program
-   --enable-esd-shared     dynamically load ESD audio support [default=yes]
-   --enable-pulseaudio     use PulseAudio [default=yes]
-+  --enable-sndio          use SNDIO [default=yes]
-   --enable-pulseaudio-shared
-                           dynamically load PulseAudio support [default=yes]
-   --enable-arts           support the Analog Real Time Synthesizer
-@@ -21000,6 +21001,23 @@
-     fi
- }
-
-+CheckSndio()
-+{
-+# Check whether --enable-sndio was given.
-+if test "${enable_sndio+set}" = set; then
-+  enableval=$enable_sndio;
-+else
-+  enable_sndio=yes
-+fi
-+
-+if test "x${enable_sndio}" = "xyes"; then :
-+  SOURCES="$SOURCES $srcdir/src/audio/sndio/SDL_sndioaudio.c"
-+  EXTRA_CFLAGS="$EXTRA_CFLAGS -DSDL_AUDIO_DRIVER_SNDIO=1"
-+  EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lsndio"
-+  have_audio=yes
-+fi
-+}
-+
- CheckPulseAudio()
- {
-     # Check whether --enable-pulseaudio was given.
-@@ -29550,6 +29568,7 @@
-         CheckMME
-         CheckALSA
-         CheckARTSC
-+        CheckSndio
-         CheckESD
-         CheckPulseAudio
-         CheckNAS
---- a/include/SDL_config.h.in	2018-11-27 21:52:07.645177938 +0100
-+++ b/include/SDL_config.h.in	2018-11-27 22:03:06.217107399 +0100
-@@ -184,6 +184,7 @@
- #undef SDL_AUDIO_DRIVER_QNXNTO
- #undef SDL_AUDIO_DRIVER_SNDMGR
- #undef SDL_AUDIO_DRIVER_SUNAUDIO
-+#undef SDL_AUDIO_DRIVER_SNDIO
- #undef SDL_AUDIO_DRIVER_WAVEOUT
- 
- /* Enable various cdrom drivers */
---- a/src/audio/SDL_audio.c	2018-11-27 21:52:07.646177937 +0100
-+++ b/src/audio/SDL_audio.c	2018-11-27 22:04:37.977097571 +0100
-@@ -42,6 +42,9 @@
- #if SDL_AUDIO_DRIVER_ALSA
- 	&ALSA_bootstrap,
- #endif
-+#if SDL_AUDIO_DRIVER_SNDIO
-+	&SNDIO_bootstrap,
-+#endif
- #if SDL_AUDIO_DRIVER_BSD
- 	&BSD_AUDIO_bootstrap,
- #endif
---- a/src/audio/SDL_sysaudio.h	2018-11-27 21:52:07.647177937 +0100
-+++ b/src/audio/SDL_sysaudio.h	2018-11-27 22:05:13.697093745 +0100
-@@ -105,6 +105,9 @@
- #if SDL_AUDIO_DRIVER_BSD
- extern AudioBootStrap BSD_AUDIO_bootstrap;
- #endif
-+#if SDL_AUDIO_DRIVER_SNDIO
-+extern AudioBootStrap SNDIO_bootstrap;
-+#endif
- #if SDL_AUDIO_DRIVER_PULSE
- extern AudioBootStrap PULSE_bootstrap;
- #endif
---- a/src/audio/sndio/SDL_sndioaudio.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/audio/sndio/SDL_sndioaudio.c	2013-12-19 10:24:18.000000000 +0100
-@@ -0,0 +1,243 @@
-+/*
-+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "SDL_config.h"
-+
-+/* Allow access to a raw mixing buffer */
-+
-+#ifdef HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
-+#include <unistd.h>
-+
-+#include "SDL_timer.h"
-+#include "SDL_audio.h"
-+#include "../SDL_audiomem.h"
-+#include "../SDL_audio_c.h"
-+#include "../SDL_audiodev_c.h"
-+#include "SDL_sndioaudio.h"
-+
-+/* The tag name used by sndio audio */
-+#define SNDIO_DRIVER_NAME         "sndio"
-+
-+/* Audio driver functions */
-+static int SNDIO_OpenAudio(_THIS, SDL_AudioSpec *spec);
-+static void SNDIO_WaitAudio(_THIS);
-+static void SNDIO_PlayAudio(_THIS);
-+static Uint8 *SNDIO_GetAudioBuf(_THIS);
-+static void SNDIO_CloseAudio(_THIS);
-+
-+/* Audio driver bootstrap functions */
-+
-+static int Audio_Available(void)
-+{
-+	struct sio_hdl *this_hdl;
-+	int available = 0;
-+
-+	if ( (this_hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0)) != NULL ) {
-+		sio_close(this_hdl);
-+		available = 1;
-+	}
-+
-+	return available;
-+}
-+
-+static void Audio_DeleteDevice(SDL_AudioDevice *device)
-+{
-+	SDL_free(device->hidden);
-+	SDL_free(device);
-+}
-+
-+static SDL_AudioDevice *Audio_CreateDevice(int devindex)
-+{
-+	SDL_AudioDevice *this;
-+
-+	/* Initialize all variables that we clean on shutdown */
-+	this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice));
-+	if ( this ) {
-+		SDL_memset(this, 0, (sizeof *this));
-+		this->hidden = (struct SDL_PrivateAudioData *)
-+				SDL_malloc((sizeof *this->hidden));
-+	}
-+	if ( (this == NULL) || (this->hidden == NULL) ) {
-+		SDL_OutOfMemory();
-+		if ( this ) {
-+			SDL_free(this);
-+		}
-+		return(0);
-+	}
-+	SDL_memset(this->hidden, 0, (sizeof *this->hidden));
-+
-+	/* Set the function pointers */
-+	this->OpenAudio = SNDIO_OpenAudio;
-+	this->WaitAudio = SNDIO_WaitAudio;
-+	this->PlayAudio = SNDIO_PlayAudio;
-+	this->GetAudioBuf = SNDIO_GetAudioBuf;
-+	this->CloseAudio = SNDIO_CloseAudio;
-+
-+	this->free = Audio_DeleteDevice;
-+
-+	hdl = NULL;
-+
-+	return this;
-+}
-+
-+AudioBootStrap SNDIO_bootstrap = {
-+	SNDIO_DRIVER_NAME, "sndio",
-+	Audio_Available, Audio_CreateDevice
-+};
-+
-+
-+
-+/* This function waits until it is possible to write a full sound buffer */
-+static void SNDIO_WaitAudio(_THIS)
-+{
-+	/* nothing, we're using the blocking api */
-+}
-+
-+static void SNDIO_PlayAudio(_THIS)
-+{
-+	int written;
-+
-+	/* Write the audio data */
-+	written = sio_write(hdl, mixbuf, mixlen);
-+	
-+	/* If we couldn't write, assume fatal error for now */
-+	if ( written == 0 ) {
-+		this->enabled = 0;
-+	}
-+#ifdef DEBUG_AUDIO
-+	fprintf(stderr, "Wrote %d bytes of audio data\n", written);
-+#endif
-+}
-+
-+static Uint8 *SNDIO_GetAudioBuf(_THIS)
-+{
-+	return(mixbuf);
-+}
-+
-+static void SNDIO_CloseAudio(_THIS)
-+{
-+	if ( mixbuf != NULL ) {
-+		SDL_FreeAudioMem(mixbuf);
-+		mixbuf = NULL;
-+	}
-+	if ( hdl != NULL ) {
-+		sio_close(hdl);
-+		hdl = NULL;
-+	}
-+}
-+
-+static int SNDIO_OpenAudio(_THIS, SDL_AudioSpec *spec)
-+{
-+	struct sio_par par;
-+
-+	mixbuf = NULL;
-+
-+	if ((hdl = sio_open(NULL, SIO_PLAY, 0)) == NULL) {
-+		SDL_SetError("sio_open() failed");
-+		return(-1);
-+	}
-+
-+	sio_initpar(&par);
-+
-+	switch (spec->format) {
-+	case AUDIO_S16LSB:
-+		par.bits = 16;
-+		par.sig = 1;
-+		par.le = 1;
-+		break;
-+	case AUDIO_S16MSB:
-+		par.bits = 16;
-+		par.sig = 1;
-+		par.le = 0;
-+		break;
-+	case AUDIO_S8:
-+		par.bits = 8;
-+		par.sig = 1;
-+		break;
-+	case AUDIO_U16LSB:
-+		par.bits = 16;
-+		par.sig = 0;
-+		par.le = 1;
-+		break;
-+	case AUDIO_U16MSB:
-+		par.bits = 16;
-+		par.sig = 0;
-+		par.le = 0;
-+		break;
-+	case AUDIO_U8:
-+		par.bits = 8;
-+		par.sig = 0;
-+		break;
-+	default:
-+		SDL_SetError("SNDIO unknown format");
-+		return(-1);
-+	}
-+
-+	par.rate = spec->freq;
-+	par.pchan = spec->channels;
-+	par.round = spec->samples;
-+	par.appbufsz = par.round * 2;
-+
-+	if (sio_setpar(hdl, &par) == 0) {
-+		SDL_SetError("sio_setpar() failed");
-+		return(-1);
-+	}
-+
-+	if (sio_getpar(hdl, &par) == 0) {
-+		SDL_SetError("sio_getpar() failed");
-+		return(-1);
-+	}
-+
-+	if (par.bits == 16) {
-+		if (par.sig && par.le) {
-+			spec->format = AUDIO_S16LSB;
-+		} else if (par.sig && !par.le) {
-+			spec->format = AUDIO_S16MSB;
-+		} else if (!par.sig && par.le) {
-+			spec->format = AUDIO_U16LSB;
-+		} else 
-+			spec->format = AUDIO_U16MSB;
-+	} else if (par.bits == 8) {
-+		spec->format = par.sig ? AUDIO_S8 : AUDIO_U8;
-+	} else {
-+		SDL_SetError("SNDIO couldn't configure a suitable format");
-+		return(-1);
-+	}
-+
-+	spec->freq = par.rate;
-+	spec->channels = par.pchan;
-+	spec->samples = par.round;
-+
-+	SDL_CalculateAudioSpec(spec);
-+
-+	/* Allocate mixing buffer */
-+	mixlen = spec->size;
-+	mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen);
-+	if ( mixbuf == NULL ) {
-+		return(-1);
-+	}
-+	SDL_memset(mixbuf, spec->silence, spec->size);
-+
-+	if ( sio_start(hdl) == 0 ) {
-+		SDL_SetError("sio_start() failed");
-+		return(-1);
-+	}
-+
-+	/* We're ready to rock and roll. :-) */
-+	return(0);
-+}
---- a/src/audio/sndio/SDL_sndioaudio.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/audio/sndio/SDL_sndioaudio.h	2013-12-15 02:57:55.000000000 +0100
-@@ -0,0 +1,50 @@
-+/*
-+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "SDL_config.h"
-+
-+#ifndef _SDL_sndioaudio_h
-+#define _SDL_sndioaudio_h
-+
-+#include <sndio.h>
-+
-+#include "../SDL_sysaudio.h"
-+
-+/* Hidden "this" pointer for the video functions */
-+#define _THIS	SDL_AudioDevice *this
-+
-+struct SDL_PrivateAudioData {
-+	/* The stream descriptor for the audio device */
-+	struct sio_hdl *hdl;
-+
-+	/* The parent process id, to detect when application quits */
-+	pid_t parent;
-+
-+	/* Raw mixing buffer */
-+	Uint8 *mixbuf;
-+	int    mixlen;
-+
-+};
-+
-+/* Old variable names */
-+#define stream			(this->hidden->stream)
-+#define parent			(this->hidden->parent)
-+#define mixbuf			(this->hidden->mixbuf)
-+#define mixlen			(this->hidden->mixlen)
-+#define hdl			(this->hidden->hdl)
-+
-+#endif /* _SDL_sndioaudio_h */
-+
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
deleted file mode 100644
index ee8447047b42c8..00000000000000
--- a/srcpkgs/SDL/template
+++ /dev/null
@@ -1,44 +0,0 @@
-# Template file for 'SDL'
-pkgname=SDL
-version=1.2.15
-revision=14
-build_style=gnu-configure
-configure_args="--enable-alsa --enable-sndio --disable-esd --disable-rpath
- --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
- --disable-alsa-shared --disable-pulseaudio-shared --disable-video-dga
- --disable-osmesa-shared $(vopt_enable aalib video-aalib)
- $(vopt_enable pulseaudio) $(vopt_enable opengl video-opengl)
- $(vopt_if x11 '-enable-video-x11-xrandr --enable-video-x11-vm --enable-video-x11-xv')"
-hostmakedepends="pkg-config nasm"
-makedepends="alsa-lib-devel sndio-devel $(vopt_if x11 libXrandr-devel)
- $(vopt_if aalib aalib-devel) $(vopt_if opengl glu-devel)
- $(vopt_if pulseaudio pulseaudio-devel)"
-short_desc="Simple Directmedia Layer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://www.libsdl.org/"
-distfiles="https://www.libsdl.org/release/SDL-${version}.tar.gz"
-checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
-
-# Package build options
-build_options="x11 opengl aalib pulseaudio"
-build_options_default="x11 opengl pulseaudio"
-
-if [ "$build_option_opengl" ]; then
-	# libGL.so.1 is dynamically loaded with dlopen.
-	shlib_requires="libGL.so.1"
-	depends="virtual?libGL"
-fi
-
-SDL-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} SDL>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}
diff --git a/srcpkgs/sdl12-compat-devel b/srcpkgs/sdl12-compat-devel
new file mode 120000
index 00000000000000..901c98ddbd0f94
--- /dev/null
+++ b/srcpkgs/sdl12-compat-devel
@@ -0,0 +1 @@
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/sdl12-compat/patches/sdl-config.patch b/srcpkgs/sdl12-compat/patches/sdl-config.patch
new file mode 100644
index 00000000000000..344d5f550e61cf
--- /dev/null
+++ b/srcpkgs/sdl12-compat/patches/sdl-config.patch
@@ -0,0 +1,11 @@
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -31,6 +31,8 @@
+ 
+   case $1 in
+     --prefix=*)
++      [ "${libdir#${prefix}}" = "${libdir}" ] || libdir="${optarg}/${libdir#${prefix}}"
++      [ "${includedir#${prefix}}" = "${includedir}" ] || includedir="${optarg}/${includedir#${prefix}}"
+       prefix=$optarg
+       if test $exec_prefix_set = no ; then
+         exec_prefix=$optarg
diff --git a/srcpkgs/sdl12-compat/template b/srcpkgs/sdl12-compat/template
new file mode 100644
index 00000000000000..54c0d4b84f7776
--- /dev/null
+++ b/srcpkgs/sdl12-compat/template
@@ -0,0 +1,46 @@
+# Template file for 'sdl12-compat'
+pkgname=sdl12-compat
+version=1.2.68
+revision=1
+build_style=cmake
+makedepends="SDL2-devel"
+short_desc="SDL-1.2 compatibility library based on SDL 2.0"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Zlib AND (Public Domain OR MIT-0)"
+homepage="https://github.com/libsdl-org/sdl12-compat"
+distfiles="${homepage}/archive/release-${version}.tar.gz"
+checksum=63c6e4dcc1154299e6f363c872900be7f3dcb3e42b9f8f57e05442ec3d89d02d
+replaces="SDL>=0"
+provides="SDL-${version}_${revision}"
+
+post_install() {
+	vlicense LICENSE.txt
+	ln -s sdl12_compat.pc "${DESTDIR}/usr/lib/pkgconfig/sdl.pc"
+}
+
+sdl12-compat-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	replaces="SDL-devel>=0"
+	provides="SDL-devel-${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}
+
+SDL_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
+
+SDL-devel_package() {
+	depends="SDL-devel>=${version}_${revision}"
+	short_desc+=" - development files (transitional dummy package)"
+	build_style=meta
+}

From 86a22026c0ffdb6f2f8888d344b706e3c8b1e08e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:45 -0500
Subject: [PATCH 02/39] Powermanga: build with new sdl12-compat library

---
 srcpkgs/Powermanga/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Powermanga/template b/srcpkgs/Powermanga/template
index f3b9ef9faf3c15..8e9af6901926ac 100644
--- a/srcpkgs/Powermanga/template
+++ b/srcpkgs/Powermanga/template
@@ -1,10 +1,10 @@
 # Template file for 'Powermanga'
 pkgname=Powermanga
 version=0.93.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="automake libtool SDL-devel"
-makedepends="libpng-devel SDL_mixer-devel SDL_image-devel"
+hostmakedepends="automake libtool pkg-config sdl12-compat-devel"
+makedepends="libpng-devel sdl12-compat-devel SDL_mixer-devel SDL_image-devel"
 short_desc="Arcade 2D shoot-em-up game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From db0b6c15e2b57c63624acc51e4c2456bbe16988b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 03/39] SDL_gfx: build with new sdl12-compat library

---
 srcpkgs/SDL_gfx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_gfx/template b/srcpkgs/SDL_gfx/template
index 5af9730e6143e1..94d5ee80246192 100644
--- a/srcpkgs/SDL_gfx/template
+++ b/srcpkgs/SDL_gfx/template
@@ -1,10 +1,10 @@
 # Template file for 'SDL_gfx'
 pkgname=SDL_gfx
 version=2.0.26
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Graphics drawing primitives for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -27,7 +27,7 @@ post_install() {
 	vlicense LICENSE
 }
 SDL_gfx-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 9c67d5df17fd866c7eb42d374269ee8f6253620d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 04/39] SDL_image: build with new sdl12-compat library

---
 srcpkgs/SDL_image/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index 05681e6da03c10..dbccde7cb3471c 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_image'
 pkgname=SDL_image
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="libpng-devel tiff-devel SDL-devel libwebp-devel"
+makedepends="libpng-devel tiff-devel sdl12-compat-devel libwebp-devel"
 # The following are dlopen(3)ed at runtime.
 depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.4.0"
 short_desc="Load images as SDL surfaces"
@@ -20,7 +20,7 @@ post_install() {
 }
 
 SDL_image-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 1a352f0de37d64f453da99d869f4fa7cec72173e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 05/39] SDL_mixer: build with new sdl12-compat library

---
 srcpkgs/SDL_mixer/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index b4462ef8c1e335..2f29b8c12669a8 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,11 +1,12 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=14
+revision=15
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel fluidsynth-devel"
+makedepends="sdl12-compat-devel libvorbis-devel libmikmod-devel libflac-devel
+ smpeg-devel fluidsynth-devel"
 # The following deps are dlopen(3)ed at runtime.
 depends="libvorbis libmikmod smpeg libflac"
 short_desc="Multi-channel audio mixer library"
@@ -28,7 +29,7 @@ post_install() {
 }
 
 SDL_mixer-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 7372934d246d0ea77fce405ee145e3b7e92dda66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 06/39] SDL_net: build with new sdl12-compat library

---
 srcpkgs/SDL_net/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index 81fadf794bc3c6..978b67785d01e4 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_net'
 pkgname=SDL_net
 version=1.2.8
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Small sample cross-platform networking library for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 SDL_net-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 86d9d6c7535b45bf505028d3b412f6ee7862a97d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 07/39] SDL_sound: build with new sdl12-compat library

---
 srcpkgs/SDL_sound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template
index 19c86987d22f37..391034e0d8c3f7 100644
--- a/srcpkgs/SDL_sound/template
+++ b/srcpkgs/SDL_sound/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_sound'
 pkgname=SDL_sound
 version=1.0.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel libmikmod-devel libvorbis-devel
+makedepends="sdl12-compat-devel libmikmod-devel libvorbis-devel
  libflac-devel speex-devel smpeg-devel"
 short_desc="Library to decode several popular sound file formats"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +15,7 @@ distfiles="http://icculus.org/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df
 
 SDL_sound-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e50de7ecd6b974ddb8804ce1a3abb31d4f5f695f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 08/39] SDL_ttf: build with new sdl12-compat library

---
 srcpkgs/SDL_ttf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index a6856a297bc496..9c4020c2788d77 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_ttf'
 pkgname=SDL_ttf
 version=2.0.11
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="freetype-devel SDL-devel libSM-devel"
+makedepends="freetype-devel sdl12-compat-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 SDL_ttf-devel_package() {
-	depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="freetype-devel sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6bcd1a54266f0b59b968dae84b10c5f83ac6e7ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 09/39] agg: build with new sdl12-compat library

---
 srcpkgs/agg/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template
index 2069096d4cdf03..15ac2b48639a6e 100644
--- a/srcpkgs/agg/template
+++ b/srcpkgs/agg/template
@@ -1,11 +1,11 @@
 # Template file for 'agg'
 pkgname=agg
 version=2.5
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-examples"
-hostmakedepends="SDL-devel automake gettext-devel libtool pkg-config"
-makedepends="SDL-devel freetype-devel"
+hostmakedepends="sdl12-compat-devel automake gettext-devel libtool pkg-config"
+makedepends="sdl12-compat-devel freetype-devel"
 short_desc="High Quality Rendering Engine for C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -13,6 +13,7 @@ homepage="https://agg.sourceforge.net/antigrain.com/"
 distfiles="http://www.antigrain.com/agg-${version}.tar.gz"
 checksum=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
 disable_parallel_build=yes
+broken="unable to fetch source"
 
 pre_configure() {
 	sed -e '/AM_C_PROTOTYPES/d' -i configure.in

From c0d59d2f30dffa96c65638c53e53e9e2264fe49e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 10/39] ballerburg: build with new sdl12-compat library

---
 srcpkgs/ballerburg/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ballerburg/template b/srcpkgs/ballerburg/template
index 986e2db2456124..38fc87372434f4 100644
--- a/srcpkgs/ballerburg/template
+++ b/srcpkgs/ballerburg/template
@@ -1,13 +1,14 @@
 # Template file for 'ballerburg'
 pkgname=ballerburg
 version=1.2.1
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="which cmake SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="which cmake sdl12-compat-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Classical castle combat game"
 maintainer="pulux <pulux@pf4sh.de>"
 license="GPL-3.0-or-later"
 homepage="http://baller.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/baller/$pkgname-$version.tar.gz"
 checksum=3f4ad9465f01c256dd1b37cc62c9fd8cbca372599753dbb21726629f042a6e62
+broken="unable to fetch source"

From bedbc193340d520ded3e790b1347ec9bfa2c3755 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 11/39] boswars: build with new sdl12-compat library

---
 srcpkgs/boswars/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/boswars/template b/srcpkgs/boswars/template
index 42c097d1dcdf23..913bbad6c10759 100644
--- a/srcpkgs/boswars/template
+++ b/srcpkgs/boswars/template
@@ -1,9 +1,10 @@
 # Template file for 'boswars'
 pkgname=boswars
 version=2.8
-revision=1
+revision=2
 hostmakedepends="pkg-config libpng-progs python3"
-makedepends="SDL-devel glu-devel libpng-devel libtheora-devel libvorbis-devel lua51-devel"
+makedepends="sdl12-compat-devel glu-devel libpng-devel
+ libtheora-devel libvorbis-devel lua51-devel"
 depends="${pkgname}-data"
 short_desc="Futuristic real-time strategy game (RTS)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 617e8143f27faa1120d2fbb1faf749b04c4a70f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 12/39] caph: build with new sdl12-compat library

---
 srcpkgs/caph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/caph/template b/srcpkgs/caph/template
index a0d6f8211a03b2..c7d4e94fdbc2b8 100644
--- a/srcpkgs/caph/template
+++ b/srcpkgs/caph/template
@@ -1,13 +1,13 @@
 # Template file for 'caph'
 pkgname=caph
 version=1.1
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="-f caph.mk"
 hostmakedepends="which pkg-config"
-makedepends="SDL-devel libpng-devel"
+makedepends="sdl12-compat-devel libpng-devel"
 short_desc="Drawing and physics sandbox game"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-or-later"

From b783b7ebc9bc77a0bd7faa040a282864d0fde7c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 13/39] crimson: build with new sdl12-compat library

---
 srcpkgs/crimson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crimson/template b/srcpkgs/crimson/template
index 211fc3eeac04e8..2b58ee2cc74e12 100644
--- a/srcpkgs/crimson/template
+++ b/srcpkgs/crimson/template
@@ -1,9 +1,9 @@
 # Template file for 'crimson'
 pkgname=crimson
 version=0.5.3
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="SDL-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel"
 short_desc="Tactical war game in the tradition of the popular Battle Isle"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ca8910d6fd586013aadc77b87701f3d3c7e032c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 14/39] darkplaces: build with new sdl12-compat library

---
 srcpkgs/darkplaces/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darkplaces/template b/srcpkgs/darkplaces/template
index 437bee50ceaf27..5b27327c13442e 100644
--- a/srcpkgs/darkplaces/template
+++ b/srcpkgs/darkplaces/template
@@ -1,10 +1,11 @@
 # Template file for 'darkplaces'
 pkgname=darkplaces
 version=20140513
-revision=3
+revision=4
 create_wrksrc=yes
 hostmakedepends="unzip"
-makedepends="zlib-devel alsa-lib-devel libjpeg-turbo-devel libXpm-devel libXxf86vm-devel SDL-devel MesaLib-devel"
+makedepends="zlib-devel alsa-lib-devel libjpeg-turbo-devel libXpm-devel
+ libXxf86vm-devel sdl12-compat-devel MesaLib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="An advanced Quake 1 game engine"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b4f1a3dfa5568c86c3ef50b61c1e1ca49b45f92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 15/39] dgen-sdl: build with new sdl12-compat library

---
 srcpkgs/dgen-sdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index d32ca6d23948b1..fc7c23b53a6d24 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -1,10 +1,10 @@
 # Template file for 'dgen-sdl'
 pkgname=dgen-sdl
 version=1.33
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config nasm"
-makedepends="SDL-devel libarchive-devel"
+makedepends="sdl12-compat-devel libarchive-devel"
 short_desc="Multi-platform Genesis/Mega Drive Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later"

From 0b2fa300c819fa138161f9508e27c458d294c2d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 16/39] gnuradio: build with new sdl12-compat library

---
 srcpkgs/gnuradio/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a6b0be4640da09..6e6f8b6dd77a54 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
 version=3.10.11.0
-revision=3
+revision=4
 build_style=cmake
 build_helper="python3"
 conf_files="/etc/gnuradio/conf.d/*"
@@ -12,10 +12,10 @@ _pydeps="python3-Mako python3-cairo python3-click python3-click-plugins python3-
  python3-jsonschema python3-numpy python3-pyqtgraph python3-pyzmq python3-scipy python3-yaml"
 hostmakedepends="pkg-config doxygen mathjax2 python3-Sphinx python3-pygccxml
  qt5-host-tools qt5-qmake ${_pydeps}"
-makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel
- gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel
- python3-devel python3-gobject-devel python3-pybind11 python3-pygccxml qwt-devel spdlog
- fmt-devel uhd-devel volk-devel"
+makedepends="sdl12-compat-devel SoapySDR-devel boost-devel codec2-devel cppzmq
+ fftw-devel gmpxx-devel gsl-devel gtk+3-devel jack-devel libgsm-devel
+ libiio-devel libsndfile-devel python3-devel python3-gobject-devel
+ python3-pybind11 python3-pygccxml qwt-devel spdlog fmt-devel uhd-devel volk-devel"
 depends="${_pydeps} python3-cheetah3 python3-lxml python3-matplotlib"
 checkdepends="python3-pytest"
 short_desc="Framework for software defined radio"

From 16e36ea52578c5e95eaf7368450fbf90365ba85a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 17/39] gst-plugins-bad1: build with new sdl12-compat library

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 8cbf2f4f541d51..48901b59976313 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.24.10
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -17,7 +17,7 @@ hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc $(vopt_if wayland wayland-devel)"
 makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
- libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
+ libexif-devel libmpcdec-devel faac-devel sdl12-compat-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
  xvidcore-devel jasper-devel libmodplug-devel libcurl-devel lcms2-devel
  libvdpau-devel libgsm-devel librtmp-devel libass-devel libvpx-devel

From 284729006e860ecebb001a577325ee4c29da3889 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 18/39] hex-a-hop: build with new sdl12-compat library

---
 srcpkgs/hex-a-hop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hex-a-hop/template b/srcpkgs/hex-a-hop/template
index 682cbeba9c9bc4..4f4e3e41e5b219 100644
--- a/srcpkgs/hex-a-hop/template
+++ b/srcpkgs/hex-a-hop/template
@@ -1,9 +1,9 @@
 # Template file for 'hex-a-hop'
 pkgname=hex-a-hop
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="SDL-devel SDL_mixer-devel SDL_ttf-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel SDL_ttf-devel"
 short_desc="Hex-a-Hop is an hexagonal tile-based puzzle game"
 maintainer="David Ferlier <dispertio@gmx.es>"
 license="GPL-2.0-only"

From 64c0bac4eaab0133c46d3c3d53a583778700a738 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 19/39] hyperrogue: build with new sdl12-compat library

---
 srcpkgs/hyperrogue/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index f472f08d2da4e3..69266f969c8556 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,11 +1,11 @@
 # Template file for 'hyperrogue'
 pkgname=hyperrogue
 version=13.0w
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
- SDL_ttf-devel zlib-devel fontconfig-devel"
+makedepends="glew-devel libpng-devel sdl12-compat-devel SDL_gfx-devel
+ SDL_mixer-devel SDL_ttf-devel zlib-devel fontconfig-devel"
 depends="dejavu-fonts-ttf"
 short_desc="SDL rogue-like in a non-euclidean world"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"

From 10365ff6eddae53e892aad92b184e0a87e7631fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 20/39] libmpeg2: build with new sdl12-compat library

---
 srcpkgs/libmpeg2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template
index 83abab0f9779f3..d4d64757b9b98d 100644
--- a/srcpkgs/libmpeg2/template
+++ b/srcpkgs/libmpeg2/template
@@ -1,11 +1,11 @@
 # Template file for 'libmpeg2'
 pkgname=libmpeg2
 version=0.5.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--enable-shared"
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXv-devel SDL-devel"
+makedepends="libXext-devel libXv-devel sdl12-compat-devel"
 short_desc="Library for decoding MPEG-2 and MPEG-1 video streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"

From cdcda5ec7cdf62e35feacfc8ffeeb816589ae8ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 21/39] libvisual: build with new sdl12-compat library

---
 srcpkgs/libvisual/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvisual/template b/srcpkgs/libvisual/template
index ef95a6551adb8a..5ba8e89b212aab 100644
--- a/srcpkgs/libvisual/template
+++ b/srcpkgs/libvisual/template
@@ -1,10 +1,10 @@
 # Template file for 'libvisual'
 pkgname=libvisual
 version=0.4.2
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="pkg-config sdl12-compat-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Abstraction library for audio visualisation plugins"
 maintainer="Piraty <mail@piraty.dev>"
 license="LGPL-2.1-or-later"

From b31b46785b675fef7f20d58ca3de74f330a48292 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 22/39] ltris: build with new sdl12-compat library

---
 srcpkgs/ltris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 9cd52394da35fa..a5742efb440f97 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,11 +1,11 @@
 # Template file for 'ltris'
 pkgname=ltris
 version=1.2.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
 hostmakedepends="bison"
-makedepends="SDL-devel SDL_mixer-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel"
 short_desc="Tetris clone using SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7c4928e3fad2f143a104d16f48624c0cd0af1a3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 23/39] navit: build with new sdl12-compat library

---
 srcpkgs/navit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 0bb5e58a336d0a..257747c2bdb998 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,11 +1,11 @@
 # Template file for 'navit'
 pkgname=navit
 version=0.5.6
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="SDL-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
+makedepends="sdl12-compat-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
  fontconfig-devel zlib-devel libpng-devel qt5-declarative-devel qt5-svg-devel
  qt5-location-devel SDL_ttf-devel SDL_image-devel libfreeglut-devel gtk+-devel
  pango-devel atk-devel gdk-pixbuf-devel qt5-sensors-devel qt5-multimedia-devel

From d906b1beb249246bb43c2bd74534d39ba552ee78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 24/39] netrek-client-cow: build with new sdl12-compat library

---
 srcpkgs/netrek-client-cow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netrek-client-cow/template b/srcpkgs/netrek-client-cow/template
index 10e677c2f27e7c..06fde0e05dc216 100644
--- a/srcpkgs/netrek-client-cow/template
+++ b/srcpkgs/netrek-client-cow/template
@@ -1,11 +1,11 @@
 # Template file for 'netrek-client-cow'
 pkgname=netrek-client-cow
 version=3.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="libX11-devel imlib2-devel libXxf86vm-devel gmp-devel
- SDL_mixer-devel SDL-devel libXpm-devel"
+ SDL_mixer-devel sdl12-compat-devel libXpm-devel"
 short_desc="Netrek Client (C and X11)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT, custom:PublicDomain"

From ddcd6a07377b98bc3680a63f80066b6936f4437b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 25/39] pcsxr: build with new sdl12-compat library

---
 srcpkgs/pcsxr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template
index 3102f23ed5e63c..eeda663d6545dc 100644
--- a/srcpkgs/pcsxr/template
+++ b/srcpkgs/pcsxr/template
@@ -1,11 +1,11 @@
 # Template file for 'pcsxr'
 pkgname=pcsxr
 version=1.9.94
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libcdio --enable-opengl"
 hostmakedepends="pkg-config automake libtool intltool glib-devel gettext-devel nasm"
-makedepends="libXv-devel libXtst-devel libcdio-devel SDL-devel gtk+3-devel
+makedepends="libXv-devel libXtst-devel libcdio-devel sdl12-compat-devel gtk+3-devel
  libXxf86vm-devel"
 depends="desktop-file-utils"
 short_desc="Sony PlayStation (PSX) emulator based on the PCSX-df project"

From 623373bd2831588626700ce3d32bd2d619987ad2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 26/39] povray: build with new sdl12-compat library

---
 srcpkgs/povray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 1bd7309959d35c..1fc3df63f0feba 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
 # Template file for 'povray'
 pkgname=povray
 version=3.7.0.8
-revision=10
+revision=11
 build_style=gnu-configure
 _v=${version%.*.*}
 configure_args="COMPILED_BY=Void --disable-optimiz-arch"
@@ -9,7 +9,7 @@ conf_files="
  /etc/povray/$_v/povray.conf
  /etc/povray/$_v/povray.ini"
 hostmakedepends="git autoconf automake"
-makedepends="boost-devel libpng-devel tiff-devel SDL-devel"
+makedepends="boost-devel libpng-devel tiff-devel sdl12-compat-devel"
 depends="openexr"
 short_desc="Script-based raytracer for 3D graphic production"
 maintainer="Brenton Horne <brentonhorne77@gmail.com>"

From 4d17f0f429e2ee4d091b4911d4fe6e3e92ade730 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 27/39] qodem: build with new sdl12-compat library

---
 srcpkgs/qodem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qodem/template b/srcpkgs/qodem/template
index d1b74cabc04820..2be40c629c5304 100644
--- a/srcpkgs/qodem/template
+++ b/srcpkgs/qodem/template
@@ -1,9 +1,9 @@
 # Template file for 'qodem'
 pkgname=qodem
 version=1.0.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="ncurses-devel gpm-devel miniupnpc-devel SDL-devel"
+makedepends="ncurses-devel gpm-devel miniupnpc-devel sdl12-compat-devel"
 short_desc="Re-implementation of the Qmodem serial communication package"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="CC0-1.0"

From 203c6fbd9cdc087cf45125209ebf96064dff6a7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 28/39] rott: build with new sdl12-compat library

---
 srcpkgs/rott/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 4650d0320e60b8..bb1cfeb6c401fc 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,11 +1,11 @@
 # Template file for 'rott'
 pkgname=rott
 version=1.1.2
-revision=2
+revision=3
 build_wrksrc=rott
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="SDL_mixer-devel SDL-devel"
+makedepends="SDL_mixer-devel sdl12-compat-devel"
 short_desc="Port of Apogee's 3D action title Rise of the Triad"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 13038f742adb36539fa7bcb53c05d0098793fcb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 29/39] smpeg: build with new sdl12-compat library

---
 srcpkgs/smpeg/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template
index d5c403dc826b36..e518ba055f88e8 100644
--- a/srcpkgs/smpeg/template
+++ b/srcpkgs/smpeg/template
@@ -1,12 +1,12 @@
 # Template file for 'smpeg'
 pkgname=smpeg
 version=0.4.5
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr --disable-gtk-player --disable-opengl-player"
+configure_args="--disable-gtk-player --disable-opengl-player"
 make_build_args="LDFLAGS+=-lstdc++"
-hostmakedepends="autoconf automake libtool"
-makedepends="SDL-devel"
+hostmakedepends="pkg-config autoconf automake libtool"
+makedepends="sdl12-compat-devel"
 short_desc="SDL MPEG Player Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -25,7 +25,7 @@ post_install() {
 }
 
 smpeg-devel_package() {
-	depends="SDL-devel smpeg>=${version}_${revision}"
+	depends="sdl12-compat-devel smpeg>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 0a584de094838e6f53bec110a74524c1733d424c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 30/39] sopwith: update to 2.7.0.

---
 .../patches/enable_cross_compilation.patch    | 37 -------------------
 srcpkgs/sopwith/template                      | 17 ++++-----
 2 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sopwith/patches/enable_cross_compilation.patch

diff --git a/srcpkgs/sopwith/patches/enable_cross_compilation.patch b/srcpkgs/sopwith/patches/enable_cross_compilation.patch
deleted file mode 100644
index 8dff50ad6bd258..00000000000000
--- a/srcpkgs/sopwith/patches/enable_cross_compilation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1,4 +1,4 @@
--AC_INIT(src/swmain.c)
-+AC_INIT([sopwith], [1.8.4])
- AC_CONFIG_AUX_DIR(autotools)
- 
- VERSION=1.8.4
-@@ -46,7 +46,8 @@
- 	;;
- esac
- 
--AM_INIT_AUTOMAKE(sopwith,$VERSION)
-+AM_INIT_AUTOMAKE([-Wall foreign])
-+AM_PROG_AR
- 
- AM_CONFIG_HEADER(config.h:config.hin)
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- bin_PROGRAMS = @SOPWITH_BINS@
- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
- 
--CFLAGS = @CFLAGS@ -I..
-+AM_CFLAGS = @CFLAGS@ @SDL_CFLAGS@ -I..
- 
- COMMON_SRC =       \
- video.h	    swcollsn.c  swgames.h   swmain.h    swutil.h 	\
---- a/src/sdl/Makefile.am
-+++ b/src/sdl/Makefile.am
-@@ -1,4 +1,4 @@
--CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
-+AM_CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
- 
- noinst_LIBRARIES = libsdlsopwith.a
- 
diff --git a/srcpkgs/sopwith/template b/srcpkgs/sopwith/template
index aa160fdbb8700b..8763a1bd84bc8b 100644
--- a/srcpkgs/sopwith/template
+++ b/srcpkgs/sopwith/template
@@ -1,19 +1,18 @@
 # Template file for 'sopwith'
 pkgname=sopwith
-version=1.8.4
-revision=2
+version=2.7.0
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="automake pkg-config"
+makedepends="SDL2-devel"
 short_desc="Sidescrolling shoot 'em up game"
-maintainer="beefcurtains <beefcurtains@users.noreply.github.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://sdl-sopwith.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/sdl-sopwith/sdl_sopwith/${version}/sopwith-${version}.tar.gz"
-checksum=a5ecb795a7aeff6be3ebfb99f1c6218054b73048786809f8468a92c952c17bd0
+homepage="https://fragglet.github.io/sdl-sopwith/"
+distfiles="https://github.com/fragglet/sdl-sopwith/archive/sdl-sopwith-${version}.tar.gz"
+checksum=48e90f1c837fbe8c91f639500c70c69493cb6ec22f7e769b2e27d252c167033e
 
 pre_configure() {
-	mv configure.{in,ac}
 	autoreconf -fi
 }
 

From 0b3296d7b8f4cf1e12f1cf7c69dac1f60168c52e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 31/39] spectrum3d: build with new sdl12-compat library

---
 srcpkgs/spectrum3d/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectrum3d/template b/srcpkgs/spectrum3d/template
index 5cdf3e528398f8..fdcc27a5db5c7e 100644
--- a/srcpkgs/spectrum3d/template
+++ b/srcpkgs/spectrum3d/template
@@ -1,10 +1,11 @@
 # Template file for 'spectrum3d'
 pkgname=spectrum3d
 version=2.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gstreamer1-devel gtk+3-devel SDL-devel alsa-lib-devel glu-devel"
+makedepends="gstreamer1-devel gtk+3-devel sdl12-compat-devel
+ alsa-lib-devel glu-devel"
 short_desc="Audio spectrum visualiser in 3D for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 23c2c5d89d1e35463f4cc0f4c3b6a5bb106160e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 32/39] swars: build with new sdl12-compat library

---
 srcpkgs/swars/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swars/template b/srcpkgs/swars/template
index 699361425ae96d..48ea08faf4003d 100644
--- a/srcpkgs/swars/template
+++ b/srcpkgs/swars/template
@@ -6,11 +6,12 @@ lib32mode="full"
 
 pkgname=swars
 version=0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-data-path=/opt/swars/"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel zlib-devel libopenal-devel libpng-devel libvorbis-devel"
+makedepends="sdl12-compat-devel zlib-devel libopenal-devel libpng-devel
+ libvorbis-devel"
 depends="vorbis-tools cdparanoia"
 short_desc="A SDL port of the 1996 DOS game Syndicate Wars"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,6 +19,7 @@ license="GPL-3"
 homepage="http://swars.vexillium.org/"
 distfiles="http://swars.vexillium.org/files/swars-${version}.tar.bz2"
 checksum=01f44e5b792d41b138d361d04810a875cfa5f897c642a2b13d0dde633fabdacb
+broken="unable to fetch source"
 
 post_install() {
 	# remove useless files

From 2fa0666424d5181ff1a762ba960fdbdeaf8215a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 33/39] tworld: build with new sdl12-compat library

---
 srcpkgs/tworld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tworld/template b/srcpkgs/tworld/template
index 11025bcd52fb48..9edd8d027ded16 100644
--- a/srcpkgs/tworld/template
+++ b/srcpkgs/tworld/template
@@ -1,9 +1,9 @@
 # Template file for 'tworld'
 pkgname=tworld
 version=1.3.2
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Emulator for Chip's Challenge game engine"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 20872db7d1642d36279cd17b410a11930493323b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 34/39] urbanterror: build with new sdl12-compat library

---
 srcpkgs/urbanterror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template
index 1ed3b0e49e3034..4d47c6e7a54f6d 100644
--- a/srcpkgs/urbanterror/template
+++ b/srcpkgs/urbanterror/template
@@ -1,8 +1,8 @@
 # Template file for 'urbanterror'
 pkgname=urbanterror
 version=4.3.4
-revision=2
-makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel
+revision=3
+makedepends="sdl12-compat-devel libopenal-devel libcurl-devel libvorbis-devel
  libXxf86vm-devel"
 depends="urbanterror-data>=${version}"
 short_desc="Team tactical shooter based on ioquake"

From 605ac4020b69870480cef12cf1a3dc57f6b46dbc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 35/39] virtualbox-ose: build with new sdl12-compat library

---
 srcpkgs/virtualbox-ose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 914cc5540a012b..4ba4a575929771 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=7.1.6
-revision=1
+revision=2
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, CDDL-1.0"
@@ -19,8 +19,8 @@ hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which gls
 makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
  libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
  libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel
- SDL-devel xorg-server-devel libslirp-devel libtpms-devel libxml2-devel libvncserver-devel
- openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
+ sdl12-compat-devel xorg-server-devel libslirp-devel libtpms-devel libxml2-devel
+ libvncserver-devel openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
  libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
  SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
 

From 0786c6c9666a322e3e05575bcf046e1c1a8bd52d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 36/39] xen: build with new sdl12-compat library

---
 srcpkgs/xen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 8ff41345f7189b..e6558977d722d0 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=12
+revision=13
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
  ghostscript git ocaml ocaml-findlib pandoc pkg-config tar texinfo wget
  python3-Markdown python3-setuptools"
-makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
+makedepends="sdl12-compat-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
  ncurses-devel"

From 8ee48c54dae1c16f9689d0c895a3e7bcbb317fdf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 37/39] xmoto: build with new sdl12-compat library

---
 srcpkgs/xmoto/patches/stdint.patch | 22 ++++++++++++++++++++++
 srcpkgs/xmoto/template             |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xmoto/patches/stdint.patch

diff --git a/srcpkgs/xmoto/patches/stdint.patch b/srcpkgs/xmoto/patches/stdint.patch
new file mode 100644
index 00000000000000..980227a352ed42
--- /dev/null
+++ b/srcpkgs/xmoto/patches/stdint.patch
@@ -0,0 +1,22 @@
+diff -ur a/src/common/DBuffer.cpp b/src/common/DBuffer.cpp
+--- a/src/common/DBuffer.cpp	2020-06-21 15:18:16.000000000 -0400
++++ b/src/common/DBuffer.cpp	2025-02-01 22:25:26.230759197 -0500
+@@ -24,6 +24,7 @@
+ #include "DBuffer.h"
+ #include "helpers/SwapEndian.h"
+ #include <algorithm>
++#include <cstdint>
+ 
+ void DBuffer::_FreeDBuffer(void) {
+   /* Free stuff if anything */
+diff -ur a/src/common/VFileIO.cpp b/src/common/VFileIO.cpp
+--- a/src/common/VFileIO.cpp	2020-06-21 15:18:16.000000000 -0400
++++ b/src/common/VFileIO.cpp	2025-02-01 22:25:38.676782152 -0500
+@@ -48,6 +48,7 @@
+ #include "xmoto/UserConfig.h"
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #ifdef WIN32
+ std::string win32_getHomeDir(bool i_asUtf8 = false) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index a1a159ecc6fbe7..1a25a8175d7f47 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,13 +1,13 @@
 # Template file for 'xmoto'
 pkgname=xmoto
 version=0.6.1
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu"
 configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel-tools desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
- libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
+ libxml2-devel libxdg-basedir-devel glu-devel sdl12-compat-devel SDL_mixer-devel
  SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel
  bzip2-devel gettext-devel"
 depends="${pkgname}-data"

From 9e19f243c4e99b13690c5f97eba5939a6f521cca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:55 -0500
Subject: [PATCH 38/39] xrick: build with new sdl12-compat library

---
 srcpkgs/xrick/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 3b751dcc67740e..885b74b128526d 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -1,10 +1,10 @@
 # Template file for 'xrick'
 pkgname=xrick
 version=021212
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=1
-makedepends="SDL-devel zlib-devel"
+makedepends="sdl12-compat-devel zlib-devel"
 short_desc="Clone of Rick Dangerous"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:GPL-ish"
@@ -12,6 +12,7 @@ homepage="http://www.bigorno.net/xrick/"
 distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz"
 checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
 restricted=yes
+broken="unable to fetch source"
 
 CFLAGS=-fcommon
 

From 213a2914632244b7e2b58bc4a4ae33eb65d6610f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:55 -0500
Subject: [PATCH 39/39] zsnes: build with new sdl12-compat library

---
 srcpkgs/zsnes/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zsnes/template b/srcpkgs/zsnes/template
index 78987d9d512ad5..8a7fa1545a5f93 100644
--- a/srcpkgs/zsnes/template
+++ b/srcpkgs/zsnes/template
@@ -3,13 +3,13 @@
 # 32bit
 pkgname=zsnes
 version=1.51
-revision=4
+revision=5
 archs="i686"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="force_arch=i686"
 hostmakedepends="nasm pkg-config"
-makedepends="MesaLib-devel SDL-devel libpng-devel ncurses-devel"
+makedepends="MesaLib-devel sdl12-compat-devel libpng-devel ncurses-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Super Nintendo emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,6 +20,13 @@ checksum=2856dedba272e9eed66cbf68dd4a9ae56797c373686c57371a65c7df35264623
 lib32mode="full"
 
 CFLAGS="-fcommon"
+CXXFLAGS="-fcommon"
+
+do_configure() {
+	# The build system fails to honor -std=c++14 in CXXFLAGS,
+	# so we'll force it in the compiler executable name
+	CXX="${CXX} -std=c++14" ./configure ${configure_args}
+}
 
 post_install() {
 	vmkdir usr/share

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] SDL: replace with `sdl12-compat`
  2025-02-03 14:09 [PR PATCH] SDL: replace with `sdl12-compat` ahesford
  2025-02-03 14:15 ` [PR PATCH] [Updated] " ahesford
@ 2025-02-03 19:36 ` ahesford
  2025-02-03 19:36 ` [PR PATCH] [Merged]: " ahesford
  2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2025-02-03 19:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1197 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages sdl12-compat
https://github.com/void-linux/void-packages/pull/54199

SDL: replace with `sdl12-compat`
Especially now that SDL 3 is available, let's completely abandon the dead SDL 1.2 in favor of the official compat library that uses SDL 2 on the backend. This supersedes https://github.com/void-linux/void-packages/pull/53761.

Four packages that depend on SDL fail to build because their distfiles cannot be fetched:
- `agg` (only required by `desumume`)
- `ballerburg` (leaf package, some game)
- `swars` (leaf package, only for `i686`, some game)
- `xrick` (leaf package, restricted)

I've marked these broken to highlight the existing issues. Note that, because `sdl12-compat` is ABI compatible with SDL 1.2, people with any of these packages installed should still be able to upgrade seamlessly and we should avoid any shlib staging.

#### Testing the changes
- I tested the changes in this PR: **briefly**, works as expected with `dosbox` and `tworld`.

A patch file from https://github.com/void-linux/void-packages/pull/54199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sdl12-compat-54199.patch --]
[-- Type: text/x-diff, Size: 64108 bytes --]

From e5f73a17099746b4f97fce674f8044a29a6b89b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 21:49:15 -0500
Subject: [PATCH 01/39] SDL: replace with sdl12-compat

New package: sdl12-compat-1.2.68.
---
 common/shlibs                                 |   2 +-
 srcpkgs/SDL                                   |   1 +
 srcpkgs/SDL-devel                             |   2 +-
 .../patches/SDL-1.2.10-GrabNotViewable.patch  |  22 -
 srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch |  24 --
 srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch    | 375 ------------------
 srcpkgs/SDL/template                          |  44 --
 srcpkgs/sdl12-compat-devel                    |   1 +
 srcpkgs/sdl12-compat/patches/sdl-config.patch |  11 +
 srcpkgs/sdl12-compat/template                 |  48 +++
 10 files changed, 63 insertions(+), 467 deletions(-)
 create mode 120000 srcpkgs/SDL
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
 delete mode 100644 srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
 delete mode 100644 srcpkgs/SDL/template
 create mode 120000 srcpkgs/sdl12-compat-devel
 create mode 100644 srcpkgs/sdl12-compat/patches/sdl-config.patch
 create mode 100644 srcpkgs/sdl12-compat/template

diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..c03c19f37b8cde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -410,7 +410,7 @@ libpostproc.so.55 libpostproc-4.0_1
 libavcodec.so.58 libavcodec-4.0_1
 libavutil.so.56 libavutil-4.0_1
 libavfilter.so.7 libavfilter-4.0_1
-libSDL-1.2.so.0 SDL-1.2.14_1
+libSDL-1.2.so.0 sdl12-compat-1.2.68_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.157 x264-20190507.2245_1
 libopenh264.so.7 openh264-2.4.1_1
diff --git a/srcpkgs/SDL b/srcpkgs/SDL
new file mode 120000
index 00000000000000..901c98ddbd0f94
--- /dev/null
+++ b/srcpkgs/SDL
@@ -0,0 +1 @@
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/SDL-devel b/srcpkgs/SDL-devel
index bf798a56736d19..901c98ddbd0f94 120000
--- a/srcpkgs/SDL-devel
+++ b/srcpkgs/SDL-devel
@@ -1 +1 @@
-SDL
\ No newline at end of file
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch b/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
deleted file mode 100644
index a05c37044c68ca..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
-viewable. Patch provided by <pbonzini@redhat.com>.
-See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
-
---- a/src/video/x11/SDL_x11wm.c	2007-12-31 04:48:13.000000000 +0000
-+++ b/src/video/x11/SDL_x11wm.c	2009-01-15 10:27:14.000000000 +0000
-@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, 
- 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
- 						GrabModeAsync, GrabModeAsync,
- 						SDL_Window, None, CurrentTime);
--			if ( result == GrabSuccess ) {
-+			if ( result == GrabSuccess || result == GrabNotViewable ) {
- 				break;
- 			}
- 			SDL_Delay(100);
- 		}
- 		if ( result != GrabSuccess ) {
- 			/* Uh, oh, what do we do here? */ ;
-+			return(SDL_GRAB_OFF);
- 		}
- 		/* Now grab the keyboard */
- 		XGrabKeyboard(SDL_Display, WMwindow, True,
diff --git a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch b/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
deleted file mode 100644
index 5afa0a4059f91e..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
-+++ b/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
-@@ -3,7 +3,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
--libdir=@libdir@
- 
- @ENABLE_STATIC_FALSE@usage="\
- @ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
-@@ -45,11 +44,11 @@ while test $# -gt 0; do
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
--@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
- @ENABLE_STATIC_TRUE@      ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch b/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
deleted file mode 100644
index 94d13f9223001e..00000000000000
--- a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch
+++ /dev/null
@@ -1,375 +0,0 @@
---- a/configure        2012-01-19 07:30:12.000000000 +0100
-+++ b/configure  2018-11-27 22:58:07.344753821 +0100
-@@ -1514,6 +1514,7 @@
-   --disable-esdtest       Do not try to compile and run a test ESD program
-   --enable-esd-shared     dynamically load ESD audio support [default=yes]
-   --enable-pulseaudio     use PulseAudio [default=yes]
-+  --enable-sndio          use SNDIO [default=yes]
-   --enable-pulseaudio-shared
-                           dynamically load PulseAudio support [default=yes]
-   --enable-arts           support the Analog Real Time Synthesizer
-@@ -21000,6 +21001,23 @@
-     fi
- }
-
-+CheckSndio()
-+{
-+# Check whether --enable-sndio was given.
-+if test "${enable_sndio+set}" = set; then
-+  enableval=$enable_sndio;
-+else
-+  enable_sndio=yes
-+fi
-+
-+if test "x${enable_sndio}" = "xyes"; then :
-+  SOURCES="$SOURCES $srcdir/src/audio/sndio/SDL_sndioaudio.c"
-+  EXTRA_CFLAGS="$EXTRA_CFLAGS -DSDL_AUDIO_DRIVER_SNDIO=1"
-+  EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lsndio"
-+  have_audio=yes
-+fi
-+}
-+
- CheckPulseAudio()
- {
-     # Check whether --enable-pulseaudio was given.
-@@ -29550,6 +29568,7 @@
-         CheckMME
-         CheckALSA
-         CheckARTSC
-+        CheckSndio
-         CheckESD
-         CheckPulseAudio
-         CheckNAS
---- a/include/SDL_config.h.in	2018-11-27 21:52:07.645177938 +0100
-+++ b/include/SDL_config.h.in	2018-11-27 22:03:06.217107399 +0100
-@@ -184,6 +184,7 @@
- #undef SDL_AUDIO_DRIVER_QNXNTO
- #undef SDL_AUDIO_DRIVER_SNDMGR
- #undef SDL_AUDIO_DRIVER_SUNAUDIO
-+#undef SDL_AUDIO_DRIVER_SNDIO
- #undef SDL_AUDIO_DRIVER_WAVEOUT
- 
- /* Enable various cdrom drivers */
---- a/src/audio/SDL_audio.c	2018-11-27 21:52:07.646177937 +0100
-+++ b/src/audio/SDL_audio.c	2018-11-27 22:04:37.977097571 +0100
-@@ -42,6 +42,9 @@
- #if SDL_AUDIO_DRIVER_ALSA
- 	&ALSA_bootstrap,
- #endif
-+#if SDL_AUDIO_DRIVER_SNDIO
-+	&SNDIO_bootstrap,
-+#endif
- #if SDL_AUDIO_DRIVER_BSD
- 	&BSD_AUDIO_bootstrap,
- #endif
---- a/src/audio/SDL_sysaudio.h	2018-11-27 21:52:07.647177937 +0100
-+++ b/src/audio/SDL_sysaudio.h	2018-11-27 22:05:13.697093745 +0100
-@@ -105,6 +105,9 @@
- #if SDL_AUDIO_DRIVER_BSD
- extern AudioBootStrap BSD_AUDIO_bootstrap;
- #endif
-+#if SDL_AUDIO_DRIVER_SNDIO
-+extern AudioBootStrap SNDIO_bootstrap;
-+#endif
- #if SDL_AUDIO_DRIVER_PULSE
- extern AudioBootStrap PULSE_bootstrap;
- #endif
---- a/src/audio/sndio/SDL_sndioaudio.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/audio/sndio/SDL_sndioaudio.c	2013-12-19 10:24:18.000000000 +0100
-@@ -0,0 +1,243 @@
-+/*
-+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "SDL_config.h"
-+
-+/* Allow access to a raw mixing buffer */
-+
-+#ifdef HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
-+#include <unistd.h>
-+
-+#include "SDL_timer.h"
-+#include "SDL_audio.h"
-+#include "../SDL_audiomem.h"
-+#include "../SDL_audio_c.h"
-+#include "../SDL_audiodev_c.h"
-+#include "SDL_sndioaudio.h"
-+
-+/* The tag name used by sndio audio */
-+#define SNDIO_DRIVER_NAME         "sndio"
-+
-+/* Audio driver functions */
-+static int SNDIO_OpenAudio(_THIS, SDL_AudioSpec *spec);
-+static void SNDIO_WaitAudio(_THIS);
-+static void SNDIO_PlayAudio(_THIS);
-+static Uint8 *SNDIO_GetAudioBuf(_THIS);
-+static void SNDIO_CloseAudio(_THIS);
-+
-+/* Audio driver bootstrap functions */
-+
-+static int Audio_Available(void)
-+{
-+	struct sio_hdl *this_hdl;
-+	int available = 0;
-+
-+	if ( (this_hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0)) != NULL ) {
-+		sio_close(this_hdl);
-+		available = 1;
-+	}
-+
-+	return available;
-+}
-+
-+static void Audio_DeleteDevice(SDL_AudioDevice *device)
-+{
-+	SDL_free(device->hidden);
-+	SDL_free(device);
-+}
-+
-+static SDL_AudioDevice *Audio_CreateDevice(int devindex)
-+{
-+	SDL_AudioDevice *this;
-+
-+	/* Initialize all variables that we clean on shutdown */
-+	this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice));
-+	if ( this ) {
-+		SDL_memset(this, 0, (sizeof *this));
-+		this->hidden = (struct SDL_PrivateAudioData *)
-+				SDL_malloc((sizeof *this->hidden));
-+	}
-+	if ( (this == NULL) || (this->hidden == NULL) ) {
-+		SDL_OutOfMemory();
-+		if ( this ) {
-+			SDL_free(this);
-+		}
-+		return(0);
-+	}
-+	SDL_memset(this->hidden, 0, (sizeof *this->hidden));
-+
-+	/* Set the function pointers */
-+	this->OpenAudio = SNDIO_OpenAudio;
-+	this->WaitAudio = SNDIO_WaitAudio;
-+	this->PlayAudio = SNDIO_PlayAudio;
-+	this->GetAudioBuf = SNDIO_GetAudioBuf;
-+	this->CloseAudio = SNDIO_CloseAudio;
-+
-+	this->free = Audio_DeleteDevice;
-+
-+	hdl = NULL;
-+
-+	return this;
-+}
-+
-+AudioBootStrap SNDIO_bootstrap = {
-+	SNDIO_DRIVER_NAME, "sndio",
-+	Audio_Available, Audio_CreateDevice
-+};
-+
-+
-+
-+/* This function waits until it is possible to write a full sound buffer */
-+static void SNDIO_WaitAudio(_THIS)
-+{
-+	/* nothing, we're using the blocking api */
-+}
-+
-+static void SNDIO_PlayAudio(_THIS)
-+{
-+	int written;
-+
-+	/* Write the audio data */
-+	written = sio_write(hdl, mixbuf, mixlen);
-+	
-+	/* If we couldn't write, assume fatal error for now */
-+	if ( written == 0 ) {
-+		this->enabled = 0;
-+	}
-+#ifdef DEBUG_AUDIO
-+	fprintf(stderr, "Wrote %d bytes of audio data\n", written);
-+#endif
-+}
-+
-+static Uint8 *SNDIO_GetAudioBuf(_THIS)
-+{
-+	return(mixbuf);
-+}
-+
-+static void SNDIO_CloseAudio(_THIS)
-+{
-+	if ( mixbuf != NULL ) {
-+		SDL_FreeAudioMem(mixbuf);
-+		mixbuf = NULL;
-+	}
-+	if ( hdl != NULL ) {
-+		sio_close(hdl);
-+		hdl = NULL;
-+	}
-+}
-+
-+static int SNDIO_OpenAudio(_THIS, SDL_AudioSpec *spec)
-+{
-+	struct sio_par par;
-+
-+	mixbuf = NULL;
-+
-+	if ((hdl = sio_open(NULL, SIO_PLAY, 0)) == NULL) {
-+		SDL_SetError("sio_open() failed");
-+		return(-1);
-+	}
-+
-+	sio_initpar(&par);
-+
-+	switch (spec->format) {
-+	case AUDIO_S16LSB:
-+		par.bits = 16;
-+		par.sig = 1;
-+		par.le = 1;
-+		break;
-+	case AUDIO_S16MSB:
-+		par.bits = 16;
-+		par.sig = 1;
-+		par.le = 0;
-+		break;
-+	case AUDIO_S8:
-+		par.bits = 8;
-+		par.sig = 1;
-+		break;
-+	case AUDIO_U16LSB:
-+		par.bits = 16;
-+		par.sig = 0;
-+		par.le = 1;
-+		break;
-+	case AUDIO_U16MSB:
-+		par.bits = 16;
-+		par.sig = 0;
-+		par.le = 0;
-+		break;
-+	case AUDIO_U8:
-+		par.bits = 8;
-+		par.sig = 0;
-+		break;
-+	default:
-+		SDL_SetError("SNDIO unknown format");
-+		return(-1);
-+	}
-+
-+	par.rate = spec->freq;
-+	par.pchan = spec->channels;
-+	par.round = spec->samples;
-+	par.appbufsz = par.round * 2;
-+
-+	if (sio_setpar(hdl, &par) == 0) {
-+		SDL_SetError("sio_setpar() failed");
-+		return(-1);
-+	}
-+
-+	if (sio_getpar(hdl, &par) == 0) {
-+		SDL_SetError("sio_getpar() failed");
-+		return(-1);
-+	}
-+
-+	if (par.bits == 16) {
-+		if (par.sig && par.le) {
-+			spec->format = AUDIO_S16LSB;
-+		} else if (par.sig && !par.le) {
-+			spec->format = AUDIO_S16MSB;
-+		} else if (!par.sig && par.le) {
-+			spec->format = AUDIO_U16LSB;
-+		} else 
-+			spec->format = AUDIO_U16MSB;
-+	} else if (par.bits == 8) {
-+		spec->format = par.sig ? AUDIO_S8 : AUDIO_U8;
-+	} else {
-+		SDL_SetError("SNDIO couldn't configure a suitable format");
-+		return(-1);
-+	}
-+
-+	spec->freq = par.rate;
-+	spec->channels = par.pchan;
-+	spec->samples = par.round;
-+
-+	SDL_CalculateAudioSpec(spec);
-+
-+	/* Allocate mixing buffer */
-+	mixlen = spec->size;
-+	mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen);
-+	if ( mixbuf == NULL ) {
-+		return(-1);
-+	}
-+	SDL_memset(mixbuf, spec->silence, spec->size);
-+
-+	if ( sio_start(hdl) == 0 ) {
-+		SDL_SetError("sio_start() failed");
-+		return(-1);
-+	}
-+
-+	/* We're ready to rock and roll. :-) */
-+	return(0);
-+}
---- a/src/audio/sndio/SDL_sndioaudio.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/audio/sndio/SDL_sndioaudio.h	2013-12-15 02:57:55.000000000 +0100
-@@ -0,0 +1,50 @@
-+/*
-+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "SDL_config.h"
-+
-+#ifndef _SDL_sndioaudio_h
-+#define _SDL_sndioaudio_h
-+
-+#include <sndio.h>
-+
-+#include "../SDL_sysaudio.h"
-+
-+/* Hidden "this" pointer for the video functions */
-+#define _THIS	SDL_AudioDevice *this
-+
-+struct SDL_PrivateAudioData {
-+	/* The stream descriptor for the audio device */
-+	struct sio_hdl *hdl;
-+
-+	/* The parent process id, to detect when application quits */
-+	pid_t parent;
-+
-+	/* Raw mixing buffer */
-+	Uint8 *mixbuf;
-+	int    mixlen;
-+
-+};
-+
-+/* Old variable names */
-+#define stream			(this->hidden->stream)
-+#define parent			(this->hidden->parent)
-+#define mixbuf			(this->hidden->mixbuf)
-+#define mixlen			(this->hidden->mixlen)
-+#define hdl			(this->hidden->hdl)
-+
-+#endif /* _SDL_sndioaudio_h */
-+
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
deleted file mode 100644
index ee8447047b42c8..00000000000000
--- a/srcpkgs/SDL/template
+++ /dev/null
@@ -1,44 +0,0 @@
-# Template file for 'SDL'
-pkgname=SDL
-version=1.2.15
-revision=14
-build_style=gnu-configure
-configure_args="--enable-alsa --enable-sndio --disable-esd --disable-rpath
- --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
- --disable-alsa-shared --disable-pulseaudio-shared --disable-video-dga
- --disable-osmesa-shared $(vopt_enable aalib video-aalib)
- $(vopt_enable pulseaudio) $(vopt_enable opengl video-opengl)
- $(vopt_if x11 '-enable-video-x11-xrandr --enable-video-x11-vm --enable-video-x11-xv')"
-hostmakedepends="pkg-config nasm"
-makedepends="alsa-lib-devel sndio-devel $(vopt_if x11 libXrandr-devel)
- $(vopt_if aalib aalib-devel) $(vopt_if opengl glu-devel)
- $(vopt_if pulseaudio pulseaudio-devel)"
-short_desc="Simple Directmedia Layer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://www.libsdl.org/"
-distfiles="https://www.libsdl.org/release/SDL-${version}.tar.gz"
-checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
-
-# Package build options
-build_options="x11 opengl aalib pulseaudio"
-build_options_default="x11 opengl pulseaudio"
-
-if [ "$build_option_opengl" ]; then
-	# libGL.so.1 is dynamically loaded with dlopen.
-	shlib_requires="libGL.so.1"
-	depends="virtual?libGL"
-fi
-
-SDL-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} SDL>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}
diff --git a/srcpkgs/sdl12-compat-devel b/srcpkgs/sdl12-compat-devel
new file mode 120000
index 00000000000000..901c98ddbd0f94
--- /dev/null
+++ b/srcpkgs/sdl12-compat-devel
@@ -0,0 +1 @@
+sdl12-compat
\ No newline at end of file
diff --git a/srcpkgs/sdl12-compat/patches/sdl-config.patch b/srcpkgs/sdl12-compat/patches/sdl-config.patch
new file mode 100644
index 00000000000000..344d5f550e61cf
--- /dev/null
+++ b/srcpkgs/sdl12-compat/patches/sdl-config.patch
@@ -0,0 +1,11 @@
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -31,6 +31,8 @@
+ 
+   case $1 in
+     --prefix=*)
++      [ "${libdir#${prefix}}" = "${libdir}" ] || libdir="${optarg}/${libdir#${prefix}}"
++      [ "${includedir#${prefix}}" = "${includedir}" ] || includedir="${optarg}/${includedir#${prefix}}"
+       prefix=$optarg
+       if test $exec_prefix_set = no ; then
+         exec_prefix=$optarg
diff --git a/srcpkgs/sdl12-compat/template b/srcpkgs/sdl12-compat/template
new file mode 100644
index 00000000000000..1af48957ccae1e
--- /dev/null
+++ b/srcpkgs/sdl12-compat/template
@@ -0,0 +1,48 @@
+# Template file for 'sdl12-compat'
+pkgname=sdl12-compat
+version=1.2.68
+revision=1
+build_style=cmake
+makedepends="SDL2-devel"
+short_desc="SDL-1.2 compatibility library based on SDL 2.0"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Zlib AND (Public Domain OR MIT-0)"
+homepage="https://github.com/libsdl-org/sdl12-compat"
+distfiles="${homepage}/archive/release-${version}.tar.gz"
+checksum=63c6e4dcc1154299e6f363c872900be7f3dcb3e42b9f8f57e05442ec3d89d02d
+replaces="SDL>=0"
+provides="SDL-${version}_${revision}"
+# The compat library dlopens SDL 2
+shlib_requires="libSDL2-2.0.so.0"
+
+post_install() {
+	vlicense LICENSE.txt
+	ln -s sdl12_compat.pc "${DESTDIR}/usr/lib/pkgconfig/sdl.pc"
+}
+
+sdl12-compat-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	replaces="SDL-devel>=0"
+	provides="SDL-devel-${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}
+
+SDL_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
+
+SDL-devel_package() {
+	depends="SDL-devel>=${version}_${revision}"
+	short_desc+=" - development files (transitional dummy package)"
+	build_style=meta
+}

From 26f701335e9719864e0b2cd8c64153b3a5ef942e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:45 -0500
Subject: [PATCH 02/39] Powermanga: build with new sdl12-compat library

---
 srcpkgs/Powermanga/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Powermanga/template b/srcpkgs/Powermanga/template
index f3b9ef9faf3c15..8e9af6901926ac 100644
--- a/srcpkgs/Powermanga/template
+++ b/srcpkgs/Powermanga/template
@@ -1,10 +1,10 @@
 # Template file for 'Powermanga'
 pkgname=Powermanga
 version=0.93.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="automake libtool SDL-devel"
-makedepends="libpng-devel SDL_mixer-devel SDL_image-devel"
+hostmakedepends="automake libtool pkg-config sdl12-compat-devel"
+makedepends="libpng-devel sdl12-compat-devel SDL_mixer-devel SDL_image-devel"
 short_desc="Arcade 2D shoot-em-up game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 32e6febb203ea8c375fe216632920f3d603d4244 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 03/39] SDL_gfx: build with new sdl12-compat library

---
 srcpkgs/SDL_gfx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_gfx/template b/srcpkgs/SDL_gfx/template
index 5af9730e6143e1..94d5ee80246192 100644
--- a/srcpkgs/SDL_gfx/template
+++ b/srcpkgs/SDL_gfx/template
@@ -1,10 +1,10 @@
 # Template file for 'SDL_gfx'
 pkgname=SDL_gfx
 version=2.0.26
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Graphics drawing primitives for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -27,7 +27,7 @@ post_install() {
 	vlicense LICENSE
 }
 SDL_gfx-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 15ac5501513c082d67280ef2b0490cc54f15d140 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 04/39] SDL_image: build with new sdl12-compat library

---
 srcpkgs/SDL_image/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index 05681e6da03c10..dbccde7cb3471c 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_image'
 pkgname=SDL_image
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="libpng-devel tiff-devel SDL-devel libwebp-devel"
+makedepends="libpng-devel tiff-devel sdl12-compat-devel libwebp-devel"
 # The following are dlopen(3)ed at runtime.
 depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.4.0"
 short_desc="Load images as SDL surfaces"
@@ -20,7 +20,7 @@ post_install() {
 }
 
 SDL_image-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e057f46d11b9a36329fe5dd59e39176cfda72208 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 05/39] SDL_mixer: build with new sdl12-compat library

---
 srcpkgs/SDL_mixer/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index b4462ef8c1e335..2f29b8c12669a8 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,11 +1,12 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=14
+revision=15
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel fluidsynth-devel"
+makedepends="sdl12-compat-devel libvorbis-devel libmikmod-devel libflac-devel
+ smpeg-devel fluidsynth-devel"
 # The following deps are dlopen(3)ed at runtime.
 depends="libvorbis libmikmod smpeg libflac"
 short_desc="Multi-channel audio mixer library"
@@ -28,7 +29,7 @@ post_install() {
 }
 
 SDL_mixer-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 69daa0628c2c7a19622d815b59f0675f555caa47 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:46 -0500
Subject: [PATCH 06/39] SDL_net: build with new sdl12-compat library

---
 srcpkgs/SDL_net/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index 81fadf794bc3c6..978b67785d01e4 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_net'
 pkgname=SDL_net
 version=1.2.8
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Small sample cross-platform networking library for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 SDL_net-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From fbfe7e65682d5b53ec079d2721ff541eb26f095a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 07/39] SDL_sound: build with new sdl12-compat library

---
 srcpkgs/SDL_sound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template
index 19c86987d22f37..391034e0d8c3f7 100644
--- a/srcpkgs/SDL_sound/template
+++ b/srcpkgs/SDL_sound/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_sound'
 pkgname=SDL_sound
 version=1.0.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel libmikmod-devel libvorbis-devel
+makedepends="sdl12-compat-devel libmikmod-devel libvorbis-devel
  libflac-devel speex-devel smpeg-devel"
 short_desc="Library to decode several popular sound file formats"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +15,7 @@ distfiles="http://icculus.org/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df
 
 SDL_sound-devel_package() {
-	depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 4b41c0d317c6acd3179b09a5ab763fcfe9da01aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 08/39] SDL_ttf: build with new sdl12-compat library

---
 srcpkgs/SDL_ttf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index a6856a297bc496..9c4020c2788d77 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -1,11 +1,11 @@
 # Template file for 'SDL_ttf'
 pkgname=SDL_ttf
 version=2.0.11
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="freetype-devel SDL-devel libSM-devel"
+makedepends="freetype-devel sdl12-compat-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 SDL_ttf-devel_package() {
-	depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
+	depends="freetype-devel sdl12-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From cb5b5236b1b3cbc12673507458e096e3a62755b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 09/39] agg: build with new sdl12-compat library

---
 srcpkgs/agg/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template
index 2069096d4cdf03..15ac2b48639a6e 100644
--- a/srcpkgs/agg/template
+++ b/srcpkgs/agg/template
@@ -1,11 +1,11 @@
 # Template file for 'agg'
 pkgname=agg
 version=2.5
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-examples"
-hostmakedepends="SDL-devel automake gettext-devel libtool pkg-config"
-makedepends="SDL-devel freetype-devel"
+hostmakedepends="sdl12-compat-devel automake gettext-devel libtool pkg-config"
+makedepends="sdl12-compat-devel freetype-devel"
 short_desc="High Quality Rendering Engine for C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -13,6 +13,7 @@ homepage="https://agg.sourceforge.net/antigrain.com/"
 distfiles="http://www.antigrain.com/agg-${version}.tar.gz"
 checksum=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
 disable_parallel_build=yes
+broken="unable to fetch source"
 
 pre_configure() {
 	sed -e '/AM_C_PROTOTYPES/d' -i configure.in

From 9dc5ea7ba7617df08e50be425bb7acfc3e7287ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:47 -0500
Subject: [PATCH 10/39] ballerburg: build with new sdl12-compat library

---
 srcpkgs/ballerburg/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ballerburg/template b/srcpkgs/ballerburg/template
index 986e2db2456124..38fc87372434f4 100644
--- a/srcpkgs/ballerburg/template
+++ b/srcpkgs/ballerburg/template
@@ -1,13 +1,14 @@
 # Template file for 'ballerburg'
 pkgname=ballerburg
 version=1.2.1
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="which cmake SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="which cmake sdl12-compat-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Classical castle combat game"
 maintainer="pulux <pulux@pf4sh.de>"
 license="GPL-3.0-or-later"
 homepage="http://baller.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/baller/$pkgname-$version.tar.gz"
 checksum=3f4ad9465f01c256dd1b37cc62c9fd8cbca372599753dbb21726629f042a6e62
+broken="unable to fetch source"

From edb854b696c946f9b76ef3c2950cf42e5f4e54ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 11/39] boswars: build with new sdl12-compat library

---
 srcpkgs/boswars/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/boswars/template b/srcpkgs/boswars/template
index 42c097d1dcdf23..913bbad6c10759 100644
--- a/srcpkgs/boswars/template
+++ b/srcpkgs/boswars/template
@@ -1,9 +1,10 @@
 # Template file for 'boswars'
 pkgname=boswars
 version=2.8
-revision=1
+revision=2
 hostmakedepends="pkg-config libpng-progs python3"
-makedepends="SDL-devel glu-devel libpng-devel libtheora-devel libvorbis-devel lua51-devel"
+makedepends="sdl12-compat-devel glu-devel libpng-devel
+ libtheora-devel libvorbis-devel lua51-devel"
 depends="${pkgname}-data"
 short_desc="Futuristic real-time strategy game (RTS)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b51af85a578d6e46963e11b61e2ec43c4ddc5299 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 12/39] caph: build with new sdl12-compat library

---
 srcpkgs/caph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/caph/template b/srcpkgs/caph/template
index a0d6f8211a03b2..c7d4e94fdbc2b8 100644
--- a/srcpkgs/caph/template
+++ b/srcpkgs/caph/template
@@ -1,13 +1,13 @@
 # Template file for 'caph'
 pkgname=caph
 version=1.1
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="-f caph.mk"
 hostmakedepends="which pkg-config"
-makedepends="SDL-devel libpng-devel"
+makedepends="sdl12-compat-devel libpng-devel"
 short_desc="Drawing and physics sandbox game"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-or-later"

From 32fe71893f2b638034504a64699e71c7462b1b5a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 13/39] crimson: build with new sdl12-compat library

---
 srcpkgs/crimson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crimson/template b/srcpkgs/crimson/template
index 211fc3eeac04e8..2b58ee2cc74e12 100644
--- a/srcpkgs/crimson/template
+++ b/srcpkgs/crimson/template
@@ -1,9 +1,9 @@
 # Template file for 'crimson'
 pkgname=crimson
 version=0.5.3
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="SDL-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel"
 short_desc="Tactical war game in the tradition of the popular Battle Isle"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e5e391853ee56515edb50ea0ecaa5976b7c0dd51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:48 -0500
Subject: [PATCH 14/39] darkplaces: build with new sdl12-compat library

---
 srcpkgs/darkplaces/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darkplaces/template b/srcpkgs/darkplaces/template
index 437bee50ceaf27..5b27327c13442e 100644
--- a/srcpkgs/darkplaces/template
+++ b/srcpkgs/darkplaces/template
@@ -1,10 +1,11 @@
 # Template file for 'darkplaces'
 pkgname=darkplaces
 version=20140513
-revision=3
+revision=4
 create_wrksrc=yes
 hostmakedepends="unzip"
-makedepends="zlib-devel alsa-lib-devel libjpeg-turbo-devel libXpm-devel libXxf86vm-devel SDL-devel MesaLib-devel"
+makedepends="zlib-devel alsa-lib-devel libjpeg-turbo-devel libXpm-devel
+ libXxf86vm-devel sdl12-compat-devel MesaLib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="An advanced Quake 1 game engine"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d643c593dc456572b8289a5e7609eaee92901529 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 15/39] dgen-sdl: build with new sdl12-compat library

---
 srcpkgs/dgen-sdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index d32ca6d23948b1..fc7c23b53a6d24 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -1,10 +1,10 @@
 # Template file for 'dgen-sdl'
 pkgname=dgen-sdl
 version=1.33
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config nasm"
-makedepends="SDL-devel libarchive-devel"
+makedepends="sdl12-compat-devel libarchive-devel"
 short_desc="Multi-platform Genesis/Mega Drive Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later"

From 44354233c9c756ff8a09b096802c53404f7acc2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 16/39] gnuradio: build with new sdl12-compat library

---
 srcpkgs/gnuradio/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a6b0be4640da09..6e6f8b6dd77a54 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
 version=3.10.11.0
-revision=3
+revision=4
 build_style=cmake
 build_helper="python3"
 conf_files="/etc/gnuradio/conf.d/*"
@@ -12,10 +12,10 @@ _pydeps="python3-Mako python3-cairo python3-click python3-click-plugins python3-
  python3-jsonschema python3-numpy python3-pyqtgraph python3-pyzmq python3-scipy python3-yaml"
 hostmakedepends="pkg-config doxygen mathjax2 python3-Sphinx python3-pygccxml
  qt5-host-tools qt5-qmake ${_pydeps}"
-makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel
- gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel
- python3-devel python3-gobject-devel python3-pybind11 python3-pygccxml qwt-devel spdlog
- fmt-devel uhd-devel volk-devel"
+makedepends="sdl12-compat-devel SoapySDR-devel boost-devel codec2-devel cppzmq
+ fftw-devel gmpxx-devel gsl-devel gtk+3-devel jack-devel libgsm-devel
+ libiio-devel libsndfile-devel python3-devel python3-gobject-devel
+ python3-pybind11 python3-pygccxml qwt-devel spdlog fmt-devel uhd-devel volk-devel"
 depends="${_pydeps} python3-cheetah3 python3-lxml python3-matplotlib"
 checkdepends="python3-pytest"
 short_desc="Framework for software defined radio"

From 9504facf06b450ea5b9925b0e374b191d64f1c55 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 17/39] gst-plugins-bad1: build with new sdl12-compat library

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 8cbf2f4f541d51..48901b59976313 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.24.10
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -17,7 +17,7 @@ hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc $(vopt_if wayland wayland-devel)"
 makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
- libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
+ libexif-devel libmpcdec-devel faac-devel sdl12-compat-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
  xvidcore-devel jasper-devel libmodplug-devel libcurl-devel lcms2-devel
  libvdpau-devel libgsm-devel librtmp-devel libass-devel libvpx-devel

From af53fc8a9001387254a5081e1af4b177ada513c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:49 -0500
Subject: [PATCH 18/39] hex-a-hop: build with new sdl12-compat library

---
 srcpkgs/hex-a-hop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hex-a-hop/template b/srcpkgs/hex-a-hop/template
index 682cbeba9c9bc4..4f4e3e41e5b219 100644
--- a/srcpkgs/hex-a-hop/template
+++ b/srcpkgs/hex-a-hop/template
@@ -1,9 +1,9 @@
 # Template file for 'hex-a-hop'
 pkgname=hex-a-hop
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="SDL-devel SDL_mixer-devel SDL_ttf-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel SDL_ttf-devel"
 short_desc="Hex-a-Hop is an hexagonal tile-based puzzle game"
 maintainer="David Ferlier <dispertio@gmx.es>"
 license="GPL-2.0-only"

From 835d918558fff207eaf98f96764a6279cb2c4b9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 19/39] hyperrogue: build with new sdl12-compat library

---
 srcpkgs/hyperrogue/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index f472f08d2da4e3..69266f969c8556 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,11 +1,11 @@
 # Template file for 'hyperrogue'
 pkgname=hyperrogue
 version=13.0w
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
- SDL_ttf-devel zlib-devel fontconfig-devel"
+makedepends="glew-devel libpng-devel sdl12-compat-devel SDL_gfx-devel
+ SDL_mixer-devel SDL_ttf-devel zlib-devel fontconfig-devel"
 depends="dejavu-fonts-ttf"
 short_desc="SDL rogue-like in a non-euclidean world"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"

From 88ba0c6b7622a02d8e505d377006f72d87ba5d04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 20/39] libmpeg2: build with new sdl12-compat library

---
 srcpkgs/libmpeg2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template
index 83abab0f9779f3..d4d64757b9b98d 100644
--- a/srcpkgs/libmpeg2/template
+++ b/srcpkgs/libmpeg2/template
@@ -1,11 +1,11 @@
 # Template file for 'libmpeg2'
 pkgname=libmpeg2
 version=0.5.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--enable-shared"
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXv-devel SDL-devel"
+makedepends="libXext-devel libXv-devel sdl12-compat-devel"
 short_desc="Library for decoding MPEG-2 and MPEG-1 video streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"

From 5c2e5f4dfe10f666e351d964d3ead42b53dbf100 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 21/39] libvisual: build with new sdl12-compat library

---
 srcpkgs/libvisual/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvisual/template b/srcpkgs/libvisual/template
index ef95a6551adb8a..5ba8e89b212aab 100644
--- a/srcpkgs/libvisual/template
+++ b/srcpkgs/libvisual/template
@@ -1,10 +1,10 @@
 # Template file for 'libvisual'
 pkgname=libvisual
 version=0.4.2
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="pkg-config sdl12-compat-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Abstraction library for audio visualisation plugins"
 maintainer="Piraty <mail@piraty.dev>"
 license="LGPL-2.1-or-later"

From e5f4e41fe0992a85bfc80a5c34fdebffaa88a306 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:50 -0500
Subject: [PATCH 22/39] ltris: build with new sdl12-compat library

---
 srcpkgs/ltris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 9cd52394da35fa..a5742efb440f97 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,11 +1,11 @@
 # Template file for 'ltris'
 pkgname=ltris
 version=1.2.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
 hostmakedepends="bison"
-makedepends="SDL-devel SDL_mixer-devel"
+makedepends="sdl12-compat-devel SDL_mixer-devel"
 short_desc="Tetris clone using SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4a9be9f45db24257474a74105447eecdb701b421 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 23/39] navit: build with new sdl12-compat library

---
 srcpkgs/navit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 0bb5e58a336d0a..257747c2bdb998 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,11 +1,11 @@
 # Template file for 'navit'
 pkgname=navit
 version=0.5.6
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="SDL-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
+makedepends="sdl12-compat-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
  fontconfig-devel zlib-devel libpng-devel qt5-declarative-devel qt5-svg-devel
  qt5-location-devel SDL_ttf-devel SDL_image-devel libfreeglut-devel gtk+-devel
  pango-devel atk-devel gdk-pixbuf-devel qt5-sensors-devel qt5-multimedia-devel

From 8193c2f8d7b87b87c1407fabe243997100e4135e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 24/39] netrek-client-cow: build with new sdl12-compat library

---
 srcpkgs/netrek-client-cow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netrek-client-cow/template b/srcpkgs/netrek-client-cow/template
index 10e677c2f27e7c..06fde0e05dc216 100644
--- a/srcpkgs/netrek-client-cow/template
+++ b/srcpkgs/netrek-client-cow/template
@@ -1,11 +1,11 @@
 # Template file for 'netrek-client-cow'
 pkgname=netrek-client-cow
 version=3.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="libX11-devel imlib2-devel libXxf86vm-devel gmp-devel
- SDL_mixer-devel SDL-devel libXpm-devel"
+ SDL_mixer-devel sdl12-compat-devel libXpm-devel"
 short_desc="Netrek Client (C and X11)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT, custom:PublicDomain"

From dad3343297c0b740089982f25ac038b6156b8bf7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 25/39] pcsxr: build with new sdl12-compat library

---
 srcpkgs/pcsxr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template
index 3102f23ed5e63c..eeda663d6545dc 100644
--- a/srcpkgs/pcsxr/template
+++ b/srcpkgs/pcsxr/template
@@ -1,11 +1,11 @@
 # Template file for 'pcsxr'
 pkgname=pcsxr
 version=1.9.94
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libcdio --enable-opengl"
 hostmakedepends="pkg-config automake libtool intltool glib-devel gettext-devel nasm"
-makedepends="libXv-devel libXtst-devel libcdio-devel SDL-devel gtk+3-devel
+makedepends="libXv-devel libXtst-devel libcdio-devel sdl12-compat-devel gtk+3-devel
  libXxf86vm-devel"
 depends="desktop-file-utils"
 short_desc="Sony PlayStation (PSX) emulator based on the PCSX-df project"

From afe8b4f04c20f0404d957f90a214c2ffaa07c647 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:51 -0500
Subject: [PATCH 26/39] povray: build with new sdl12-compat library

---
 srcpkgs/povray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 1bd7309959d35c..1fc3df63f0feba 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
 # Template file for 'povray'
 pkgname=povray
 version=3.7.0.8
-revision=10
+revision=11
 build_style=gnu-configure
 _v=${version%.*.*}
 configure_args="COMPILED_BY=Void --disable-optimiz-arch"
@@ -9,7 +9,7 @@ conf_files="
  /etc/povray/$_v/povray.conf
  /etc/povray/$_v/povray.ini"
 hostmakedepends="git autoconf automake"
-makedepends="boost-devel libpng-devel tiff-devel SDL-devel"
+makedepends="boost-devel libpng-devel tiff-devel sdl12-compat-devel"
 depends="openexr"
 short_desc="Script-based raytracer for 3D graphic production"
 maintainer="Brenton Horne <brentonhorne77@gmail.com>"

From d9954aa2b84b93f75b3491cb43055483a7e4e60c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 27/39] qodem: build with new sdl12-compat library

---
 srcpkgs/qodem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qodem/template b/srcpkgs/qodem/template
index d1b74cabc04820..2be40c629c5304 100644
--- a/srcpkgs/qodem/template
+++ b/srcpkgs/qodem/template
@@ -1,9 +1,9 @@
 # Template file for 'qodem'
 pkgname=qodem
 version=1.0.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="ncurses-devel gpm-devel miniupnpc-devel SDL-devel"
+makedepends="ncurses-devel gpm-devel miniupnpc-devel sdl12-compat-devel"
 short_desc="Re-implementation of the Qmodem serial communication package"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="CC0-1.0"

From b1c0f77330cd2b82e18cc759b4bb4c767d3be8ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 28/39] rott: build with new sdl12-compat library

---
 srcpkgs/rott/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 4650d0320e60b8..bb1cfeb6c401fc 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,11 +1,11 @@
 # Template file for 'rott'
 pkgname=rott
 version=1.1.2
-revision=2
+revision=3
 build_wrksrc=rott
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="SDL_mixer-devel SDL-devel"
+makedepends="SDL_mixer-devel sdl12-compat-devel"
 short_desc="Port of Apogee's 3D action title Rise of the Triad"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e0c304904979895ec326b805cb3b57ba20989976 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:52 -0500
Subject: [PATCH 29/39] smpeg: build with new sdl12-compat library

---
 srcpkgs/smpeg/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template
index d5c403dc826b36..e518ba055f88e8 100644
--- a/srcpkgs/smpeg/template
+++ b/srcpkgs/smpeg/template
@@ -1,12 +1,12 @@
 # Template file for 'smpeg'
 pkgname=smpeg
 version=0.4.5
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr --disable-gtk-player --disable-opengl-player"
+configure_args="--disable-gtk-player --disable-opengl-player"
 make_build_args="LDFLAGS+=-lstdc++"
-hostmakedepends="autoconf automake libtool"
-makedepends="SDL-devel"
+hostmakedepends="pkg-config autoconf automake libtool"
+makedepends="sdl12-compat-devel"
 short_desc="SDL MPEG Player Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -25,7 +25,7 @@ post_install() {
 }
 
 smpeg-devel_package() {
-	depends="SDL-devel smpeg>=${version}_${revision}"
+	depends="sdl12-compat-devel smpeg>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From e2e93cec402346eb78efe43c2a5dccecfff03e19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 30/39] sopwith: update to 2.7.0.

---
 .../patches/enable_cross_compilation.patch    | 37 -------------------
 srcpkgs/sopwith/template                      | 17 ++++-----
 2 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sopwith/patches/enable_cross_compilation.patch

diff --git a/srcpkgs/sopwith/patches/enable_cross_compilation.patch b/srcpkgs/sopwith/patches/enable_cross_compilation.patch
deleted file mode 100644
index 8dff50ad6bd258..00000000000000
--- a/srcpkgs/sopwith/patches/enable_cross_compilation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1,4 +1,4 @@
--AC_INIT(src/swmain.c)
-+AC_INIT([sopwith], [1.8.4])
- AC_CONFIG_AUX_DIR(autotools)
- 
- VERSION=1.8.4
-@@ -46,7 +46,8 @@
- 	;;
- esac
- 
--AM_INIT_AUTOMAKE(sopwith,$VERSION)
-+AM_INIT_AUTOMAKE([-Wall foreign])
-+AM_PROG_AR
- 
- AM_CONFIG_HEADER(config.h:config.hin)
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- bin_PROGRAMS = @SOPWITH_BINS@
- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
- 
--CFLAGS = @CFLAGS@ -I..
-+AM_CFLAGS = @CFLAGS@ @SDL_CFLAGS@ -I..
- 
- COMMON_SRC =       \
- video.h	    swcollsn.c  swgames.h   swmain.h    swutil.h 	\
---- a/src/sdl/Makefile.am
-+++ b/src/sdl/Makefile.am
-@@ -1,4 +1,4 @@
--CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
-+AM_CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
- 
- noinst_LIBRARIES = libsdlsopwith.a
- 
diff --git a/srcpkgs/sopwith/template b/srcpkgs/sopwith/template
index aa160fdbb8700b..8763a1bd84bc8b 100644
--- a/srcpkgs/sopwith/template
+++ b/srcpkgs/sopwith/template
@@ -1,19 +1,18 @@
 # Template file for 'sopwith'
 pkgname=sopwith
-version=1.8.4
-revision=2
+version=2.7.0
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake SDL-devel"
-makedepends="SDL-devel"
+hostmakedepends="automake pkg-config"
+makedepends="SDL2-devel"
 short_desc="Sidescrolling shoot 'em up game"
-maintainer="beefcurtains <beefcurtains@users.noreply.github.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://sdl-sopwith.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/sdl-sopwith/sdl_sopwith/${version}/sopwith-${version}.tar.gz"
-checksum=a5ecb795a7aeff6be3ebfb99f1c6218054b73048786809f8468a92c952c17bd0
+homepage="https://fragglet.github.io/sdl-sopwith/"
+distfiles="https://github.com/fragglet/sdl-sopwith/archive/sdl-sopwith-${version}.tar.gz"
+checksum=48e90f1c837fbe8c91f639500c70c69493cb6ec22f7e769b2e27d252c167033e
 
 pre_configure() {
-	mv configure.{in,ac}
 	autoreconf -fi
 }
 

From 3b973bc32d479bec3bed61ee56d3f072f402b2d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 31/39] spectrum3d: build with new sdl12-compat library

---
 srcpkgs/spectrum3d/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectrum3d/template b/srcpkgs/spectrum3d/template
index 5cdf3e528398f8..fdcc27a5db5c7e 100644
--- a/srcpkgs/spectrum3d/template
+++ b/srcpkgs/spectrum3d/template
@@ -1,10 +1,11 @@
 # Template file for 'spectrum3d'
 pkgname=spectrum3d
 version=2.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gstreamer1-devel gtk+3-devel SDL-devel alsa-lib-devel glu-devel"
+makedepends="gstreamer1-devel gtk+3-devel sdl12-compat-devel
+ alsa-lib-devel glu-devel"
 short_desc="Audio spectrum visualiser in 3D for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From d7d7c960d6eae202c12233f6dadc849d459fb2b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 32/39] swars: build with new sdl12-compat library

---
 srcpkgs/swars/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swars/template b/srcpkgs/swars/template
index 699361425ae96d..48ea08faf4003d 100644
--- a/srcpkgs/swars/template
+++ b/srcpkgs/swars/template
@@ -6,11 +6,12 @@ lib32mode="full"
 
 pkgname=swars
 version=0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-data-path=/opt/swars/"
 hostmakedepends="pkg-config"
-makedepends="SDL-devel zlib-devel libopenal-devel libpng-devel libvorbis-devel"
+makedepends="sdl12-compat-devel zlib-devel libopenal-devel libpng-devel
+ libvorbis-devel"
 depends="vorbis-tools cdparanoia"
 short_desc="A SDL port of the 1996 DOS game Syndicate Wars"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,6 +19,7 @@ license="GPL-3"
 homepage="http://swars.vexillium.org/"
 distfiles="http://swars.vexillium.org/files/swars-${version}.tar.bz2"
 checksum=01f44e5b792d41b138d361d04810a875cfa5f897c642a2b13d0dde633fabdacb
+broken="unable to fetch source"
 
 post_install() {
 	# remove useless files

From 8aca8ffca40693d94abdb9c57449c1b92d0b1963 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:53 -0500
Subject: [PATCH 33/39] tworld: build with new sdl12-compat library

---
 srcpkgs/tworld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tworld/template b/srcpkgs/tworld/template
index 11025bcd52fb48..9edd8d027ded16 100644
--- a/srcpkgs/tworld/template
+++ b/srcpkgs/tworld/template
@@ -1,9 +1,9 @@
 # Template file for 'tworld'
 pkgname=tworld
 version=1.3.2
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="SDL-devel"
+makedepends="sdl12-compat-devel"
 short_desc="Emulator for Chip's Challenge game engine"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 22e1db937b61d6c58efac7c1f42e407a657a0ff0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 34/39] urbanterror: build with new sdl12-compat library

---
 srcpkgs/urbanterror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template
index 1ed3b0e49e3034..4d47c6e7a54f6d 100644
--- a/srcpkgs/urbanterror/template
+++ b/srcpkgs/urbanterror/template
@@ -1,8 +1,8 @@
 # Template file for 'urbanterror'
 pkgname=urbanterror
 version=4.3.4
-revision=2
-makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel
+revision=3
+makedepends="sdl12-compat-devel libopenal-devel libcurl-devel libvorbis-devel
  libXxf86vm-devel"
 depends="urbanterror-data>=${version}"
 short_desc="Team tactical shooter based on ioquake"

From e8fdeafb5e8d989fd07e8253d6843d18af61a320 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 35/39] virtualbox-ose: build with new sdl12-compat library

---
 srcpkgs/virtualbox-ose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 914cc5540a012b..4ba4a575929771 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=7.1.6
-revision=1
+revision=2
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, CDDL-1.0"
@@ -19,8 +19,8 @@ hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which gls
 makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
  libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
  libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel
- SDL-devel xorg-server-devel libslirp-devel libtpms-devel libxml2-devel libvncserver-devel
- openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
+ sdl12-compat-devel xorg-server-devel libslirp-devel libtpms-devel libxml2-devel
+ libvncserver-devel openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
  libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
  SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
 

From d8403019d0e401d72dedabe10752ed61d016736f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 36/39] xen: build with new sdl12-compat library

---
 srcpkgs/xen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 8ff41345f7189b..e6558977d722d0 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=12
+revision=13
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
  ghostscript git ocaml ocaml-findlib pandoc pkg-config tar texinfo wget
  python3-Markdown python3-setuptools"
-makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
+makedepends="sdl12-compat-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
  ncurses-devel"

From ee0655a13a99f12b433c020230d92d2935d87bcc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:54 -0500
Subject: [PATCH 37/39] xmoto: build with new sdl12-compat library

---
 srcpkgs/xmoto/patches/stdint.patch | 22 ++++++++++++++++++++++
 srcpkgs/xmoto/template             |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xmoto/patches/stdint.patch

diff --git a/srcpkgs/xmoto/patches/stdint.patch b/srcpkgs/xmoto/patches/stdint.patch
new file mode 100644
index 00000000000000..980227a352ed42
--- /dev/null
+++ b/srcpkgs/xmoto/patches/stdint.patch
@@ -0,0 +1,22 @@
+diff -ur a/src/common/DBuffer.cpp b/src/common/DBuffer.cpp
+--- a/src/common/DBuffer.cpp	2020-06-21 15:18:16.000000000 -0400
++++ b/src/common/DBuffer.cpp	2025-02-01 22:25:26.230759197 -0500
+@@ -24,6 +24,7 @@
+ #include "DBuffer.h"
+ #include "helpers/SwapEndian.h"
+ #include <algorithm>
++#include <cstdint>
+ 
+ void DBuffer::_FreeDBuffer(void) {
+   /* Free stuff if anything */
+diff -ur a/src/common/VFileIO.cpp b/src/common/VFileIO.cpp
+--- a/src/common/VFileIO.cpp	2020-06-21 15:18:16.000000000 -0400
++++ b/src/common/VFileIO.cpp	2025-02-01 22:25:38.676782152 -0500
+@@ -48,6 +48,7 @@
+ #include "xmoto/UserConfig.h"
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #ifdef WIN32
+ std::string win32_getHomeDir(bool i_asUtf8 = false) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index a1a159ecc6fbe7..1a25a8175d7f47 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,13 +1,13 @@
 # Template file for 'xmoto'
 pkgname=xmoto
 version=0.6.1
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu"
 configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel-tools desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
- libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
+ libxml2-devel libxdg-basedir-devel glu-devel sdl12-compat-devel SDL_mixer-devel
  SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel
  bzip2-devel gettext-devel"
 depends="${pkgname}-data"

From fa856630bb495a2a5c2f005f76867233ad16afdc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:55 -0500
Subject: [PATCH 38/39] xrick: build with new sdl12-compat library

---
 srcpkgs/xrick/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 3b751dcc67740e..885b74b128526d 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -1,10 +1,10 @@
 # Template file for 'xrick'
 pkgname=xrick
 version=021212
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=1
-makedepends="SDL-devel zlib-devel"
+makedepends="sdl12-compat-devel zlib-devel"
 short_desc="Clone of Rick Dangerous"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:GPL-ish"
@@ -12,6 +12,7 @@ homepage="http://www.bigorno.net/xrick/"
 distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz"
 checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
 restricted=yes
+broken="unable to fetch source"
 
 CFLAGS=-fcommon
 

From 0b91413b7dd32b1e7d35588e5f9143cd34f16980 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jan 2025 22:16:55 -0500
Subject: [PATCH 39/39] zsnes: build with new sdl12-compat library

---
 srcpkgs/zsnes/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zsnes/template b/srcpkgs/zsnes/template
index 78987d9d512ad5..8a7fa1545a5f93 100644
--- a/srcpkgs/zsnes/template
+++ b/srcpkgs/zsnes/template
@@ -3,13 +3,13 @@
 # 32bit
 pkgname=zsnes
 version=1.51
-revision=4
+revision=5
 archs="i686"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="force_arch=i686"
 hostmakedepends="nasm pkg-config"
-makedepends="MesaLib-devel SDL-devel libpng-devel ncurses-devel"
+makedepends="MesaLib-devel sdl12-compat-devel libpng-devel ncurses-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Super Nintendo emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,6 +20,13 @@ checksum=2856dedba272e9eed66cbf68dd4a9ae56797c373686c57371a65c7df35264623
 lib32mode="full"
 
 CFLAGS="-fcommon"
+CXXFLAGS="-fcommon"
+
+do_configure() {
+	# The build system fails to honor -std=c++14 in CXXFLAGS,
+	# so we'll force it in the compiler executable name
+	CXX="${CXX} -std=c++14" ./configure ${configure_args}
+}
 
 post_install() {
 	vmkdir usr/share

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Merged]: SDL: replace with `sdl12-compat`
  2025-02-03 14:09 [PR PATCH] SDL: replace with `sdl12-compat` ahesford
  2025-02-03 14:15 ` [PR PATCH] [Updated] " ahesford
  2025-02-03 19:36 ` ahesford
@ 2025-02-03 19:36 ` ahesford
  2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2025-02-03 19:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]

There's a merged pull request on the void-packages repository

SDL: replace with `sdl12-compat`
https://github.com/void-linux/void-packages/pull/54199

Description:
Especially now that SDL 3 is available, let's completely abandon the dead SDL 1.2 in favor of the official compat library that uses SDL 2 on the backend. This supersedes https://github.com/void-linux/void-packages/pull/53761.

Four packages that depend on SDL fail to build because their distfiles cannot be fetched:
- `agg` (only required by `desumume`)
- `ballerburg` (leaf package, some game)
- `swars` (leaf package, only for `i686`, some game)
- `xrick` (leaf package, restricted)

I've marked these broken to highlight the existing issues. Note that, because `sdl12-compat` is ABI compatible with SDL 1.2, people with any of these packages installed should still be able to upgrade seamlessly and we should avoid any shlib staging.

#### Testing the changes
- I tested the changes in this PR: **briefly**, works as expected with `dosbox` and `tworld`.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-02-03 19:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-03 14:09 [PR PATCH] SDL: replace with `sdl12-compat` ahesford
2025-02-03 14:15 ` [PR PATCH] [Updated] " ahesford
2025-02-03 19:36 ` ahesford
2025-02-03 19:36 ` [PR PATCH] [Merged]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).