summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Niemenmaa2018-02-28 13:03:31 +0200
committerMatti Niemenmaa2018-02-28 13:06:34 +0200
commit29167d47f5dbfabd6fcd803eac6c48b62f1cb852 (patch)
tree96f2b10b8f21b07712dd0e6eec6ecdd2a01ae918
parenta91006e7fe44297dd72c937d74abfb10d84e963f (diff)
downloadaur-29167d47f5dbfabd6fcd803eac6c48b62f1cb852.tar.gz
Fix build, and make/optdepend on audacious
No point in fighting the build system about audacious, we can just provide the plugin and not require it at runtime.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD27
-rw-r--r--install-headers.patch16
3 files changed, 32 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44413750c8f..a00eb9b5252 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,23 @@
pkgbase = vgmstream-kode54-git
pkgdesc = Library for playback of various streamed audio formats used in video games (kode54's fork)
- pkgver = r1020.r770.g00e1a5f
+ pkgver = r1020.r1169.gc3d3aaee
pkgrel = 1
url = https://gitlab.kode54.net/kode54/vgmstream
arch = i686
arch = x86_64
license = BSD
+ makedepends = audacious
makedepends = git
depends = glibc
depends = libogg
depends = libvorbis
depends = mpg123
depends = ffmpeg
+ optdepends = audacious: to use the bundled plugin
source = vgmstream-kode54-git::git+https://gitlab.kode54.net/kode54/vgmstream.git
+ source = install-headers.patch
sha256sums = SKIP
+ sha256sums = 8f723536321480bb46b731f66c29a5f5354834094458f93de7539bbe4465b824
pkgname = vgmstream-kode54-git
diff --git a/PKGBUILD b/PKGBUILD
index ec63d7562f1..2c41c510d42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,17 @@
pkgname=vgmstream-kode54-git
-pkgver=r1020.r770.g00e1a5f
+pkgver=r1020.r1169.gc3d3aaee
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 ffmpeg)
-makedepends=(git)
-source=(${pkgname}::git+https://gitlab.kode54.net/kode54/vgmstream.git)
-sha256sums=('SKIP')
+makedepends=(audacious git)
+optdepends=('audacious: to use the bundled plugin')
+source=(${pkgname}::git+https://gitlab.kode54.net/kode54/vgmstream.git
+ install-headers.patch)
+sha256sums=('SKIP'
+ '8f723536321480bb46b731f66c29a5f5354834094458f93de7539bbe4465b824')
pkgver() {
cd "$srcdir/$pkgname"
@@ -20,27 +23,19 @@ pkgver() {
prepare() {
cd "$srcdir/$pkgname"
-
- # 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.ac
+ patch -p0 < "$srcdir"/install-headers.patch
}
build() {
cd "$srcdir/$pkgname"
./bootstrap
- CFLAGS="$CFLAGS -DVGM_USE_FFMPEG" LIBS="-lavcodec -lavformat -lavutil" ./configure
- cd src
- 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
+ CFLAGS="$CFLAGS -DVGM_USE_FFMPEG" LIBS="-lavcodec -lavformat -lavutil" ./configure --prefix=/usr
+ make -f Makefile.autotools
}
package() {
cd "$srcdir/$pkgname"
- 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
+ make -f Makefile.autotools install DESTDIR="$pkgdir"
}
# vim:set sw=2 et:
diff --git a/install-headers.patch b/install-headers.patch
new file mode 100644
index 00000000000..a8301e58198
--- /dev/null
+++ b/install-headers.patch
@@ -0,0 +1,16 @@
+diff --git src/Makefile.autotools.am src/Makefile.autotools.am
+index a15eb51f..d6be8b5c 100644
+--- src/Makefile.autotools.am
++++ src/Makefile.autotools.am
+@@ -1,5 +1,11 @@
+ ## vgmstream autotools script
+
++include_HEADERS = ../ext_includes/clHCA.h
++__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
++
+ lib_LTLIBRARIES = libvgmstream.la
+
+ AM_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/