Date: Friday, December 6, 2019 @ 20:19:20 Author: heftig Revision: 370489
archrelease: copy trunk to extra-x86_64 Added: openal/repos/extra-x86_64/PKGBUILD (from rev 370488, openal/trunk/PKGBUILD) openal/repos/extra-x86_64/sdl_sound.diff (from rev 370488, openal/trunk/sdl_sound.diff) Deleted: openal/repos/extra-x86_64/PKGBUILD ----------------+ PKGBUILD | 123 ++++++++++++++++++++++++++++--------------------------- sdl_sound.diff | 78 ++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 59 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-06 20:18:57 UTC (rev 370488) +++ PKGBUILD 2019-12-06 20:19:20 UTC (rev 370489) @@ -1,59 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: Jason Chu <j...@xentac.net> - -pkgbase=openal -pkgname=(openal openal-examples) -pkgver=1.19.1 -pkgrel=2 -pkgdesc="Cross-platform 3D audio library, software implementation" -arch=(x86_64) -url="https://github.com/kcat/openal-soft" -license=(LGPL) -depends=(glibc) -makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2 sdl_sound ffmpeg - git cmake ninja) -_commit=6761218e51699f46bf25c377e65b3e9ea5e434b9 # tags/openal-soft-1.19.1 -source=("git+https://github.com/kcat/openal-soft#commit=$_commit") -sha512sums=('SKIP') - -pkgver() { - cd openal-soft - git describe --tags | sed 's/^openal-soft-//;s/-/+/g' -} - -prepare() { - mkdir build examples - cd openal-soft - git cherry-pick -n 8bacb5dfb8ef910586fcf5b5cd89526ec81061e8 -} - -build() { - cd build - cmake ../openal-soft -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=lib - ninja -} - -package_openal() { - optdepends=('qt5-base: alsoft-config GUI Configurator' - 'fluidsynth: MIDI rendering') - - DESTDIR="$pkgdir" ninja -C build install - install -Dt "$pkgdir/usr/share/doc/openal" -m644 openal-soft/docs/* - -### Split openal-examples - cd "$pkgdir/usr/bin" - mv -vt "$srcdir/examples" alffplay alhrtf allatency alloopback almultireverb \ - alplay alrecord alreverb alstream altonegen -} - -package_openal-examples() { - pkgdesc+=" (example programs)" - depends=("openal=$pkgver-$pkgrel" sdl2 sdl_sound ffmpeg) - - mkdir "$pkgdir/usr" - mv -v examples "$pkgdir/usr/bin" -} Copied: openal/repos/extra-x86_64/PKGBUILD (from rev 370488, openal/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-06 20:19:20 UTC (rev 370489) @@ -0,0 +1,64 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Jason Chu <j...@xentac.net> + +pkgbase=openal +pkgname=(openal openal-examples) +pkgver=1.20.0 +pkgrel=1 +pkgdesc="Cross-platform 3D audio library, software implementation" +arch=(x86_64) +url="https://github.com/kcat/openal-soft" +license=(LGPL) +depends=(gcc-libs) +makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2 sdl_sound + ffmpeg libmysofa git cmake) +optdepends=('qt5-base: alsoft-config GUI Configurator' + 'fluidsynth: MIDI rendering' + 'libmysofa: makemhr tool') +_commit=c0cf323e1d56ce605e90927324d2fdafcfbb564a # tags/openal-soft-1.20.0 +source=("git+https://github.com/kcat/openal-soft#commit=$_commit" + sdl_sound.diff) +sha512sums=('SKIP' + 'ebfdb316adbfbdfc6e6236a390dc33579e9eb06918ba110e436ffa91b4535c82ad225b1379587e1ba6b444abcc5f65d53e0360823a054f860bc57bc6f4b51334') + +pkgver() { + cd openal-soft + git describe --tags | sed 's/^openal-soft-//;s/-/+/g' +} + +prepare() { + cd openal-soft + + # Fix building some things with our old SDL_sound (and SDL1) + git apply -3 ../sdl_sound.diff +} + +build() { + cmake -Hopenal-soft -Bbuild \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_LIBDIR=lib + cmake --build build +} + +package_openal() { + DESTDIR="$pkgdir" cmake --build build --target install + install -Dt "$pkgdir/usr/share/doc/openal" -m644 openal-soft/docs/* + +### Split openal-examples + mkdir -p examples/usr/bin + for f in \ + alffplay alhrtf allatency alloopback almultireverb alplay alrecord \ + alreverb alstream altonegen + do + mv -v "$pkgdir/usr/bin/$f" examples/usr/bin/$f + done +} + +package_openal-examples() { + pkgdesc+=" (example programs)" + depends=("openal=$pkgver-$pkgrel" sdl2 sdl_sound ffmpeg) + optdepends=() + mv examples/* "$pkgdir" +} Copied: openal/repos/extra-x86_64/sdl_sound.diff (from rev 370488, openal/trunk/sdl_sound.diff) =================================================================== --- sdl_sound.diff (rev 0) +++ sdl_sound.diff 2019-12-06 20:19:20 UTC (rev 370489) @@ -0,0 +1,78 @@ +diff --git i/examples/alhrtf.c w/examples/alhrtf.c +index 2be28a91..dfa01e5c 100644 +--- i/examples/alhrtf.c ++++ w/examples/alhrtf.c +@@ -30,8 +30,6 @@ + #include <string.h> + + #include "SDL_sound.h" +-#include "SDL_audio.h" +-#include "SDL_stdinc.h" + + #include "AL/al.h" + #include "AL/alc.h" +diff --git i/examples/allatency.c w/examples/allatency.c +index a61fb820..5705506a 100644 +--- i/examples/allatency.c ++++ w/examples/allatency.c +@@ -28,8 +28,6 @@ + #include <assert.h> + + #include "SDL_sound.h" +-#include "SDL_audio.h" +-#include "SDL_stdinc.h" + + #include "AL/al.h" + #include "AL/alext.h" +diff --git i/examples/almultireverb.c w/examples/almultireverb.c +index a90b3368..65e444f5 100644 +--- i/examples/almultireverb.c ++++ w/examples/almultireverb.c +@@ -35,8 +35,6 @@ + #include <string.h> + + #include "SDL_sound.h" +-#include "SDL_audio.h" +-#include "SDL_stdinc.h" + + #include "AL/al.h" + #include "AL/alc.h" +diff --git i/examples/alplay.c w/examples/alplay.c +index 09ad96b4..01cf769d 100644 +--- i/examples/alplay.c ++++ w/examples/alplay.c +@@ -28,8 +28,6 @@ + #include <assert.h> + + #include "SDL_sound.h" +-#include "SDL_audio.h" +-#include "SDL_stdinc.h" + + #include "AL/al.h" + +diff --git i/examples/alreverb.c w/examples/alreverb.c +index d789dffe..a6dd141d 100644 +--- i/examples/alreverb.c ++++ w/examples/alreverb.c +@@ -28,8 +28,6 @@ + #include <assert.h> + + #include "SDL_sound.h" +-#include "SDL_audio.h" +-#include "SDL_stdinc.h" + + #include "AL/al.h" + #include "AL/alc.h" +diff --git i/examples/alstream.c w/examples/alstream.c +index 56505ddb..103492c7 100644 +--- i/examples/alstream.c ++++ w/examples/alstream.c +@@ -30,8 +30,6 @@ + #include <assert.h> + + #include "SDL_sound.h" +-#include "SDL_audio.h" +-#include "SDL_stdinc.h" + + #include "AL/al.h" +