git: c562b9479c43 - main - net/gerbera: Update to 3.3.0

The branch main has been updated by diizzy:

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

commit c562b9479c43fc331a4363bfdc362d62a8dd7f3f
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-09-20 07:14:17 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-09-20 07:32:54 +0000

    net/gerbera: Update to 3.3.0
    
    Changelog: https://github.com/gerbera/gerbera/releases/tag/v3.3.0
---
 net/gerbera/Makefile                               |  3 +-
 net/gerbera/distinfo                               |  6 +--
 ...git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f | 56 ----------------------
 net/gerbera/pkg-plist                              |  1 +
 4 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 2c7b6c71b19b..a52642bb3478 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.1
-PORTREVISION=	1
+DISTVERSION=	3.3.0
 CATEGORIES=	net multimedia
 
 MAINTAINER=	diizzy@FreeBSD.org
diff --git a/net/gerbera/distinfo b/net/gerbera/distinfo
index eac757f978bd..ab44b5471311 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774165590
-SHA256 (gerbera-gerbera-v3.2.1_GH0.tar.gz) = 6b89d0c416b6d98e34634e5b1121f340315d60b088e9e6b2fca423488760030f
-SIZE (gerbera-gerbera-v3.2.1_GH0.tar.gz) = 10059938
+TIMESTAMP = 1789892490
+SHA256 (gerbera-gerbera-v3.3.0_GH0.tar.gz) = 79db1b4d9fcfafe5cb6a30eb29174f912f1b2c04a644bd5fe5075bccad10eb97
+SIZE (gerbera-gerbera-v3.3.0_GH0.tar.gz) = 10092220
diff --git a/net/gerbera/files/patch-git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f b/net/gerbera/files/patch-git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f
deleted file mode 100644
index 4bd2e0d74895..000000000000
--- a/net/gerbera/files/patch-git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f Mon Sep 17 00:00:00 2001
-From: Karlchen <k_straussberger@netzland.net>
-Date: Sun, 7 Jun 2026 00:21:04 +0200
-Subject: [PATCH] Handle url decoding correctly
-
----
- ChangeLog.md          | 1 +
- ReleaseNotes.md       | 1 +
- src/upnp/compat.h     | 5 +++++
- src/util/url_utils.cc | 3 ++-
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/upnp/compat.h b/src/upnp/compat.h
-index 3470efe1d..cb1d91b15 100644
---- src/upnp/compat.h
-+++ src/upnp/compat.h
-@@ -46,6 +46,9 @@ static constexpr grb_read_t GRB_READ_ERROR = -1;
- #define GrbUpnpFileInfoSetContentType(i, mt) (i)->content_type = std::move((mt))
- #define GrbUpnpGetHeaders(i) (i)->request_headers
- #define GrbUpnpSetHeaders(i, h) std::copy((h).begin(), (h).end(), std::back_inserter((i)->response_headers))
-+// npupnp reencodes the query arguments to build a parsable URL. We need another
-+// decoding layer when using it.
-+#define GrbUrlUnescape(u) urlUnescape(urlUnescape(u))
- 
- #define UPNP_NEEDS_LITERAL_HOST_REDIRECT
- extern "C" void UpnpSetAllowLiteralHostRedirection(int);
-@@ -80,6 +83,8 @@ void UpnpSetHeadersCompat(const UpnpFileInfo* fileInfo, const std::map<std::stri
- #define GrbUpnpGetHeaders(i) UpnpGetHeadersCompat(i)
- #define GrbUpnpSetHeaders(i, h) UpnpSetHeadersCompat(i, h)
- 
-+#define GrbUrlUnescape(u) urlUnescape(u)
-+
- #if (UPNP_VERSION <= 11419) or (UPNP_VERSION > 170000 and UPNP_VERSION <= 170110)
- // new method added
- #define UPNP_NEEDS_CORS
-diff --git a/src/util/url_utils.cc b/src/util/url_utils.cc
-index 884f23667..3a80e9096 100644
---- src/util/url_utils.cc
-+++ src/util/url_utils.cc
-@@ -24,6 +24,7 @@ Gerbera - https://gerbera.io/
- #include "url_utils.h" // API
- 
- #include "exceptions.h"
-+#include "upnp/compat.h"
- 
- #include <fmt/format.h>
- #if FMT_VERSION >= 100202
-@@ -195,7 +196,7 @@ std::map<std::string, std::string> dictDecode(std::string_view url, bool unEscap
-             auto key = std::string_view(data, eqPos - data);
-             auto value = std::string_view(eqPos + 1, ampPos - eqPos - 1);
-             if (unEscape) {
--                dict.try_emplace(urlUnescape(key), urlUnescape(value));
-+                dict.try_emplace(GrbUrlUnescape(key), GrbUrlUnescape(value));
-             } else {
-                 dict.emplace(key, value);
-             }
diff --git a/net/gerbera/pkg-plist b/net/gerbera/pkg-plist
index 552b3211c998..2a2a7d5d3e0f 100644
--- a/net/gerbera/pkg-plist
+++ b/net/gerbera/pkg-plist
@@ -2,6 +2,7 @@ bin/gerbera
 %%DATADIR%%/config2.xsd
 %%DATADIR%%/js/audio.js
 %%DATADIR%%/js/common.js
+%%DATADIR%%/js/cuesheet.js
 %%DATADIR%%/js/image.js
 %%DATADIR%%/js/import.js
 %%DATADIR%%/js/metadata.js