update for gcc9 support

2 files changed, 42 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f522987c2f76..410606a33f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = adlplug-git
 	pkgdesc = FM chip synthesizer
-	pkgver = v1.0.0.beta.5.r15.bacf19b
+	pkgver = v1.0.1.r35.025baba
 	pkgrel = 1
 	url = https://github.com/jpcima/ADLplug
 	arch = i686
@@ -12,7 +12,9 @@ pkgbase = adlplug-git
 	makedepends = libxrandr
 	makedepends = libxinerama
 	makedepends = libxcursor
+	depends = fmt
 	depends = jack
+	depends = liblo
 	depends = freetype2
 	depends = libxext
 	depends = hicolor-icon-theme
@@ -22,12 +24,14 @@ pkgbase = adlplug-git
 	source = git+https://github.com/jpcima/JUCE.git
 	source = git+https://github.com/fmtlib/fmt.git
 	source = git+https://github.com/jpcima/simpleini.git
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	source = juce-gcc9.patch::https://github.com/WeAreROLI/JUCE/commit/4e0adb2af8b424c43d22bd431011c9a6c57d36b6.patch
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = 263fe21e7362f4b8c4009d33e8a086ddf57ddd44267343b924f1304a58580a38e6bd2d36c9548ec706be733476d27e5c89f8095f401b9b841ade63d9cb812a77
 
 pkgname = adlplug-git
 	pkgdesc = FM synthesizer for ADLMIDI with OPL3 chip emulation
diff --git a/PKGBUILD b/PKGBUILD
index 3a27081210c5..5c6b8109215a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,29 @@
 
 pkgname=(adlplug-git opnplug-git)
 _pkgname=ADLplug
-pkgver=v1.0.0.beta.5.r15.bacf19b
+pkgver=v1.0.1.r35.025baba
 pkgrel=1
 pkgdesc="FM chip synthesizer"
 arch=('i686' 'x86_64')
 url="https://github.com/jpcima/ADLplug"
 license=('GPL')
 groups=('pro-audio')
-depends=('jack' 'freetype2' 'libxext' 'hicolor-icon-theme')
+depends=('fmt' 'jack' 'liblo' 'freetype2' 'libxext' 'hicolor-icon-theme')
 makedepends=('git' 'cmake' 'libxrandr' 'libxinerama' 'libxcursor')
 source=('git+https://github.com/jpcima/ADLplug.git'
         'git+https://github.com/Wohlstand/libADLMIDI.git'
         'git+https://github.com/Wohlstand/libOPNMIDI.git'
         'git+https://github.com/jpcima/JUCE.git'
         'git+https://github.com/fmtlib/fmt.git'
-        'git+https://github.com/jpcima/simpleini.git')
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP')
+        'git+https://github.com/jpcima/simpleini.git'
+        "juce-gcc9.patch::https://github.com/WeAreROLI/JUCE/commit/4e0adb2af8b424c43d22bd431011c9a6c57d36b6.patch")
+sha512sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '263fe21e7362f4b8c4009d33e8a086ddf57ddd44267343b924f1304a58580a38e6bd2d36c9548ec706be733476d27e5c89f8095f401b9b841ade63d9cb812a77')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -41,6 +43,8 @@ prepare() {
   done
   git submodule update
 
+  patch -Np1 -d thirdparty/JUCE -i "${srcdir}"/juce-gcc9.patch
+
   cd "${srcdir}"
   cp -rf "${_pkgname}" "${_pkgname}-opn"
 }
@@ -49,13 +53,23 @@ build() {
   cd "${srcdir}/${_pkgname}"
   mkdir -p build
   cd build
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DADLplug_CHIP=OPL3 ..
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DADLplug_CHIP=OPL3 \
+        -DADLplug_USE_SYSTEM_FMT=ON \
+        ..
   make
 
   cd "${srcdir}/${_pkgname}-opn"
   mkdir -p build
   cd build
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DADLplug_CHIP=OPN2 ..
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DADLplug_CHIP=OPN2 \
+        -DADLplug_USE_SYSTEM_FMT=ON \
+        ..
   make
 }
 
@@ -64,8 +78,9 @@ package_adlplug-git() {
   provides=('adlplug')
   conflicts=('adlplug')
 
-  cd "${srcdir}/${_pkgname}/build"
-  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/${_pkgname}"
+  make -C build DESTDIR="${pkgdir}/" install
+  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
 
 package_opnplug-git() {
@@ -73,6 +88,7 @@ package_opnplug-git() {
   provides=('opnplug')
   conflicts=('opnplug')
 
-  cd "${srcdir}/${_pkgname}-opn/build"
-  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/${_pkgname}-opn"
+  make -C build DESTDIR="${pkgdir}/" install
+  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }