From 31fc754884d0fd28dee99a031a72ea6a7a25ca78 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sun, 12 Mar 2023 08:31:19 +0100 Subject: [PATCH 1/2] libupnp: fix configure args for gerbera gerbera configure complains: ``` CMake Warning at CMakeLists.txt:405 (message): !! It is strongly recommended to build libupnp with --enable-reuseaddr !! Without this option Gerbera will be unable to restart with the same port number. CMake Warning at CMakeLists.txt:412 (message): !! It is strongly recommended to build libupnp with --disable-blocking-tcp-connections !! Without this option non-responsive control points can cause libupnp to hang. ``` These issues are indeed present with gerbera without these options. --- srcpkgs/libupnp/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template index 9e2da2d594c3..bb6f91f94386 100644 --- a/srcpkgs/libupnp/template +++ b/srcpkgs/libupnp/template @@ -1,8 +1,9 @@ # Template file for 'libupnp' pkgname=libupnp version=1.14.12 -revision=1 +revision=2 build_style=gnu-configure +configure_args="--enable-reuseaddr --disable-blocking-tcp-connections" hostmakedepends="automake libtool pkg-config" short_desc="Portable Open Source UPnP Development Kit" maintainer="Orphaned " From 4bf5deba86a45f8d1926c7bc07bb2da560d7e9d4 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sun, 12 Mar 2023 08:34:52 +0100 Subject: [PATCH 2/2] gerbera: update to 1.12.1. --- srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 ------------------------- srcpkgs/gerbera/template | 6 ++--- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch deleted file mode 100644 index 7adedf9005db..000000000000 --- a/srcpkgs/gerbera/patches/fmt-9-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 -From: Felix Yan -Date: Fri, 19 Aug 2022 15:22:10 +0300 -Subject: [PATCH] Fix build with fmt 9.0 - -Fixes #2681 ---- - src/database/sql_format.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/database/sql_format.h b/src/database/sql_format.h -index 32dc00efa..e4e1909a8 100644 ---- a/src/database/sql_format.h -+++ b/src/database/sql_format.h -@@ -42,7 +42,7 @@ struct SQLIdentifier { - template <> - struct fmt::formatter : formatter { - template -- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) -+ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) - { - return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); - } -@@ -61,7 +61,7 @@ struct ColumnUpdate { - template <> - struct fmt::formatter : formatter { - template -- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) -+ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) - { - return format_to(ctx.out(), "{} = {}", a.column, a.value); - } diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index d37296cd049b..ae14f35c767c 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera -version=1.11.0 -revision=5 +version=1.12.1 +revision=1 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="http://gerbera.io/" changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md" distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz" -checksum=0c13049792a28ec0e3086ba61c7f9675626a1dbadb043650a452192727418be7 +checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c # libupnp uses large file support, so users must do that, too CXXFLAGS="-D_FILE_OFFSET_BITS=64"