Merge pull request #17583 from Rmys/master

libsdl2 ver. bump

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 \
+    options = "-B build -G Ninja \
-               --disable-arts \
+              "
-               --disable-esd \
-               --disable-nas \
-               --enable-pulseaudio-shared \
-               --enable-alsa \
-               --disable-rpath"
 
     if get.buildTYPE() == "emul32":
-        options += " --libdir=/usr/lib32 \
+        options += " -DCMAKE_INSTALL_PREFIX=/emul32 -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
-                     --disable-ibus \
+                   "
-                     --bindir=/emul32/bin \
-                     --mandir=/emul32/man \
-                     "
 
         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
 
-
+    shelltools.cd("..")
-    pisitools.dodoc("BUGS.txt", "CREDITS.txt", "README*", "README-SDL.txt", "TODO.txt", "WhatsNew.txt")
+    pisitools.dodoc("BUGS.*", "README*", "LICENSE.txt")

multimedia/misc/libsdl2/pspec.xml

@@ -12,8 +12,10 @@
         <IsA>library</IsA>
         <Summary>Simple Direct Media Layer 2.0 series</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="f740f229130bcf2982cd25ca78b91c2d4744d988" type="targz">https://github.com/libsdl-org/SDL/releases/download/release-2.30.8/SDL2-2.30.8.tar.gz</Archive>
+        <Archive sha1sum="bfe8f9b631e1e0acc10fd4f22bca3d99114004ac" type="targz">https://github.com/libsdl-org/sdl2-compat/releases/download/release-2.32.56/sdl2-compat-2.32.56.tar.gz</Archive>
         <BuildDependencies>
+            <Dependency>cmake</Dependency>
+            <Dependency>ninja</Dependency>
             <Dependency>DirectFB-devel</Dependency>
             <Dependency>alsa-lib-devel</Dependency>
             <Dependency>audiofile-devel</Dependency>
@@ -35,6 +37,7 @@
             <Dependency>egl-wayland-devel</Dependency>
             <Dependency>wayland-protocols-devel</Dependency>
             <Dependency>pulseaudio-libs-devel</Dependency>
+            <Dependency>libsdl3-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!-- <Patch level="1">fedora/SDL2-2.0.9-khrplatform.patch</Patch> -->
@@ -56,16 +59,18 @@
             <Dependency>libXrender</Dependency>
             <Dependency>libXt</Dependency>
             <Dependency>libglvnd</Dependency>
+            <Dependency>libsdl3</Dependency>
             <Dependency>pulseaudio-libs</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="library">/usr/lib/libSDL2.so</Path>
+            <Path fileType="library">/usr/lib/libSDL2-2.0.so</Path>
             <Path fileType="library">/usr/lib/libSDL2.a</Path>
             <Path fileType="library">/usr/lib/libSDL2main.a</Path>
             <Path fileType="library">/usr/lib/libSDL2-2.0.so.0*</Path>
             <Path fileType="library">/usr/lib/libSDL2_test.a</Path>
-
+            <Path fileType="doc">/usr/share/licenses/sdl2-compat/LICENSE.txt</Path>
         </Files>
     </Package>
 
@@ -74,6 +79,7 @@
         <Summary>Development files for libsdl2</Summary>
         <RuntimeDependencies>
             <Dependency release="current">libsdl2</Dependency>
+            <Dependency>libsdl3-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -93,6 +99,7 @@
             <Dependency>libX11-32bit</Dependency>
             <Dependency>libXext-32bit</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
+            <Dependency>libsdl3-32bit</Dependency>
             <Dependency>alsa-lib-32bit</Dependency>
             <Dependency>audiofile-32bit</Dependency>
             <Dependency>libXrandr-32bit</Dependency>
@@ -107,6 +114,7 @@
             <Dependency>libXext-32bit</Dependency>
             <Dependency>alsa-lib-32bit</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
+            <Dependency>libsdl3-32bit</Dependency>
             <Dependency>audiofile-32bit</Dependency>
             <Dependency>libXrandr-32bit</Dependency>
             <Dependency>libXrender-32bit</Dependency>
@@ -121,6 +129,20 @@
     </Package>
 
     <History>
+        <Update release="20">
+            <Date>2025-10-23</Date>
+            <Version>2.32.56</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="19">
+            <Date>2025-10-23</Date>
+            <Version>2.32.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="18">
             <Date>2024-10-04</Date>
             <Version>2.30.8</Version>