From e1c7ba248acfd62655a6594a2cd6087f61a27e08 Mon Sep 17 00:00:00 2001
From: Mikael Eriksson <mikael_eriksson@miffe.org>
Date: Wed, 5 Feb 2020 19:53:22 +0100
Subject: [PATCH] 0.2.1

---
 .SRCINFO    | 14 +++++++-------
 PKGBUILD    | 36 ++++++++++++++++++++----------------
 ocp.install | 17 -----------------
 3 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100644 ocp.install

diff --git a/.SRCINFO b/.SRCINFO
index 01e74d5..f839958 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
 pkgbase = ocp
 	pkgdesc = Open Cubic Player
-	pkgver = 0.1.21
-	pkgrel = 7
-	url = http://stian.cubic.org/project-ocp.php
-	install = ocp.install
+	pkgver = 0.2.1
+	pkgrel = 1
+	url = https://github.com/mywave82/opencubicplayer
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = texinfo
 	makedepends = desktop-file-utils
 	depends = libsidplay
 	depends = libxxf86vm
@@ -18,8 +16,10 @@ pkgbase = ocp
 	depends = flac
 	depends = sdl
 	depends = adplug
-	source = http://sourceforge.net/projects/opencubicplayer/files/ocp-0.1.21/ocp-0.1.21.tar.bz2
-	md5sums = 558a6eacfadfd9c60c97a6e9c7f83f47
+	source = git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.1
+	source = git+https://github.com/mywave82/timidity.git
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = ocp
 
diff --git a/PKGBUILD b/PKGBUILD
index cb4f20b..2b2bfdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,33 @@
 # Original PKGBUILD by: berkus [berkus_at_madfire_dot_net]
 
 pkgname=ocp
-pkgver=0.1.21
-pkgrel=7
+pkgver=0.2.1
+pkgrel=1
 pkgdesc="Open Cubic Player"
 arch=('i686' 'x86_64')
-url="http://stian.cubic.org/project-ocp.php"
+url="https://github.com/mywave82/opencubicplayer"
 depends=('libsidplay' 'libxxf86vm' 'libvorbis' 'libxpm' 'alsa-lib' 'libmad' 'flac' 'sdl' 'adplug')
-makedepends=('texinfo' 'desktop-file-utils')
+makedepends=('desktop-file-utils')
 license=('GPL')
-source=(http://sourceforge.net/projects/opencubicplayer/files/ocp-$pkgver/ocp-$pkgver.tar.bz2)
-md5sums=('558a6eacfadfd9c60c97a6e9c7f83f47')
-install=ocp.install
+source=(git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver}
+        git+https://github.com/mywave82/timidity.git)
+md5sums=('SKIP'
+         'SKIP')
+
+prepare() {
+	cd opencubicplayer
+	git submodule init
+	git config submodule.playgmi/timidity-git.url $srcdir/timidity
+	git submodule update
+}
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7.*|8.*)" configure
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make -j1 DESTDIR=$pkgdir
+	cd opencubicplayer
+	./configure --prefix=/usr --sysconfdir=/etc
+	make DESTDIR=$pkgdir
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make -j1 DESTDIR=$pkgdir install
-  install -m755 playopl/playopl.so $pkgdir/usr/lib/ocp-0.1.21/playopl.so
-  install -m755 playopl/opltype.so $pkgdir/usr/lib/ocp-0.1.21/autoload/30-opltype.so
-  rm $pkgdir/usr/share/info/dir
+	cd opencubicplayer
+	make DESTDIR=$pkgdir install
 }
diff --git a/ocp.install b/ocp.install
deleted file mode 100644
index a19a27c..0000000
--- a/ocp.install
+++ /dev/null
@@ -1,17 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-test -x /usr/bin/gtk-update-icon-cache && /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-test -x /usr/bin/gtk-update-icon-cache && /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
-## arg 1:  the old package version
-post_remove() {
-test -x /usr/bin/gtk-update-icon-cache && /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
-# vim:set ts=2 sw=2 et: