From 45dbfcb14ef23d76488dd85901cd31f002e3860e Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 23 Oct 2025 17:49:42 +0300 Subject: [PATCH] libsdl2 ver. bump --- multimedia/misc/libsdl2/actions.py | 36 ++++++++++++++---------------- multimedia/misc/libsdl2/pspec.xml | 26 +++++++++++++++++++-- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/multimedia/misc/libsdl2/actions.py b/multimedia/misc/libsdl2/actions.py index 054412dc18..5965505ad2 100644 --- a/multimedia/misc/libsdl2/actions.py +++ b/multimedia/misc/libsdl2/actions.py @@ -8,9 +8,10 @@ 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 = "SDL2-%s" % get.srcVERSION() +# WorkDir = "SDL2-%s" % get.srcVERSION() docdir = "%s/%s" % (get.docDIR(), get.srcNAME()) def setup(): @@ -19,42 +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-sdl-dlopen \ - --disable-arts \ - --disable-esd \ - --disable-nas \ - --enable-pulseaudio-shared \ - --enable-alsa \ - --disable-rpath" + options = "-B build -G Ninja \ + " if get.buildTYPE() == "emul32": - options += " --libdir=/usr/lib32 \ - --disable-ibus \ - --bindir=/emul32/bin \ - --mandir=/emul32/man \ - " + 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) + 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() if get.buildTYPE() == "emul32": pisitools.dosed("%s/usr/lib32/cmake/SDL2/*.cmake" % get.installDIR(), "emul32", "usr") + pisitools.dosed("%s/usr/lib32/pkgconfig/*.pc" % get.installDIR(), "emul32", "usr") + pisitools.removeDir("/emul32") return - - pisitools.dodoc("BUGS.txt", "CREDITS.txt", "README*", "README-SDL.txt", "TODO.txt", "WhatsNew.txt") + shelltools.cd("..") + pisitools.dodoc("BUGS.*", "README*", "LICENSE.txt") diff --git a/multimedia/misc/libsdl2/pspec.xml b/multimedia/misc/libsdl2/pspec.xml index 234599bb8b..6a6f486618 100644 --- a/multimedia/misc/libsdl2/pspec.xml +++ b/multimedia/misc/libsdl2/pspec.xml @@ -12,8 +12,10 @@ library Simple Direct Media Layer 2.0 series 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. - https://github.com/libsdl-org/SDL/releases/download/release-2.30.8/SDL2-2.30.8.tar.gz + https://github.com/libsdl-org/sdl2-compat/releases/download/release-2.32.56/sdl2-compat-2.32.56.tar.gz + cmake + ninja DirectFB-devel alsa-lib-devel audiofile-devel @@ -35,6 +37,7 @@ egl-wayland-devel wayland-protocols-devel pulseaudio-libs-devel + libsdl3-devel @@ -56,16 +59,18 @@ libXrender libXt libglvnd + libsdl3 pulseaudio-libs /usr/share/doc /usr/lib/libSDL2.so + /usr/lib/libSDL2-2.0.so /usr/lib/libSDL2.a /usr/lib/libSDL2main.a /usr/lib/libSDL2-2.0.so.0* /usr/lib/libSDL2_test.a - + /usr/share/licenses/sdl2-compat/LICENSE.txt @@ -74,6 +79,7 @@ Development files for libsdl2 libsdl2 + libsdl3-devel /usr/bin @@ -93,6 +99,7 @@ libX11-32bit libXext-32bit libglvnd-32bit + libsdl3-32bit alsa-lib-32bit audiofile-32bit libXrandr-32bit @@ -107,6 +114,7 @@ libXext-32bit alsa-lib-32bit libglvnd-32bit + libsdl3-32bit audiofile-32bit libXrandr-32bit libXrender-32bit @@ -121,6 +129,20 @@ + + 2025-10-23 + 2.32.56 + Version bump. + Pisi Linux Community + admin@pisilinux.org + + + 2025-10-23 + 2.32.10 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-10-04 2.30.8