Fix build after various changes

* Makefile patch no longer applies, and is not needed.
* Patch configure.ac instead of configure.in.
* clHCA.h is #included from outside vgmstream/, so install it at the
  root of /usr/include.
* Makefiles were renamed from *.unix to *.audacious. Misleading for
  this, since we don't actually provide the Audacious plugin.
* ffmpeg is now needed due to VGM_USE_FFMPEG, which is theoretically
  optional, but the code does not compile without it.

1 files changed, 11 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index eebcab0e9735..ec63d7562f11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,14 @@
 pkgname=vgmstream-kode54-git
-pkgver=r1020.r557.gd2fac79
-pkgrel=3
+pkgver=r1020.r770.g00e1a5f
+pkgrel=1
 pkgdesc="Library for playback of various streamed audio formats used in video games (kode54's fork)"
 arch=(i686 x86_64)
 url='https://gitlab.kode54.net/kode54/vgmstream'
 license=(BSD)
-depends=(glibc libogg libvorbis mpg123)
+depends=(glibc libogg libvorbis mpg123 ffmpeg)
 makedepends=(git)
-source=(${pkgname}::git+https://gitlab.kode54.net/kode54/vgmstream.git
-        libcoding-utils.patch)
-sha256sums=('SKIP'
-            '3ae17fca859443b8d75dde83fa511111dee016e5bf2c5cb86c6786929ee30da3')
+source=(${pkgname}::git+https://gitlab.kode54.net/kode54/vgmstream.git)
+sha256sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -22,24 +20,24 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$pkgname"
-  patch -Np0 -i "$srcdir/libcoding-utils.patch"
 
   # We won't build the Audacious plugin so we don't need the libraries either.
-  sed -i '/PKG_CHECK_MODULES(\(AUDACIOUS\|GTK\)/{N;N;d}' configure.in
+  sed -i '/PKG_CHECK_MODULES(\(AUDACIOUS\|GTK\)/{N;N;d}' configure.ac
 }
 
 build() {
   cd "$srcdir/$pkgname"
   ./bootstrap
-  CFLAGS="$CFLAGS -I../ext_includes -I../../ext_includes" ./configure
+  CFLAGS="$CFLAGS -DVGM_USE_FFMPEG" LIBS="-lavcodec -lavformat -lavutil" ./configure
   cd src
-  make -f Makefile.unix
-  "${CC-cc}" "$CFLAGS" -lvorbisfile -lmpg123 -shared -o .libs/libvgmstream.so .libs/*.o */.libs/*.o
+  make -f Makefile.audacious
+  "${CC-cc}" "$CFLAGS" -lvorbisfile -lmpg123 -lavcodec -lavformat -lavutil -shared -o .libs/libvgmstream.so .libs/*.o */.libs/*.o ../ext_libs/.libs/*.o
 }
 
 package() {
   cd "$srcdir/$pkgname"
-  install -D -m644 -t "$pkgdir/usr/include/vgmstream" src/{vgmstream,stream{file,types},util}.h ext_includes/clHCA.h
+  install -D -m644 -t "$pkgdir/usr/include" ext_includes/clHCA.h
+  install -D -m644 -t "$pkgdir/usr/include/vgmstream" src/{vgmstream,stream{file,types},util}.h
   install -D -m644 -t "$pkgdir/usr/include/vgmstream/coding" src/coding/{{acm,nwa}_decoder,g72x_state}.h
   install -D -m644 -t "$pkgdir/usr/lib" src/.libs/libvgmstream.{a,so}
   install -D -m644 -t "$pkgdir/usr/share/licenses/$pkgname" COPYING