gerbera, bump version (#9032)

This commit is contained in:
Schrijvers Luc
2023-07-13 14:39:02 +02:00
committed by GitHub
parent e87cf9e082
commit 0ef09273f1
2 changed files with 39 additions and 12 deletions

View File

@@ -4,12 +4,12 @@ your digital media through your home network and consume it on a variety of \
UPnP compatible devices."
HOMEPAGE="https://docs.gerbera.io"
COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer
2020-2022 Gerbera Contributors"
2020-2023 Gerbera Contributors"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/gerbera/gerbera/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="0c13049792a28ec0e3086ba61c7f9675626a1dbadb043650a452192727418be7"
SOURCE_FILENAME="gerbera-$portVersion.tar.gz"
CHECKSUM_SHA256="2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c"
SOURCE_FILENAME="gerbera-v$portVersion.tar.gz"
PATCHES="gerbera-$portVersion.patchset"
ADDITIONAL_FILES="config.xml
install_config.sh
@@ -74,7 +74,7 @@ BUILD_REQUIRES="
devel:libintl$secondaryArchSuffix
devel:libmagic$secondaryArchSuffix
devel:libmatroska$secondaryArchSuffix
devel:libnpupnp$secondaryArchSuffix >= 4.2.0
devel:libnpupnp$secondaryArchSuffix >= 9.1.0
devel:libpugixml$secondaryArchSuffix
devel:libspdlog$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix

View File

@@ -1,11 +1,11 @@
From da48cdddbc343123f1595f321d550fef971458e4 Mon Sep 17 00:00:00 2001
From aeaab402b8dc65f217904bcf71c2069f354444c6 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 8 May 2022 16:19:51 +0200
Subject: Gerbera, Fix install paths
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2705125..1923453 100644
index d2ac25c..0107737 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ if(COMMAND conan_basic_setup)
@@ -19,7 +19,7 @@ index 2705125..1923453 100644
set(WITH_NPUPNP NO CACHE BOOL "Use npupnp instead of libupnp")
set(WITH_MAGIC YES CACHE BOOL "Use libmagic to identify file mime types")
set(WITH_MYSQL NO CACHE BOOL "Store media information in MySQL DB")
@@ -579,15 +583,15 @@ if(WITH_TESTS)
@@ -604,15 +608,15 @@ if(WITH_TESTS)
add_subdirectory(test)
endif()
@@ -41,20 +41,20 @@ index 2705125..1923453 100644
include(packaging)
--
2.30.2
2.37.3
From 610b503fd06221bd472ef845da3b09d05f89e488 Mon Sep 17 00:00:00 2001
From 13e310599033fefb1830724efd7f1a9404a1be3f 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: Gerbera, DATA PATH fix
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1923453..6a227cb 100644
index 0107737..bc5ab1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,7 +308,7 @@ endif()
@@ -319,7 +319,7 @@ endif()
message(STATUS "Gerbera Version: ${GERBERA_VERSION}")
target_compile_definitions(libgerbera PUBLIC GERBERA_VERSION="${GERBERA_VERSION}")
@@ -64,5 +64,32 @@ index 1923453..6a227cb 100644
if (WITH_DEBUG)
target_compile_definitions(libgerbera PUBLIC TOMBDEBUG)
--
2.30.2
2.37.3
From 449acc1f7e8190668bef039a83eb9c310a42b3d1 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 13 Jul 2023 12:05:49 +0000
Subject: Add check for libnetwork on Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc5ab1f..ccd0a90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -457,6 +457,12 @@ if(SOCKET_LIBRARY)
target_link_libraries(libgerbera PUBLIC ${SOCKET_LIBRARY})
endif()
+# Link to the network library if it exists. This is something you need on Haiku
+find_library(SOCKET_LIBRARY network)
+if(SOCKET_LIBRARY)
+ target_link_libraries(libgerbera PUBLIC ${SOCKET_LIBRARY})
+endif()
+
# Link to libnsl (Network services library) if it exists. This is something you need on Solaris/OmniOS/Joyent
find_library(NSL_LIBRARY nsl)
if(NSL_LIBRARY)
--
2.37.3