libsdl ver. bump

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 \
+    options = "-B build -G Ninja -DSDL12TESTS=0 -DSDL12DEVEL=1\
-               --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"
 
     if get.buildTYPE() == "emul32":
-        options += " --libdir=/usr/lib32 \
+        options += " -DCMAKE_INSTALL_PREFIX=/emul32 -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
-                     --bindir=/emul32/bin \
+                   "
-                     --mandir=/emul32/man \
-                     --disable-video-aalib \
-                     --disable-video-caca \
-                     --disable-video-directfb"
 
         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)
-    
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 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"]:
+    if get.buildTYPE() == "emul32":
-        pisitools.insinto(docdir, "docs/%s" % i)
+        # 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")

multimedia/misc/libsdl/pspec.xml

@@ -12,8 +12,10 @@
         <IsA>library</IsA>
         <Summary>Simple Direct Media Layer</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="0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c" type="targz">http://www.libsdl.org/release/SDL-1.2.15.tar.gz</Archive>
+        <Archive sha1sum="ca42a5662878286157c109c2b4bb72a1d134cfc7" type="targz">https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.68.tar.gz</Archive>
         <BuildDependencies>
+            <Dependency>cmake</Dependency>
+            <Dependency>ninja</Dependency>
             <Dependency versionFrom="1.7.7">DirectFB-devel</Dependency>
             <Dependency>alsa-lib-devel</Dependency>
             <Dependency>aalib-devel</Dependency>
@@ -26,14 +28,14 @@
             <Dependency>mesa-glu-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">sdl-1.2.14-disable-mmx.patch</Patch>
+<!--             <Patch level="1">sdl-1.2.14-disable-mmx.patch</Patch> -->
-            <Patch level="0">sdl_x11sym.patch</Patch>
+<!--             <Patch level="0">sdl_x11sym.patch</Patch> -->
-            <Patch level="1">SDL-1.2.14-dont-propagate-lpthread.patch</Patch>
+<!--             <Patch level="1">SDL-1.2.14-dont-propagate-lpthread.patch</Patch> -->
-            <Patch level="1">SDL-1.2.14-noproc.patch</Patch>
+<!--             <Patch level="1">SDL-1.2.14-noproc.patch</Patch> -->
-            <Patch level="1">SDL-1.2.13-rh484362.patch</Patch>
+<!--             <Patch level="1">SDL-1.2.13-rh484362.patch</Patch> -->
-            <Patch level="0">libsdl-1.2.15-sdl-config.patch</Patch>
+<!--             <Patch level="0">libsdl-1.2.15-sdl-config.patch</Patch> -->
-            <Patch level="0">libsdl-1.2.15-resizing.patch</Patch>
+<!--             <Patch level="0">libsdl-1.2.15-resizing.patch</Patch> -->
-            <Patch level="0">libsdl-1.2.15-joystick.patch</Patch>
+<!--             <Patch level="0">libsdl-1.2.15-joystick.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -100,6 +102,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2025-10-23</Date>
+            <Version>1.2.68</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
 	<Update release="7">
             <Date>2020-01-11</Date>
             <Version>1.2.15</Version>