summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a7f9f8eebba1..30ab163cee2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
pkgbase = axoloti
pkgdesc = Firmware and GUI for the Axoloti Core
pkgver = 1.0.12_1
- pkgrel = 1
+ pkgrel = 3
url = http://www.axoloti.com
install = axoloti.install
arch = x86_64
license = GPL
makedepends = apache-ant
- makedepends = unzip
makedepends = git
- depends = java-runtime=7
+ depends = java-runtime
depends = bash
- depends = gtk2
depends = udev
depends = lib32-bzip2
depends = lib32-zlib
@@ -21,7 +19,7 @@ pkgbase = axoloti
options = !strip
source = git+https://github.com/axoloti/axoloti.git
source = axoloti.sh
- source = http://sourceforge.net/projects/chibios/files/ChibiOS_RT%20stable/Version%202.6.9/ChibiOS_2.6.9.zip
+ source = https://sourceforge.net/projects/chibios/files/ChibiOS%20GPL3/Version%202.6.9/ChibiOS_2.6.9.zip
source = https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2
source = libusb-1.0.19.tar.bz2::http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-1.0.19/libusb-1.0.19.tar.bz2/download
source = http://dfu-util.sourceforge.net/releases/dfu-util-0.8.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index aee0efb5f068..669338a98c85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=axoloti
pkgver=1.0.12_1
-pkgrel=1
+pkgrel=3
pkgdesc='Firmware and GUI for the Axoloti Core'
arch=('x86_64')
url='http://www.axoloti.com'
license=('GPL')
-depends=('java-runtime=7' 'bash' 'gtk2' 'udev' 'lib32-bzip2' 'lib32-zlib' 'lib32-ncurses')
-makedepends=('apache-ant' 'unzip' 'git')
+depends=('java-runtime' 'bash' 'udev' 'lib32-bzip2' 'lib32-zlib' 'lib32-ncurses')
+makedepends=('apache-ant' 'git')
conflicts=('axoloti-git' 'axoloti-runtime-git')
options=('!strip')
install="$pkgname.install"
@@ -27,7 +27,7 @@ _dfu_util_archive=${_dfu_util}.tar.gz
source=(
"git+https://github.com/axoloti/axoloti.git"
"axoloti.sh"
- "http://sourceforge.net/projects/chibios/files/ChibiOS_RT%20stable/Version%20${_chibios_version}/${_chibios_archive}"
+ "https://sourceforge.net/projects/chibios/files/ChibiOS%20GPL3/Version%20${_chibios_version}/${_chibios_archive}"
"https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/${_toolchain_archive}"
"${_libusb_archive}::http://sourceforge.net/projects/libusb/files/libusb-1.0/${_libusb}/${_libusb_archive}/download"
"http://dfu-util.sourceforge.net/releases/${_dfu_util_archive}"
@@ -47,7 +47,7 @@ build() {
git checkout ${pkgver//_/-}
mkdir -p "$srcdir/${pkgname}-runtime/"{platform_linux/{bin,lib,src},chibios}
cp -r "$srcdir/$_chibios"/* "$srcdir/${pkgname}-runtime/chibios/"
- unzip -q -o "$srcdir/${pkgname}-runtime/chibios/ext/fatfs-0.9-patched.zip" -d "$srcdir/${pkgname}-runtime/chibios/ext"
+ bsdtar -xf "$srcdir/${pkgname}-runtime/chibios/ext/fatfs-0.9-patched.zip" -C "$srcdir/${pkgname}-runtime/chibios/ext"
cp -r "$srcdir/$_toolchain"/* "$srcdir/${pkgname}-runtime/platform_linux/"
cd "$srcdir/$_libusb"
patch -N -p1 < "$srcdir/$pkgname/platform_linux/src/libusb.stdfu.patch"