[arch-commits] Commit in openal/trunk (PKGBUILD sdl_sound.diff)

Jan Steffens heftig at archlinux.org
Mon Dec 2 22:34:26 UTC 2019


    Date: Monday, December 2, 2019 @ 22:34:26
  Author: heftig
Revision: 370243

1.20.0-1

Added:
  openal/trunk/sdl_sound.diff
Modified:
  openal/trunk/PKGBUILD

----------------+
 PKGBUILD       |   47 ++++++++++++++++++---------------
 sdl_sound.diff |   78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-02 21:40:48 UTC (rev 370242)
+++ PKGBUILD	2019-12-02 22:34:26 UTC (rev 370243)
@@ -4,18 +4,20 @@
 
 pkgbase=openal
 pkgname=(openal openal-examples)
-pkgver=1.19.1
-pkgrel=2
+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=(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')
+makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2 sdl_sound
+             ffmpeg libmysofa git cmake)
+_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
@@ -23,37 +25,40 @@
 }
 
 prepare() {
-  mkdir build examples
   cd openal-soft
-  git cherry-pick -n 8bacb5dfb8ef910586fcf5b5cd89526ec81061e8
+
+  # Fix building some things with our old SDL_sound (and SDL1)
+  git apply -3 ../sdl_sound.diff
 }
 
 build() {
-  cd build
-  cmake ../openal-soft -G Ninja \
+  cmake -Hopenal-soft -Bbuild \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_LIBDIR=lib
-  ninja
+  cmake --build build
 }
 
 package_openal() {
   optdepends=('qt5-base: alsoft-config GUI Configurator'
-              'fluidsynth: MIDI rendering')
+              'fluidsynth: MIDI rendering'
+              'libmysofa: makemhr tool')
 
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" cmake --build build --target 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
+  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)
-
-  mkdir "$pkgdir/usr"
-  mv -v examples "$pkgdir/usr/bin"
+  mv examples/* "$pkgdir"
 }

Added: sdl_sound.diff
===================================================================
--- sdl_sound.diff	                        (rev 0)
+++ sdl_sound.diff	2019-12-02 22:34:26 UTC (rev 370243)
@@ -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"
+ 



More information about the arch-commits mailing list