Update to r78.27590fe (Thanks afontenot)

4 files changed, 85 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7fba6d4bbb9..f874f79461ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = squishyball
 	pkgdesc = Perform ABX audio sample comparison testing on the command line
-	pkgver = 19643
+	pkgver = r78.27590fe
 	pkgrel = 1
-	url = https://svn.xiph.org/trunk/squishyball/
+	url = https://gitlab.xiph.org/xiph/squishyball
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = subversion
 	depends = opusfile
 	depends = ncurses
 	depends = libvorbis
 	depends = flac
 	depends = libao
-	source = svn+https://svn.xiph.org/trunk/squishyball/
-	sha1sums = SKIP
+	source = git+https://gitlab.xiph.org/xiph/squishyball.git
+	source = https://gitlab.xiph.org/xiph/squishyball/uploads/5609ceaf85ebb6dc297c0efe61b9a1b7/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch
+	sha256sums = SKIP
+	sha256sums = 9eb5e820069867a6b36c06b71b941d5c82aff6bd0f966be588cbcf203e29aae6
 
 pkgname = squishyball
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..786350f50d63
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/pkg/
+/src/
+/*.patch
+
+/squishyball-*.tar*
+/squishyball/
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000000..6073b72eb45d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,56 @@
+.SHELL = /usr/bin/env bash
+
+NAME    = "$(shell grep -m 1 pkgname .SRCINFO | cut -d '=' -f 2 | xargs)"
+URL     = "$(shell grep url .SRCINFO | cut -d '=' -f 2 | xargs)"
+VERSION = "$(shell grep pkgver .SRCINFO | cut -d '=' -f 2 | xargs)"
+
+.PHONY: all
+all: build git install
+
+.PHONY: clean
+clean:
+	rm -r src pkg || true
+
+.PHONY: geninteg
+geninteg:
+	sed -i '/.*sums=(/,$$d' PKGBUILD
+	makepkg --geninteg >> PKGBUILD
+
+.PHONY: srcinfo
+srcinfo:
+	makepkg --printsrcinfo > .SRCINFO
+
+.PHONY: makepkg
+makepkg:
+	makepkg --syncdeps --force
+
+.PHONY: build
+build: geninteg srcinfo makepkg
+
+.PHONY: git
+git: git_add git_commit
+
+.PHONY: git_add
+git_add:
+	git add PKGBUILD .SRCINFO Makefile
+
+.PHONY: git_commit
+git_commit: GIT_STATUS = "$(shell git status --porcelain)"
+git_commit:
+	[ -n ${GIT_STATUS} ] && git commit -m "Update to ${VERSION}"
+
+.PHONY: install
+install:
+	makepkg --repackage --install --force
+
+.PHONY: open
+open:
+	xdg-open $(URL)
+
+.PHONY: run
+run:
+	env $(NAME)
+
+.PHONY: test
+test:
+	env $(NAME) --version
diff --git a/PKGBUILD b/PKGBUILD
index f5fa4b5d9f64..358126b7fa2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,40 @@
 # Maintainer: goetzc
 # Contributor: Gaetan Bisson <bisson@archlinux.org
+# Contributor: afontenot
 
 pkgname=squishyball
-pkgver=19643
+pkgver=r78.27590fe
 pkgrel=1
 pkgdesc='Perform ABX audio sample comparison testing on the command line'
-url='https://svn.xiph.org/trunk/squishyball/'
+url='https://gitlab.xiph.org/xiph/squishyball'
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('subversion')
 depends=('opusfile' 'ncurses' 'libvorbis' 'flac' 'libao')
-source=("svn+https://svn.xiph.org/trunk/squishyball/")
-sha1sums=('SKIP')
+source=("git+https://gitlab.xiph.org/xiph/squishyball.git"
+        "https://gitlab.xiph.org/xiph/squishyball/uploads/5609ceaf85ebb6dc297c0efe61b9a1b7/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch")
 
-prepare() {
-  cd "${srcdir}/${pkgname}"
-  # Fix compile, from Debian bug tracker #860334
-  sed -i '/#define _FILE_OFFSET_BITS/a#define NCURSES_INTERNALS' mincurses.c
+pkgver() {
+  cd "$pkgname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-pkgver() {
-  cd "${srcdir}/${pkgname}"
-  svn info | awk '/Revision/{print $2}'
+prepare() {
+  cd "$pkgname"
+  # fix building against ncurses-6.3+
+  patch -Np1 -i "$srcdir/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "$pkgname"
   sed -i 's:@MANDIR@:/usr/share/man:' Makefile.am
   ./autogen.sh --prefix='/usr'
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "$pkgname"
   make DESTDIR="${pkgdir}" install
 }
+
+sha256sums=('SKIP'
+            '9eb5e820069867a6b36c06b71b941d5c82aff6bd0f966be588cbcf203e29aae6')