gerbera: fix building with fmtlib v9 and linking on Darwin; bump revision

4 files changed, 38 insertions, 8 deletions

diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile
index d796d043ea3..f4ef94cf784 100644
--- a/multimedia/gerbera/Makefile
+++ b/multimedia/gerbera/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2022/09/27 20:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/10/10 12:47:51 adam Exp $
 
 DISTNAME=	gerbera-1.11.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gerbera/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/multimedia/gerbera/distinfo b/multimedia/gerbera/distinfo
index 61310f6f268..3065fa1a800 100644
--- a/multimedia/gerbera/distinfo
+++ b/multimedia/gerbera/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2022/10/06 08:41:03 nros Exp $
+$NetBSD: distinfo,v 1.4 2022/10/10 12:47:51 adam Exp $
 
 BLAKE2s (gerbera-1.11.0.tar.gz) = b5262860214cd153029adb3895f4c6d332a3ebd40d38f45728af001b80a71eaa
 SHA512 (gerbera-1.11.0.tar.gz) = ae2b3342b3b57ce6d656d0ebadfd73b5f2764f2164314f6b0deac170a82e6861349c37732e6914454918112124038b221dbd4882001b5de51a49326432ccd70f
 Size (gerbera-1.11.0.tar.gz) = 4115178 bytes
-SHA1 (patch-CMakeLists.txt) = 97f56d9c927c40ad8179d80f97f338441fae142f
+SHA1 (patch-CMakeLists.txt) = 37a399d71cb6f798fd29a64d7b16bb6215c41f6f
+SHA1 (patch-src_database_sql__format.h) = db65159e215067f648857d05439c327adeab0e72
 SHA1 (patch-src_main.cc) = b7b59975bc477141c8a92af9200ba2b301e55926
 SHA1 (patch-src_util_string__converter.cc) = f60a91b8ccdb851c5e939254e429ac08f5715196
diff --git a/multimedia/gerbera/patches/patch-CMakeLists.txt b/multimedia/gerbera/patches/patch-CMakeLists.txt
index bcf484e9fd1..9c86966ab32 100644
--- a/multimedia/gerbera/patches/patch-CMakeLists.txt
+++ b/multimedia/gerbera/patches/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2022/10/06 08:41:03 nros Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2022/10/10 12:47:51 adam Exp $
 
-* fix build on systems that have const in second argument to iconv
+Fix build on systems that have const in second argument to iconv.
+Darwin does not require libuuid.
 
 --- CMakeLists.txt.orig	2022-05-03 17:39:25.000000000 +0000
 +++ CMakeLists.txt
-@@ -326,6 +326,16 @@ target_link_libraries(libgerbera PUBLIC 
+@@ -326,9 +326,20 @@ target_link_libraries(libgerbera PUBLIC 
  
  find_package(Iconv REQUIRED)
  target_link_libraries(libgerbera PUBLIC Iconv::Iconv)
@@ -17,7 +18,11 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2022/10/06 08:41:03 nros Exp $
 +    target_compile_definitions(libgerbera PRIVATE ICONV_CONST)
 +endif()
 +unset(CMAKE_REQUIRED_LIBRARIES)
-+
  
  find_package(UUID REQUIRED)
++if (NOT APPLE)
  target_link_libraries(libgerbera PUBLIC UUID::UUID)
++endif()
+ 
+ find_package(LFS REQUIRED)
+ target_compile_definitions(libgerbera PUBLIC ${LFS_DEFINITIONS})
diff --git a/multimedia/gerbera/patches/patch-src_database_sql__format.h b/multimedia/gerbera/patches/patch-src_database_sql__format.h
new file mode 100644
index 00000000000..19c126c4075
--- /dev/null
+++ b/multimedia/gerbera/patches/patch-src_database_sql__format.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_database_sql__format.h,v 1.1 2022/10/10 12:47:51 adam Exp $
+
+https://github.com/gerbera/gerbera/pull/2694
+
+--- src/database/sql_format.h.orig	2022-05-03 17:39:25.000000000 +0000
++++ src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+     template <typename FormatContext>
+-    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<ColumnUpdate> : formatter<std::string_view> {
+     template <typename FormatContext>
+-    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);
+     }