From: Logarithmus <Logarithmus@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: simulide-0.4.13
Date: Tue, 10 Nov 2020 23:05:03 +0100 [thread overview]
Message-ID: <20201110220503.G5ivUuNxs0SMO5tCxZKAVjAeOpB06qKHxCm2CjBg2Yo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25945@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 723 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages simulide
https://github.com/void-linux/void-packages/pull/25945
New package: simulide-0.4.13
Real time electronic circuit simulator with PIC, AVR and Arduino simulation.
It bundles some older versions of `simavr` and `gpsim`. I tried to make it use up-to-date versions, which are installed system-wide, but turns out there's plenty of fixing needed to do it. So I postponed it for the future.
P. S. I'm not the author of this tool, I just use it for my university MCU programming course.
A patch file from https://github.com/void-linux/void-packages/pull/25945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simulide-25945.patch --]
[-- Type: text/x-diff, Size: 9890 bytes --]
From 24c84d21435ad0bd01f6e68360b330e5e6bce3a4 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 28 Oct 2020 20:30:48 +0300
Subject: [PATCH] New package: simulide-0.4.13
---
.../simulide/patches/01-use-system-simavr.bak | 133 ++++++++++++++++++
.../simulide/patches/02-use-system-gpsim.bak | 94 +++++++++++++
srcpkgs/simulide/template | 34 +++++
3 files changed, 261 insertions(+)
create mode 100644 srcpkgs/simulide/patches/01-use-system-simavr.bak
create mode 100644 srcpkgs/simulide/patches/02-use-system-gpsim.bak
create mode 100644 srcpkgs/simulide/template
diff --git a/srcpkgs/simulide/patches/01-use-system-simavr.bak b/srcpkgs/simulide/patches/01-use-system-simavr.bak
new file mode 100644
index 00000000000..452d70597f7
--- /dev/null
+++ b/srcpkgs/simulide/patches/01-use-system-simavr.bak
@@ -0,0 +1,133 @@
+--- src/gui/circuitwidget/components/mcu/arduino.cpp 2020-07-11 13:15:00.000000000 +0300
++++ src/gui/circuitwidget/components/mcu/arduino.cpp 2020-10-22 04:17:34.409831811 +0300
+@@ -26,7 +26,7 @@
+
+ #include "hd44780.h"
+
+-#include "avr_twi.h"
++#include <simavr/avr_twi.h>
+
+ LibraryItem* Arduino::libraryItem()
+ {
+--- src/gui/circuitwidget/components/mcu/avrcompbase.cpp 2020-07-04 20:30:48.000000000 +0300
++++ src/gui/circuitwidget/components/mcu/avrcompbase.cpp 2020-10-22 04:18:15.119908217 +0300
+@@ -20,7 +20,7 @@
+ #include <math.h>
+
+ #include "avrcompbase.h"
+-#include "avr_twi.h"
++#include <simavr/avr_twi.h>
+
+
+ AvrCompBase::AvrCompBase( QObject* parent, QString type, QString id )
+--- src/gui/circuitwidget/components/mcu/avrcomponentpin.h 2020-05-24 10:29:23.000000000 +0300
++++ src/gui/circuitwidget/components/mcu/avrcomponentpin.h 2020-10-22 04:06:23.234074279 +0300
+@@ -25,12 +25,12 @@
+ #include "mcucomponentpin.h"
+
+ //simavr includes
+-#include "sim_avr.h"
+-#include "sim_irq.h"
+-#include "sim_io.h"
+-#include "avr_adc.h"
+-#include "avr_ioport.h"
+-#include "avr_timer.h"
++#include <simavr/sim_avr.h>
++#include <simavr/sim_irq.h>
++#include <simavr/sim_io.h>
++#include <simavr/avr_adc.h>
++#include <simavr/avr_ioport.h>
++#include <simavr/avr_timer.h>
+
+
+ class AVRComponentPin : public McuComponentPin
+--- src/simulator/elements/processors/avrprocessor.cpp 2020-08-24 02:14:43.000000000 +0300
++++ src/simulator/elements/processors/avrprocessor.cpp 2020-10-22 04:00:42.865064317 +0300
+@@ -23,12 +23,12 @@
+ #include "utils.h"
+
+ // simavr includes
+-#include "sim_elf.h"
+-#include "sim_hex.h"
+-#include "sim_core.h"
+-#include "sim_gdb.h"
+-#include "avr_uart.h"
+-#include "avr_eeprom.h"
++#include <simavr/sim_elf.h>
++#include <simavr/sim_hex.h>
++#include <simavr/sim_core.h>
++#include <simavr/sim_gdb.h>
++#include <simavr/avr_uart.h>
++#include <simavr/avr_eeprom.h>
+
+ //AvrProcessor* AvrProcessor::m_pSelf = 0l;
+
+--- src/simulator/elements/processors/avrprocessor.h 2020-08-24 02:14:40.000000000 +0300
++++ src/simulator/elements/processors/avrprocessor.h 2020-10-22 03:55:19.300510501 +0300
+@@ -26,7 +26,7 @@
+ #include "baseprocessor.h"
+
+ // simavr includes
+-#include "sim_avr.h"
++#include <simavr/sim_avr.h>
+ struct avr_t;
+
+ class AvrProcessor : public BaseProcessor
+--- src/simulator/elements/processors/read_elf.c 2018-03-16 11:18:04.000000000 +0300
++++ src/simulator/elements/processors/read_elf.c 2020-10-22 03:53:11.322128504 +0300
+@@ -7,10 +7,10 @@
+ #include <libelf.h>
+ #include <gelf.h>
+
+-#include "sim_elf.h"
+-#include "sim_vcd_file.h"
+-#include "avr_eeprom.h"
+-#include "avr_ioport.h"
++#include <simavr/sim_elf.h>
++#include <simavr/sim_vcd_file.h>
++#include <simavr/avr_eeprom.h>
++#include <simavr/avr_ioport.h>
+
+ #ifndef O_BINARY
+ #define O_BINARY 0
+--- SimulIDE.pro 2020-08-13 22:39:49.000000000 +0300
++++ SimulIDE.pro 2020-10-22 03:08:27.819023767 +0300
+@@ -61,8 +61,8 @@
+ ../src/simulator/elements/outputs/*.cpp \
+ ../src/simulator/elements/passive/*.cpp \
+ ../src/simulator/elements/processors/*.cpp \
+- ../src/simavr/sim/*.c \
+- ../src/simavr/cores/*.c \
++# ../src/simavr/sim/*.c \
++# ../src/simavr/cores/*.c \
+ ../src/gpsim/*.cc \
+ ../src/gpsim/devices/*.cc \
+ ../src/gpsim/modules/*.cc \
+@@ -96,9 +96,9 @@
+ ../src/simulator/elements/outputs/*.h \
+ ../src/simulator/elements/passive/*.h \
+ ../src/simulator/elements/processors/*.h \
+- ../src/simavr/sim/*.h \
+- ../src/simavr/sim/avr/*.h \
+- ../src/simavr/cores/*.h \
++# ../src/simavr/sim/*.h \
++# ../src/simavr/sim/avr/*.h \
++# ../src/simavr/cores/*.h \
+ ../resources/data/*.xml \
+ ../src/gpsim/*.h \
+ ../src/gpsim/devices/*.h \
+@@ -133,10 +133,10 @@
+ ../src/simulator/elements/outputs \
+ ../src/simulator/elements/passive \
+ ../src/simulator/elements/processors \
+- ../src/simavr \
+- ../src/simavr/sim \
+- ../src/simavr/sim/avr \
+- ../src/simavr/cores \
++# ../src/simavr \
++# ../src/simavr/sim \
++# ../src/simavr/sim/avr \
++# ../src/simavr/cores \
+ ../src/gpsim \
+ ../src/gpsim/devices \
+ ../src/gpsim/modules \
diff --git a/srcpkgs/simulide/patches/02-use-system-gpsim.bak b/srcpkgs/simulide/patches/02-use-system-gpsim.bak
new file mode 100644
index 00000000000..a52dbf94f78
--- /dev/null
+++ b/srcpkgs/simulide/patches/02-use-system-gpsim.bak
@@ -0,0 +1,94 @@
+--- src/simulator/elements/processors/picprocessor.cpp 2020-08-24 02:14:48.000000000 +0300
++++ src/simulator/elements/processors/picprocessor.cpp 2020-10-23 02:14:47.581299752 +0300
+@@ -25,10 +25,10 @@
+ #include "utils.h"
+
+ // GpSim includes
+-#include "uart.h"
+-#include "pir.h"
+-#include "eeprom.h"
+-#include "hexutils.h"
++#include <gpsim/uart.h>
++#include <gpsim/pir.h>
++#include <gpsim/eeprom.h>
++#include <gpsim/hexutils.h>
+
+ PicProcessor::PicProcessor( QObject* parent )
+ : BaseProcessor( parent )
+--- src/simulator/elements/processors/picprocessor.h 2020-08-24 02:13:59.000000000 +0300
++++ src/simulator/elements/processors/picprocessor.h 2020-10-22 04:51:33.604926613 +0300
+@@ -23,7 +23,7 @@
+
+ #include "baseprocessor.h"
+
+-#include "pic-processor.h"
+-#include "registers.h"
+-#include "hexutils.h"
++#include <gpsim/pic-processor.h>
++#include <gpsim/registers.h>
++#include <gpsim/hexutils.h>
+
+--- src/gui/circuitwidget/components/mcu/piccomponentpin.cpp 2020-05-24 10:32:10.000000000 +0300
++++ src/gui/circuitwidget/components/mcu/piccomponentpin.cpp 2020-10-22 04:07:33.887936322 +0300
+@@ -26,7 +26,7 @@
+
+ //#include "stimuli.h"
+ //#include "ioports.h"
+-#include "pic-processor.h"
++#include <gpsim/pic-processor.h>
+ //#include "gpsim_time.h"
+
+ PICComponentPin::PICComponentPin( McuComponent* mcu, QString id, QString type, QString label, int pos, int xpos, int ypos, int angle )
+--- SimulIDE.pro 2020-08-13 22:39:49.000000000 +0300
++++ SimulIDE.pro 2020-10-22 03:08:27.819023767 +0300
+@@ -61,12 +61,12 @@
+ ../src/simulator/elements/outputs/*.cpp \
+ ../src/simulator/elements/passive/*.cpp \
+ ../src/simulator/elements/processors/*.cpp \
+ # ../src/simavr/sim/*.c \
+ # ../src/simavr/cores/*.c \
+- ../src/gpsim/*.cc \
+- ../src/gpsim/devices/*.cc \
+- ../src/gpsim/modules/*.cc \
+- ../src/gpsim/registers/*.cc
++# ../src/gpsim/*.cc \
++# ../src/gpsim/devices/*.cc \
++# ../src/gpsim/modules/*.cc \
++# ../src/gpsim/registers/*.cc
+
+ HEADERS += ../src/*.h \
+ ../src/gui/*.h \
+@@ -96,14 +96,16 @@
+ ../src/simulator/elements/outputs/*.h \
+ ../src/simulator/elements/passive/*.h \
+ ../src/simulator/elements/processors/*.h \
+ # ../src/simavr/sim/*.h \
+ # ../src/simavr/sim/avr/*.h \
+ # ../src/simavr/cores/*.h \
+ ../resources/data/*.xml \
+- ../src/gpsim/*.h \
+- ../src/gpsim/devices/*.h \
+- ../src/gpsim/modules/*.h \
+- ../src/gpsim/registers/*.h \
++# ../src/gpsim/*.h \
++# ../src/gpsim/devices/*.h \
++# ../src/gpsim/modules/*.h \
++# ../src/gpsim/registers/*.h \
+ /usr/include/glib-2.0/glib.h \
+ /usr/lib/glib-2.0/include/glibconfig.h
+
+@@ -133,16 +133,16 @@
+ ../src/simulator/elements/outputs \
+ ../src/simulator/elements/passive \
+ ../src/simulator/elements/processors \
+- ../src/gpsim \
+- ../src/gpsim/devices \
+- ../src/gpsim/modules \
+- ../src/gpsim/registers \
++# ../src/gpsim \
++# ../src/gpsim/devices \
++# ../src/gpsim/modules \
++# ../src/gpsim/registers \
+ # ../src/simavr \
+ # ../src/simavr/sim \
+ # ../src/simavr/sim/avr \
diff --git a/srcpkgs/simulide/template b/srcpkgs/simulide/template
new file mode 100644
index 00000000000..6dd53536ff5
--- /dev/null
+++ b/srcpkgs/simulide/template
@@ -0,0 +1,34 @@
+# Template file for 'simulide'
+pkgname=simulide
+version=0.4.13
+revision=1
+_pkgname=SimulIDE
+_rev=SR5
+wrksrc=${pkgname}_${version}-${_rev}_Sources
+build_wrksrc=build_XX
+build_style=qmake
+hostmakedepends="qt5-qmake pkg-config"
+makedepends="qt5-devel qt5-svg-devel qt5-multimedia-devel qt5-serialport-devel
+ qt5-script-devel elfutils-devel"
+short_desc="Electronic circuit simulator for PIC, AVR, Arduino"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="GPL-3.0-or-later"
+homepage="https://simulide.com"
+distfiles="https://mailfence.com/pub/docs/santigoro/web/${_pkgname}_${version}/${_pkgname}_${version}-${_rev}_Sources.tar.gz"
+checksum=b55b03e507882b8b68a25e5155dcac6020ba273be93bdf689612a0be67056d43
+nopie_files="/usr/bin/simulide"
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+="qt5-host-tools qt5-svg-devel qt5-script-devel \
+ qt5-serialport-devel qt5-multimedia-devel"
+fi
+
+pre_build() {
+ CXXFLAGS="$($PKG_CONFIG --cflags glib-2.0)"
+}
+
+do_install() {
+ cd release/${_pkgname}_${version}-${_rev}
+ vbin bin/simulide
+ mv share ${DESTDIR}/usr/
+}
next prev parent reply other threads:[~2020-11-10 22:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 18:02 [PR PATCH] " Logarithmus
2020-10-28 18:19 ` [PR REVIEW] " ericonr
2020-10-28 18:19 ` ericonr
2020-10-28 18:27 ` [PR PATCH] [Updated] " Logarithmus
2020-10-28 18:31 ` [PR REVIEW] " Logarithmus
2020-10-28 18:31 ` Logarithmus
2020-10-28 18:32 ` Logarithmus
2020-10-30 14:03 ` [PR PATCH] [Updated] " Logarithmus
2020-10-30 14:05 ` Logarithmus
2020-10-30 14:06 ` Logarithmus
2020-10-30 14:07 ` [PR REVIEW] " sgn
2020-10-31 2:12 ` [PR PATCH] [Updated] " Logarithmus
2020-10-31 4:12 ` [PR REVIEW] " sgn
2020-10-31 13:39 ` [PR PATCH] [Updated] " Logarithmus
2020-11-10 21:52 ` Logarithmus
2020-11-10 22:05 ` Logarithmus [this message]
2020-11-10 22:20 ` Logarithmus
2020-11-10 22:26 ` Logarithmus
2020-11-10 22:26 ` Logarithmus
2020-11-10 22:44 ` Logarithmus
2020-11-10 22:45 ` Logarithmus
2020-11-11 0:23 ` Logarithmus
2020-11-21 21:47 ` [PR REVIEW] " the-maldridge
2020-11-21 21:51 ` Logarithmus
2021-02-19 2:18 ` [PR PATCH] [Updated] " Logarithmus
2021-02-19 2:19 ` [PR REVIEW] " Logarithmus
2021-02-19 3:55 ` [PR PATCH] [Updated] " Logarithmus
2021-02-19 4:24 ` Logarithmus
2021-03-17 17:40 ` New package: simulide-0.4.14 Logarithmus
2021-03-26 21:44 ` [PR PATCH] [Updated] " Logarithmus
2021-07-27 2:10 ` Logarithmus
2022-04-22 2:14 ` github-actions
2022-05-07 2:05 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201110220503.G5ivUuNxs0SMO5tCxZKAVjAeOpB06qKHxCm2CjBg2Yo@z \
--to=logarithmus@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).