summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--fix-audacious-prefix.patch13
-rw-r--r--no-link-audacious.patch12
4 files changed, 12 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bf757ab682c5..03df0d141d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
pkgbase = vgmstream-kode54-git
pkgdesc = Library for playback of various streamed audio formats used in video games (kode54's fork)
- pkgver = r1050.r2771.ge58c73aa
- pkgrel = 1
+ pkgver = r1050.3185.g471dadb4
+ pkgrel = 2
url = https://github.com/kode54/vgmstream
arch = x86_64
license = BSD
+ makedepends = audacious
makedepends = git
- depends = audacious
+ makedepends = gtk2
depends = ffmpeg
depends = libao
depends = libatrac9-git
depends = libogg
depends = libvorbis
depends = mpg123
+ optdepends = audacious: for using 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
sha256sums = SKIP
sha256sums = a991dff4a9e0772ede0881d81cdc7ac559148c2194885cbdd534fe4af43779da
sha256sums = c94d4d34f5a2caa1574b1a94869202cacd959b55f643a8bafe0660008acad9c3
- sha256sums = d2f0a5d991cc7e629c58f529f82a4e0b9be3b68a49b86a98e1a6dbb106e6b1c3
sha256sums = e3e94769b6545e2c8c0b60ffda684b659bb8db06f3fb9d7645fd4a734d115bac
pkgname = vgmstream-kode54-git
diff --git a/PKGBUILD b/PKGBUILD
index c7aa85e14892..6b0179d0897c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,33 @@
pkgname=vgmstream-kode54-git
-pkgver=r1050.r2771.ge58c73aa
-pkgrel=1
+pkgver=r1050.3185.g471dadb4
+pkgrel=2
pkgdesc="Library for playback of various streamed audio formats used in video games (kode54's fork)"
arch=(x86_64)
url='https://github.com/kode54/vgmstream'
license=(BSD)
-depends=(audacious ffmpeg libao libatrac9-git libogg libvorbis mpg123)
-makedepends=(git)
+depends=(ffmpeg libao libatrac9-git libogg libvorbis mpg123)
+makedepends=(audacious git gtk2)
+optdepends=('audacious: for using the bundled plugin')
source=(${pkgname}::git+https://github.com/kode54/vgmstream.git
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'
'a991dff4a9e0772ede0881d81cdc7ac559148c2194885cbdd534fe4af43779da'
'c94d4d34f5a2caa1574b1a94869202cacd959b55f643a8bafe0660008acad9c3'
- 'd2f0a5d991cc7e629c58f529f82a4e0b9be3b68a49b86a98e1a6dbb106e6b1c3'
'e3e94769b6545e2c8c0b60ffda684b659bb8db06f3fb9d7645fd4a734d115bac')
pkgver() {
cd "$srcdir/$pkgname"
( set -o pipefail
- git describe --long 2>/dev/null | sed -r 's/([^-]*-g)/r\1/;y/-/./' ||
+ git describe --tags --exact-match 2>/dev/null | tr - . ||
+ git describe --long | tr - . ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
)
}
prepare() {
cd "$srcdir/$pkgname"
- patch -p0 < "$srcdir"/fix-audacious-prefix.patch
patch -p0 < "$srcdir"/install-headers.patch
}
diff --git a/fix-audacious-prefix.patch b/fix-audacious-prefix.patch
deleted file mode 100644
index 288fd04fa6f7..000000000000
--- a/fix-audacious-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/no-link-audacious.patch b/no-link-audacious.patch
deleted file mode 100644
index a770cf986de1..000000000000
--- a/no-link-audacious.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git src/Makefile.autotools.am src/Makefile.autotools.am
-index a15eb51f..a1f2e160 100644
---- src/Makefile.autotools.am
-+++ src/Makefile.autotools.am
-@@ -11,6 +17,6 @@ SUBDIRS = coding layout meta
- libvgmstream_la_LDFLAGS = coding/libcoding.la layout/liblayout.la meta/libmeta.la
- libvgmstream_la_SOURCES = (auto-updated)
- libvgmstream_la_SOURCES += ../ext_libs/clHCA.c
--libvgmstream_la_LIBADD = $(AUDACIOUS_LIBS) $(GTK_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(MPG123_LIBS) -lm
-+libvgmstream_la_LIBADD = $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(MPG123_LIBS) -lm
- EXTRA_DIST = (auto-updated)
- EXTRA_DIST += ../ext_includes/clHCA.h