Update to version 1.3c

2 files changed, 58 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0884bd5e068c..97e907fd74d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jan 18 15:19:42 UTC 2016
 pkgbase = chipmachine
 	pkgdesc = A demoscene/retro Jukebox/spotify-like music player
-	pkgver = 1.2
+	pkgver = 1.3c
 	pkgrel = 1
 	url = https://github.com/sasq64/chipmachine
 	arch = i686
@@ -10,15 +8,19 @@ pkgbase = chipmachine
 	license = MIT
 	makedepends = cmake
 	makedepends = ninja
+	makedepends = vim
 	depends = mpg123
 	depends = glew
 	depends = glfw
 	depends = curl
-	depends = xxd
-	source = https://github.com/sasq64/chipmachine/archive/v1.2.tar.gz
-	source = https://github.com/sasq64/apone/archive/chipmachine-v1.2.tar.gz
-	sha256sums = 1371734728b99fa22ebd36a7aa9ccc88e8f975ff8abb749075c10afc01eb3b51
-	sha256sums = 96fd8f1ec540a8c3121145dbdf51adf9ad2efe2b0ed58b68d7512d7c45fc5806
+	source = https://github.com/sasq64/chipmachine/archive/v1.3c.tar.gz
+	source = apone.tar.gz::https://github.com/sasq64/apone/archive/d320e07159a35f47cbc81ea45f145c27a976f98c.tar.gz
+	source = two-missing-std-specifiers.patch::https://github.com/sasq64/chipmachine/commit/31181465d5c8ba87efa6450c149dc00acffe0f6d.patch
+	source = fixed-against-latest-apone.patch::https://github.com/sasq64/chipmachine/commit/44ed091a4305b2231595bd7f62c11803eb66aeb7.patch
+	sha256sums = fe83080035a6ba23917a79b9133e29b2b934e7711fb21e8039eff3a9411fd354
+	sha256sums = fc9e60c3b57065ec0b65dff649aa4bd4212e3ec8c496326be63d9cf5fe427499
+	sha256sums = 7dc76d37e016a5109efb471b30b3c46246ea231ad3cd6e45bd8a6a438cccfd44
+	sha256sums = 531db4559b7cb57e20409e26d500aa82dc8e6c03aa437547affdd88c5cb03997
 
 pkgname = chipmachine
 
diff --git a/PKGBUILD b/PKGBUILD
index 2a392dd7b0fc..0396d5047401 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,60 @@
+# Maintainer: Michael Straube <straubem@gmx.de>
 # Contributor: Sebastian Wolf <fatmike303 at googlemail dot com>
+
+_aponecommit=d320e07159a35f47cbc81ea45f145c27a976f98c
+_patchcommit1=31181465d5c8ba87efa6450c149dc00acffe0f6d
+_patchcommit2=44ed091a4305b2231595bd7f62c11803eb66aeb7
+
 pkgname=chipmachine
-pkgver=1.2
-pkgrel=2
+pkgver=1.3c
+pkgrel=1
 pkgdesc='A demoscene/retro Jukebox/spotify-like music player'
 arch=('i686' 'x86_64')
 url='https://github.com/sasq64/chipmachine'
-depends=('mpg123' 'glew' 'glfw' 'curl' 'xxd')
-makedepends=('cmake' 'ninja')
 license=('MIT')
-source=(https://github.com/sasq64/${pkgname}/archive/v${pkgver}.tar.gz
-        https://github.com/sasq64/apone/archive/${pkgname}-v${pkgver}.tar.gz)
-sha256sums=(1371734728b99fa22ebd36a7aa9ccc88e8f975ff8abb749075c10afc01eb3b51
-            96fd8f1ec540a8c3121145dbdf51adf9ad2efe2b0ed58b68d7512d7c45fc5806)
+depends=('mpg123' 'glew' 'glfw' 'curl')
+makedepends=('cmake' 'ninja' 'vim')
+source=("https://github.com/sasq64/$pkgname/archive/v$pkgver.tar.gz"
+        "apone.tar.gz::https://github.com/sasq64/apone/archive/$_aponecommit.tar.gz"
+        "two-missing-std-specifiers.patch::https://github.com/sasq64/$pkgname/commit/$_patchcommit1.patch"
+        "fixed-against-latest-apone.patch::https://github.com/sasq64/$pkgname/commit/$_patchcommit2.patch")
+sha256sums=('fe83080035a6ba23917a79b9133e29b2b934e7711fb21e8039eff3a9411fd354'
+            'fc9e60c3b57065ec0b65dff649aa4bd4212e3ec8c496326be63d9cf5fe427499'
+            '7dc76d37e016a5109efb471b30b3c46246ea231ad3cd6e45bd8a6a438cccfd44'
+            '531db4559b7cb57e20409e26d500aa82dc8e6c03aa437547affdd88c5cb03997')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # https://github.com/sasq64/chipmachine/commit/3118146
+  patch -p1 -i ../two-missing-std-specifiers.patch
+
+  # https://github.com/sasq64/chipmachine/commit/44ed091
+  patch -p1 -i ../fixed-against-latest-apone.patch
+
+  ln -s "$srcdir"/apone-$_aponecommit ../apone
+  mkdir ../build
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ln -s ${srcdir}/apone-${pkgname}-v${pkgver} ${srcdir}/apone
-  cmake -GNinja -DCMAKE_BUILD_TYPE=Release || return 1
-  ninja || return 1
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+    -GNinja -DCMAKE_BUILD_TYPE=Release
+  ninja
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # Binary
-  install -D -m755 ${pkgname} ${pkgdir}/usr/lib/${pkgname}/${pkgname}
-  install -d -m755 ${pkgdir}/usr/bin/
-  ln -s /usr/lib/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-  
-  # Directories
-  install -d -m755 ${pkgdir}/usr/lib/${pkgname}/data
-  cp -r data ${pkgdir}/usr/lib/${pkgname}/
-  install -d -m755 ${pkgdir}/usr/lib/${pkgname}/lua
-  cp -r lua ${pkgdir}/usr/lib/${pkgname}/
-  
-  # License
-  install -D -m644 ${srcdir}/apone/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd $pkgname-$pkgver
+
+  install -d "$pkgdir"/usr/{bin,lib/chipmachine,share/chipmachine}
+
+  install -m755 ../build/{chipmachine,cm} "$pkgdir"/usr/lib/chipmachine/
+  ln -s /usr/lib/chipmachine/chipmachine "$pkgdir"/usr/bin/chipmachine
+  ln -s /usr/lib/chipmachine/cm "$pkgdir"/usr/bin/chipmachine-cli
+
+  cp -r data lua "$pkgdir"/usr/share/chipmachine/
+  ln -s /usr/share/chipmachine/data "$pkgdir"/usr/lib/chipmachine/data
+
+  install -Dm644 ../apone/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }