git: f30264ca1d6d - main - =?utf-8?Q?net/teddycloud: Update 0.6.2 =E2=86=92 0.6.3, update supported architectu=Q?net/teddycloud: Update 0.6.2 =E2=86=92 0.6.3, update supported architectu=

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 31 Jan 2025 13:51:01 UTC
res?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: vvd
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f30264ca1d6d7e1af256325834a9f976e00a11d9
Auto-Submitted: auto-generated

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f30264ca1d6d7e1af256325834a9f976e00a11d9

commit f30264ca1d6d7e1af256325834a9f976e00a11d9
Author:     Michael Pape <freebsd@pe82.de>
AuthorDate: 2025-01-31 13:43:13 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-01-31 13:43:13 +0000

    net/teddycloud: Update 0.6.2 → 0.6.3, update supported architectures
    
    Changelog:
    https://github.com/toniebox-reverse-engineering/teddycloud/releases/tag/tc_v0.6.3
    
    PR:     284350
---
 net/teddycloud/Makefile                            | 31 ++++++------
 net/teddycloud/distinfo                            | 10 ++--
 net/teddycloud/files/patch-Makefile                | 55 ----------------------
 .../files/patch-cyclone_common_compiler__port.h    |  8 ++--
 .../patch-src_cyclone_common_compiler__port.h      | 11 -----
 net/teddycloud/pkg-plist                           | 38 +++++++++++----
 6 files changed, 54 insertions(+), 99 deletions(-)

diff --git a/net/teddycloud/Makefile b/net/teddycloud/Makefile
index a24f48919ea5..a222aaec2336 100644
--- a/net/teddycloud/Makefile
+++ b/net/teddycloud/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	teddycloud
 DISTVERSIONPREFIX=	tc_v
-DISTVERSION=	0.6.2
+DISTVERSION=	0.6.3
 CATEGORIES=	net
 # Get the latest commit hashes here: https://github.com/toniebox-reverse-engineering/tonies-json/commits/release/
 # NOTE: remove the existing tonies.json and tonieboxes.json from DISTDIR before you do a `make makesum`
@@ -15,7 +15,8 @@ WWW=		https://tonies-wiki.revvox.de/docs/tools/teddycloud/
 
 LICENSE=	GPLv2+
 
-NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS=		armv6 armv7 i386 powerpc powerpcspe
+NOT_FOR_ARCHS_REASON=	32bit targets do not build due to type issues, upstream library assumes FreeBSD to be 64bit
 
 BUILD_DEPENDS+=	curl:ftp/curl \
 		protoc-c:devel/protobuf-c
@@ -39,25 +40,23 @@ GH_SUBDIR=	cJSON:cJSON ogg:ogg opus:opus teddycloud_web:teddycloud_web \
 GH_TAGNAME=	v1.7.15-33-gacc7623:cJSON \
 		v1.3.5-9-gdb5c7a4:ogg \
 		v1.4-7-g101a71e0:opus \
-		tcw_v0.6.2:teddycloud_web \
+		tcw_v0.6.3:teddycloud_web \
 		v2.3.2:cyclone_common,cyclone_crypto,cyclone_ssl,cyclone_tcp
 
 USE_RC_SUBR=	teddycloudd
 MAKE_ENV+=	CONFIG_RUNTIME_BASE_PATH=${PREFIX}/etc/teddycloud \
 		RUNTIME_BASE_PATH=${PREFIX}/share/teddycloud \
