svn commit: r531967 - in head/devel/simavr: . files
Tobias C. Berner
tcberner at FreeBSD.org
Fri Apr 17 19:34:08 UTC 2020
Author: tcberner
Date: Fri Apr 17 19:34:06 2020
New Revision: 531967
URL: https://svnweb.freebsd.org/changeset/ports/531967
Log:
devel/simavr: update to 1.6
PR: 245678
Submitted by: Felix Palmen <felix at palmen-it.de> (maintainer)
Added:
head/devel/simavr/files/patch-Makefile (contents, props changed)
head/devel/simavr/files/patch-examples_parts_Makefile (contents, props changed)
Deleted:
head/devel/simavr/files/patch-examples_Makefile.opengl
head/devel/simavr/files/patch-examples_parts_uart__pty.c
Modified:
head/devel/simavr/Makefile
head/devel/simavr/distinfo
head/devel/simavr/files/patch-simavr_Makefile
head/devel/simavr/pkg-plist
Modified: head/devel/simavr/Makefile
==============================================================================
--- head/devel/simavr/Makefile Fri Apr 17 19:22:55 2020 (r531966)
+++ head/devel/simavr/Makefile Fri Apr 17 19:34:06 2020 (r531967)
@@ -2,12 +2,16 @@
# $FreeBSD$
PORTNAME= simavr
-PORTVERSION= 1.3
-PORTREVISION= 1
+PORTVERSION= 1.6
DISTVERSIONPREFIX= v
-CATEGORIES= devel
+CATEGORIES= devel emulators
+DIST_SUBDIR= ${PORTNAME}
PATCH_DIST_STRIP= -p1
+PATCH_SITES= https://github.com/buserror/simavr/commit/
+PATCHFILES= 86264ad6d0b6b921130e293769d8ebaec512eecd.diff \
+ e5ea627259daae64ddbe67402b6d121e0143cd21.diff \
+ 082939e64e1632d8ea0b1d6ebea93ca832c9e762.diff
MAINTAINER= felix at palmen-it.de
COMMENT= Simulator for several Atmel AVR chips
@@ -18,30 +22,22 @@ BUILD_DEPENDS= avr-gcc:devel/avr-gcc \
bash:shells/bash \
${LOCALBASE}/avr/lib/libc.a:devel/avr-libc
+USES= gl gmake pathfix pkgconfig xorg
+USE_GL= gl glu glut
+PATHFIX_MAKEFILEIN= Makefile
+USE_XORG= xdamage xcb xext xfixes xrandr
USE_GITHUB= yes
GH_ACCOUNT= buserror
+USE_LDCONFIG= yes
-USES= gmake pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile
-ALL_TARGET= build-simavr
+ALL_TARGET= build-parts
MAKE_ARGS= "RELEASE=1 PREFIX=${PREFIX} DESTDIR=${STAGEDIR}${PREFIX}"
-USE_LDCONFIG= yes
+OPTIONS_DEFINE= DOCS EXAMPLES
-OPTIONS_DEFINE= DOCS EXAMPLES THREADSAFE
-THREADSAFE_DESC= Add a patch to make debugging output thread-safe
-
DOCS_ALL_TARGET= doc
DOCS_USE= tex=latex:build tex=pdftex:build tex=texmf:build
-EXAMPLES_ALL_TARGET= build-examples
-EXAMPLES_USES= gl xorg
-EXAMPLES_USE= xorg=xdamage xorg=xcb xorg=xext xorg=xfixes \
- xorg=xrandr gl=glut
-
-THREADSAFE_PATCH_SITES= https://github.com/zirias/simavr/commit/
-THREADSAFE_PATCHFILES= 4b7c8c5245e1bbb8cac04948564622f47178b5f0.diff
-
AVR_STRIP_CMD?= avr-strip
DUMPMACHINE= ${CC} -dumpmachine
OBJDIRNAME= obj-$$(${DUMPMACHINE})
@@ -49,6 +45,7 @@ OBJDIRNAME= obj-$$(${DUMPMACHINE})
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simavr
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsimavr.so.1
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsimavrparts.so.1
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -56,7 +53,7 @@ post-install-DOCS-on:
${INSTALL_DATA} ${WRKSRC}/doc/simavr_callgraph.pdf ${STAGEDIR}${DOCSDIR}
post-install-EXAMPLES-on:
-.for BOARDELF in hd77480,charlcd i2ctest ledramp simduino ssd1306,ssd1306demo timer_64led
+.for BOARDELF in ds1338,ds1338demo hd44780,charlcd i2ctest ledramp simduino ssd1306,ssd1306demo timer_64led
BOARDELF=${BOARDELF}; \
BOARD=$${BOARDELF%%,*}; \
ELF=$${BOARDELF##*,}; \
@@ -65,12 +62,15 @@ post-install-EXAMPLES-on:
${WRKSRC}/examples/board_$${BOARD}/${OBJDIRNAME}/$${ELF}.elf \
${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/$${ELF}; \
${INSTALL_DATA} ${WRKSRC}/examples/board_$${BOARD}/*.[aihc]* \
- ${WRKSRC}/examples/board_$${BOARD}/README \
${WRKSRC}/examples/board_$${BOARD}/Makefile \
- ${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/
+ ${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/;\
+ ${TEST} -f ${WRKSRC}/examples/board_$${BOARD}/README && \
+ ${INSTALL_DATA} ${WRKSRC}/examples/board_$${BOARD}/README \
+ ${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/ || ${TRUE}
.endfor
.for AXF in \
- hd77480/atmega48_charlcd \
+ ds1338/atmega32_ds1338 \
+ hd44780/atmega48_charlcd \
i2ctest/atmega1280_i2ctest \
ledramp/atmega48_ledramp \
ssd1306/atmega32_ssd1306 \
Modified: head/devel/simavr/distinfo
==============================================================================
--- head/devel/simavr/distinfo Fri Apr 17 19:22:55 2020 (r531966)
+++ head/devel/simavr/distinfo Fri Apr 17 19:34:06 2020 (r531967)
@@ -1,4 +1,9 @@
-SHA256 (buserror-simavr-v1.3_GH0.tar.gz) = ddaaf9745b62b0c032a773365375a6f1b12c50ff4a89ae4d531e7b516846e357
-SIZE (buserror-simavr-v1.3_GH0.tar.gz) = 741336
-SHA256 (4b7c8c5245e1bbb8cac04948564622f47178b5f0.diff) = 0bb3af41d9a64a372b64d2849bcfb9da00a685f54a31ee70fd7caf26d7db9c6c
-SIZE (4b7c8c5245e1bbb8cac04948564622f47178b5f0.diff) = 1551
+TIMESTAMP = 1587070720
+SHA256 (simavr/buserror-simavr-v1.6_GH0.tar.gz) = a55ad04d055eef5656c49f78bc089968b059c6efb6a831618b8d7e67a840936d
+SIZE (simavr/buserror-simavr-v1.6_GH0.tar.gz) = 3317397
+SHA256 (simavr/86264ad6d0b6b921130e293769d8ebaec512eecd.diff) = cc0b23d08f713bc450013f68df3e7cf2d329aa6eee6d66458e6101349aa10255
+SIZE (simavr/86264ad6d0b6b921130e293769d8ebaec512eecd.diff) = 313
+SHA256 (simavr/e5ea627259daae64ddbe67402b6d121e0143cd21.diff) = fef6af9400ad4abd5ad8f0272fb4d656815e289b42e8906476e6e0b0560ab25e
+SIZE (simavr/e5ea627259daae64ddbe67402b6d121e0143cd21.diff) = 976
+SHA256 (simavr/082939e64e1632d8ea0b1d6ebea93ca832c9e762.diff) = 70a0d68aa4768062d38e5b816d55506745ea2336b253ce4c275c263cc6ab4634
+SIZE (simavr/082939e64e1632d8ea0b1d6ebea93ca832c9e762.diff) = 394
Added: head/devel/simavr/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/simavr/files/patch-Makefile Fri Apr 17 19:34:06 2020 (r531967)
@@ -0,0 +1,12 @@
+--- Makefile.orig 2020-04-16 22:04:43 UTC
++++ Makefile
+@@ -29,9 +29,6 @@ install:
+ doc:
+ $(MAKE) -C doc RELEASE=$(RELEASE)
+
+-install:
+- $(MAKE) -C simavr install
+-
+ clean:
+ $(MAKE) -C simavr clean
+ $(MAKE) -C tests clean
Added: head/devel/simavr/files/patch-examples_parts_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/simavr/files/patch-examples_parts_Makefile Fri Apr 17 19:34:06 2020 (r531967)
@@ -0,0 +1,12 @@
+--- examples/parts/Makefile.orig 2020-04-16 21:45:08 UTC
++++ examples/parts/Makefile
+@@ -44,9 +44,7 @@ ${target}: ${OBJ}/${target}.a
+ #
+ # Shared library (Linux only)
+ #
+-ifeq (${shell uname}, Linux)
+ ${target}: ${OBJ}/${target}.so
+-endif
+
+ clean: clean-${OBJ}
+ rm -rf *.hex *.a *.axf *.vcd .*.swo .*.swp .*.swm .*.swn *.so *.o
Modified: head/devel/simavr/files/patch-simavr_Makefile
==============================================================================
--- head/devel/simavr/files/patch-simavr_Makefile Fri Apr 17 19:22:55 2020 (r531966)
+++ head/devel/simavr/files/patch-simavr_Makefile Fri Apr 17 19:34:06 2020 (r531967)
@@ -1,26 +1,33 @@
---- simavr/Makefile.orig 2016-10-03 12:42:39 UTC
+--- simavr/Makefile.orig 2020-04-16 21:45:08 UTC
+++ simavr/Makefile
-@@ -73,12 +73,9 @@ ${OBJ}/libsimavr.so : ${OBJ}/libsimavr.
- ln -sf libsimavr.so.1 $@
+@@ -19,7 +19,7 @@
+ SHELL := ${shell which bash}
+ SIMAVR_VERSION := ${shell \
+ git describe --abbrev=0 --tags || \
+- echo "unknown" }
++ echo "v1.6" }
+ SIMAVR_REVISION = 2
+ target = run_avr
+@@ -54,9 +54,7 @@ ${OBJ}/libsimavr.a : ${sim_o}
+
libsimavr : config ${OBJ}/libsimavr.a
--# shared library won't work that easily on non-linux
+ # shared library won't work that easily on non-linux
-ifeq (${shell uname}, Linux)
- libsimavr : ${OBJ}/libsimavr.so
+ libsimavr : ${OBJ}/libsimavr.so
-endif
--${OBJ}/${target}.elf : ${OBJ}/${target}.o
-+${OBJ}/${target}.elf : ${OBJ}/${target}.o | libsimavr
-
- ${target} : ${OBJ}/${target}.elf
-
-@@ -108,10 +105,8 @@ install : all
- simavr-avr.pc >$(DESTDIR)/libdata/pkgconfig/simavr-avr.pc
- sed -e "s|PREFIX|${PREFIX}|g" -e "s|VERSION|${SIMAVR_VERSION}|g" \
+ ${OBJ}/${target}.elf : libsimavr
+ ${OBJ}/${target}.elf : ${OBJ}/${target}.o
+@@ -94,12 +92,10 @@ install : all
simavr.pc >$(DESTDIR)/libdata/pkgconfig/simavr.pc
+ sed -e "s|PREFIX|${PREFIX}|g" -e "s|VERSION|${SIMAVR_VERSION}|g" \
+ simavrparts.pc >$(DESTDIR)/libdata/pkgconfig/simavrparts.pc
-ifeq (${shell uname}, Linux)
$(INSTALL) ${OBJ}/libsimavr.so.1 $(DESTDIR)/lib/
+ $(INSTALL) ../examples/parts/${OBJ}/libsimavrparts.so.1 $(DESTDIR)/lib/
ln -sf libsimavr.so.1 $(DESTDIR)/lib/libsimavr.so
+ ln -sf libsimavrparts.so.1 $(DESTDIR)/lib/libsimavrparts.so
-endif
$(MKDIR) $(DESTDIR)/bin
$(INSTALL) ${OBJ}/${target}.elf $(DESTDIR)/bin/simavr
Modified: head/devel/simavr/pkg-plist
==============================================================================
--- head/devel/simavr/pkg-plist Fri Apr 17 19:22:55 2020 (r531966)
+++ head/devel/simavr/pkg-plist Fri Apr 17 19:34:06 2020 (r531967)
@@ -1,5 +1,6 @@
bin/simavr
include/simavr/avr/avr_mcu_section.h
+include/simavr/avr_acomp.h
include/simavr/avr_adc.h
include/simavr/avr_bitbang.h
include/simavr/avr_eeprom.h
@@ -14,8 +15,22 @@ include/simavr/avr_uart.h
include/simavr/avr_usb.h
include/simavr/avr_watchdog.h
include/simavr/fifo_declare.h
+include/simavr/parts/ac_input.h
+include/simavr/parts/button.h
+include/simavr/parts/ds1338_virt.h
+include/simavr/parts/hc595.h
+include/simavr/parts/hd44780.h
+include/simavr/parts/hd44780_glut.h
+include/simavr/parts/i2c_eeprom.h
+include/simavr/parts/lcd_font.h
+include/simavr/parts/ssd1306_glut.h
+include/simavr/parts/ssd1306_virt.h
+include/simavr/parts/uart_pty.h
+include/simavr/parts/uart_udp.h
+include/simavr/parts/vhci_usb.h
include/simavr/sim_avr.h
include/simavr/sim_avr_types.h
+include/simavr/sim_cmds.h
include/simavr/sim_core.h
include/simavr/sim_core_config.h
include/simavr/sim_core_decl.h
@@ -29,27 +44,40 @@ include/simavr/sim_irq.h
include/simavr/sim_network.h
include/simavr/sim_regbit.h
include/simavr/sim_time.h
+include/simavr/sim_utils.h
include/simavr/sim_vcd_file.h
lib/libsimavr.a
lib/libsimavr.so
lib/libsimavr.so.1
+lib/libsimavrparts.a
+lib/libsimavrparts.so
+lib/libsimavrparts.so.1
libdata/pkgconfig/simavr-avr.pc
libdata/pkgconfig/simavr.pc
+libdata/pkgconfig/simavrparts.pc
%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/simavr_callgraph.pdf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.common
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.opengl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/atmega48_charlcd.axf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/atmega48_charlcd.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/avr_hd44780.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/avr_hd44780.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/avr_hd44780_conf.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/charlcd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/charlcd.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd77480/font.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/atmega32_ds1338.axf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/atmega32_ds1338.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/ds1338.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/ds1338.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/ds1338demo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/ds1338demo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/i2cmaster.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_ds1338/twimaster.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/atmega48_charlcd.axf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/atmega48_charlcd.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/avr_hd44780.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/avr_hd44780.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/avr_hd44780_conf.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/charlcd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_hd44780/charlcd.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_i2ctest/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_i2ctest/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_i2ctest/atmega1280_i2ctest.axf
@@ -90,6 +118,8 @@ libdata/pkgconfig/simavr.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/ac_input.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/button.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/button.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/ds1338_virt.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/ds1338_virt.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/hc595.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/hc595.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/hd44780.c
@@ -98,6 +128,7 @@ libdata/pkgconfig/simavr.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/hd44780_glut.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/i2c_eeprom.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/i2c_eeprom.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/lcd_font.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/ssd1306_glut.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/ssd1306_glut.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parts/ssd1306_virt.c
More information about the svn-ports-all
mailing list