xbrzscale upstream updated to xbrz 1.8

2 files changed, 19 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3217c6c10c18..9ad41fd8cf60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = xbrzscale
 	pkgdesc = New Generation Image Upscaling Tool
 	pkgver = 1.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/atheros/xbrzscale
 	arch = i686
 	arch = x86_64
 	arch = aarch64
 	license = GPL3
 	depends = sdl2_image
-	options = buildflags
-	source = xbrzscale.tar.gz::https://github.com/atheros/xbrzscale/tarball/master
-	source = xbrz-1.8.zip::https://sourceforge.net/projects/xbrz/files/xBRZ/xBRZ_1.8.zip/download
+	noextract = xbrzscale.zip
+	source = xbrzscale.zip::https://github.com/atheros/xbrzscale/archive/ef36908831c058df7a202c8175d575a1fdfaf156.zip
 	source = 001-makefile.patch
-	sha256sums = d9175f17781608f472de47265a5c399fc003cc468fd584c11de08b17385d488e
-	sha256sums = e4e2513801c7097fe9a391b481a48b1890f80e696549d8cf27884bd223a4cba9
-	sha256sums = 1fcd854678da773a1ef87d8e94da1d71604bc64f62d84bdd70339e2945480ebf
+	sha256sums = 5b418a271d79f5e7b7add2cc487785c05dbbfd8342e3c18ed7c0a4f70e121bfa
+	sha256sums = 3c6fabff0ce6b6f988aaec4dcc0a350d10c11753fed8729936dab2fc87fbb051
 
 pkgname = xbrzscale
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c8abf5ae008..c0a858ecc33e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,37 @@
 # Maintainer: Peter blackman <peter at pblackman dot plus dot com>
-# Build xbrzscale with latest version (1.8) of xbrz library
+# Version (1.8) is based on the xbrz library
+# xbrzscale does not currently have any version or release tags to use
+# Pinned to xbrz 1.8 via the git commit
+# Patch makefile to fix RELRO
 
 pkgname=xbrzscale
 pkgver=1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="New Generation Image Upscaling Tool"
 arch=('i686' 'x86_64' 'aarch64')
-url="https://sourceforge.net/projects/xbrz/files/xBRZ/"
 url="https://github.com/atheros/xbrzscale"
 license=('GPL3')
-depends=(sdl2_image)
-options=(buildflags)
-source=("$pkgname.tar.gz::https://github.com/atheros/xbrzscale/tarball/master"
-	"xbrz-$pkgver.zip::https://sourceforge.net/projects/xbrz/files/xBRZ/xBRZ_1.8.zip/download"
+depends=('sdl2_image')
+_commit=ef36908831c058df7a202c8175d575a1fdfaf156
+source=("$pkgname.zip::https://github.com/atheros/xbrzscale/archive/$_commit.zip"
 	001-makefile.patch)
-sha256sums=('d9175f17781608f472de47265a5c399fc003cc468fd584c11de08b17385d488e'
-            'e4e2513801c7097fe9a391b481a48b1890f80e696549d8cf27884bd223a4cba9'
-            '1fcd854678da773a1ef87d8e94da1d71604bc64f62d84bdd70339e2945480ebf')
+sha256sums=('5b418a271d79f5e7b7add2cc487785c05dbbfd8342e3c18ed7c0a4f70e121bfa'
+            '3c6fabff0ce6b6f988aaec4dcc0a350d10c11753fed8729936dab2fc87fbb051')
+noextract=($pkgname.zip)
 
 
-# Replace /xbrz contents
-# Apply makefile patch
 prepare() {
-  rm -fr "$pkgname"
-  mv "atheros-$pkgname-b719c2c" "$pkgname"
-
-  rm "$pkgname"/xbrz/*
-  mv xbrz.cpp      "$pkgname/xbrz/"
-  mv xbrz.h        "$pkgname/xbrz/"
-  mv xbrz_config.h "$pkgname/xbrz/"
-  mv xbrz_tools.h  "$pkgname/xbrz/"
-  mv Changelog.txt "$pkgname/xbrz/"
+  bsdtar -xf $pkgname.zip -s /$pkgname-$_commit/$pkgname/
 
   cd "$pkgname"
-  patch -Np1 < ../../001-makefile.patch
+  patch -Np1 < "$srcdir/001-makefile.patch"
 }
 
-
 build() {
   cd "$pkgname"
-  make
+  make all
 }
 
-
 package() {
   cd "$pkgname"
   install -Dm 755 "$pkgname"         -t "$pkgdir/usr/bin"