Merge pull request #3960 from evandeaubl/arduino
arduino: update to 1.6.8
This commit is contained in:
Michael Gehring
commit
b0f2b0edb0
3 changed files with 94 additions and 24 deletions
|
|
@ -1,19 +0,0 @@
|
|||
--- build/build.xml.orig 2015-12-15 10:07:28.947037415 +0100
|
||||
+++ build/build.xml 2015-12-15 10:07:41.416037987 +0100
|
||||
@@ -836,16 +836,6 @@
|
||||
|
||||
<antcall target="windows-build-avr-toolchain" />
|
||||
|
||||
- <antcall target="unzip">
|
||||
- <param name="archive_file" value="./libastylej-2.05.1.zip" />
|
||||
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
|
||||
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
|
||||
- <param name="dest_folder" value="${staging_folder}" />
|
||||
- </antcall>
|
||||
- <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
|
||||
- <copy file="windows/msvcp100.dll" todir="windows/work" />
|
||||
- <copy file="windows/msvcr100.dll" todir="windows/work" />
|
||||
-
|
||||
<!-- Copy listComPort.exe tool -->
|
||||
<copy todir="windows/work/hardware/tools">
|
||||
<fileset file="windows/listComPorts.exe" />
|
||||
85
srcpkgs/arduino/patches/disable-dependency-build.patch
Normal file
85
srcpkgs/arduino/patches/disable-dependency-build.patch
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
--- build/build.xml.orig 2016-03-27 18:18:08.681227463 -0700
|
||||
+++ build/build.xml 2016-03-27 18:19:28.096229351 -0700
|
||||
@@ -425,17 +425,6 @@
|
||||
</antcall>
|
||||
|
||||
<antcall target="unzip">
|
||||
- <param name="archive_file" value="./libastylej-2.05.1.zip" />
|
||||
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
|
||||
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
|
||||
- <param name="dest_folder" value="${staging_folder}" />
|
||||
- </antcall>
|
||||
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
|
||||
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
|
||||
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
|
||||
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
|
||||
-
|
||||
- <antcall target="unzip">
|
||||
<param name="archive_file" value="./liblistSerials-1.0.5.zip" />
|
||||
<param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.5.zip" />
|
||||
<param name="final_folder" value="${staging_folder}/liblistSerials-1.0.5" />
|
||||
@@ -625,15 +614,6 @@
|
||||
<fileset dir="linux/work" includes="**/*.sh" />
|
||||
</chmod>
|
||||
|
||||
- <antcall target="unzip">
|
||||
- <param name="archive_file" value="./libastylej-2.05.1.zip" />
|
||||
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
|
||||
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
|
||||
- <param name="dest_folder" value="${staging_folder}" />
|
||||
- </antcall>
|
||||
- <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
|
||||
- <chmod perm="755" file="linux/work/lib/libastylej.so" />
|
||||
-
|
||||
<antcall target="portable-${portable}">
|
||||
<param name="parentdir" value="linux/work" />
|
||||
</antcall>
|
||||
@@ -670,15 +650,6 @@
|
||||
</copy>
|
||||
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
|
||||
|
||||
- <antcall target="avr-toolchain-bundle">
|
||||
- <param name="unpack_target" value="untar"/>
|
||||
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||
- </antcall>
|
||||
-
|
||||
- <antcall target="package-library-index-json-bundle"/>
|
||||
</target>
|
||||
|
||||
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
|
||||
@@ -702,15 +673,6 @@
|
||||
</copy>
|
||||
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
|
||||
|
||||
- <antcall target="avr-toolchain-bundle">
|
||||
- <param name="unpack_target" value="untar"/>
|
||||
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="gcc_version" value="4.8.1-arduino5"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="avrdude_version" value="6.0.1-arduino5"/>
|
||||
- </antcall>
|
||||
-
|
||||
- <antcall target="package-library-index-json-bundle"/>
|
||||
</target>
|
||||
|
||||
<target name="linux-jvm-noop"/>
|
||||
@@ -898,16 +860,6 @@
|
||||
<antcall target="windows-build-avr-toolchain" />
|
||||
|
||||
<antcall target="unzip">
|
||||
- <param name="archive_file" value="./libastylej-2.05.1.zip" />
|
||||
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
|
||||
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
|
||||
- <param name="dest_folder" value="${staging_folder}" />
|
||||
- </antcall>
|
||||
- <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
|
||||
- <copy file="windows/msvcp100.dll" todir="windows/work" />
|
||||
- <copy file="windows/msvcr100.dll" todir="windows/work" />
|
||||
-
|
||||
- <antcall target="unzip">
|
||||
<param name="archive_file" value="./liblistSerials-1.0.5.zip" />
|
||||
<param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.5.zip" />
|
||||
<param name="final_folder" value="${staging_folder}/liblistSerials-1.0.5" />
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
# Template file for 'arduino'
|
||||
pkgname=arduino
|
||||
version=1.6.7
|
||||
version=1.6.8
|
||||
revision=1
|
||||
makedepends="openjdk"
|
||||
hostmakedepends="apache-ant unzip ImageMagick"
|
||||
hostmakedepends="apache-ant unzip ImageMagick openjdk"
|
||||
depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
|
||||
short_desc="IDE for the arduino open-source electronics prototyping platform"
|
||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||
|
|
@ -12,7 +11,7 @@ homepage="http://arduino.cc/"
|
|||
distfiles="
|
||||
https://github.com/arduino/Arduino/archive/${version}.tar.gz
|
||||
${SOURCEFORGE_SITE}/astyle/astyle_2.05.1_linux.tar.gz"
|
||||
checksum="fbbbe3bad6d85fe3243ecdb5248b52e3b609cc03d649a2e16684194d4f9db85f
|
||||
checksum="5b2e8b3115000986f12ebdc126162d22c2dc85b3ca9732b8f8966e6dcdf2edad
|
||||
fbdfc6f1966a972d19a215927266c76d4183eee235ed1e2bd7ec551c2a270eac"
|
||||
nostrip=yes
|
||||
wrksrc=Arduino-$version
|
||||
|
|
@ -30,7 +29,12 @@ do_build() {
|
|||
cp bin/libastyle-2.05.1j.so \
|
||||
../../../Arduino-$version/build/linux/work/lib/libastylej.so
|
||||
cd ../../../Arduino-$version/build
|
||||
ant linux-build package-library-index-json-bundle
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) LINUX_BUILD=linux32-build ;;
|
||||
x86_64*) LINUX_BUILD=linux64-build ;;
|
||||
*) LINUX_BUILD=linux-build ;;
|
||||
esac
|
||||
ant $LINUX_BUILD package-library-index-json-bundle
|
||||
sed -i -e "s#{runtime\.tools\.[^.]*\.path}#/usr#g" \
|
||||
-e "s#\(tools\.avrdude\.config\.path=\).*#\1/etc/avrdude.conf#" \
|
||||
linux/work/hardware/arduino/avr/platform.txt
|
||||
|
|
|
|||
Loading…
Reference in a new issue