-		NO_SANITIZERS=1
-# can be used if https://github.com/toniebox-reverse-engineering/teddycloud/pull/243 is included
-# and patch for Makefile is then obsolete
-#		GIT_DIRTY=0 \
-#		GIT_BUILD_TIME="2024-10-26 18:14:34 +0000" \
-#		GIT_SHORT_SHA=203f12d \
-#		GIT_SHA=203f12d3d357d16268b83c7bdedb332820b9e87a \
-#		GIT_TAG=tc_v0.6.2 \
-#		WEB_GIT_DIRTY=0 \
-#		WEB_GIT_BUILD_TIME="2024-10-26 06:25:22 +0200" \
-#		WEB_GIT_SHORT_SHA=e4d9fc1 \
-#		WEB_GIT_SHA=e4d9fc19e493933c2020be2d40ee5de2f07d7eef \
-#		WEB_GIT_TAG=tcw_v0.6.2
+		NO_SANITIZERS=1 \
+		GIT_DIRTY=0 \
+		GIT_BUILD_TIME="2025-01-06 08:31:53 +0000" \
+		GIT_SHORT_SHA=39b2f89 \
+		GIT_SHA=39b2f89bb0c4f7e40cea0efdced012c5715c1f59 \
+		GIT_TAG=tc_v0.6.3 \
+		WEB_GIT_DIRTY=0 \
+		WEB_GIT_BUILD_TIME="2025-01-06 09:28:23 +0100" \
+		WEB_GIT_SHORT_SHA=514140d \
+		WEB_GIT_SHA=514140d169f5e821299a452fa33dac155eef3a85 \
+		WEB_GIT_TAG=tcw_v0.6.3
 # This did reliably fail due to some unknown deps when using parallel build
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	preinstall
diff --git a/net/teddycloud/distinfo b/net/teddycloud/distinfo
index b5004bef8048..6756dc469824 100644
--- a/net/teddycloud/distinfo
+++ b/net/teddycloud/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1730732169
+TIMESTAMP = 1738007717
 SHA256 (tonies.json) = 074396727ba9738c5061bb3e22bb2e505af255adecd00b07444465ee7083156e
 SIZE (tonies.json) = 5035861
 SHA256 (tonieboxes.json) = de50e30f844dcf743617337ba158b67498117f9c459b9ca4d26097aa3cb6b36f
 SIZE (tonieboxes.json) = 2736
-SHA256 (toniebox-reverse-engineering-teddycloud-tc_v0.6.2_GH0.tar.gz) = 1cb3436f5099ddcaaca4b32021d7fa269c1359b257542ad31aa3bc9fbb13099f
-SIZE (toniebox-reverse-engineering-teddycloud-tc_v0.6.2_GH0.tar.gz) = 11587377
-SHA256 (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.2_GH0.tar.gz) = aecff11ca81d0c2c9af238202e71797f21ddcd2c1ab9f5f7e40cab45a041a2a2
-SIZE (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.2_GH0.tar.gz) = 6844210
+SHA256 (toniebox-reverse-engineering-teddycloud-tc_v0.6.3_GH0.tar.gz) = ff2b4cbd61edb99943dfd65b6944beb91ca786a3952c614d34c6718d2eaf0d88
+SIZE (toniebox-reverse-engineering-teddycloud-tc_v0.6.3_GH0.tar.gz) = 14057299
+SHA256 (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.3_GH0.tar.gz) = 667b05329f916e21bfc59f53a12925f3052989e0f6efb62304e27d3468ffbd6a
+SIZE (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.3_GH0.tar.gz) = 9306659
 SHA256 (DaveGamble-cJSON-v1.7.15-33-gacc7623_GH0.tar.gz) = a87a20cbe1245922a8b19fd586b0e2567a5c56a57f9e2d283dbea23a5722a519
 SIZE (DaveGamble-cJSON-v1.7.15-33-gacc7623_GH0.tar.gz) = 354833
 SHA256 (xiph-ogg-v1.3.5-9-gdb5c7a4_GH0.tar.gz) = fac013405bc8ac0e1754b2de64455bc2d73c06ef181df8eb3b48d6addecd69c1
