update :)

3 files changed, 60 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 789a598283b2..8e1f47c903fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,28 @@
 pkgbase = openal-hrtf
-	pkgdesc = Enable binaural audio globally in 3d applications
+	pkgdesc = Generate HRTF datasets for OpenAL
 	pkgver = 1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.archlinux.org/index.php/Gaming
 	arch = i686
 	arch = x86_64
-	license = LGPL
-	depends = openal>=1.14
-	noextract = data02.tgz
-	source = http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
-	source = http://www.sp.m.is.nagoya-u.ac.jp/HRTF/archive/data02.tgz
-	source = alsoftrc
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	license = custom
+	depends = openal
+	noextract = CIAIR.tar.gz
+	noextract = IRC_1005.zip
+	noextract = MIT_KEMAR.zip
+	source = https://openal-soft.org/openal-releases/openal-soft-1.17.2.tar.bz2
+	source = https://openal-soft.org/openal-releases/openal-soft-1.22.0.tar.bz2
+	source = CIAIR.tar.gz::http://www.sp.m.is.nagoya-u.ac.jp/HRTF/archive/data02.tgz
+	source = ftp://ftp.ircam.fr/pub/IRCAM/equipes/salles/listen/archive/SUBJECTS/IRC_1005.zip
+	source = MIT_KEMAR.zip::http://sound.media.mit.edu/resources/KEMAR/full.zip
+	source = http://sofacoustics.org/data/database/mit/mit_kemar_normal_pinna.sofa
+	source = http://sofacoustics.org/data/database/scut/SCUT_KEMAR_radius_all.sofa
+	sha256sums = a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314
+	sha256sums = ce0f9300de3de7bc737b0be2a995619446e493521d070950eea53eddd533fc9b
+	sha256sums = 9ed522abbf34f5e3e049fc0371f597798fea3586d565daf6eea79884d9c9334c
+	sha256sums = 1c34116d4eeb02958d55f5e8803b593d05f1bc384e79ae1e447503f419929773
+	sha256sums = 3fb533f7af95a6c07944f31a2a1d9dca0c77ab525a44865fc508009efb692ef6
+	sha256sums = e7035994f5fd754058424c061380ee92b1d5ed58fccef2887a4266916616acdf
+	sha256sums = 789cf1cbc03076e0cecb9b8a4b123e7bdef2333acd52513f3c26b65eb62923e9
 
 pkgname = openal-hrtf
-
diff --git a/PKGBUILD b/PKGBUILD
index f419e9890059..e69f02cbac37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,55 @@
-# Maintainer: Zach Jaggi <feilen1000@gmail.com>
-
 pkgname=openal-hrtf
 pkgver=1.0
-pkgrel=1
-_oalversion=1.17.2
+pkgrel=2
 arch=('i686' 'x86_64')
-license=('LGPL')
-pkgdesc="Enable binaural audio globally in 3d applications"
-depends=('openal>=1.14')
+license=('custom')
+pkgdesc="Generate HRTF datasets for OpenAL"
+depends=('openal')
 url="https://wiki.archlinux.org/index.php/Gaming"
