haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gerbera: bump (#5713)

Browse Source 
* Gerbera: bump
This commit is contained in:
extrowerk
2021-02-27 10:17:00 +01:00
committed by GitHub
parent 901daf6ce1
commit 05028661db
3 changed files with 170 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
net-misc/gerbera/additional-files/config.xml
View File

@@ -2,16 +2,16 @@
<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
<!--
See http://gerbera.io or read the docs for more
information on creating and using config.xml configration files.
information on creating and using config.xml configuration files.
-->
<server>
<ui enabled="yes" show-tooltips="yes">
<accounts enabled="no" session-timeout="30">
<account user="gerbera" password="gerbera"/>
<account user="gerbera" password="gerbera" />
</accounts>
</ui>
<name>Gerbera</name>
<udn>uuid:3a49bdf9-c613-476e-a684-8274ae67ee16</udn>
<udn>uuid:b6efabe0-aa91-4814-9cb9-82c9a0550eba</udn>
<home>/boot/home/config/settings/gerbera</home>
<webroot>/system/data/gerbera/web</webroot>
<!--
@@ -26,26 +26,10 @@
<alive>1800</alive>
<storage>
<sqlite3 enabled="yes">
<init-sql-file>/system/data/gerbera/sqlite3.sql</init-sql-file>
<database-file>gerbera.db</database-file>
</sqlite3>
</storage>
<protocolInfo extend="no" dlna-seek="yes"/><!-- For PS3 support change to "yes" -->
<!--
Uncomment the lines below to get rid of jerky avi playback on the
DSM320 or to enable subtitles support on the DSM units
-->
<!--
<custom-http-headers>
<add header="X-User-Agent: redsonic"/>
</custom-http-headers>
<manufacturerURL>redsonic.com</manufacturerURL>
<modelNumber>105</modelNumber>
-->
<!-- Uncomment the line below if you have a Telegent TG100 -->
<!--
<upnp-string-limit>101</upnp-string-limit>
-->
<extended-runtime-options>
<mark-played-items enabled="no" suppress-cds-updates="yes">
<string mode="prepend">*</string>
@@ -57,73 +41,82 @@
</server>
<import hidden-files="no">
<scripting script-charset="UTF-8">
<virtual-layout type="builtin"/>
<common-script>/system/data/gerbera/js/common.js</common-script>
<playlist-script>/system/data/gerbera/js/playlists.js</playlist-script>
<virtual-layout type="builtin">
<import-script>/system/data/gerbera/js/import.js</import-script>
</virtual-layout>
</scripting>
<mappings>
<extension-mimetype ignore-unknown="no">
<map from="mp3" to="audio/mpeg"/>
<map from="ogx" to="application/ogg"/>
<map from="ogv" to="video/ogg"/>
<map from="oga" to="audio/ogg"/>
<map from="ogg" to="audio/ogg"/>
<map from="ogm" to="video/ogg"/>
<map from="asf" to="video/x-ms-asf"/>
<map from="asx" to="video/x-ms-asf"/>
<map from="wma" to="audio/x-ms-wma"/>
<map from="wax" to="audio/x-ms-wax"/>
<map from="wmv" to="video/x-ms-wmv"/>
<map from="wvx" to="video/x-ms-wvx"/>
<map from="wm" to="video/x-ms-wm"/>
<map from="wmx" to="video/x-ms-wmx"/>
<map from="m3u" to="audio/x-mpegurl"/>
<map from="pls" to="audio/x-scpls"/>
<map from="flv" to="video/x-flv"/>
<map from="mkv" to="video/x-matroska"/>
<map from="mka" to="audio/x-matroska"/>
<map from="dsf" to="audio/x-dsd"/>
<map from="dff" to="audio/x-dsd"/>
<map from="wv" to="audio/x-wavpack"/>
<map from="asf" to="video/x-ms-asf" />
<map from="asx" to="video/x-ms-asf" />
<map from="dff" to="audio/x-dsd" />
<map from="dsf" to="audio/x-dsd" />
<map from="flv" to="video/x-flv" />
<map from="m2ts" to="video/mp2t" />
<map from="m3u" to="audio/x-mpegurl" />
<map from="mka" to="audio/x-matroska" />
<map from="mkv" to="video/x-matroska" />
<map from="mp3" to="audio/mpeg" />
<map from="mts" to="video/mp2t" />
<map from="oga" to="audio/ogg" />
<map from="ogg" to="audio/ogg" />
<map from="ogm" to="video/ogg" />
<map from="ogv" to="video/ogg" />
<map from="ogx" to="application/ogg" />
<map from="pls" to="audio/x-scpls" />
<map from="ts" to="video/mp2t" />
<map from="tsa" to="audio/mp2t" />
<map from="tsv" to="video/mp2t" />
<map from="wax" to="audio/x-ms-wax" />
<map from="wm" to="video/x-ms-wm" />
<map from="wma" to="audio/x-ms-wma" />
<map from="wmv" to="video/x-ms-wmv" />
<map from="wmx" to="video/x-ms-wmx" />
<map from="wv" to="audio/x-wavpack" />
<map from="wvx" to="video/x-ms-wvx" />
<!-- Uncomment the line below for PS3 divx support -->
<!-- <map from="avi" to="video/divx"/> -->
<!-- <map from="avi" to="video/divx" /> -->
<!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 -->
<!-- <map from="avi" to="video/avi"/> -->
<!-- <map from="avi" to="video/avi" /> -->
</extension-mimetype>
<mimetype-upnpclass>
<map from="audio/*" to="object.item.audioItem.musicTrack"/>
<map from="video/*" to="object.item.videoItem"/>
<map from="image/*" to="object.item.imageItem"/>
<map from="application/ogg" to="object.item.audioItem.musicTrack"/>
<map from="audio/*" to="object.item.audioItem.musicTrack" />
<map from="video/*" to="object.item.videoItem" />
<map from="image/*" to="object.item.imageItem" />
<map from="application/ogg" to="object.item.audioItem.musicTrack" />
</mimetype-upnpclass>
<mimetype-contenttype>
<treat mimetype="audio/mpeg" as="mp3"/>
<treat mimetype="application/ogg" as="ogg"/>
<treat mimetype="audio/ogg" as="ogg"/>
<treat mimetype="audio/x-flac" as="flac"/>
<treat mimetype="audio/flac" as="flac"/>
<treat mimetype="audio/x-ms-wma" as="wma"/>
<treat mimetype="audio/x-wavpack" as="wv"/>
<treat mimetype="image/jpeg" as="jpg"/>
<treat mimetype="audio/x-mpegurl" as="playlist"/>
<treat mimetype="audio/x-scpls" as="playlist"/>
<treat mimetype="audio/x-wav" as="pcm"/>
<treat mimetype="audio/L16" as="pcm"/>
<treat mimetype="video/x-msvideo" as="avi"/>
<treat mimetype="video/mp4" as="mp4"/>
<treat mimetype="audio/mp4" as="mp4"/>
<treat mimetype="video/x-matroska" as="mkv"/>
<treat mimetype="audio/x-matroska" as="mka"/>
<treat mimetype="audio/x-dsd" as="dsd"/>
<treat mimetype="audio/mpeg" as="mp3" />
<treat mimetype="application/ogg" as="ogg" />
<treat mimetype="audio/ogg" as="ogg" />
<treat mimetype="audio/x-flac" as="flac" />
<treat mimetype="audio/flac" as="flac" />
<treat mimetype="audio/x-ms-wma" as="wma" />
<treat mimetype="audio/x-wavpack" as="wv" />
<treat mimetype="image/jpeg" as="jpg" />
<treat mimetype="audio/x-mpegurl" as="playlist" />
<treat mimetype="audio/x-scpls" as="playlist" />
<treat mimetype="audio/x-wav" as="pcm" />
<treat mimetype="audio/L16" as="pcm" />
<treat mimetype="video/x-msvideo" as="avi" />
<treat mimetype="video/mp4" as="mp4" />
<treat mimetype="audio/mp4" as="mp4" />
<treat mimetype="video/x-matroska" as="mkv" />
<treat mimetype="audio/x-matroska" as="mka" />
<treat mimetype="audio/x-dsd" as="dsd" />
</mimetype-contenttype>
</mappings>
<online-content>
<AppleTrailers enabled="no" refresh="43200" update-at-start="no" resolution="640"/>
<AppleTrailers enabled="no" refresh="43200" update-at-start="no" resolution="640" />
</online-content>
</import>
<transcoding enabled="no">
<mimetype-profile-mappings>
<transcode mimetype="video/x-flv" using="vlcmpeg"/>
<transcode mimetype="application/ogg" using="vlcmpeg"/>
<transcode mimetype="audio/ogg" using="ogg2mp3"/>
<transcode mimetype="video/x-flv" using="vlcmpeg" />
<transcode mimetype="application/ogg" using="vlcmpeg" />
<transcode mimetype="audio/ogg" using="ogg2mp3" />
</mimetype-profile-mappings>
<profiles>
<profile name="ogg2mp3" enabled="no" type="external">
@@ -131,17 +124,18 @@
<accept-url>no</accept-url>
<first-resource>yes</first-resource>
<accept-ogg-theora>no</accept-ogg-theora>
<agent command="ffmpeg" arguments="-y -i %in -f mp3 %out"/>
<buffer size="1048576" chunk-size="131072" fill-size="262144"/>
<agent command="ffmpeg" arguments="-y -i %in -f mp3 %out" />
<buffer size="1048576" chunk-size="131072" fill-size="262144" />
</profile>
<profile name="vlcmpeg" enabled="no" type="external">
<mimetype>video/mpeg</mimetype>
<accept-url>yes</accept-url>
<first-resource>yes</first-resource>
<accept-ogg-theora>yes</accept-ogg-theora>
<agent command="vlc" arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit"/>
<buffer size="14400000" chunk-size="512000" fill-size="120000"/>
<agent command="vlc" arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit" />
<buffer size="14400000" chunk-size="512000" fill-size="120000" />
</profile>
</profiles>
</transcoding>
</config>

66
net-misc/gerbera/gerbera-1.4.0.recipe → net-misc/gerbera/gerbera-1.7.0~git.recipe
View File

@@ -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
}

66
net-misc/gerbera/patches/gerbera-1.7.0~git.patchset Normal file
View File

@@ -0,0 +1,66 @@
From 26cb20c6840e537b884593e9d1aec019e1e87a5c 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
--- 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?= <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
--- 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