summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lin2020-10-28 19:52:10 -0700
committerAndrew Lin2020-10-28 19:54:49 -0700
commitb607c39ea5c8aea72482dc0bdbb261ef8af8014d (patch)
tree67a3b455ae710f1f416a7cf0098d45915e524eda
parent5906fec86c8a7c20b7b97e775271a28c1b9caaee (diff)
downloadaur-vgmplay.tar.gz
Add patch to fix GCC 10 linking error on VGMEnd
Patch is based on https://github.com/vgmrips/vgmplay/pull/74
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--fix-vgmend-extern.patch12
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd0a4da3b2eb..b54e3e7b95ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Feb 22 08:58:44 UTC 2019
pkgbase = vgmplay
pkgdesc = The offical and always up-to-date player for all VGM files
pkgver = 0.40.9
- pkgrel = 1
+ pkgrel = 2
url = http://vgmrips.net/forum/viewtopic.php?t=112
arch = i686
arch = x86_64
@@ -12,7 +10,9 @@ pkgbase = vgmplay
depends = libao
depends = zlib
source = https://github.com/vgmrips/vgmplay/archive/0.40.9.tar.gz
+ source = fix-vgmend-extern.patch
md5sums = a2217e465c5e3bdebc47dbb15a6cb436
+ md5sums = 6fb9555d745d989f7e4578d7ee9962d3
pkgname = vgmplay
diff --git a/PKGBUILD b/PKGBUILD
index e2883f0b54d5..07b2b3f3db52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,21 @@
pkgname=vgmplay
pkgver=0.40.9
-pkgrel=1
+pkgrel=2
pkgdesc="The offical and always up-to-date player for all VGM files"
arch=('i686' 'x86_64')
url="http://vgmrips.net/forum/viewtopic.php?t=112"
license=('GPL' 'custom')
-source=("https://github.com/vgmrips/vgmplay/archive/$pkgver.tar.gz")
+source=("https://github.com/vgmrips/vgmplay/archive/$pkgver.tar.gz"
+ "fix-vgmend-extern.patch")
depends=('libao' 'zlib')
-md5sums=('a2217e465c5e3bdebc47dbb15a6cb436')
+md5sums=('a2217e465c5e3bdebc47dbb15a6cb436'
+ '6fb9555d745d989f7e4578d7ee9962d3')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch --forward --strip=2 --input="${srcdir}/fix-vgmend-extern.patch"
+}
build() {
cd "$pkgname-$pkgver/VGMPlay"
diff --git a/fix-vgmend-extern.patch b/fix-vgmend-extern.patch
new file mode 100644
index 000000000000..4293beac7aaa
--- /dev/null
+++ b/fix-vgmend-extern.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text src.old/vgmplay-0.40.9/VGMPlay/VGMPlay_AddFmts.c src.new/vgmplay-0.40.9/VGMPlay/VGMPlay_AddFmts.c
+--- src.old/vgmplay-0.40.9/VGMPlay/VGMPlay_AddFmts.c 2018-12-24 13:00:00.000000000 -0800
++++ src.new/vgmplay-0.40.9/VGMPlay/VGMPlay_AddFmts.c 2020-10-28 19:26:25.945034851 -0700
+@@ -117,7 +117,7 @@
+ extern INT32 VGMSampleRate;
+ extern UINT32 BlocksSent;
+ extern UINT32 BlocksPlayed;
+-bool VGMEnd;
++extern bool VGMEnd;
+ extern bool EndPlay;
+ extern bool PausePlay;
+ extern bool FadePlay;