Update package for 2.1.0. Build with libusb and libcd64

3 files changed, 37 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c46c49fea46d..b9ab3c374c5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = ucon64
 	pkgdesc = A ROM backup tool and emulator's Swiss Army knife program.
-	pkgver = 2.0.3
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = http://ucon64.sourceforge.net/index.php
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = zlib
-	source = https://downloads.sourceforge.net/ucon64/ucon64-2.0.3-src.tar.gz
-	source = patch-ucon64_misc.c
-	sha256sums = fdf158a4bc7c3a7d45a60ef495151f635ce39938799d373a29628f5985790bd2
-	sha256sums = f52d6e0cb307a2c0bc4e4ede0673139f5ddd704199ee12d15f58d2e394f25c80
+	depends = libusb-compat
+	source = https://downloads.sourceforge.net/ucon64/ucon64-2.1.0-src.tar.gz
+	sha256sums = c99964060a5337cea811b27c4103e186a14ba1f04b19cff08bac0260271bc872
 
 pkgname = ucon64
 
diff --git a/PKGBUILD b/PKGBUILD
index f01b86d5875f..60afd577a39a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,47 @@
-# Maintainer : Paula Breton <paula@parashep.com>
+# Maintainer: Kristian Gunstone <kristian.gunstone.butnotthispart@pean.northis.org>
+# Contributor: Paula Breton <paula@parashep.com>
 # Contributor: robb_force <robb_force@holybuffalo.net>
 
 pkgname=ucon64
-pkgver=2.0.3
+pkgver=2.1.0
 pkgrel=1
-pkgdesc="A ROM backup tool and emulator's Swiss Army knife program."
+pkgdesc="A ROM backup tool and emulator's Swiss Army knife program. " 
 arch=('i686' 'x86_64')
 url="http://ucon64.sourceforge.net/index.php"
 license=('GPL')
-depends=('zlib')
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-src.tar.gz \
-        patch-ucon64_misc.c)
-sha256sums=('fdf158a4bc7c3a7d45a60ef495151f635ce39938799d373a29628f5985790bd2'
-            'f52d6e0cb307a2c0bc4e4ede0673139f5ddd704199ee12d15f58d2e394f25c80')
+depends=('zlib' 'libusb-compat')
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-src.tar.gz)
+sha256sums=('c99964060a5337cea811b27c4103e186a14ba1f04b19cff08bac0260271bc872')
 
-prepare() {
-  cd ${pkgname}-${pkgver}-src/src
-
-  patch -p0 < ../../patch-ucon64_misc.c
-  sed -i 's|$(CFLAGS0)|"$(CFLAGS0)"|g' Makefile
+prepare()
+{
+    # This quickfix, which amends a typo in the Makefile resulting in
+    # misinterpreting CFLAGS, was added by the previous maintainer.
+    #
+    # Here's an example of what happens without the end quotation, with a
+    # CFLAGS variable containing spaces:
+    #   
+    # $ CFLAGS="-O2 -ggdb3" make
+    # cd libdiscmage && CFLAGS=-O2 -ggdb3 LDFLAGS= make
+    # /bin/sh: -ggdb3: command not found
+    # make: *** [Makefile:243: libdiscmage/discmage.so] Error 127
+    # $
+    #
+    # 
+    sed -i 's|$(CFLAGS0)|"$(CFLAGS0)"|g' ${pkgname}-${pkgver}-src/src/Makefile
 }
 
-build() {
-  cd ${pkgname}-${pkgver}-src/src
-
-  ./configure --prefix=/usr
-  make
+build() 
+{
+    cd ${pkgname}-${pkgver}-src/src
+    ./configure --prefix=/usr --with-libusb --with-libcd64
+    make
 }
 
-package() {
-  cd ${pkgname}-${pkgver}-src/src
+package() 
+{
+    cd ${pkgname}-${pkgver}-src/src
 
-  install -Dm775 ucon64 "${pkgdir}"/usr/bin/ucon64
-  install -Dm755 libdiscmage/discmage.so "${pkgdir}"/usr/lib/discmage.so
+    install -Dm775 ucon64 "${pkgdir}"/usr/bin/ucon64
+    install -Dm755 libdiscmage/discmage.so "${pkgdir}"/usr/lib/discmage.so
 }
diff --git a/patch-ucon64_misc.c b/patch-ucon64_misc.c
deleted file mode 100644
index 146801c0440a..000000000000
--- a/patch-ucon64_misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ucon64_misc.c.orig	2017-07-05 21:00:01.742106829 +0200
-+++ ucon64_misc.c	2017-07-05 21:00:31.738646663 +0200
-@@ -1180,7 +1180,7 @@
- #elif   defined __APPLE__                       // Mac OS X actually
-         PROPERTY_MODE_DIR ("ucon64") "discmage.dylib",
- #elif   defined __unix__ || defined __BEOS__
--        PROPERTY_MODE_DIR ("ucon64") "discmage.so",
-+        "/usr/lib/discmage.so",
- #else
-         "",
- #endif