diff --git a/net/teddycloud/files/patch-Makefile b/net/teddycloud/files/patch-Makefile
deleted file mode 100644
index 1b889c0270f5..000000000000
--- a/net/teddycloud/files/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.orig	2024-10-26 18:14:34 UTC
-+++ Makefile
-@@ -24,7 +24,7 @@ else
- 	build_os_id:="windows"
- else
- 	SHELL_ENV ?= bash
--	build_arch:="$(shell arch)"
-+	build_arch:="$(shell uname -m)"
- 	build_os_id:="$(shell grep "^ID=" /etc/os-release | cut -d'=' -f2- | tr -d '"')"
- endif
- 
-@@ -47,11 +47,11 @@ endif
- build_rawDateTime:="${shell date "+%Y-%m-%d %H:%M:%S %z"}"
- endif
- 
--build_gitDirty:=${shell git diff --quiet && echo '0' || echo '1'}
--build_gitDateTime:="${shell git log -1 --format=%ai}"
--build_gitShortSha:=${shell git rev-parse --short HEAD}
--build_gitSha:=${shell git rev-parse HEAD}
--build_gitTag:=${shell git name-rev --tags --name-only $(build_gitSha)}
-+build_gitDirty:=0
-+build_gitDateTime:="2024-10-26 18:14:34 +0000"
-+build_gitShortSha:=203f12d
-+build_gitSha:=203f12d3d357d16268b83c7bdedb332820b9e87a
-+build_gitTag:=tc_v0.6.2
- build_platform:=$(PLATFORM)
- build_os:="$(OS)"
- 
-@@ -70,12 +70,12 @@ endif
- 	CFLAGS_VERSION+=-DBUILD_VERSION=\"${build_version}\" 
- endif
- 
--web_gitDirty:=${shell cd $(WEB_SRC_DIR) && git diff --quiet && echo '0' || echo '1'}
--web_gitDateTime:="${shell cd $(WEB_SRC_DIR) && git log -1 --format=%ai}"
--web_gitShortSha:=${shell cd $(WEB_SRC_DIR) && git rev-parse --short HEAD}
--web_gitSha:=${shell cd $(WEB_SRC_DIR) && git rev-parse HEAD}
--web_gitTag:=${shell cd $(WEB_SRC_DIR) && git name-rev --tags --name-only $(web_gitSha)}
--web_gitTagPrefix:=$(firstword $(subst _, ,$(web_gitTag)))
-+web_gitDirty:=0
-+web_gitDateTime:="2024-10-26 06:25:22 +0200"
-+web_gitShortSha:=e4d9fc1
-+web_gitSha:=e4d9fc19e493933c2020be2d40ee5de2f07d7eef
-+web_gitTag:=tcw_v0.6.2
-+web_gitTagPrefix:=tcw
- web_version:=vX.X.X
- CFLAGS_VERSION+=-DWEB_GIT_IS_DIRTY=${web_gitDirty} -DWEB_GIT_DATETIME=\"${web_gitDateTime}\" -DWEB_RAW_DATETIME=\"${web_rawDateTime}\" -DWEB_GIT_SHORT_SHA=\"${web_gitShortSha}\" -DWEB_GIT_SHA=\"${web_gitSha}\" -DWEB_GIT_TAG=\"${web_gitTag}\"
- ifeq ($(web_gitTagPrefix),tcw)
-@@ -153,6 +153,7 @@ CFLAGS_linux += -DFFMPEG_DECODING
- endif
- CFLAGS_linux += -ggdb
- CFLAGS_linux += -DFFMPEG_DECODING
-+LFLAGS_linux += -pthread -lm
- 
- # for now enable extensive error checking
- # Add flags for extensive error checking if NO_SANITIZERS is not set to 1
diff --git a/net/teddycloud/files/patch-cyclone_common_compiler__port.h b/net/teddycloud/files/patch-cyclone_common_compiler__port.h
index 2868f1fe464e..985ff2f920a1 100644
--- a/net/teddycloud/files/patch-cyclone_common_compiler__port.h
+++ b/net/teddycloud/files/patch-cyclone_common_compiler__port.h
@@ -1,11 +1,13 @@
 --- cyclone/common/compiler_port.h.orig	2024-01-17 21:26:40 UTC
 +++ cyclone/common/compiler_port.h
