gerbera, bump version (#6356)

net-misc/gerbera/gerbera-1.9.2.recipe

@@ -6,17 +6,16 @@ HOMEPAGE="https://docs.gerbera.io"
 COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer
 	2020-2021 Gerbera Contributors"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/gerbera/gerbera/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="b1e5591515f05a46de052ef4d95a2bb3387e96f565a5ce7abb6a77dbe581f09a"
+CHECKSUM_SHA256="dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd"
 SOURCE_FILENAME="gerbera-$portVersion.tar.gz"
 PATCHES="gerbera-$portVersion.patchset"
-ADDITIONAL_FILES="
-	config.xml
+ADDITIONAL_FILES="config.xml
 	install_config.sh
 	"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
@@ -46,6 +45,7 @@ REQUIRES="
 	lib:libduktape$secondaryArchSuffix
 	lib:libebml$secondaryArchSuffix
 	lib:libexif$secondaryArchSuffix
+#	lib:libffmpegthumbnailer$secondaryArchSuffix
 	lib:libfmt$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -68,6 +68,7 @@ BUILD_REQUIRES="
 	devel:libduktape$secondaryArchSuffix
 	devel:libebml$secondaryArchSuffix
 	devel:libexif$secondaryArchSuffix
+#	devel:libffmpegthumbnailer$secondaryArchSuffix
 	devel:libfmt$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
@@ -103,7 +104,8 @@ BUILD()
 		-DWITH_SYSTEMD=NO \
 		-DWITH_NPUPNP=YES \
 		-DWITH_AVCODEC=YES \
-		-DWITH_TESTS=ON
+		-DWITH_TESTS=OFF #\
+#		-DWITH_FFMPEGTHUMBNAILER=YES # doesn't produce thumbnails
 
 	make $jobArgs -C build
 }

net-misc/gerbera/patches/gerbera-1.9.2.patchset

@@ -1,11 +1,11 @@
-From 0393ed6f4b706855ea52f20faf1ab3ba0aca7007 Mon Sep 17 00:00:00 2001
+From 4e2f96d2a9e59a87cad91b89f00971768567ee90 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 16 Feb 2020 16:19:26 +0000
 Subject: Fix install paths
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0c51669..5df8932 100644
+index ca47ebf..86e2f22 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -37,6 +37,10 @@ set(WITH_LASTFM            NO  CACHE BOOL "Enable scrobbling to LastFM")
@@ -19,7 +19,7 @@ index 0c51669..5df8932 100644
  # For building packages without depending on the old system libupnp
  set(STATIC_LIBUPNP 0 CACHE BOOL "Link to libupnp statically")
  
-@@ -585,13 +589,13 @@ if(WITH_TESTS)
+@@ -570,15 +574,15 @@ if(WITH_TESTS)
      add_subdirectory(test)
  endif()
  
@@ -31,7 +31,9 @@ index 0c51669..5df8932 100644
 +INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/web DESTINATION ${CMAKE_INSTALL_DATADIR})
  INSTALL(FILES
          src/database/mysql/mysql.sql
+         src/database/mysql/mysql-upgrade.xml
          src/database/sqlite3/sqlite3.sql
+         src/database/sqlite3/sqlite3-upgrade.xml
 -        DESTINATION share/gerbera)
 -INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION share/man/man1)
 +        DESTINATION ${CMAKE_INSTALL_DATADIR})
@@ -42,61 +44,25 @@ index 0c51669..5df8932 100644
 2.30.2
 
 
-From 2bb165c58fc45b04094dbc3b958da0d250e14743 Mon Sep 17 00:00:00 2001
+From 7fa85709cae3aa97ed3270b814ba33d5368b83e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Mon, 22 Feb 2021 20:07:46 +0100
 Subject: DATA PATH fix
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5df8932..7f5e925 100644
+index 86e2f22..9ac86c4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -291,7 +291,7 @@ endif()
+@@ -294,7 +294,7 @@ endif()
  message(STATUS "Gerbera Version: ${GERBERA_VERSION}")
  target_compile_definitions(libgerbera PUBLIC GERBERA_VERSION="${GERBERA_VERSION}")
  
 -target_compile_definitions(gerbera PRIVATE PACKAGE_DATADIR="${CMAKE_INSTALL_PREFIX}/share/gerbera")
 +target_compile_definitions(gerbera PRIVATE PACKAGE_DATADIR="${CMAKE_INSTALL_DATADIR}")
  
- # Check for C++17 STL Optional
- include(CheckIncludeFileCXX)
--- 
-2.30.2
-
-
-From 79dacaf3db974db907f473e0483b8d97c68bf10e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Sun, 6 Jun 2021 13:46:09 +0200
-Subject: Build fixes
-
-
-diff --git a/src/main.cc b/src/main.cc
-index 1d2d97b..1367f23 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -262,7 +262,7 @@ int main(int argc, char** argv, char** envp)
- // mac os x does this differently, setgid and setuid are basically doing the same
- // as setresuid and setresgid on linux: setting all of real{u,g}id, effective{u,g}id and saved-set{u,g}id
- // Solaroid systems are likewise missing setresgid and setresuid
--#if defined(__APPLE__) || defined(SOLARIS) || defined(__CYGWIN__)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(__CYGWIN__) || defined(__HAIKU__)
-             // set group-ids, then add. groups, last user-ids, all need to succeed
-             if (0 != setgid(user_id->pw_gid) || 0 != initgroups(user_id->pw_name, user_id->pw_gid) || 0 != setuid(user_id->pw_uid)) {
- #else
-diff --git a/src/util/thread_runner.h b/src/util/thread_runner.h
-index 2ed7716..79fa8c9 100644
---- a/src/util/thread_runner.h
-+++ b/src/util/thread_runner.h
-@@ -177,7 +177,7 @@ protected:
-     /// \brief start the thread
-     void startThread() override
-     {
--#ifndef SOLARIS
-+#if !defined(SOLARIS) && !defined(__HAIKU__)
-         // default scoping on solaroid systems is in fact PTHREAD_SCOPE_SYSTEM
-         // plus, setting PTHREAD_EXPLICIT_SCHED requires elevated priveleges
-         if (config->getBoolOption(CFG_THREAD_SCOPE_SYSTEM)) {
+ if (WITH_DEBUG)
+     target_compile_definitions(libgerbera PUBLIC TOMBDEBUG)
 -- 
 2.30.2