From nobody Tue Nov 05 06:56:00 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjJyS6TJ9z5bgXt; Tue, 05 Nov 2024 06:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjJyS64dMz4TJp; Tue, 5 Nov 2024 06:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730789760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCEdAhUuEiYjrGwbr0YsFjgL8ki8Z+M37nO5XF9ynN4=; b=EVV+E1VVWjOmF5l2tK9aHI8lz4td+dmbZ7OEZbjx1eMJL1k4f012g5fapdwvKS4ejhWDt2 dAB/ir3st/X//EALqmplilxyb+biD8/ixrudGbhVfl9S3z/0LV90Twa6X9Vb7BrhBiymJv bwTv9xSubYUWLcanedy2WCSZZzw+8jIhl25XLYGVqPjC6G+T4ZZ6tlynYEkCENFBgKAypz ME/ptIvm/zgWdOk8Vyqge6UMyBAeTy1Z2ivIrxOyw3vhVeNzWxwqIxp1ElgGI2VpM9xpTQ mMxfq+zVFqvkWpbOpZDGpn1BBG9zULCvIgpJC62xx1NUMymgBuI2iCnObqo94Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730789760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCEdAhUuEiYjrGwbr0YsFjgL8ki8Z+M37nO5XF9ynN4=; b=afLMgEfrJoXhMZxDM6KK/3s5rik/kaGIPHs7QLjpxSWksAW3GTuUoLUXChCFy03p7wQi79 qOAuJqn05RBViwwZugXtZxhwSBVZiQhOz94CiIxXp0EnrKfJ18u/ACnk/5128sq+wUcooh DQGXz311lDLh3x5wFTS6MBCRfWw8ilh7d25cYFHHVPgQlDsHvkD3YJkDS0gFYulnoY2apY WGsj7Fjkh9qDD7xvzLHN/u0J8Go0mlXS53YZMhOdhD7wc2ksbmNcTcNGy1YpKegk6feI4n 9dJKmW2k/rNW3/dS7RxiLx97xIPu7Ut2ui7mGPe8p2P2h4pFr1gcsshKRKjWpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730789760; a=rsa-sha256; cv=none; b=Sucbc1E5wzs6VNMiUo5r0NoNjsQWYg9JTAe+r/SBlMGdQiBiCiwQ4MYkjxtD23ZVBaFcJN hNjlIwfOK4ZwgL+nJ6vJAkqNovFQn1E5OZ3dj4Gp1ZTV1vZLT8mATf4SwGBb8xDhFSYMtG USWDV7xyIoCuX+L4A5UXA9q//uYHHY8DwenhoPrBEqm2Oya1sIxBvtS/D0E/YTTnTnFTDG n6yx9jjMd3FAkoP8XWPsW2fjcm+0Ge5D/5kitBq6f1D4NMePBGhhTgPQyblIuIhPd+a0Vu Q5+pI0QfRtDCVjF5p8PzjPrfFRjQ1Lr2iSK74Clso4S/dtyVBydPm7ctnh2VDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjJyS5V3Dz16Zx; Tue, 5 Nov 2024 06:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A56u0Id045232; Tue, 5 Nov 2024 06:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A56u0sW045229; Tue, 5 Nov 2024 06:56:00 GMT (envelope-from git) Date: Tue, 5 Nov 2024 06:56:00 GMT Message-Id: <202411050656.4A56u0sW045229@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 753f37087249 - main - net/teddycloud: update to 0.6.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 753f37087249da4f51266d10e1b7de53cc98bc64 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=753f37087249da4f51266d10e1b7de53cc98bc64 commit 753f37087249da4f51266d10e1b7de53cc98bc64 Author: Matthias Fechner AuthorDate: 2024-11-04 15:02:48 +0000 Commit: Matthias Fechner CommitDate: 2024-11-05 06:51:40 +0000 net/teddycloud: update to 0.6.2 Thanks to Michael (maintainer) for fixing the linker issue, see also here: https://github.com/toniebox-reverse-engineering/teddycloud/pull/242 The next release of teddycloud will include all necessary modifications, so patches can be removed from ports with a newer release. Changes: https://github.com/toniebox-reverse-engineering/teddycloud/releases PR: 282541 Approved by: freebsd@pe82.de (maintainer) --- net/teddycloud/Makefile | 28 ++++++++---- net/teddycloud/distinfo | 26 +++++------ net/teddycloud/files/patch-Makefile | 48 +++++++++++++++++--- .../patch-src_cyclone_common_compiler__port.h | 11 +++++ net/teddycloud/pkg-message | 27 +++++++++++ net/teddycloud/pkg-plist | 52 ++++++++++++++++++---- 6 files changed, 156 insertions(+), 36 deletions(-) diff --git a/net/teddycloud/Makefile b/net/teddycloud/Makefile index f10e5cd2e34b..c977e360fb62 100644 --- a/net/teddycloud/Makefile +++ b/net/teddycloud/Makefile @@ -1,10 +1,10 @@ PORTNAME= teddycloud DISTVERSIONPREFIX= tc_v -DISTVERSION= 0.3.5 +DISTVERSION= 0.6.2 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` -MASTER_SITES= https://raw.githubusercontent.com/toniebox-reverse-engineering/tonies-json/d3bde1c301cc509ffced79bb08b40ec769029bbe/:toniesjson +MASTER_SITES= https://raw.githubusercontent.com/toniebox-reverse-engineering/tonies-json/85a888e355f20ef300e581ad11feb4ac623e62d6/:toniesjson DISTFILES= tonies.json:toniesjson \ tonieboxes.json:toniesjson EXTRACT_ONLY= ${DISTFILES:N*\:toniesjson:C/\:.*//} @@ -34,15 +34,28 @@ GH_SUBDIR= cJSON:cJSON ogg:ogg opus:opus teddycloud_web:teddycloud_web \ # find versions here clone the repository and switch to tag # git submodule update # git submodule -GH_TAGNAME= v1.7.17:cJSON \ - v1.3.5:ogg \ - v1.4:opus \ - ad73bfa: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 \ 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 + 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 # This did reliably fail due to some unknown deps when using parallel build MAKE_JOBS_UNSAFE= yes ALL_TARGET= preinstall @@ -53,7 +66,6 @@ pre-install: @${CP} ${DISTFILES:M*\:toniesjson:C/\:.*//:S,^,${_DISTDIR},} ${WRKSRC}/install/pre/config/ do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/install/pre/teddycloud ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/install/pre/teddycloud ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/certs @(cd ${WRKSRC}/install/pre/certs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/certs) diff --git a/net/teddycloud/distinfo b/net/teddycloud/distinfo index fd6908c8e56e..b5004bef8048 100644 --- a/net/teddycloud/distinfo +++ b/net/teddycloud/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1730528281 -SHA256 (tonies.json) = 1316eb7076dc49fe49fd51b8843cb29285090c574201714bf97898955c2cb243 -SIZE (tonies.json) = 5006642 +TIMESTAMP = 1730732169 +SHA256 (tonies.json) = 074396727ba9738c5061bb3e22bb2e505af255adecd00b07444465ee7083156e +SIZE (tonies.json) = 5035861 SHA256 (tonieboxes.json) = de50e30f844dcf743617337ba158b67498117f9c459b9ca4d26097aa3cb6b36f SIZE (tonieboxes.json) = 2736 -SHA256 (toniebox-reverse-engineering-teddycloud-tc_v0.3.5_GH0.tar.gz) = eeec26b7375e4ed4a496564930b382be659f117bdf1a0de2146650dec3b35517 -SIZE (toniebox-reverse-engineering-teddycloud-tc_v0.3.5_GH0.tar.gz) = 4758871 -SHA256 (toniebox-reverse-engineering-teddycloud_web-ad73bfa_GH0.tar.gz) = b9cc6afeca96da521a0014135de87a427cfaed13f55c77acef7b75483a5039fa -SIZE (toniebox-reverse-engineering-teddycloud_web-ad73bfa_GH0.tar.gz) = 386567 -SHA256 (DaveGamble-cJSON-v1.7.17_GH0.tar.gz) = c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c -SIZE (DaveGamble-cJSON-v1.7.17_GH0.tar.gz) = 353748 -SHA256 (xiph-ogg-v1.3.5_GH0.tar.gz) = f6f1b04cfa4e98b70ffe775d5e302d9c6b98541f05159af6de2d6617817ed7d6 -SIZE (xiph-ogg-v1.3.5_GH0.tar.gz) = 251765 -SHA256 (xiph-opus-v1.4_GH0.tar.gz) = 659e6b223e42a51b0a898632b9a5f406ccd5c2e00aa526ddd1264789774b94e5 -SIZE (xiph-opus-v1.4_GH0.tar.gz) = 851780 +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 (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 +SIZE (xiph-ogg-v1.3.5-9-gdb5c7a4_GH0.tar.gz) = 251955 +SHA256 (xiph-opus-v1.4-7-g101a71e0_GH0.tar.gz) = d6410f6fb6334672a8b4d1441a8549a6e972a811509b61b77c349a4ef553ac14 +SIZE (xiph-opus-v1.4-7-g101a71e0_GH0.tar.gz) = 855253 SHA256 (Oryx-Embedded-Common-v2.3.2_GH0.tar.gz) = 0a251e8a3674f777e33f01a825be0f55b2092bedbedd058b579b0e00d1b0119d SIZE (Oryx-Embedded-Common-v2.3.2_GH0.tar.gz) = 45692 SHA256 (Oryx-Embedded-CycloneCRYPTO-v2.3.2_GH0.tar.gz) = a37d72648d3e551a9d02106ed42fca5622a3b27d3f7f8540117fe1eb9bfde3cf diff --git a/net/teddycloud/files/patch-Makefile b/net/teddycloud/files/patch-Makefile index 97473952121d..1b889c0270f5 100644 --- a/net/teddycloud/files/patch-Makefile +++ b/net/teddycloud/files/patch-Makefile @@ -1,6 +1,15 @@ ---- Makefile.orig 2024-01-22 13:39:05 UTC +--- Makefile.orig 2024-10-26 18:14:34 UTC +++ Makefile -@@ -40,11 +40,11 @@ else +@@ -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 @@ -10,10 +19,37 @@ -build_gitSha:=${shell git rev-parse HEAD} -build_gitTag:=${shell git name-rev --tags --name-only $(build_gitSha)} +build_gitDirty:=0 -+build_gitDateTime:="2024-01-22 13:39:05 +0000" -+build_gitShortSha:=8602da9 -+build_gitSha:=8602da92d1080e67c678f476d4cf4de008aa857e -+build_gitTag:=tc_v0.3.5 ++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-src_cyclone_common_compiler__port.h b/net/teddycloud/files/patch-src_cyclone_common_compiler__port.h new file mode 100644 index 000000000000..87fdd492b8bf --- /dev/null +++ b/net/teddycloud/files/patch-src_cyclone_common_compiler__port.h @@ -0,0 +1,11 @@ +--- 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-message b/net/teddycloud/pkg-message new file mode 100644 index 000000000000..ac425a3cd868 --- /dev/null +++ b/net/teddycloud/pkg-message @@ -0,0 +1,27 @@ +[ +{ type: install + message: <