updated to teensyduino 1.55 and arduino 1.8.16

2 files changed, 36 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a68a78951b13..6fcef2c83980 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = teensyduino
 	pkgdesc = Arduino SDK with Teensyduino
-	pkgver = 1.53
+	pkgver = 1.55
 	pkgrel = 1
 	url = http://www.pjrc.com/teensy/teensyduino.html
 	install = teensyduino.install
@@ -18,24 +18,27 @@ pkgbase = teensyduino
 	depends = desktop-file-utils
 	depends = giflib
 	provides = arduino
+	provides = teensy-loader
+	provides = teensy-loader-cli
 	conflicts = arduino
+	conflicts = teensy-loader
 	conflicts = teensy-loader-cli
+	conflicts = teensy-loader-cli-git
 	options = !strip
 	options = staticlibs
 	source = arduino.xml
 	source = teensy-loader.desktop
-	source = git+https://github.com/PaulStoffregen/teensy_loader_cli.git#commit=e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592
-	source = http://www.pjrc.com/teensy/49-teensy.rules
+	source = git+https://github.com/PaulStoffregen/teensy_loader_cli.git#commit=9dbbfa3b367b6c37e91e8a42dae3c6edfceccc4d
+	source = https://www.pjrc.com/teensy/00-teensy.rules
 	source = LICENSE
-	source = http://downloads.arduino.cc/arduino-1.8.13-linux64.tar.xz
-	source = TeensyduinoInstall_153_x86_64::http://www.pjrc.com/teensy/td_153/TeensyduinoInstall.linux64
+	source = http://downloads.arduino.cc/arduino-1.8.16-linux64.tar.xz
+	source = TeensyduinoInstall_155_x86_64::http://www.pjrc.com/teensy/td_155/TeensyduinoInstall.linux64
 	sha256sums = 473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68
 	sha256sums = 837a865ab3bf81163c95a8a5898f9d5f0de7740a4207949bc331409cbb40faba
 	sha256sums = SKIP
-	sha256sums = 7c17bb6dcef244fbf8bc9bd85a7eb812eebe60f6a6a3d47bceddde84c77c5914
+	sha256sums = 17f56b63603271e2cdae291fed347b66dfbdfd089b2847cf0b4383c877ffacfb
 	sha256sums = 25980feb5927b8bea8b8e999f5002e110825b1bc3d546fa902c2db5c824d33f3
-	sha256sums = 1b20d0ec850a2a63488009518725f058668bb6cb48c321f82dcf47dc4299b4ad
-	sha256sums = 2e6cd99a757bc80593ea3de006de4cc934bcb0a6ec74cad8ec327f0289d40f0b
+	sha256sums = 54af92925db18ea3d660410ab750822f0059471a3245f610dffeb40727a7f69a
+	sha256sums = 0f2a426c29b844a6209c5251c281f23e1b7a7451b8f18bd633847310374913a5
 
 pkgname = teensyduino
-
diff --git a/PKGBUILD b/PKGBUILD
index d20dd7d92f1b..1d2ff05c79fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Niels Martignène <niels.martignene@gmail.com>
+# Maintainer: Fabian Angenoorth <fabian-ang at mailbox dot org>
+# Contributor: Niels Martignène <niels.martignene@gmail.com>
 # Contributor: PyroPeter <googlemail.com@abi1789>
 # Contributor: darkapex <me@jailuthra.in>
 # Contributor: tty0 <vt.tty0[d0t]gmail.com>
 
 pkgname=teensyduino
-pkgver=1.53
-arduinover=1.8.13
+pkgver=1.55
+_arduinover=1.8.16
 pkgrel=1
 pkgdesc="Arduino SDK with Teensyduino"
 arch=('x86_64')
@@ -15,58 +16,51 @@ license=('GPL' 'LGPL' 'custom')
 depends=('gtk2' 'libusb-compat' 'libusb' 'java-runtime' 'libpng12' 'libsm'
          'desktop-file-utils' 'giflib')
 makedepends=('git')
