diff options
Diffstat (limited to 'dev-embedded/arduino/files')
6 files changed, 151 insertions, 0 deletions
diff --git a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch new file mode 100644 index 000000000000..afde2e05b661 --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch @@ -0,0 +1,38 @@ +--- arduino-1.0.1/build/build.xml 2012-04-09 00:16:12.000000000 +0100 ++++ arduino-1.0.1/build/build.xml 2012-06-25 06:12:09.000000000 +0100 +@@ -24,9 +24,9 @@ + <fileset dir=".." id="runtime.jars"> + <include name="core/core.jar" /> + <include name="app/pde.jar" /> +- <include name="app/lib/ecj.jar" /> ++<!-- <include name="app/lib/ecj.jar" /> --> + <include name="app/lib/jna.jar" /> +- <include name="app/lib/RXTXcomm.jar" /> ++<!-- <include name="app/lib/RXTXcomm.jar" /> --> + <include name="app/lib/ant.jar" /> + <include name="app/lib/ant-launcher.jar" /> + </fileset> +@@ -361,16 +361,18 @@ + </target> + + <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version"> +- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> +- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> ++<!-- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> --> ++<!-- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> --> + +- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> ++<!-- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> --> + + <!-- Unzip AVR tools --> +- <exec executable="tar" dir="linux/work/hardware"> ++<!-- Removed by Paulj - use system installed instead --> ++<!-- <exec executable="tar" dir="linux/work/hardware"> + <arg value="-xjf"/> + <arg value="../../avr_tools_linux64.tar.bz2"/> +- </exec> ++ </exec> ++--> + </target> + + <target name="linux32-run" depends="linux32-build" diff --git a/dev-embedded/arduino/files/arduino-1.0.3-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch new file mode 100644 index 000000000000..b4accc8959a1 --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.0.3-script.patch @@ -0,0 +1,20 @@ +diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino +index b5eb9db..3f3b4aa 100644 +--- a/build/linux/dist/arduino ++++ b/build/linux/dist/arduino +@@ -10,11 +10,13 @@ for LIB in \ + lib/*.jar \ + ; + do +- CLASSPATH="${CLASSPATH}:${LIB}" ++ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}" ++ + done ++CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)" + export CLASSPATH + +-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ++LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH + + export PATH="${APPDIR}/java/bin:${PATH}" diff --git a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch new file mode 100644 index 000000000000..9903da46dc4a --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch @@ -0,0 +1,26 @@ +diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt +index f7fb447c1..8ae8b73d9 100644 +--- a/hardware/arduino/avr/platform.txt ++++ b/hardware/arduino/avr/platform.txt +@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall + compiler.warning_flags.all=-Wall -Wextra + + # Default "compiler.path" is correct, change only if you want to override the initial value +-compiler.path={runtime.tools.avr-gcc.path}/bin/ ++compiler.path=/usr/bin/ + compiler.c.cmd=avr-gcc + compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects + compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections +@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} { + # AVR Uploader/Programmers tools + # ------------------------------ + +-tools.avrdude.path={runtime.tools.avrdude.path} +-tools.avrdude.cmd.path={path}/bin/avrdude +-tools.avrdude.config.path={path}/etc/avrdude.conf ++tools.avrdude.path=/usr ++tools.avrdude.cmd.path=/usr/bin/avrdude ++tools.avrdude.config.path=/etc/avrdude.conf + + tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA + diff --git a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch new file mode 100644 index 000000000000..59d796ca5a7a --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch @@ -0,0 +1,31 @@ +diff --git a/build/build.xml b/build/build.xml +index d95f8def6..13ba60286 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -641,7 +641,7 @@ + </chmod> + </target> + +- <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch"> ++ <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never"> + <antcall target="unzip"> + <param name="archive_file" value="./libastylej-2.05.1-3.zip" /> + <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" /> +@@ -666,7 +666,7 @@ + + </target> + +- <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM"> ++ <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never"> + <antcall target="unzip"> + <param name="archive_file" value="./libastylej-2.05.1-3.zip" /> + <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" /> +@@ -1186,7 +1186,7 @@ + depends="linux-clean, windows-clean, macosx-clean, subprojects-clean"> + </target> + +- <target name="avr-toolchain-bundle" unless="light_bundle"> ++ <target name="avr-toolchain-bundle" if="never"> + <!-- Unzip AVR tools --> + <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/> + diff --git a/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch new file mode 100644 index 000000000000..d2516aeb7357 --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch @@ -0,0 +1,26 @@ +diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java +index 4224bf164..fa92506ba 100644 +--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java ++++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java +@@ -41,7 +41,7 @@ public class AStyleInterface { + loadLib(Base.getContentFile(System.mapLibraryName("msvcp100"))); + loadLib(Base.getContentFile(System.mapLibraryName("msvcr100"))); + } +- loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej"))); ++ System.loadLibrary("astylej"); + } + + private static void loadLib(File lib) { +diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java +index 28a7ba0f5..8a943a8ac 100644 +--- a/arduino-core/src/processing/app/Platform.java ++++ b/arduino-core/src/processing/app/Platform.java +@@ -154,7 +154,7 @@ public class Platform { + } + + static { +- loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj"))); ++ System.loadLibrary("listSerialsj"); + } + + private static void loadLib(File lib) { diff --git a/dev-embedded/arduino/files/arduino.desktop b/dev-embedded/arduino/files/arduino.desktop new file mode 100644 index 000000000000..b75dea564b5d --- /dev/null +++ b/dev-embedded/arduino/files/arduino.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Name=arduino +Comment=Open-source electronics prototyping platform +Exec=arduino +Icon=arduino +Terminal=false +Type=Application +Categories=Development; +StartupNotify=false |