-@@ -106,7 +106,7 @@ typedef unsigned int uint_t;
+@@ -105,8 +105,8 @@ typedef unsigned int uint_t;
+    #define PRIuSIZE "u"
     #define PRIXSIZE "X"
     #define PRIuTIME "lu"
- //Linux GCC compiler
+-//Linux GCC compiler
 -#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__unix__)
++//Linux/FreeBSD GCC compiler
++#elif defined(__linux__) || defined(__FreeBSD__)
     #define PRIuSIZE "zu"
     #define PRIXSIZE "zX"
     #define PRIuTIME "lu"
diff --git a/net/teddycloud/files/patch-src_cyclone_common_compiler__port.h b/net/teddycloud/files/patch-src_cyclone_common_compiler__port.h
deleted file mode 100644
index 87fdd492b8bf..000000000000
--- a/net/teddycloud/files/patch-src_cyclone_common_compiler__port.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cyclone/common/compiler_port.h.orig	2024-11-04 17:31:41 UTC
-+++ src/cyclone/common/compiler_port.h
-@@ -106,7 +106,7 @@ typedef unsigned int uint_t;
-    #define PRIXSIZE "X"
-    #define PRIuTIME "lu"
- //Linux GCC compiler
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__unix__)
-    #define PRIuSIZE "zu"
-    #define PRIXSIZE "zX"
-    #define PRIuTIME "lu"
diff --git a/net/teddycloud/pkg-plist b/net/teddycloud/pkg-plist
index fcec3b5efd62..f6e181b8b5db 100644
--- a/net/teddycloud/pkg-plist
+++ b/net/teddycloud/pkg-plist
@@ -1,8 +1,8 @@
 bin/teddycloud
-%%ETCDIR%%/tonies.custom.json
-%%ETCDIR%%/tonies.json
 %%ETCDIR%%/tonieboxes.custom.json
 %%ETCDIR%%/tonieboxes.json
+%%ETCDIR%%/tonies.custom.json
+%%ETCDIR%%/tonies.json
 %%DATADIR%%/data/www/404.html
 %%DATADIR%%/data/www/encode_test.html
 %%DATADIR%%/data/www/favicon.ico
@@ -15,9 +15,21 @@ bin/teddycloud
 %%DATADIR%%/data/www/library/react-dom.development.js
 %%DATADIR%%/data/www/library/react.development.js
 %%DATADIR%%/data/www/robots.txt
+%%DATADIR%%/data/www/web/assets/01_CH341A_programmer_1-BWh6CFRm.png
+%%DATADIR%%/data/www/web/assets/01_CH341A_programmer_2-DLQkFrYM.png
+%%DATADIR%%/data/www/web/assets/02_CH341A_sop8_1-B7nvMxlQ.jpg
+%%DATADIR%%/data/www/web/assets/02_CH341A_sop8_2-CW3KfcCM.jpg
+%%DATADIR%%/data/www/web/assets/02_CH341A_sop8_3-B20tcrp3.jpg
+%%DATADIR%%/data/www/web/assets/02_CH341A_sop8_remove-D-uCy9Q0.jpg
 %%DATADIR%%/data/www/web/assets/3200_pcb-Dxz0Vi-z.png
+%%DATADIR%%/data/www/web/assets/3200_pcb_preview-BvQM-e4R.png
 %%DATADIR%%/data/www/web/assets/3235_pcb-BE0vs2bl.png
+%%DATADIR%%/data/www/web/assets/3235_pcb_preview-DkVKgZS0.png
 %%DATADIR%%/data/www/web/assets/cc3200-B-jSkbsy.jpg
+%%DATADIR%%/data/www/web/assets/cc3200_debugPort-CUfuhKbo.jpg
+%%DATADIR%%/data/www/web/assets/cc3200_installCfwFlashUpload-D3jB7q0q.png
+%%DATADIR%%/data/www/web/assets/cc3200_tagConnector-C5CJTEin.png
+%%DATADIR%%/data/www/web/assets/cc3200_wiresAsTagConnector-BuyL-dME.png
 %%DATADIR%%/data/www/web/assets/cc3235-Cr21bWbC.jpg
 %%DATADIR%%/data/www/web/assets/cc3235_flash-D2YMWv70.jpg
 %%DATADIR%%/data/www/web/assets/cc3235_smd_grippers-MdbEjaZo.jpg
