Gerbera: bump (#5964)

net-misc/gerbera/gerbera-1.8.2.recipe

@@ -7,11 +7,9 @@ COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer
 	2020-2021 Gerbera Contributors"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="70acc42ecaac628d4fe16a6963466773cc4c4124"
-SOURCE_URI="https://github.com/gerbera/gerbera/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="5ad95461569a6a3c762b7cb3ed9aafc7b430e73df06751b3da337dfafb7b038d"
-SOURCE_DIR="gerbera-$srcGitRev"
-SOURCE_FILENAME="gerbera-$srcGitRev.tar.gz"
+SOURCE_URI="https://github.com/gerbera/gerbera/archive/refs/tags/v$portVersion.tar.gz"
+CHECKSUM_SHA256="b1e5591515f05a46de052ef4d95a2bb3387e96f565a5ce7abb6a77dbe581f09a"
+SOURCE_FILENAME="gerbera-$portVersion.tar.gz"
 PATCHES="gerbera-$portVersion.patchset"
 ADDITIONAL_FILES="
 	config.xml
@@ -92,26 +90,25 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build && cd build
-	cmake .. \
+	cmake -B build -S . \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DCMAKE_INSTALL_DATADIR=$dataDir/gerbera \
 		-DCMAKE_INSTALL_MANDIR=$manDir/man1 \
 		-DCMAKE_EXE_LINKER_FLAGS="-lnetwork" \
+		-DCMAKE_CXX_FLAGS="-D_DEFAULT_SOURCE" \
 		-DWITH_INOTIFY=NO \
 		-DWITH_SYSTEMD=NO \
 		-DWITH_NPUPNP=YES \
 		-DWITH_AVCODEC=YES
 
-	make $jobArgs
+	make $jobArgs -C build
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	mkdir -p $settingsDir/gerbera
 	cp $portDir/additional-files/config.xml $settingsDir/gerbera

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

@@ -1,14 +1,14 @@
-From 26cb20c6840e537b884593e9d1aec019e1e87a5c Mon Sep 17 00:00:00 2001
+From 0393ed6f4b706855ea52f20faf1ab3ba0aca7007 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 bed40f7..dcff038 100644
+index 0c51669..5df8932 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,6 +46,10 @@ set(WITH_LASTFM            NO  CACHE BOOL "Enable scrobbling to LastFM")
+@@ -37,6 +37,10 @@ set(WITH_LASTFM            NO  CACHE BOOL "Enable scrobbling to LastFM")
  set(WITH_DEBUG             YES CACHE BOOL "Enables debug logging")
  set(WITH_TESTS             NO  CACHE BOOL "Build unit tests")
  
@@ -19,7 +19,7 @@ index bed40f7..dcff038 100644
  # For building packages without depending on the old system libupnp
  set(STATIC_LIBUPNP 0 CACHE BOOL "Link to libupnp statically")
  
-@@ -552,13 +556,13 @@ if(WITH_TESTS)
+@@ -585,13 +589,13 @@ if(WITH_TESTS)
      add_subdirectory(test)
  endif()
  
@@ -39,20 +39,20 @@ index bed40f7..dcff038 100644
  
  include(packaging)
 -- 
-2.30.0
+2.30.2
 
 
-From 198a66a81aed6d9c02a0d68eb7594febc207e39c Mon Sep 17 00:00:00 2001
+From 2bb165c58fc45b04094dbc3b958da0d250e14743 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 dcff038..f85148a 100644
+index 5df8932..7f5e925 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -289,7 +289,7 @@ endif()
+@@ -291,7 +291,7 @@ endif()
  message(STATUS "Gerbera Version: ${GERBERA_VERSION}")
  target_compile_definitions(libgerbera PUBLIC GERBERA_VERSION="${GERBERA_VERSION}")
  
@@ -62,5 +62,41 @@ index dcff038..f85148a 100644
  # Check for C++17 STL Optional
  include(CheckIncludeFileCXX)
 -- 
-2.30.0
+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)) {
+-- 
+2.30.2