<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6766c09db64d4ea57a6fb6212b8d31cb554a0b80">https://github.com/macports/macports-ports/commit/6766c09db64d4ea57a6fb6212b8d31cb554a0b80</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6766c09db64 simulavr: Update to 1.1.0
</span>6766c09db64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6766c09db64d4ea57a6fb6212b8d31cb554a0b80
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jul 3 18:21:26 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> simulavr: Update to 1.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60811
</span>---
emulators/simulavr/Portfile | 96 ++++++++---------
emulators/simulavr/files/doc.patch | 24 +++++
emulators/simulavr/files/include.patch | 23 ++++
emulators/simulavr/files/no-git.patch | 12 +++
emulators/simulavr/files/no-python.patch | 20 ++++
emulators/simulavr/files/patch-at90can-elpm | 27 -----
emulators/simulavr/files/patch-at90can-ivs | 120 ---------------------
emulators/simulavr/files/patch-msleep | 39 -------
emulators/simulavr/files/patch-src_Makefile.in | 19 ----
emulators/simulavr/files/patch-src_systemclock.cpp | 11 --
10 files changed, 127 insertions(+), 264 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/Portfile b/emulators/simulavr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index efdd8a4332e..9050da916ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simulavr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/simulavr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +1,72 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name simulavr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6654189a7da966ff31ae859fef4eb753329c17e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8d46a9cf05eb651c3258f720dfc3b967567cdb1a0279f55365e4203eabff9c27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1109235
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories emulators devel
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+ MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Simulator for Atmel AVR microcontrollers
long_description The SimulAVR program is a simulator for the Atmel AVR family \
of microcontrollers. (ATtiny and ATmega) SimulAVR can be used \
either standalone or as a remote target for avr-gdb.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://www.nongnu.org/simulavr/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> master_sites https://savannah.nongnu.org/download/simulavr/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# No distfile on normal download server:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://savannah.nongnu.org/bugs/?65923
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://git.savannah.nongnu.org/cgit/simulavr.git/snapshot/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-release-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0e9eb32f398943449b564e919765348c32f4c600 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 39d93faa3eeae2bee15f682dd6a48fb4d4366addd12a2abebb04c99f87809be7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:gzip:gzip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:help2man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:makeinfo:texinfo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:makeinfo:texinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:avr-binutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:avr-gcc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_systemclock.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-msleep \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-at90can-ivs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-at90can-elpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles doc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-git.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-python.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Hack the swig macro into detecting a modern version of swig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|required=1.3.18|required=3.0.8|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://savannah.nongnu.org/bugs/index.php?65943
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/0\.0\.0/${version}/g" ${worksrcpath}/cmake/get_git_version.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://savannah.nongnu.org/bugs/index.php?65947
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/include/elfio/VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Apply changes from https://savannah.nongnu.org/bugs/?35737 to fix building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # against the later avr-libc releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set regexps {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_INTERRUPT0/INT0_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_INTERRUPT1/INT1_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_INTERRUPT2/INT2_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_OUTPUT_COMPARE2A/TIMER2_COMPA_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_OUTPUT_COMPARE3B/TIMER3_COMPB_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_UART0_RECV/USART0_RX_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/SIG_UART0_DATA/USART0_UDRE_vect/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/__attribute__((progmem))/PROGMEM/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/__attribute__ ((progmem))/PROGMEM/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse fpath ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ext [file extension "${fpath}"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile "${fpath}"] && ($ext == ".c" || $ext == ".h" || $ext == ".cpp")} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach r $regexps {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C $r $fpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOT=DOT-NOTFOUND \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN=DOXYGEN-NOTFOUND \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDPKG=DPKG-NOTFOUND \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFAKEROOT=FAKEROOT-NOTFOUND \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVALGRIND=VALGRIND-NOTFOUND
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^static char unshifted|static const char unshifted|" ${worksrcpath}/examples/atmel_key/scancodes.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|prog_char shifted\[\]\[2\]|static const char shifted\[\]\[2\] PROGMEM|g} ${worksrcpath}/examples/atmel_key/scancodes.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://savannah.nongnu.org/bugs/index.php?58231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target-append doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://savannah.nongnu.org/bugs/index.php?65948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env DYLD_LIBRARY_PATH=${build.dir}/libsim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env DYLD_LIBRARY_PATH=${build.dir}/libsim
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# avr-binutils' libbfd.a can't find gettext and zlib (#41106)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lintl -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-bfd="${prefix}/avr/host" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libiberty="${prefix}/avr/host"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Tests require python, but allowing python to be found can cause unwanted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# documentation to be built.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://savannah.nongnu.org/bugs/index.php?65945
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span>
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://git.savannah.nongnu.org/cgit/simulavr.git/refs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex release-(\[0-9.\]+)[quotemeta ${extract.suffix}]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/doc.patch b/emulators/simulavr/files/doc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3eb1de49a92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/simulavr/files/doc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix documentation install directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/index.php?65952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/CMakeLists.txt 2024-07-03 17:58:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${docDir}/README.gdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${docDir}/SUPPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${docDir}/TODO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${docSrcs} DESTINATION "share/doc/common")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${docSrcs} DESTINATION "share/doc/simulavr")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/CMakeLists.txt 2024-07-03 17:58:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_target(doc-changelog DEPENDS ${DOC_CHANGELOG})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(progdoc doc-changelog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ${DOC_CHANGELOG} DESTINATION "share/doc/common")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES ${DOC_CHANGELOG} DESTINATION "share/doc/simulavr")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_target(doc COMMENT "create simulavr documentation" DEPENDS progdoc)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/include.patch b/emulators/simulavr/files/include.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a6612949c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/simulavr/files/include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install headers into subdirectory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/?65950
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsim/CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsim/CMakeLists.txt 2024-07-03 18:05:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,12 +42,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(GLOB files_elfio "${CMAKE_SOURCE_DIR}/include/elfio/elfio/*.hpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS sim DESTINATION "lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${files_common} DESTINATION "include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${files_hwtimer} DESTINATION "include/hwtimer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${files_gdb} DESTINATION "include/gdb")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${files_ui} DESTINATION "include/ui")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${files_cmd} DESTINATION "include/cmd")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${files_elfio} DESTINATION "include/elfio/elfio")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${files_common} DESTINATION "include/simulavr")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${files_hwtimer} DESTINATION "include/simulavr/hwtimer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${files_gdb} DESTINATION "include/simulavr/gdb")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${files_ui} DESTINATION "include/simulavr/ui")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${files_cmd} DESTINATION "include/simulavr/cmd")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES ${files_elfio} DESTINATION "include/simulavr/elfio/elfio")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_VERILOG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/no-git.patch b/emulators/simulavr/files/no-git.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8b3409d6738
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/simulavr/files/no-git.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not try to get version information from git. It will not work because we are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+using a tarball not a git clone.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/index.php?65943
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/get_git_version.sh.orig 2019-12-20 07:13:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/get_git_version.sh 2024-07-03 12:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if which git > /dev/null 2> /dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ H=$(git log --pretty=format:'%h' -n 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ D=$(git diff --quiet --exit-code || echo "+")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ T=$(git describe --abbrev=0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/no-python.patch b/emulators/simulavr/files/no-python.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2c837c16fbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/simulavr/files/no-python.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't fail if python isn't found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/index.php?65945
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-07-03 16:19:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,11 +26,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find python executable, for Python3 you need a virtual env, which links python to python3 executable!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(PythonInterp 3.5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(PythonInterp_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(COMMAND ${PYTHON_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -c "import sys; print('%s.%s' % (sys.version_info.major, sys.version_info.minor))"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_VARIABLE PYTHON_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REGEX MATCH "[0-9]" PYTHON_MAJOR_VERSION ${PYTHON_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PYTHON_MAJOR_VERSION 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SWIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_TCL OR BUILD_PYTHON)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/patch-at90can-elpm b/emulators/simulavr/files/patch-at90can-elpm
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 54e32a3c1d9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simulavr/files/patch-at90can-elpm
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e3d323e664884003673a00559c14d8e799699b52 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Petr Hluzin <email.is.fucking.required@invalid.invalid>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 06 Oct 2012 12:45:34 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: AT90CAN128 has ELPM instruction.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-According to AT90CAN32/64/128 datasheet rev.H all three devices in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-family have the ELPM instruction.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reported by and patch provided by Uwe Bonnes, thanks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://savannah.nongnu.org/patch/?7850
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(limited to 'src/at90canbase.cpp')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/at90canbase.cpp b/src/at90canbase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cbfef1a..da5b694 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/at90canbase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/at90canbase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,6 +92,7 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &portf.GetPin(6),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &portf.GetPin(7))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flagELPMInstructions = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flagJMPInstructions = (flash_bytes > 8U * 1024U) ? true : false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- irqSystem = new HWIrqSystem(this, (flash_bytes > 8U * 1024U) ? 4 : 2, 37);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.9.0.2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/patch-at90can-ivs b/emulators/simulavr/files/patch-at90can-ivs
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d25eca1e65..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simulavr/files/patch-at90can-ivs
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,120 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6ef1c1455becac93f445c3100520ab498ecf240c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Petr Hluzin <email.is.fucking.required@invalid.invalid>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 11 Aug 2012 18:33:23 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fixed interrupt vectors for at90can* devices.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Original code had bogus numbers for interrupt vector values and wrote
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-past end of an array.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reported by Ytai Ben-tsvi.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://lists.gnu.org/archive/html/simulavr-devel/2012-07/msg00003.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(limited to 'src/at90canbase.cpp')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/at90canbase.cpp b/src/at90canbase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 727e893..cbfef1a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/at90canbase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/at90canbase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,9 +93,9 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &portf.GetPin(7))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flagJMPInstructions = (flash_bytes > 8U * 1024U) ? true : false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- irqSystem = new HWIrqSystem(this, (flash_bytes > 8U * 1024U) ? 4 : 2, 26);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ irqSystem = new HWIrqSystem(this, (flash_bytes > 8U * 1024U) ? 4 : 2, 37);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eeprom = new HWEeprom(this, irqSystem, ee_bytes, 23, HWEeprom::DEVMODE_EXTENDED);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eeprom = new HWEeprom(this, irqSystem, ee_bytes, 26, HWEeprom::DEVMODE_EXTENDED);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stack = new HWStackSram(this, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RegisterPin("AREF", &aref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,8 +116,8 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extirq01->registerIrq(8, 7, new ExternalIRQSingle(eicrb_reg, 6, 2, GetPin("E7")));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timerIrq0 = new TimerIRQRegister(this, irqSystem, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq0->registerLine(0, new IRQLine("TOV0", 16));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq0->registerLine(1, new IRQLine("OCF0A", 15));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq0->registerLine(0, new IRQLine("TOV0", 17)); // TIMER0 OVF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq0->registerLine(1, new IRQLine("OCF0A", 16)); // TIMER0 COMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer0 = new HWTimer8_1C(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new PrescalerMultiplexerExt(&prescaler013, PinAtPort(&portd, 7)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,11 +127,11 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new PinAtPort(&portb, 7));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timerIrq1 = new TimerIRQRegister(this, irqSystem, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq1->registerLine(0, new IRQLine("TOV1", 14));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq1->registerLine(1, new IRQLine("OCF1A", 13));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq1->registerLine(2, new IRQLine("OCF1B", 12));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq1->registerLine(3, new IRQLine("OCF1C", 11));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq1->registerLine(5, new IRQLine("ICF1", 10));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq1->registerLine(0, new IRQLine("TOV1", 15)); // TIMER1 OVF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq1->registerLine(1, new IRQLine("OCF1A", 12)); // TIMER1 COMPA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq1->registerLine(2, new IRQLine("OCF1B", 13)); // TIMER1 COMPB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq1->registerLine(3, new IRQLine("OCF1C", 14)); // TIMER1 COMPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq1->registerLine(5, new IRQLine("ICF1", 11)); // TIMER1 CAPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputCapture1 = new ICaptureSource(PinAtPort(&portd, 4));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer1 = new HWTimer16_3C(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,8 +148,8 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputCapture1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timerIrq2 = new TimerIRQRegister(this, irqSystem, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq2->registerLine(0, new IRQLine("TOV2", 9));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq2->registerLine(1, new IRQLine("OCF2A", 7));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq2->registerLine(0, new IRQLine("TOV2", 10)); // TIMER2 OVF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq2->registerLine(1, new IRQLine("OCF2A", 9)); // TIMER2 COMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer2 = new HWTimer8_1C(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new PrescalerMultiplexer(&prescaler2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,11 +159,11 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new PinAtPort(&portb, 4));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timerIrq3 = new TimerIRQRegister(this, irqSystem, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq3->registerLine(0, new IRQLine("TOV3", 30));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq3->registerLine(1, new IRQLine("OCF3A", 27));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq3->registerLine(2, new IRQLine("OCF3B", 28));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq3->registerLine(3, new IRQLine("OCF3C", 29));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timerIrq3->registerLine(5, new IRQLine("ICF3", 26));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq3->registerLine(0, new IRQLine("TOV3", 31)); // TIMER3 OVF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq3->registerLine(1, new IRQLine("OCF3A", 28)); // TIMER3 COMPA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq3->registerLine(2, new IRQLine("OCF3B", 29)); // TIMER3 COMPB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq3->registerLine(3, new IRQLine("OCF3C", 30)); // TIMER3 COMPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timerIrq3->registerLine(5, new IRQLine("ICF3", 27)); // TIMER3 CAPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputCapture3 = new ICaptureSource(PinAtPort(&porte, 7));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer3 = new HWTimer16_3C(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -195,16 +195,16 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wado = new HWWado(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- acomp = new HWAcomp(this, irqSystem, PinAtPort(&porte, 2), PinAtPort(&porte, 3), 23);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ acomp = new HWAcomp(this, irqSystem, PinAtPort(&porte, 2), PinAtPort(&porte, 3), 24);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usart0 = new HWUsart(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- irqSystem,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PinAtPort(&porte,1), // TXD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PinAtPort(&porte,0), // RXD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PinAtPort(&porte,2), // XCK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 20, // RX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 21, // UDRE vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 22, // TX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 21, // RX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 22, // UDRE vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 23, // TX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usart1 = new HWUsart(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,9 +212,9 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PinAtPort(&portd,3), // TXD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PinAtPort(&portd,2), // RXD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PinAtPort(&portd,5), // XCK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 31, // RX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 32, // UDRE vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 33, // TX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 32, // RX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 33, // UDRE vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 34, // TX complete vector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.9.0.2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/patch-msleep b/emulators/simulavr/files/patch-msleep
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 53c5dee815e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simulavr/files/patch-msleep
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/atmel_key/StdDefs.c 2012-10-14 01:14:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/atmel_key/StdDefs.c 2012-10-14 01:51:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,16 +54,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sbi(TESTPIN_PORT, TESTPIN_BIT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Delay in 1/10's of a millisecond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void msleep(INT16U ms)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { /* This loop does not work with optimization != 0. Therefore we use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avr-libc _delay routines K. Schwichtenberg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INT16S i,j;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (i = 1; i < ms; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (j = 1; j < ONETENTH_MS; j++); / * to give 1/10 ms*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _delay_ms(ms); // Changed K. Schwichtenberg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // void putBCD(INT16S X, CHARU length, CHARU TrailingSpace)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/atmel_key/main.c 2012-10-14 01:14:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/atmel_key/main.c 2012-10-14 01:51:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // PS-1 Keyboard interface test program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <avr/io.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <util/delay.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //include <sig-avr.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <avr/interrupt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key=getchar();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- putchar(key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- msleep(10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _delay_ms(10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/patch-src_Makefile.in b/emulators/simulavr/files/patch-src_Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5660e0d7a98..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simulavr/files/patch-src_Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in 2012-10-25 22:47:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2012-10-25 22:46:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -420,11 +421,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- specialmem.cpp string2.cpp systemclock.cpp traceval.cpp ui/ui.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_libsim_la_SOURCES = $(FAB_CPP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libsim_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libsim_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -L$(AVR_LIBBFD_LIBPATH) -lbfd -L$(AVR_LIBIBERTY_LIBPATH) -liberty \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lz -lintl -ltcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_libsimulavr_la_SOURCES = $(TCL_WRAP_SRC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libsimulavr_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libsimulavr_la_LIBADD = $(libsim_la_OBJECTS) -lz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -L$(AVR_LIBBFD_LIBPATH) -lbfd -L$(AVR_LIBIBERTY_LIBPATH) -liberty
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -L$(AVR_LIBBFD_LIBPATH) -lbfd -L$(AVR_LIBIBERTY_LIBPATH) -liberty \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lz -lintl -ltcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkginclude_HEADERS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- adcpin.h application.h at4433.h at8515.h atmega128.h atmega16_32.h attiny2313.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simulavr/files/patch-src_systemclock.cpp b/emulators/simulavr/files/patch-src_systemclock.cpp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cb411a80139..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simulavr/files/patch-src_systemclock.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/systemclock.cpp.orig 2012-10-13 23:07:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/systemclock.cpp 2012-10-13 23:07:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<typename Key, typename Value>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void MinHeap<Key, Value>::Insert(Key k, Value v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- resize(this->size()+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->resize(this->size()+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(unsigned i = this->size();;) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned parent = i/2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(parent == 0 || (*this)[parent-1].first < k) {
</span></pre><pre style='margin:0'>
</pre>