diff --git a/multimedia/misc/libsdl/actions.py b/multimedia/misc/libsdl/actions.py
index 3021f5642b..b5ec759f6f 100644
--- a/multimedia/misc/libsdl/actions.py
+++ b/multimedia/misc/libsdl/actions.py
@@ -2,15 +2,16 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import libtools
+from pisi.actionsapi import cmaketools
from pisi.actionsapi import get
-WorkDir = "SDL-%s" % get.srcVERSION()
+# WorkDir = "SDL2-%s" % get.srcVERSION()
docdir = "%s/%s" % (get.docDIR(), get.srcNAME())
def setup():
@@ -19,66 +20,39 @@ def setup():
# for libtool version matching
#shelltools.copy("/usr/share/aclocal/ltversion.m4", "acinclude/")
- shelltools.system("./autogen.sh")
+ # shelltools.system("./autogen.sh")
#libtools.libtoolize("--force --copy")
- options = "--enable-events \
- --enable-cpuinfo \
- --enable-cdrom \
- --enable-threads \
- --enable-timers \
- --enable-file \
- --enable-alsa \
- --enable-oss \
- --enable-nasm \
- --enable-video-aalib \
- --enable-video-caca \
- --enable-video-directfb \
- --enable-video-fbcon \
- --enable-video-dummy \
- --enable-video-opengl \
- --enable-video-x11 \
- --enable-video-x11-xv \
- --enable-video-x11-xinerama \
- --enable-video-x11-xrandr \
- --with-x \
- --disable-rpath \
- --disable-arts \
- --disable-dga \
- --disable-esd \
- --disable-nas \
- --disable-video-dga \
- --disable-video-ggi \
- --disable-video-svga \
- --disable-video-x11-xme \
- --disable-static"
+ options = "-B build -G Ninja -DSDL12TESTS=0 -DSDL12DEVEL=1\
+ "
if get.buildTYPE() == "emul32":
- options += " --libdir=/usr/lib32 \
- --bindir=/emul32/bin \
- --mandir=/emul32/man \
- --disable-video-aalib \
- --disable-video-caca \
- --disable-video-directfb"
+ options += " -DCMAKE_INSTALL_PREFIX=/emul32 -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+ "
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
shelltools.export("CFLAGS", "%s -fPIC -O3 -m32" % get.CFLAGS())
shelltools.export("CXXFLAGS", "%s -fPIC -O3 -m32" % get.CXXFLAGS())
shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS())
+ else:
+ options += " -DCMAKE_INSTALL_PREFIX=/usr"
- autotools.configure(options)
-
- pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+ cmaketools.configure(options)
def build():
- autotools.make()
+ shelltools.system("ninja -C build")
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ shelltools.cd("build")
+ shelltools.system("DESTDIR=%s ninja install " % get.installDIR())
libtools.preplib()
- for i in ["html", "images", "index.html"]:
- pisitools.insinto(docdir, "docs/%s" % i)
+ if get.buildTYPE() == "emul32":
+ # pisitools.dosed("%s/usr/lib32/cmake/SDL/*.cmake" % get.installDIR(), "emul32", "usr")
+ pisitools.dosed("%s/usr/lib32/pkgconfig/*.pc" % get.installDIR(), "emul32", "usr")
+ pisitools.removeDir("/emul32")
+ return
- pisitools.dodoc("BUGS", "CREDITS", "README", "README-SDL.txt", "TODO", "WhatsNew")
+ shelltools.cd("..")
+ pisitools.dodoc("BUGS.*", "README*", "LICENSE.txt")
diff --git a/multimedia/misc/libsdl/pspec.xml b/multimedia/misc/libsdl/pspec.xml
index 4c4ecf8fef..06e34929e0 100644
--- a/multimedia/misc/libsdl/pspec.xml
+++ b/multimedia/misc/libsdl/pspec.xml
@@ -12,8 +12,10 @@
library
Simple Direct Media Layer
libsdl is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
- http://www.libsdl.org/release/SDL-1.2.15.tar.gz
+ https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.68.tar.gz
+ cmake
+ ninja
DirectFB-devel
alsa-lib-devel
aalib-devel
@@ -26,14 +28,14 @@
mesa-glu-devel
- sdl-1.2.14-disable-mmx.patch
- sdl_x11sym.patch
- SDL-1.2.14-dont-propagate-lpthread.patch
- SDL-1.2.14-noproc.patch
- SDL-1.2.13-rh484362.patch
- libsdl-1.2.15-sdl-config.patch
- libsdl-1.2.15-resizing.patch
- libsdl-1.2.15-joystick.patch
+
+
+
+
+
+
+
+
@@ -100,6 +102,13 @@
+
+ 2025-10-23
+ 1.2.68
+ Version bump.
+ Pisi Linux Community
+ admin@pisilinux.org
+
2020-01-11
1.2.15