@@ -25,17 +37,20 @@ bin/teddycloud
 %%DATADIR%%/data/www/web/assets/esp32-B_b6hCjy.jpg
 %%DATADIR%%/data/www/web/assets/esp32_pcb-CWEYHEzm.png
 %%DATADIR%%/data/www/web/assets/esp32_pcb_clamp-Cw2o3uco.png
+%%DATADIR%%/data/www/web/assets/esp32_pcb_preview-Bh1UGQPK.png
 %%DATADIR%%/data/www/web/assets/esp32_write_patched_image_with_esptools-DmsBlrjp.png
-%%DATADIR%%/data/www/web/assets/esp32c2-CtjOOsCE.js
-%%DATADIR%%/data/www/web/assets/esp32c3-DDsZSfEd.js
-%%DATADIR%%/data/www/web/assets/esp32c6-BRG5ZpJ8.js
+%%DATADIR%%/data/www/web/assets/esp32c2-CVPL8n1g.js
+%%DATADIR%%/data/www/web/assets/esp32c3-I3vXmsVg.js
+%%DATADIR%%/data/www/web/assets/esp32c5-CAGCiNY4.js
+%%DATADIR%%/data/www/web/assets/esp32c6-C93uIFil.js
+%%DATADIR%%/data/www/web/assets/esp32c61-Qo5S0GG2.js
 %%DATADIR%%/data/www/web/assets/esp32h2-Cf8JbGZQ.js
 %%DATADIR%%/data/www/web/assets/esp32p4-DfBdIAkh.js
-%%DATADIR%%/data/www/web/assets/esp32s2-BOsRKhcm.js
-%%DATADIR%%/data/www/web/assets/esp32s3-DkgZlzv1.js
+%%DATADIR%%/data/www/web/assets/esp32s2-3nCAg6Ct.js
+%%DATADIR%%/data/www/web/assets/esp32s3-mu2zzjDN.js
 %%DATADIR%%/data/www/web/assets/esp8266-8VKmCx7J.js
-%%DATADIR%%/data/www/web/assets/index-BU1Nt4kW.css
-%%DATADIR%%/data/www/web/assets/index-ChP2LRih.js
+%%DATADIR%%/data/www/web/assets/index-Dljhv4sL.css
+%%DATADIR%%/data/www/web/assets/index-DuKEIM2E.js
 %%DATADIR%%/data/www/web/assets/logo-aw46LCqE.png
 %%DATADIR%%/data/www/web/assets/openTB_step1_1-4vwQGflo.png
 %%DATADIR%%/data/www/web/assets/openTB_step1_2-DIZc5DI4.png
@@ -46,6 +61,10 @@ bin/teddycloud
 %%DATADIR%%/data/www/web/assets/rom-Caghk6Eh.js
 %%DATADIR%%/data/www/web/assets/tb-esp32-uart-BDPWj6EB.png
 %%DATADIR%%/data/www/web/assets/tb-esp32-uart-clamp-D_86EMpu.png
+%%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_black-BW2kS97B.jpg
+%%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_switch-Cl7yHFlu.jpg
+%%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_yellow-d4JFD7jo.jpg
+%%DATADIR%%/data/www/web/assets/unknown_box-xU178mnG.png
 %%DATADIR%%/data/www/web/favicon.ico
 %%DATADIR%%/data/www/web/index.html
 %%DATADIR%%/data/www/web/manifest.json
@@ -62,3 +81,4 @@ bin/teddycloud
 @dir %%DATADIR%%/data/firmware/ota/cc3235
 @dir %%DATADIR%%/data/firmware/ota/esp32
 @dir %%DATADIR%%/data/library
+@dir %%DATADIR%%/data/www/custom_img