diff --git a/net-misc/gerbera/additional-files/config.xml b/net-misc/gerbera/additional-files/config.xml
index 4e0919340..0321e4849 100644
--- a/net-misc/gerbera/additional-files/config.xml
+++ b/net-misc/gerbera/additional-files/config.xml
@@ -2,16 +2,16 @@
-
+
Gerbera
- uuid:3a49bdf9-c613-476e-a684-8274ae67ee16
+ uuid:b6efabe0-aa91-4814-9cb9-82c9a0550eba
/boot/home/config/settings/gerbera
/system/data/gerbera/web
-
-
-
-
*
@@ -57,73 +41,82 @@
-
+ /system/data/gerbera/js/common.js
+ /system/data/gerbera/js/playlists.js
+
+ /system/data/gerbera/js/import.js
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
@@ -131,17 +124,18 @@
no
yes
no
-
-
+
+
video/mpeg
yes
yes
yes
-
-
+
+
+
diff --git a/net-misc/gerbera/gerbera-1.4.0.recipe b/net-misc/gerbera/gerbera-1.7.0~git.recipe
similarity index 63%
rename from net-misc/gerbera/gerbera-1.4.0.recipe
rename to net-misc/gerbera/gerbera-1.7.0~git.recipe
index a39f56d42..27eb6b754 100644
--- a/net-misc/gerbera/gerbera-1.4.0.recipe
+++ b/net-misc/gerbera/gerbera-1.7.0~git.recipe
@@ -1,18 +1,22 @@
SUMMARY="Open source UPnP Media Server"
DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
HOMEPAGE="https://sourceforge.net/projects/mediatomb/"
-COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer"
+COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer
+ 2020-2021 Gerbera Contributors"
LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://github.com/gerbera/gerbera/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="904a9031c85ac805e4c139f363510226952683d7257acd1dee25ba1e97fd7651"
+REVISION="1"
+srcGitRev="dd8caf36a7ac0806ed347237eea21c6f86b03e4d"
+SOURCE_URI="https://github.com/gerbera/gerbera/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="3a9843db7993affc358ea6943b7c19baca7d26474af235b872c028d1920ae254"
+SOURCE_DIR="gerbera-$srcGitRev"
+SOURCE_FILENAME="gerbera-$srcGitRev.tar.gz"
PATCHES="gerbera-$portVersion.patchset"
ADDITIONAL_FILES="
config.xml
install_config.sh
"
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
commandSuffix=$secondaryArchSuffix
@@ -35,49 +39,46 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
- #lib:libavcodec$secondaryArchSuffix
+ lib:libatomic$secondaryArchSuffix
+ lib:libavformat$secondaryArchSuffix
+ lib:libavutil$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
- lib:libcrypto$secondaryArchSuffix
+ lib:libduktape$secondaryArchSuffix
lib:libebml$secondaryArchSuffix
lib:libexif$secondaryArchSuffix
- lib:libexpat$secondaryArchSuffix
- #lib:libextractor$secondaryArchSuffix
+ lib:libfmt$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libmagic$secondaryArchSuffix
lib:libmatroska$secondaryArchSuffix
- #lib:libmozjs185$secondaryArchSuffix
- #lib:libmp4v2$secondaryArchSuffix
- lib:libnghttp2$secondaryArchSuffix
+ lib:libnpupnp$secondaryArchSuffix
+ lib:libpugixml$secondaryArchSuffix
+ lib:libspdlog$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
- lib:libssl$secondaryArchSuffix
lib:libtag$secondaryArchSuffix
- lib:libupnp$secondaryArchSuffix
lib:libuuid$secondaryArchSuffix
- lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
- #devel:libavcodec$secondaryArchSuffix
+ devel:libatomic$secondaryArchSuffix
+ devel:libavformat$secondaryArchSuffix
+ devel:libavutil$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
-# devel:libcrypto$secondaryArchSuffix
+ devel:libduktape$secondaryArchSuffix
devel:libebml$secondaryArchSuffix
devel:libexif$secondaryArchSuffix
- devel:libexpat$secondaryArchSuffix
- #devel:libextractor$secondaryArchSuffix
+ devel:libfmt$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
-# devel:libintl$secondaryArchSuffix
+ devel:libintl$secondaryArchSuffix
devel:libmagic$secondaryArchSuffix
devel:libmatroska$secondaryArchSuffix
- #devel:libmozjs185$secondaryArchSuffix
- #devel:libmp4v2$secondaryArchSuffix
+ devel:libnpupnp$secondaryArchSuffix
+ devel:libpugixml$secondaryArchSuffix
+ devel:libspdlog$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
-# devel:libssl$secondaryArchSuffix
devel:libtag$secondaryArchSuffix
- devel:libupnp$secondaryArchSuffix
- devel:libuuid$secondaryArchSuffix >= 1.3
- devel:libz$secondaryArchSuffix
+ devel:libuuid$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
@@ -90,15 +91,18 @@ BUILD_PREREQUIRES="
BUILD()
{
mkdir -p build && cd build
- cmake .. -DCMAKE_BUILD_TYPE=Release \
+ cmake .. \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-DCMAKE_INSTALL_DATADIR=$dataDir/gerbera \
-DCMAKE_INSTALL_MANDIR=$manDir/man1 \
- -DCMAKE_CXX_FLAGS=-D_BSD_SOURCE \
- -L -DWITH_INOTIFY=0 \
- -DWITH_JS=0 \
- -DWITH_SYSTEMD=0
+ -DCMAKE_EXE_LINKER_FLAGS="-lnetwork" \
+ -DWITH_INOTIFY=NO \
+ -DWITH_SYSTEMD=NO \
+ -DWITH_NPUPNP=YES \
+ -DWITH_AVCODEC=YES
+
make $jobArgs
}
diff --git a/net-misc/gerbera/patches/gerbera-1.7.0~git.patchset b/net-misc/gerbera/patches/gerbera-1.7.0~git.patchset
new file mode 100644
index 000000000..4b950a359
--- /dev/null
+++ b/net-misc/gerbera/patches/gerbera-1.7.0~git.patchset
@@ -0,0 +1,66 @@
+From 26cb20c6840e537b884593e9d1aec019e1e87a5c Mon Sep 17 00:00:00 2001
+From: begasus
+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
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,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")
+
++set(CMAKE_INSTALL_BINDIR=bin)
++set(CMAKE_INSTALL_DATADIR=share/gerbera)
++set(CMAKE_INSTALL_MANDIR=share/man/man1)
++
+ # 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)
+ 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/sqlite3/sqlite3.sql
+- 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.30.0
+
+
+From 198a66a81aed6d9c02a0d68eb7594febc207e39c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?=
+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
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -289,7 +289,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.0
+