Merge branch 'master' of git.cheetah.remote:xilinux/buildfiles

7 files changed, 110 insertions, 49 deletions

diff --git a/build.log b/build.log
deleted file mode 100644
index 0fe44e5..0000000
--- a/build.log
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Cloning into '.'...
-Your branch is up to date with 'origin/master'.
-to install to /var/lib/xibuild/build/xipkg/xss-lock
-============xss-lock=============
-==========================build stage==========================
--- The C compiler identification is GNU 11.2.0
--- Detecting C compiler ABI info
--- Detecting C compiler ABI info - done
--- Check for working C compiler: /bin/cc - skipped
--- Detecting C compile features
--- Detecting C compile features - done
--- Found PkgConfig: /bin/pkg-config (found version "0.29.2") 
--- Checking for modules 'glib-2.0>=2.32;gio-unix-2.0'
---   Found glib-2.0, version 2.72.1
---   Found gio-unix-2.0, version 2.72.1
--- Checking for modules 'xcb;xcb-aux;xcb-event;xcb-screensaver'
---   Found xcb, version 1.14
---   Found xcb-aux, version 0.4.0
---   Found xcb-event, version 0.4.0
---   Found xcb-screensaver, version 1.14
--- Configuring done
--- Generating done
--- Build files have been written to: /var/lib/xibuild/build/build
-[ 25%] Generating xss-lock.1
-[ 50%] Building C object src/CMakeFiles/xss-lock.dir/xcb_utils.c.o
-[ 75%] Building C object src/CMakeFiles/xss-lock.dir/xss-lock.c.o
-[ 75%] Built target man
-[100%] Linking C executable xss-lock
-[100%] Built target xss-lock
-==========================package stage==========================
--- Install configuration: ""
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/doc/xss-lock/NEWS
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/bin/xss-lock
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/man/man1/xss-lock.1
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/doc/xss-lock/dim-screen.sh
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/doc/xss-lock/xdg-screensaver.patch
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/doc/xss-lock/transfer-sleep-lock-i3lock.sh
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/doc/xss-lock/transfer-sleep-lock-generic-delay.sh
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/zsh/site-functions/_xss-lock
--- Installing: /var/lib/xibuild/build/xipkg/xss-lock/usr/share/bash-completion/completions/xss-lock
-checking for postinstall... no postinstall
diff --git a/repo/games/extremetuxracer/extremetuxracer.xibuild b/repo/games/extremetuxracer/extremetuxracer.xibuild
new file mode 100644
index 0000000..c82f2c7
--- /dev/null
+++ b/repo/games/extremetuxracer/extremetuxracer.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+NAME="extremetuxracer"
+DESC="Downhill racing game starring Tux"
+
+MAKEDEPS="make "
+DEPS="glu mesa musl sfml "
+
+PKG_VER=0.8.1
+SOURCE="https://downloads.sourceforge.net/extremetuxracer/etr-$PKG_VER.tar.xz"
+
+build () {
+    ./configure \
+        --prefix=/usr \
+        --bindir=/usr/bin \
+        --sysconfdir=/etc
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
diff --git a/repo/media/alsa-utils/alsa-utils.xibuild b/repo/media/alsa-utils/alsa-utils.xibuild
index cd8c644..6e1226b 100644
--- a/repo/media/alsa-utils/alsa-utils.xibuild
+++ b/repo/media/alsa-utils/alsa-utils.xibuild
@@ -9,8 +9,9 @@ PKG_VER=1.2.6
 SOURCE=https://www.alsa-project.org/files/pub/utils/alsa-utils-$PKG_VER.tar.bz2
 
 build () {
-    ./configure --disable-alsaconf \
-            --disable-bat   \
+    ./configure \
+            --disable-nls \
+            --disable-bat \
             --disable-xmlto \
             --with-curses=ncursesw &&
     make
diff --git a/repo/media/openal-soft/openal-soft.xibuild b/repo/media/openal-soft/openal-soft.xibuild
new file mode 100644
index 0000000..c0d7137
--- /dev/null
+++ b/repo/media/openal-soft/openal-soft.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+NAME="openal-soft"
+DESC="software implementation of OpenAL API"
+
+MAKEDEPS="cmake "
+DEPS="ffmpeg4 musl sdl2 "
+
+PKG_VER=1.22.0
+SOURCE="https://github.com/kcat/openal-soft/archive/$PKG_VER.tar.gz"
+
+build () {
+    cmake -B build \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DBUILD_SHARED_LIBS=True \
+        -DBUILD_STATIC_LIBS=OFF
+	cmake --build build
+}
+
+package () {
+	DESTDIR="$PKG_DEST" cmake --install build
+}
diff --git a/repo/media/pulseaudio/pulseaudio.xibuild b/repo/media/pulseaudio/pulseaudio.xibuild
index 9554c72..14b9bcd 100644
--- a/repo/media/pulseaudio/pulseaudio.xibuild
+++ b/repo/media/pulseaudio/pulseaudio.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make check"
+MAKEDEPS="make check soxr speex libx11 libxtst fftw jack speexdsp openssl eudev check libtool"
 DEPS="libsndfile alsa-lib dbus elogind glib libcap speex libxtst gdbm"
 
 DESC="A featureful, general-purpose sound server"
@@ -13,10 +13,28 @@ build () {
     cd    build &&
 
     meson --prefix=/usr       \
-          --buildtype=release \
-          -Ddatabase=gdbm     \
-          -Ddoxygen=false     \
-          -Dbluez5=disabled   &&
+        -Dgcov=false \
+		-Dman=true \
+		-Dtests=true \
+		-Dsystem_user=pulse \
+		-Dsystem_group=pulse \
+		-Ddatabase=tdb \
+		-Dalsa=enabled \
+		-Ddbus=enabled \
+		-Dglib=enabled \
+		-Dgsettings=enabled \
+		-Dgtk=enabled \
+		-Dhal-compat=false \
+		-Dipv6=true \
+        -Ddatabase=gdbm \
+		-Dopenssl=enabled \
+		-Dsamplerate=disabled \
+		-Dsoxr=enabled \
+		-Dsystemd=disabled \
+		-Dudev=enabled \
+		-Dx11=enabled \
+		-Dudevrulesdir=/usr/lib/udev/rules.d \
+		-Ddoxygen=false &&
     ninja
 }
 
diff --git a/repo/media/sfml/musl-1.2.3.patch b/repo/media/sfml/musl-1.2.3.patch
new file mode 100644
index 0000000..54d2f6d
--- /dev/null
+++ b/repo/media/sfml/musl-1.2.3.patch
@@ -0,0 +1,11 @@
+--- a/src/SFML/Window/Unix/WindowImplX11.cpp
++++ b/src/SFML/Window/Unix/WindowImplX11.cpp
+@@ -1556,7 +1556,7 @@
+                                    m_window,
+                                    XNInputStyle,
+                                    XIMPreeditNothing | XIMStatusNothing,
+-                                   reinterpret_cast<void*>(NULL));
++                                   reinterpret_cast<void*>(0));
+     }
+     else
+     {
diff --git a/repo/media/sfml/sfml.xibuild b/repo/media/sfml/sfml.xibuild
new file mode 100644
index 0000000..c0001dd
--- /dev/null
+++ b/repo/media/sfml/sfml.xibuild
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+NAME="sfml"
+DESC="Simple and Fast Multimedia Library"
+
+MAKEDEPS="cmake "
+DEPS="eudev freetype2 flac libogg libvorbis libx11 libxrandr mesa musl openal-soft "
+
+PKG_VER=2.5.1
+SOURCE="https://github.com/SFML/SFML/archive/$PKG_VER/sfml-$PKG_VER.tar.gz"
+ADDITIONAL="musl-1.2.3.patch "
+
+prepare () {
+    apply_patches
+}
+
+build () {
+    cmake -B build \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DBUILD_SHARED_LIBS=True \
+        -DBUILD_STATIC_LIBS=OFF
+	cmake --build build
+}
+
+package () {
+	DESTDIR="$PKG_DEST" cmake --install build
+}