From nobody Mon Nov 04 17:09:27 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 4Xhycl52jtz5cKSB; Mon, 04 Nov 2024 17:09:27 +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 4Xhycl4Plxz41bV; Mon, 4 Nov 2024 17:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730740167; 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=/x0IhusrnS8P0914D6K3Gzpl8PSKJ9+LErK7d4/O2oc=; b=f1FdB+FwKZICkp1toLRthk+i9VrMCxHqNNGMWtn2krMdG2UCiz7xGshN5evurls9++7lGs kJ9sESNWEb3cHEIhdg8EPingj7Y4rs2e3C3fgomTIXJD6k9jYlUTIZCv5+aSeDo8+esaqe XcBLebaHskoHpc2dOzU+5VbAi6snQraxDHQYDS5K84f65RBudHfpmfF5li6M6cdOhsJqu7 k5Af6zKGSWuUB0TK4QV8Vb+r8ZpUFXJ+hqXPFxwXoHCIzrDBegEt1VcDmqJtwdkzETtikO YbR2IXrkA9WUhJLXN8V4ugaFaNGFZfaet6Co4088EcHTCPcEZHtOj02umwfSgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730740167; 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=/x0IhusrnS8P0914D6K3Gzpl8PSKJ9+LErK7d4/O2oc=; b=f55kLMeI5C1QDtEjL7LKrzbxFUR6/2A3AaVjH4s76ZiFooisvq/t5LCCNGAGccTiipRL0Q DeGKxpTRrQGcfHWUyZHqoqoYDDgTYu1EeJtxbnZ3wMp1Ev5svtm/4TyLFjqtIP62Og1p+1 DjfH50w9zaXe9ZL1DkXlfRTuoapXmm5j3/eqbGVEw9jq7kowgroHJIoblL4JNNrZUUVuhu k1fDTC38ErcJ5TUSCu2DHxdI9O9JvDSQYEblVdPAotH7TWT2EncS527jAqLRDcFqmntK3Y h5DZrt27h5nh0oBwG94uEiCIuSEGupEI4Irlgg5Z/n1l6Dyx0EGINz8QuH/y2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730740167; a=rsa-sha256; cv=none; b=byFA673WoJYTk03A8l9yWgU2ZWHTBefV+gI6k8BnWOLU+uTU38StFhMBom1rjeo6daBy8Q YMgdMgiIfCw51tfG3w+WwkQRajG/u6oYQZ9EY+X2U0fLWLhC8dvzGD+fCC+iRV21ZL0wlh JzTzf1LrN8pFg2wlD42lG1K/2FuEfZUDX2uXQ9oKL72eI2m8b4BQJ9gAFOOEHYwvzVRswX z7XEUXyDJH1qH2CeQZMORAIcFqgx6P0MV9GPsHB/FsSMCd5vqkZ/Tg57LWMaFjqFajGXtB R4wtv1b0LssLxFg3vxli+nqyta9JhAfqh23nTUnBuw90WSRSvEscpfXY58OCNw== 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 4Xhycl3hBdzhcr; Mon, 4 Nov 2024 17:09:27 +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 4A4H9RBw005295; Mon, 4 Nov 2024 17:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4H9RjX005292; Mon, 4 Nov 2024 17:09:27 GMT (envelope-from git) Date: Mon, 4 Nov 2024 17:09:27 GMT Message-Id: <202411041709.4A4H9RjX005292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 144a6782855a - main - audio/owntone: update to 28.10 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: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 144a6782855a43fd8ee1ac20121e33527b31b447 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=144a6782855a43fd8ee1ac20121e33527b31b447 commit 144a6782855a43fd8ee1ac20121e33527b31b447 Author: Dirk Meyer AuthorDate: 2024-11-04 17:09:12 +0000 Commit: Dirk Meyer CommitDate: 2024-11-04 17:09:12 +0000 audio/owntone: update to 28.10 --- audio/owntone/Makefile | 4 +-- audio/owntone/distinfo | 6 ++--- audio/owntone/files/patch-src_transcode.c | 43 ------------------------------- 3 files changed, 5 insertions(+), 48 deletions(-) diff --git a/audio/owntone/Makefile b/audio/owntone/Makefile index ad5d18b3d491..1232d1c2d711 100644 --- a/audio/owntone/Makefile +++ b/audio/owntone/Makefile @@ -1,6 +1,6 @@ PORTNAME= owntone -DISTVERSION= 28.9 -PORTREVISION= 2 +DISTVERSION= 28.10 +PORTREVISION= 0 CATEGORIES= audio MASTER_SITES= https://github.com/owntone/owntone-server/releases/download/${DISTVERSION}/ diff --git a/audio/owntone/distinfo b/audio/owntone/distinfo index 1e2a1eb3b323..250803f4ba08 100644 --- a/audio/owntone/distinfo +++ b/audio/owntone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708946327 -SHA256 (owntone-28.9.tar.xz) = 76671ab46315566541018fd404cec315b7d0f9d4c9b9dbc51fcdae7fca7be832 -SIZE (owntone-28.9.tar.xz) = 1066248 +TIMESTAMP = 1730734490 +SHA256 (owntone-28.10.tar.xz) = 00fb9c9656101b68df7a80dbb73cbfb43737cd542fddf9982322d2d5bd741002 +SIZE (owntone-28.10.tar.xz) = 1090848 diff --git a/audio/owntone/files/patch-src_transcode.c b/audio/owntone/files/patch-src_transcode.c deleted file mode 100644 index a32c41f7c0ab..000000000000 --- a/audio/owntone/files/patch-src_transcode.c +++ /dev/null @@ -1,43 +0,0 @@ -From 941fab9023f0af19f178771effd2a73865e849ba Mon Sep 17 00:00:00 2001 -From: ejurgensen -Date: Thu, 17 Aug 2023 23:09:41 +0200 -Subject: [PATCH] [xcode] Circumvent ffmpeg 6 ALAC encoding problem - -The default ffmpeg ALAC encoder, "alac", requires fixed frames of size 4096, -but the Airplay 2 implementation feeds it with frames of size 352. Before -ffmpeg 6 this worked, but not any more. Seems a frame size check has been -added. - -This commit doesn't fix this, but circumvents the ffmpeg error by modifying the -frame size that ffmpeg checks. - -Fixes issue #1640 - ---- src/transcode.c.orig 2022-01-29 16:41:27 UTC -+++ src/transcode.c -@@ -42,6 +42,8 @@ - #include "misc.h" - #include "transcode.h" - -+#define USE_ALAC_FRAME_SIZE_HACK (LIBAVCODEC_VERSION_MAJOR > 59) || ((LIBAVCODEC_VERSION_MAJOR == 59) && (LIBAVCODEC_VERSION_MINOR > 31)) -+ - // Interval between ICY metadata checks for streams, in seconds - #define METADATA_ICY_INTERVAL 5 - // Maximum number of streams in a file that we will accept -@@ -506,6 +508,16 @@ stream_add(struct encode_ctx *ctx, struct stream_ctx * - avcodec_free_context(&s->codec); - return -1; - } -+ -+ // airplay.c "misuses" the ffmpeg alac encoder in that it pushes frames with -+ // 352 samples even though the encoder wants 4096 (and doesn't have variable -+ // frame capability). This worked with no issues until ffmpeg 6, where it -+ // seems a frame size check was added. The below circumvents the check, but is -+ // dirty because we shouldn't be writing to this data element. -+#if USE_ALAC_FRAME_SIZE_HACK -+ if (codec_id == AV_CODEC_ID_ALAC) -+ s->codec->frame_size = 352; -+#endif - - // Copy the codec parameters we just set to the stream, so the muxer knows them - ret = avcodec_parameters_from_context(s->stream->codecpar, s->codec);