Convert MP3 to OGG

3 files changed, 22 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc6c4cd9e7db..b15ebea2a367 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Mon Apr 10 06:47:46 UTC 2017
 pkgbase = doomrl
 	pkgdesc = A roguelike game based on the FPS Doom.
 	pkgver = 0.9.9.7
@@ -9,6 +7,7 @@ pkgbase = doomrl
 	arch = x86_64
 	license = GPL
 	license = CCPL:cc-by-nc-sa-4.0
+	makedepends = ffmpeg
 	depends = glu
 	depends = lua
 	depends = sdl_image
@@ -18,11 +17,10 @@ pkgbase = doomrl
 	source = cc-by-nc-sa-4.0.txt
 	source = doomrl.sh
 	sha256sums = bae5ccc863235f984a52c07d011e48a86c0c12f923be2dedd8624c7abdc22c6c
-	sha256sums = 62549c30bad5da0b11650e8bc6a8fa16f7c0d49df9720e38926fedca0225620f
+	sha256sums = 6a2b8ec043da2a49f43777537dfccae16b2d1d17fa4bcff03e2bf02e2e5aa913
 	source_i686 = https://drl.chaosforge.org/file_download/33/doomrl-linux-i386-0997.tar.gz
 	sha256sums_i686 = 6d217d697e94f5f2ce3fe8ebbedaf03fa68a5ed1140cb889921f18d8604a389f
 	source_x86_64 = https://drl.chaosforge.org/file_download/32/doomrl-linux-x64-0997.tar.gz
 	sha256sums_x86_64 = d9d19e4a8794efb3c23963b3e11987ebadbb7bee7350b00ce6b64eaff501e488
 
 pkgname = doomrl
-
diff --git a/PKGBUILD b/PKGBUILD
index 8f9723df2145..5a0de04c91c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,13 +12,14 @@ arch=('i686' 'x86_64')
 url="http://drl.chaosforge.org/"
 license=('GPL' 'CCPL:cc-by-nc-sa-4.0')
 depends=('glu' 'lua' 'sdl_image' 'sdl_mixer' 'timidity++' 'zlib')
+makedepends=('ffmpeg')
 
 source=("cc-by-nc-sa-4.0.txt" "doomrl.sh")
 source_i686=("https://drl.chaosforge.org/file_download/33/$pkgname-linux-i386-${pkgver//./}.tar.gz")
 source_x86_64=("https://drl.chaosforge.org/file_download/32/$pkgname-linux-x64-${pkgver//./}.tar.gz")
 
 sha256sums=('bae5ccc863235f984a52c07d011e48a86c0c12f923be2dedd8624c7abdc22c6c'
-            '62549c30bad5da0b11650e8bc6a8fa16f7c0d49df9720e38926fedca0225620f')
+            '6a2b8ec043da2a49f43777537dfccae16b2d1d17fa4bcff03e2bf02e2e5aa913')
 sha256sums_i686=('6d217d697e94f5f2ce3fe8ebbedaf03fa68a5ed1140cb889921f18d8604a389f')
 sha256sums_x86_64=('d9d19e4a8794efb3c23963b3e11987ebadbb7bee7350b00ce6b64eaff501e488')
 
@@ -29,6 +30,20 @@ case $CARCH in
     __arch='x64' ;;
 esac
 
+prepare() {
+    cd "$srcdir/doomrl-linux-$__arch-${pkgver//./}"
+
+    # See https://forum.chaosforge.org/index.php/topic,5254.msg42649/topicseen.html#msg42649
+    # SDL does not support MP3. Convert and use OGG
+    [ -d ogg ] || mkdir ogg
+    sed -i 's/mp3/ogg/g' musichq.lua soundhq.lua
+    rm -f ogg/*
+    for f in mp3/*
+    do
+      ffmpeg -loglevel error -i $f -c:a libvorbis ${f//mp3/ogg}
+    done
+}
+
 package() {
     cd "$srcdir/doomrl-linux-$__arch-${pkgver//./}"
 
@@ -43,4 +58,3 @@ package() {
     install -D -m644 "$srcdir/cc-by-nc-sa-4.0.txt" \
     "${pkgdir}/usr/share/licenses/${pkgname}/cc-by-nc-sa-4.0.txt"
 }
-
diff --git a/doomrl.sh b/doomrl.sh
index a4f07e934847..1c91b09be045 100755
--- a/doomrl.sh
+++ b/doomrl.sh
@@ -21,6 +21,9 @@ if [[ ! -d "$dir" ]]; then
     ln -s $bin/mp3 "$dir" || exit 1
     ln -s $bin/wavhq "$dir" || exit 1 
 fi
-
+if [[ ! -d "$dir/ogg" ]]
+then
+    ln -s $bin/ogg "$dir" || exit 1
+fi
 cd "$dir"
 exec $bin/doomrl $1