Update and add support for celt, g7221, atrac9

4 files changed, 100 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a2228b74da0..f4818a9b3272 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,29 @@
 pkgbase = vgmstream-kode54-git
 	pkgdesc = Library for playback of various streamed audio formats used in video games (kode54's fork)
-	pkgver = r1020.r1169.gc3d3aaee
-	pkgrel = 2
+	pkgver = r1020.r1882.g1c68e8cb
+	pkgrel = 1
 	url = https://github.com/kode54/vgmstream
-	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = audacious
 	makedepends = git
+	depends = audacious
+	depends = ffmpeg
+	depends = libao
+	depends = libatrac9-git
+	depends = libg7221_decode-git
 	depends = libogg
 	depends = libvorbis
 	depends = mpg123
-	depends = ffmpeg
-	optdepends = audacious: to use the bundled plugin
 	source = vgmstream-kode54-git::git+https://github.com/kode54/vgmstream.git
+	source = https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz
+	source = https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz
+	source = fix-audacious-prefix.patch
 	source = install-headers.patch
-	source = no-link-audacious.patch
 	sha256sums = SKIP
-	sha256sums = 8f723536321480bb46b731f66c29a5f5354834094458f93de7539bbe4465b824
-	sha256sums = bacb229eeea75a6c00761c6c446cc34f25cd7ca938f7b4241f793d036f738554
+	sha256sums = a991dff4a9e0772ede0881d81cdc7ac559148c2194885cbdd534fe4af43779da
+	sha256sums = c94d4d34f5a2caa1574b1a94869202cacd959b55f643a8bafe0660008acad9c3
+	sha256sums = d2f0a5d991cc7e629c58f529f82a4e0b9be3b68a49b86a98e1a6dbb106e6b1c3
+	sha256sums = e3e94769b6545e2c8c0b60ffda684b659bb8db06f3fb9d7645fd4a734d115bac
 
 pkgname = vgmstream-kode54-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0d752f986ef0..8df9310ca99f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
 pkgname=vgmstream-kode54-git
-pkgver=r1020.r1169.gc3d3aaee
-pkgrel=2
+pkgver=r1020.r1882.g1c68e8cb
+pkgrel=1
 pkgdesc="Library for playback of various streamed audio formats used in video games (kode54's fork)"
-arch=(i686 x86_64)
+arch=(x86_64)
 url='https://github.com/kode54/vgmstream'
 license=(BSD)
-depends=(libogg libvorbis mpg123 ffmpeg)
-makedepends=(audacious git)
-optdepends=('audacious: to use the bundled plugin')
+depends=(audacious ffmpeg libao libatrac9-git libg7221_decode-git libogg libvorbis mpg123)
+makedepends=(git)
 source=(${pkgname}::git+https://github.com/kode54/vgmstream.git
-        install-headers.patch
-        no-link-audacious.patch)
+        https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz
+        https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz
+        fix-audacious-prefix.patch
+        install-headers.patch)
 sha256sums=('SKIP'
-            '8f723536321480bb46b731f66c29a5f5354834094458f93de7539bbe4465b824'
-            'bacb229eeea75a6c00761c6c446cc34f25cd7ca938f7b4241f793d036f738554')
+            'a991dff4a9e0772ede0881d81cdc7ac559148c2194885cbdd534fe4af43779da'
+            'c94d4d34f5a2caa1574b1a94869202cacd959b55f643a8bafe0660008acad9c3'
+            'd2f0a5d991cc7e629c58f529f82a4e0b9be3b68a49b86a98e1a6dbb106e6b1c3'
+            'e3e94769b6545e2c8c0b60ffda684b659bb8db06f3fb9d7645fd4a734d115bac')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -25,14 +28,71 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$pkgname"
+  patch -p0 < "$srcdir"/fix-audacious-prefix.patch
   patch -p0 < "$srcdir"/install-headers.patch
-  patch -p0 < "$srcdir"/no-link-audacious.patch
 }
 
