mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
gerbera, bump version (#11652)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -27,6 +27,7 @@
|
||||
<storage>
|
||||
<sqlite3 enabled="yes">
|
||||
<init-sql-file>/system/data/gerbera/sqlite3.sql</init-sql-file>
|
||||
<upgrade-file>/system/data/gerbera/sqlite3-upgrade.xml</upgrade-file>
|
||||
<database-file>gerbera.db</database-file>
|
||||
</sqlite3>
|
||||
</storage>
|
||||
|
||||
@@ -6,9 +6,9 @@ HOMEPAGE="https://docs.gerbera.io"
|
||||
COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer
|
||||
2020-2023 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="2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c"
|
||||
CHECKSUM_SHA256="563ee3941b0347a91f5a3e9fe151032bd0e26868bfe7b7c68a7c095f8b07677b"
|
||||
SOURCE_FILENAME="gerbera-v$portVersion.tar.gz"
|
||||
PATCHES="gerbera-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="config.xml
|
||||
@@ -45,6 +45,7 @@ REQUIRES="
|
||||
lib:libduktape$secondaryArchSuffix
|
||||
lib:libebml$secondaryArchSuffix
|
||||
lib:libexif$secondaryArchSuffix
|
||||
lib:libexiv2$secondaryArchSuffix
|
||||
# lib:libffmpegthumbnailer$secondaryArchSuffix
|
||||
lib:libfmt$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
@@ -57,6 +58,7 @@ REQUIRES="
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
lib:libtag$secondaryArchSuffix
|
||||
lib:libuuid$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
@@ -68,8 +70,9 @@ BUILD_REQUIRES="
|
||||
devel:libduktape$secondaryArchSuffix
|
||||
devel:libebml$secondaryArchSuffix
|
||||
devel:libexif$secondaryArchSuffix
|
||||
devel:libexiv2$secondaryArchSuffix
|
||||
# devel:libffmpegthumbnailer$secondaryArchSuffix
|
||||
devel:libfmt$secondaryArchSuffix
|
||||
devel:libfmt$secondaryArchSuffix >= 11
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libmagic$secondaryArchSuffix
|
||||
@@ -81,6 +84,7 @@ BUILD_REQUIRES="
|
||||
devel:libtag$secondaryArchSuffix
|
||||
devel:libuuid$secondaryArchSuffix
|
||||
devel:libgtest$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
@@ -1,95 +0,0 @@
|
||||
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 d2ac25c..0107737 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,6 +20,10 @@ if(COMMAND conan_basic_setup)
|
||||
conan_basic_setup(TARGETS)
|
||||
endif()
|
||||
|
||||
+set(CMAKE_INSTALL_BINDIR=bin)
|
||||
+set(CMAKE_INSTALL_DATADIR=share/gerbera)
|
||||
+set(CMAKE_INSTALL_MANDIR=share/man/man1)
|
||||
+
|
||||
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")
|
||||
@@ -604,15 +608,15 @@ if(WITH_TESTS)
|
||||
add_subdirectory(test)
|
||||
endif()
|
||||
|
||||
-INSTALL(TARGETS gerbera DESTINATION bin)
|
||||
-INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/js DESTINATION share/gerbera)
|
||||
-INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/web DESTINATION share/gerbera)
|
||||
+INSTALL(TARGETS gerbera DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/js DESTINATION ${CMAKE_INSTALL_DATADIR})
|
||||
+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})
|
||||
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
|
||||
|
||||
include(packaging)
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
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 0107737..bc5ab1f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -319,7 +319,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}")
|
||||
|
||||
if (WITH_DEBUG)
|
||||
target_compile_definitions(libgerbera PUBLIC TOMBDEBUG)
|
||||
--
|
||||
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
|
||||
|
||||
39
net-misc/gerbera/patches/gerbera-2.4.1.patchset
Normal file
39
net-misc/gerbera/patches/gerbera-2.4.1.patchset
Normal file
@@ -0,0 +1,39 @@
|
||||
From a27249625fb7cb0a2d5a6910f14684cfd54f3cbf Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Wed, 15 Jan 2025 07:47:15 +0100
|
||||
Subject: Haiku fixes
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 59e7f82..5975803 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -43,9 +43,9 @@ if(COMMAND conan_basic_setup)
|
||||
endif()
|
||||
|
||||
# set(CMAKE_INSTALL_PREFIX /usr/local)
|
||||
-set(CMAKE_INSTALL_BINDIR bin)
|
||||
-set(CMAKE_INSTALL_DATADIR share/gerbera)
|
||||
-set(CMAKE_INSTALL_MANDIR share/man/man1)
|
||||
+set(CMAKE_INSTALL_BINDIR=bin)
|
||||
+set(CMAKE_INSTALL_DATADIR=share/gerbera)
|
||||
+set(CMAKE_INSTALL_MANDIR=share/man/man1)
|
||||
|
||||
option(WITH_NPUPNP "Use npupnp instead of libupnp" OFF)
|
||||
option(WITH_MAGIC "Use libmagic to identify file mime types" ON)
|
||||
diff --git a/src/metadata/matroska_handler.cc b/src/metadata/matroska_handler.cc
|
||||
index b0111bf..338a5c2 100644
|
||||
--- a/src/metadata/matroska_handler.cc
|
||||
+++ b/src/metadata/matroska_handler.cc
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
}
|
||||
|
||||
#if LIBMATROSKA_VERSION < 0x020000
|
||||
- uint32
|
||||
+ uint32_t
|
||||
#else
|
||||
std::size_t
|
||||
#endif
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Reference in New Issue
Block a user