-provides=('arduino')
-conflicts=('arduino' 'teensy-loader-cli')
+provides=('arduino' 'teensy-loader' 'teensy-loader-cli')
+conflicts=('arduino' 'teensy-loader' 'teensy-loader-cli' 'teensy-loader-cli-git')
 install="teensyduino.install"
 source=('arduino.xml'
         'teensy-loader.desktop'
-        "git+https://github.com/PaulStoffregen/teensy_loader_cli.git#commit=e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592"
-        "http://www.pjrc.com/teensy/49-teensy.rules"
+        "git+https://github.com/PaulStoffregen/teensy_loader_cli.git#commit=9dbbfa3b367b6c37e91e8a42dae3c6edfceccc4d"
+        "https://www.pjrc.com/teensy/00-teensy.rules"
         'LICENSE'
-        "http://downloads.arduino.cc/arduino-${arduinover}-linux64.tar.xz"
+        "http://downloads.arduino.cc/arduino-${_arduinover}-linux64.tar.xz"
         "TeensyduinoInstall_${pkgver//./}_x86_64::http://www.pjrc.com/teensy/td_${pkgver//./}/TeensyduinoInstall.linux64")
 
 sha256sums=('473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68'
             '837a865ab3bf81163c95a8a5898f9d5f0de7740a4207949bc331409cbb40faba'
             'SKIP'
-            '7c17bb6dcef244fbf8bc9bd85a7eb812eebe60f6a6a3d47bceddde84c77c5914'
+            '17f56b63603271e2cdae291fed347b66dfbdfd089b2847cf0b4383c877ffacfb'
             '25980feb5927b8bea8b8e999f5002e110825b1bc3d546fa902c2db5c824d33f3'
-            '1b20d0ec850a2a63488009518725f058668bb6cb48c321f82dcf47dc4299b4ad'
-            '2e6cd99a757bc80593ea3de006de4cc934bcb0a6ec74cad8ec327f0289d40f0b')
+            '54af92925db18ea3d660410ab750822f0059471a3245f610dffeb40727a7f69a'
+            '0f2a426c29b844a6209c5251c281f23e1b7a7451b8f18bd633847310374913a5')
 
 build() {
-  msg2 "Installing Teensyduino"
+  echo "Installing Teensyduino"
 
   chmod +x "TeensyduinoInstall_${pkgver//./}_${CARCH}"
-  ./TeensyduinoInstall_${pkgver//./}_${CARCH} --dir="${srcdir}/arduino-${arduinover}"
+  ./TeensyduinoInstall_${pkgver//./}_${CARCH} --dir="${srcdir}/arduino-${_arduinover}"
 
-  msg2 "Building Teensy Loader command line"
+  echo "Building Teensy Loader command line"
 
   cd teensy_loader_cli
   make
 }
 
 package() {
-  cd "arduino-${arduinover}"
+  cd "arduino-${_arduinover}"
 
   mkdir -p "${pkgdir}/usr/bin"
-  mkdir -p "${pkgdir}/usr/share/"{doc,applications,icons/hicolor,mime/packages,licenses/teensyduino}
-  mkdir -p "${pkgdir}/usr/lib/udev/rules.d"
+  mkdir -p "${pkgdir}/usr/share/"{applications,icons/hicolor,mime/packages,licenses/teensyduino}
+  mkdir -p "${pkgdir}/etc/udev/rules.d"
 
   # copy the whole SDK to /usr/share/arduino/
   cp -a . "${pkgdir}/usr/share/arduino"
 
-  # use system's RXTX library
-  ln -sf /usr/lib/librxtxSerial.so "${pkgdir}/usr/share/arduino/lib/librxtxSerial.so"
-  ln -sf /usr/lib/librxtxSerial.so "${pkgdir}/usr/share/arduino/lib/librxtxSerial64.so"
-  ln -sf /usr/share/java/rxtx/RXTXcomm.jar "${pkgdir}/usr/share/arduino/lib/RXTXcomm.jar"
-
-  # we don't need these sources
-  rm -rf "${pkgdir}/usr/share/arduino/src"
-
-  # at least support the FHS a little bit
   ln -s /usr/share/arduino/arduino "${pkgdir}/usr/bin/arduino"
-  ln -s /usr/share/arduino/reference "${pkgdir}/usr/share/doc/arduino"
+
+  # remove bundled java to use system's java environment
+  rm -rf "${pkgdir}/usr/share/arduino/java"
 
   # desktop icon
   cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor"
@@ -80,8 +74,10 @@ package() {
   # install custom PJRC license
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/teensyduino/"
 
+  # install teensy udev rule
+  install -m644 "${srcdir}/00-teensy.rules" "${pkgdir}/etc/udev/rules.d"
+
   # install teensy loader files
-  install -m644 "${srcdir}/49-teensy.rules" "${pkgdir}/usr/lib/udev/rules.d"
   ln -s /usr/share/arduino/hardware/tools/teensy "${pkgdir}/usr/bin/teensy-loader"
   install -m644 "${srcdir}/teensy-loader.desktop" "${pkgdir}/usr/share/applications/"