+celt_symbols=(
+  alg_quant
+  alg_unquant
+  celt_decode
+  celt_decoder_create
+  celt_decoder_create_custom
+  celt_decoder_destroy
+  celt_mode_create
+  celt_mode_destroy
+  celt_mode_info
+  celt_encoder_destroy
+  celt_encoder_create
+  celt_encode
+  celt_encode_float
+  celt_encoder_ctl
+  celt_decode_float
+  celt_decoder_ctl
+  compute_allocation
+  compute_band_energies
+  denormalise_bands
+  ec_dec_init
+  ec_decode
+  ec_decode_bin
+  ec_dec_update
+  ec_dec_uint
+  ec_dec_bits
+  ec_enc_init
+  ec_encode
+  ec_encode_bin
+  ec_enc_uint
+  ec_enc_bits
+  ec_enc_done
+  normalise_bands
+  renormalise_vector
+  quant_coarse_energy
+  quant_fine_energy
+  quant_energy_finalise
+  unquant_coarse_energy
+  unquant_energy_finalise
+  unquant_fine_energy)
+
 build() {
+  celt_cflags="$CFLAGS -fPIC"
+  for sym in ${celt_symbols[@]}; do
+    celt_cflags+=" -D$sym=$(sed 's/[^_]\+/&_0061/' <<< $sym)"
+  done
+
+  cd "$srcdir/celt-0.6.1"
+  CFLAGS=$celt_cflags ./configure
+  make
+
+  cd "$srcdir/celt-0.11.0"
+  celt_cflags=${celt_cflags//_0061/_0110}
+  CFLAGS="$celt_cflags -DCUSTOM_MODES=1" ./configure
+  make
+
   cd "$srcdir/$pkgname"
   ./bootstrap
-  CFLAGS="$CFLAGS -DVGM_USE_FFMPEG" LIBS="-lavcodec -lavformat -lavutil" ./configure --prefix=/usr
+  CFLAGS="$CFLAGS -DVGM_USE_FFMPEG -DVGM_USE_MPEG -DVGM_USE_VORBIS -DVGM_USE_G7221 -DVGM_USE_ATRAC9 -DVGM_USE_CELT" \
+    LIBS="-lavcodec -lavformat -lavutil -lg7221 -latrac9 $srcdir/celt-0.6.1/libcelt/.libs/libcelt.a $srcdir/celt-0.11.0/libcelt/.libs/libcelt0.a -lm" \
+    ./configure --prefix=/usr
   make -f Makefile.autotools
 }
 
diff --git a/fix-audacious-prefix.patch b/fix-audacious-prefix.patch
new file mode 100644
index 000000000000..288fd04fa6f7
--- /dev/null
+++ b/fix-audacious-prefix.patch
@@ -0,0 +1,13 @@
+diff --git configure.ac configure.ac
+index 3e4456d8..80a49c03 100644
+--- configure.ac
++++ configure.ac
+@@ -53,7 +53,7 @@ then
+   CFLAGS="$CFLAGS -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-unused-but-set-variable"
+ fi
+ 
+-plugindir=`pkg-config audacious --variable=plugin_dir`
++plugindir=`pkg-config audacious --define-variable=prefix="$prefix" --variable=plugin_dir`
+ AC_SUBST(plugindir)
+ 
+ INPUT_PLUGIN_DIR="Input"
diff --git a/install-headers.patch b/install-headers.patch
index a8301e58198e..602ac6cf9214 100644
--- a/install-headers.patch
+++ b/install-headers.patch
@@ -9,7 +9,7 @@ index a15eb51f..d6be8b5c 100644
 +__vgmstream_includedir = $(includedir)/vgmstream
 +__vgmstream_include_HEADERS = vgmstream.h streamfile.h util.h streamtypes.h
 +__coding_includedir = $(includedir)/vgmstream/coding
-+__coding_include_HEADERS = coding/acm_decoder.h coding/nwa_decoder.h coding/g72x_state.h
++__coding_include_HEADERS = coding/g72x_state.h coding/nwa_decoder.h
 +
  lib_LTLIBRARIES = libvgmstream.la