-source=("http://kcat.strangesoft.net/openal-releases/openal-soft-$_oalversion.tar.bz2"
-        'https://web.archive.org/web/20130911210554/http://www.sp.m.is.nagoya-u.ac.jp/HRTF/archive/data02.tgz'
-        'alsoftrc')
-noextract=('data02.tgz')
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP')
+source=("https://openal-soft.org/openal-releases/openal-soft-1.17.2.tar.bz2"
+        "https://openal-soft.org/openal-releases/openal-soft-1.22.0.tar.bz2"
+        'CIAIR.tar.gz::http://www.sp.m.is.nagoya-u.ac.jp/HRTF/archive/data02.tgz'
+        'ftp://ftp.ircam.fr/pub/IRCAM/equipes/salles/listen/archive/SUBJECTS/IRC_1005.zip'
+        'MIT_KEMAR.zip::http://sound.media.mit.edu/resources/KEMAR/full.zip'
+        'http://sofacoustics.org/data/database/mit/mit_kemar_normal_pinna.sofa'
+        'http://sofacoustics.org/data/database/scut/SCUT_KEMAR_radius_all.sofa')
+sha256sums=('a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314'
+            'ce0f9300de3de7bc737b0be2a995619446e493521d070950eea53eddd533fc9b'
+            '9ed522abbf34f5e3e049fc0371f597798fea3586d565daf6eea79884d9c9334c'
+            '1c34116d4eeb02958d55f5e8803b593d05f1bc384e79ae1e447503f419929773'
+            '3fb533f7af95a6c07944f31a2a1d9dca0c77ab525a44865fc508009efb692ef6'
+            'e7035994f5fd754058424c061380ee92b1d5ed58fccef2887a4266916616acdf'
+            '789cf1cbc03076e0cecb9b8a4b123e7bdef2333acd52513f3c26b65eb62923e9')
+noextract=('CIAIR.tar.gz' 'IRC_1005.zip' 'MIT_KEMAR.zip')
 
 prepare() {
-    cd $srcdir
-    mkdir -p hrtfs CIAIR
-    tar -xf data02.tgz -C CIAIR
+  mkdir -p "$srcdir/"{CIAIR,IRC_1005,MIT_KEMAR,MIT_KEMAR_sofa,SCUT_KEMAR}
+  tar -xf "$srcdir/CIAIR.tar.gz" -C "$srcdir/CIAIR" --skip-old-files
+  unzip -n "$srcdir/IRC_1005.zip" -d "$srcdir/IRC_1005/IRC"
+  unzip -n "$srcdir/MIT_KEMAR.zip" -d "$srcdir/MIT_KEMAR/MITfull"
+  ln -sf "$srcdir/mit_kemar_normal_pinna.sofa" "$srcdir/MIT_KEMAR_sofa/mit_kemar_normal_pinna.sofa"
+  ln -sf "$srcdir/SCUT_KEMAR_radius_all.sofa" "$srcdir/SCUT_KEMAR/SCUT_KEMAR_radius_all.sofa"
 }
 
+
 build() {
-  for hrtftable in CIAIR; do
+  tables_old=("CIAIR" "IRC_1005" "MIT_KEMAR")
+  for hrtftable in "${tables_old[@]}"; do
+    cd $srcdir/$hrtftable
+    makemhr -m -r44100 -i"$srcdir/openal-soft-1.17.2/utils/$hrtftable.def" -o$srcdir/$hrtftable-%r.mhr
+    makemhr -m -r48000 -i"$srcdir/openal-soft-1.17.2/utils/$hrtftable.def" -o$srcdir/$hrtftable-%r.mhr
+  done
+  tables_new=("MIT_KEMAR_sofa" "SCUT_KEMAR")
+  for hrtftable in "${tables_new[@]}"; do
     cd $srcdir/$hrtftable
-    makehrtf -m -r=44100 -i="$srcdir/openal-soft-$_oalversion/utils/$hrtftable.def" -o=$srcdir/hrtfs/$hrtftable-%r.mhr
-    makehrtf -m -r=48000 -i="$srcdir/openal-soft-$_oalversion/utils/$hrtftable.def" -o=$srcdir/hrtfs/$hrtftable-%r.mhr
+    makemhr -m -r44100 -i"$srcdir/openal-soft-1.22.0/utils/$hrtftable.def" -o$srcdir/$hrtftable-%r.mhr
+    makemhr -m -r48000 -i"$srcdir/openal-soft-1.22.0/utils/$hrtftable.def" -o$srcdir/$hrtftable-%r.mhr
   done
 }
 
 package() {
-
-  install -m644 -D $srcdir/alsoftrc $pkgdir/etc/openal/alsoft.conf
-
-  cd $srcdir/hrtfs
-  for hrtftable in CIAIR; do
-    install -m644 -D ./$hrtftable-44100.mhr $pkgdir/usr/share/openal/hrtfs/$hrtftable-44100.mhr
-    install -m644 -D ./$hrtftable-48000.mhr $pkgdir/usr/share/openal/hrtfs/$hrtftable-48000.mhr
+  cd "$srcdir/"
+  for mhr in *.mhr; do
+    install -m644 -D "$mhr" "$pkgdir/usr/share/openal/hrtf/$mhr"
   done
-
 }
diff --git a/alsoftrc b/alsoftrc
deleted file mode 100644
index 16562b772e54..000000000000
--- a/alsoftrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# This line enables HRTF and is the bare minimum for using it. Note that if you
-# are not using a sample rate of 44100Hz HRTF will be disabled.
-hrtf = true
-
-# Below are some alternate tables to use with HRTF, uncomment to use them. They
-# the '%r' variable and automatically select sample rate from common 
-# pre-generated tables.
-
-# hrtf_tables = "/usr/share/openal/hrtfs/CIAIR-%r.mhr"