* [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
@ 2017-06-17 16:34 Ian Whyman
0 siblings, 0 replies; 6+ messages in thread
From: Ian Whyman @ 2017-06-17 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 01c9e9d631a356d7da00cae6062b66c0cb805023
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 16:33:47 2017 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 16:34:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c9e9d6
net-misc/gerbera: Fix init scripts
Fixes #621934
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-misc/gerbera/files/gerbera-1.0.0.confd | 37 ++++++++++------------
net-misc/gerbera/files/gerbera-1.0.0.initd | 31 ++++++++++++------
net-misc/gerbera/files/gerbera.tmpfiles | 1 +
...erbera-1.0.0.ebuild => gerbera-1.0.0-r1.ebuild} | 4 ++-
net-misc/gerbera/gerbera-9999.ebuild | 4 ++-
5 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.confd b/net-misc/gerbera/files/gerbera-1.0.0.confd
index 7f5c0083025..4c4a4422035 100644
--- a/net-misc/gerbera/files/gerbera-1.0.0.confd
+++ b/net-misc/gerbera/files/gerbera-1.0.0.confd
@@ -1,28 +1,25 @@
-# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
+# /etc/conf.d/gerbera: config file for /etc/init.d/gerbera
-# See the mediatomb(1) manpage for more info.
+# See the gerbera(1) manpage for more info.
-# MediaTomb Web UI port.
+# Gerbera Web UI port.
# NOTE: The minimum value allowed is 49152
-MEDIATOMB_PORT=49152
+GERBERA_PORT=49152
-# Run MediaTomb as this user.
-# NOTE: For security reasons do not run MediaTomb as root.
-MEDIATOMB_USER="mediatomb"
+# Run Gerbera as this user.
+# NOTE: For security reasons do not run Gerbera as root.
+GERBERA_USER="gerbera"
-# Run MediaTomb as this group.
-# NOTE: For security reasons do not run MediaTomb as root.
-MEDIATOMB_GROUP="mediatomb"
+# Run Gerbera as this group.
+# NOTE: For security reasons do not run Gerbera as root.
+GERBERA_GROUP="gerbera"
-# Path to MediaTomb config file.
-MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
+# Path to Gerbera config file.
+GERBERA_CONFIG="/etc/gerbera/config.xml"
-# Path to MediaTomb log file.
-MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
+# Path to Gerbera log file.
+GERBERA_LOGFILE="/var/log/gerbera.log"
-# Path to MediaTomb pid file.
-MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
-
-# Other options you want to pass to MediaTomb.
-# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface.
-MEDIATOMB_OPTIONS=""
+# Other options you want to pass to Gerbera.
+# Add "--interface ${GERBERA_INTERFACE}" to bind to a named interface.
+GERBERA_OPTIONS=""
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.initd b/net-misc/gerbera/files/gerbera-1.0.0.initd
index 86111395d7d..faee5e3c56c 100644
--- a/net-misc/gerbera/files/gerbera-1.0.0.initd
+++ b/net-misc/gerbera/files/gerbera-1.0.0.initd
@@ -5,24 +5,35 @@
depend() {
need net
# In order to properly support this (need vs use), we would have to
- # parse ${MEDIATOMB_CONFIG} and see if mysql is enabled and if it is
+ # parse ${GERBERA_CONFIG} and see if mysql is enabled and if it is
# pointing to the local system. #368409
use mysql
}
start() {
- ebegin "Starting MediaTomb"
- start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
- --pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
- --pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
- --group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
- --config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
- ${MEDIATOMB_OPTIONS}
+ ebegin "Starting Gerbera"
+
+ checkpath --directory --owner "${GERBERA_USER}:${GERBERA_GROUP}" --mode 0755 /run/gerbera
+ checkpath --file --owner "${GERBERA_USER}:${GERBERA_GROUP}" --mode 0644 "${GERBERA_LOGFILE}"
+
+ start-stop-daemon \
+ --start \
+ --exec /usr/bin/gerbera \
+ --user ${GERBERA_USER} \
+ --group ${GERBERA_GROUP} \
+ --background \
+ --wait 500 \
+ -- \
+ --pidfile /run/gerbera/gerbera.pid \
+ --logfile ${GERBERA_LOGFILE} \
+ --config ${GERBERA_CONFIG} \
+ --port ${GERBERA_PORT} \
+ ${GERBERA_OPTIONS}
eend $?
}
stop () {
- ebegin "Stopping MediaTomb"
- start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
+ ebegin "Stopping Gerbera"
+ start-stop-daemon --stop --retry 10 --quiet --pidfile /run/gerbera/gerbera.pid
eend $?
}
diff --git a/net-misc/gerbera/files/gerbera.tmpfiles b/net-misc/gerbera/files/gerbera.tmpfiles
new file mode 100644
index 00000000000..fcc9b5de490
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera.tmpfiles
@@ -0,0 +1 @@
+d /run/gerbera 0755 gerbera gerbera -
\ No newline at end of file
diff --git a/net-misc/gerbera/gerbera-1.0.0.ebuild b/net-misc/gerbera/gerbera-1.0.0-r1.ebuild
similarity index 95%
rename from net-misc/gerbera/gerbera-1.0.0.ebuild
rename to net-misc/gerbera/gerbera-1.0.0-r1.ebuild
index 6b6892239b6..6202d227a4d 100644
--- a/net-misc/gerbera/gerbera-1.0.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils eutils linux-info systemd user
+inherit cmake-utils eutils linux-info systemd tmpfiles user
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/v00d00/${PN}.git"
@@ -88,6 +88,8 @@ src_install() {
keepdir /var/lib/${PN}
fowners ${PN}:${PN} /var/lib/${PN}
+
+ newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
}
pkg_postinst() {
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 6b6892239b6..6202d227a4d 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils eutils linux-info systemd user
+inherit cmake-utils eutils linux-info systemd tmpfiles user
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/v00d00/${PN}.git"
@@ -88,6 +88,8 @@ src_install() {
keepdir /var/lib/${PN}
fowners ${PN}:${PN} /var/lib/${PN}
+
+ newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
@ 2017-09-30 16:10 Ian Whyman
0 siblings, 0 replies; 6+ messages in thread
From: Ian Whyman @ 2017-09-30 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 42ea35941d6dfc6851aff8a3e98faea2d2edcd5a
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 16:09:56 2017 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 16:10:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ea3594
net-misc/gerbera: Expose new v1.1 options as useflags
Package-Manager: Portage-2.3.10, Repoman-2.3.3
net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch | 14 ++++++++++++++
.../{gerbera-1.1.0.ebuild => gerbera-1.1.0-r1.ebuild} | 12 +++++++++---
net-misc/gerbera/gerbera-9999.ebuild | 10 +++++++---
net-misc/gerbera/metadata.xml | 2 ++
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
new file mode 100644
index 00000000000..ff5f6075ec1
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
@@ -0,0 +1,14 @@
+diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc
+index 2fade4a9..de33617b 100644
+--- gerbera/src/file_request_handler.cc
++++ gerbera/src/file_request_handler.cc
+@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf
+ header = header + "CaptionInfo.sec: " + url;
+ }
+ }
+-#endif
+ }
++#endif
+ }
+
+ if (!string_ok(mimeType))
diff --git a/net-misc/gerbera/gerbera-1.1.0.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
similarity index 82%
rename from net-misc/gerbera/gerbera-1.1.0.ebuild
rename to net-misc/gerbera/gerbera-1.1.0-r1.ebuild
index 86fe0131d52..f9521cc5691 100644
--- a/net-misc/gerbera/gerbera-1.1.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
@@ -17,11 +17,11 @@ else
fi
DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/v00d00/gerbera"
+HOMEPAGE="https://github.com/gerbera/gerbera"
LICENSE="GPL-2"
SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
DEPEND="
!!net-misc/mediatomb
@@ -37,6 +37,7 @@ DEPEND="
libav? ( >=media-video/libav-10:0= )
!libav? ( >=media-video/ffmpeg-2.2:0= )
)
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
curl? ( net-misc/curl net-misc/youtube-dl )
magic? ( sys-apps/file )
sys-apps/util-linux
@@ -47,6 +48,8 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~INOTIFY_USER"
+PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
+
pkg_setup() {
linux-info_pkg_setup
@@ -61,12 +64,15 @@ src_configure() {
-DWITH_DEBUG_LOGGING="$(usex debug)" \
-DWITH_EXIF="$(usex exif)" \
-DWITH_AVCODEC="$(usex ffmpeg)" \
+ -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-DWITH_JS="$(usex javascript)" \
-DWITH_LASTFM="$(usex lastfm)" \
-DWITH_MAGIC="$(usex magic)" \
-DWITH_MYSQL="$(usex mysql)"
+ -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
-DWITH_SYSTEMD="$(usex systemd)" \
- -DWITH_TAGLIB="$(usex taglib)"
+ -DWITH_TAGLIB="$(usex taglib)" \
+ -DWITH_INOTIFY=1
)
cmake-utils_src_configure
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 86fe0131d52..7f6f95dd5c3 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -17,11 +17,11 @@ else
fi
DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/v00d00/gerbera"
+HOMEPAGE="https://github.com/gerbera/gerbera"
LICENSE="GPL-2"
SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
DEPEND="
!!net-misc/mediatomb
@@ -37,6 +37,7 @@ DEPEND="
libav? ( >=media-video/libav-10:0= )
!libav? ( >=media-video/ffmpeg-2.2:0= )
)
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
curl? ( net-misc/curl net-misc/youtube-dl )
magic? ( sys-apps/file )
sys-apps/util-linux
@@ -61,12 +62,15 @@ src_configure() {
-DWITH_DEBUG_LOGGING="$(usex debug)" \
-DWITH_EXIF="$(usex exif)" \
-DWITH_AVCODEC="$(usex ffmpeg)" \
+ -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-DWITH_JS="$(usex javascript)" \
-DWITH_LASTFM="$(usex lastfm)" \
-DWITH_MAGIC="$(usex magic)" \
-DWITH_MYSQL="$(usex mysql)"
+ -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
-DWITH_SYSTEMD="$(usex systemd)" \
- -DWITH_TAGLIB="$(usex taglib)"
+ -DWITH_TAGLIB="$(usex taglib)" \
+ -DWITH_INOTIFY=1
)
cmake-utils_src_configure
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index e244367f765..1c5747db8eb 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -8,9 +8,11 @@
<longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
<use>
<flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+ <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
<flag name="lastfm">Enable last.fm support</flag>
<flag name="magic">Use libmagic to determine file types</flag>
<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+ <flag name="protocol-extensions">Enable partial DLNA support</flag>
<flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
@ 2019-01-27 21:59 Ian Whyman
0 siblings, 0 replies; 6+ messages in thread
From: Ian Whyman @ 2019-01-27 21:59 UTC (permalink / raw
To: gentoo-commits
commit: adca6ff181c11c7221beeb543c9d71da102da1dc
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 21:59:09 2019 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 21:59:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adca6ff1
net-misc/gerbera: v1.3 Version bump
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
net-misc/gerbera/Manifest | 1 +
net-misc/gerbera/files/gerbera-1.3.0.config | 147 ++++++++++++++++++++++++++++
net-misc/gerbera/gerbera-1.3.0.ebuild | 101 +++++++++++++++++++
3 files changed, 249 insertions(+)
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 9b5bf6263c1..227564a9a01 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1,2 @@
DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
+DIST gerbera-1.3.0.tar.gz 2799974 BLAKE2B b062b554552a58e3c71b18d189e4c1e6a59be4150ab3f2c22ba1e2186ca55a181a4037694e79803ebd5e877f3c75e55fe09665b06ec64374fe418082dc22fa7d SHA512 1afebd865a226ac13f82fb97381015d7875c1bebd9186e793acd8d715ac049e0502e60e4696a53b9d23d9dbccb4758889e1b3638fb53aeede3796c3264a01434
diff --git a/net-misc/gerbera/files/gerbera-1.3.0.config b/net-misc/gerbera/files/gerbera-1.3.0.config
new file mode 100644
index 00000000000..4c41a27143c
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.3.0.config
@@ -0,0 +1,147 @@
+<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.
+ -->
+ <server>
+ <ui enabled="yes" show-tooltips="yes">
+ <accounts enabled="no" session-timeout="30">
+ <account user="gerbera" password="gerbera"/>
+ </accounts>
+ </ui>
+ <name>Gerbera</name>
+ <udn>uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9</udn>
+ <home>/var/lib/gerbera<home>
+ <webroot>/usr/share/gerbera/web</webroot>
+ <!--
+ How frequently (in seconds) to send ssdp:alive advertisements.
+ Minimum alive value accepted is: 62
+
+ The advertisement will be sent every (A/2)-30 seconds,
+ and will have a cache-control max-age of A where A is
+ the value configured here. Ex: A value of 62 will result
+ in an SSDP advertisement being sent every second.
+ -->
+ <alive>1800</alive>
+ <storage>
+ <sqlite3 enabled="yes">
+ <database-file>gerbera.db</database-file>
+ </sqlite3>
+ <mysql enabled="no">
+ <host>localhost</host>
+ <username>gerbera</username>
+ <database>gerbera</database>
+ </mysql>
+ </storage>
+ <protocolInfo extend="yes"/>
+ <extended-runtime-options>
+ <ffmpegthumbnailer enabled="no">
+ <thumbnail-size>128</thumbnail-size>
+ <seek-percentage>5</seek-percentage>
+ <filmstrip-overlay>yes</filmstrip-overlay>
+ <workaround-bugs>no</workaround-bugs>
+ <image-quality>8</image-quality>
+ </ffmpegthumbnailer>
+ <mark-played-items enabled="no" suppress-cds-updates="yes">
+ <string mode="prepend">*</string>
+ <mark>
+ <content>video</content>
+ </mark>
+ </mark-played-items>
+ </extended-runtime-options>
+ </server>
+ <import hidden-files="no">
+ <scripting script-charset="UTF-8">
+ <common-script>/usr/share/gerbera/js/common.js</common-script>
+ <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
+ <virtual-layout type="builtin">
+ <import-script>/usr/share/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"/>
+ <!-- Uncomment the line below for PS3 divx support -->
+ <!-- <map from="avi" to="video/divx"/> -->
+ <!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 -->
+ <!-- <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"/>
+ </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"/>
+ </mimetype-contenttype>
+ </mappings>
+ <online-content>
+ <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"/>
+ </mimetype-profile-mappings>
+ <profiles>
+ <profile name="ogg2mp3" enabled="no" type="external">
+ <mimetype>audio/mpeg</mimetype>
+ <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"/>
+ </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"/>
+ </profile>
+ </profiles>
+ </transcoding>
+</config>
+
diff --git a/net-misc/gerbera/gerbera-1.3.0.ebuild b/net-misc/gerbera/gerbera-1.3.0.ebuild
new file mode 100644
index 00000000000..fcdb0195c5e
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.3.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+ KEYWORDS=""
+ SRC_URI=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+ !!net-misc/mediatomb
+ >=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
+ >=dev-db/sqlite-3
+ dev-libs/expat
+ mysql? ( dev-db/mysql-connector-c )
+ javascript? ( dev-lang/duktape )
+ taglib? ( >=media-libs/taglib-1.11 )
+ lastfm? ( >=media-libs/lastfmlib-0.4 )
+ exif? ( media-libs/libexif )
+ exiv2? ( media-gfx/exiv2 )
+ ffmpeg? (
+ libav? ( >=media-video/libav-10:0= )
+ !libav? ( >=media-video/ffmpeg-2.2:0= )
+ )
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+ curl? ( net-misc/curl net-misc/youtube-dl )
+ magic? ( sys-apps/file )
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_CURL="$(usex curl)" \
+ -DWITH_DEBUG="$(usex debug)" \
+ -DWITH_EXIF="$(usex exif)" \
+ -DWITH_EXIV2="$(usex exiv2)" \
+ -DWITH_AVCODEC="$(usex ffmpeg)" \
+ -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+ -DWITH_JS="$(usex javascript)" \
+ -DWITH_LASTFM="$(usex lastfm)" \
+ -DWITH_MAGIC="$(usex magic)" \
+ -DWITH_MYSQL="$(usex mysql)"
+ -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+ -DWITH_SYSTEMD="$(usex systemd)" \
+ -DWITH_TAGLIB="$(usex taglib)" \
+ -DWITH_INOTIFY=1
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+ insinto /etc/${PN}
+ newins "${FILESDIR}/${P}.config" config.xml
+ fperms 0640 /etc/${PN}/config.xml
+ fowners root:gerbera /etc/${PN}/config.xml
+
+ keepdir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+ if use mysql ; then
+ elog "Gerbera has been built with MySQL support and needs"
+ elog "to be configured before being started. By default"
+ elog "SQLite will be used."
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
@ 2019-01-31 20:56 Ian Whyman
0 siblings, 0 replies; 6+ messages in thread
From: Ian Whyman @ 2019-01-31 20:56 UTC (permalink / raw
To: gentoo-commits
commit: f130a7b274ed2fc3e5c880cc42951d9e50ca6cb1
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 20:55:34 2019 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 20:56:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f130a7b2
net-misc/gerbera: Fix config file, tidy old files
Closes: https://bugs.gentoo.org/676690
Closes: https://bugs.gentoo.org/676686
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
.../files/gerbera-1.1.0-build-failure.patch | 14 ---
net-misc/gerbera/files/gerbera-1.3.0.config | 2 +-
net-misc/gerbera/gerbera-1.3.0-r1.ebuild | 101 +++++++++++++++++++++
3 files changed, 102 insertions(+), 15 deletions(-)
diff --git a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
deleted file mode 100644
index ff5f6075ec1..00000000000
--- a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc
-index 2fade4a9..de33617b 100644
---- gerbera/src/file_request_handler.cc
-+++ gerbera/src/file_request_handler.cc
-@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf
- header = header + "CaptionInfo.sec: " + url;
- }
- }
--#endif
- }
-+#endif
- }
-
- if (!string_ok(mimeType))
diff --git a/net-misc/gerbera/files/gerbera-1.3.0.config b/net-misc/gerbera/files/gerbera-1.3.0.config
index 4c41a27143c..5659140c6f8 100644
--- a/net-misc/gerbera/files/gerbera-1.3.0.config
+++ b/net-misc/gerbera/files/gerbera-1.3.0.config
@@ -11,7 +11,7 @@
</ui>
<name>Gerbera</name>
<udn>uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9</udn>
- <home>/var/lib/gerbera<home>
+ <home>/var/lib/gerbera</home>
<webroot>/usr/share/gerbera/web</webroot>
<!--
How frequently (in seconds) to send ssdp:alive advertisements.
diff --git a/net-misc/gerbera/gerbera-1.3.0-r1.ebuild b/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
new file mode 100644
index 00000000000..fcdb0195c5e
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+ KEYWORDS=""
+ SRC_URI=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+ !!net-misc/mediatomb
+ >=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
+ >=dev-db/sqlite-3
+ dev-libs/expat
+ mysql? ( dev-db/mysql-connector-c )
+ javascript? ( dev-lang/duktape )
+ taglib? ( >=media-libs/taglib-1.11 )
+ lastfm? ( >=media-libs/lastfmlib-0.4 )
+ exif? ( media-libs/libexif )
+ exiv2? ( media-gfx/exiv2 )
+ ffmpeg? (
+ libav? ( >=media-video/libav-10:0= )
+ !libav? ( >=media-video/ffmpeg-2.2:0= )
+ )
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+ curl? ( net-misc/curl net-misc/youtube-dl )
+ magic? ( sys-apps/file )
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_CURL="$(usex curl)" \
+ -DWITH_DEBUG="$(usex debug)" \
+ -DWITH_EXIF="$(usex exif)" \
+ -DWITH_EXIV2="$(usex exiv2)" \
+ -DWITH_AVCODEC="$(usex ffmpeg)" \
+ -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+ -DWITH_JS="$(usex javascript)" \
+ -DWITH_LASTFM="$(usex lastfm)" \
+ -DWITH_MAGIC="$(usex magic)" \
+ -DWITH_MYSQL="$(usex mysql)"
+ -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+ -DWITH_SYSTEMD="$(usex systemd)" \
+ -DWITH_TAGLIB="$(usex taglib)" \
+ -DWITH_INOTIFY=1
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+ insinto /etc/${PN}
+ newins "${FILESDIR}/${P}.config" config.xml
+ fperms 0640 /etc/${PN}/config.xml
+ fowners root:gerbera /etc/${PN}/config.xml
+
+ keepdir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+ if use mysql ; then
+ elog "Gerbera has been built with MySQL support and needs"
+ elog "to be configured before being started. By default"
+ elog "SQLite will be used."
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
@ 2020-05-09 10:36 Ian Whyman
0 siblings, 0 replies; 6+ messages in thread
From: Ian Whyman @ 2020-05-09 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 1fee1702f4b658812d3c9aba021ad51d4988f21f
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 10:35:43 2020 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat May 9 10:35:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fee1702
net-misc/gerbera: 1.5.0 version bump
Fix 9999 to match
Closes: https://bugs.gentoo.org/719576
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
net-misc/gerbera/Manifest | 1 +
.../gerbera-1.5.0-incomplete-type-iohandler.patch | 25 ++++++++++++++++++++++
.../{gerbera-9999.ebuild => gerbera-1.5.0.ebuild} | 14 ++++++++----
net-misc/gerbera/gerbera-9999.ebuild | 10 +++++----
4 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index d49cd27e01d..ed502b3d979 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1,2 @@
DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
+DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
diff --git a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
new file mode 100644
index 00000000000..93fd9e198df
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
@@ -0,0 +1,25 @@
+From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001
+From: Ian Whyman <ian@gerbera.io>
+Date: Sat, 9 May 2020 11:22:47 +0100
+Subject: [PATCH] Fix incomplete type iohandler with Ninja generator
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+error: invalid application of ‘sizeof’ to incomplete type ‘IOHandler’
+---
+ src/metadata/ffmpeg_handler.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/metadata/ffmpeg_handler.h b/src/metadata/ffmpeg_handler.h
+index 7c134430..565ff773 100644
+--- a/src/metadata/ffmpeg_handler.h
++++ b/src/metadata/ffmpeg_handler.h
+@@ -42,6 +42,7 @@
+ namespace fs = std::filesystem;
+
+ #include "metadata_handler.h"
++#include "iohandler/io_handler.h"
+
+ // forward declaration
+ class AVFormatContext;
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-1.5.0.ebuild
similarity index 90%
copy from net-misc/gerbera/gerbera-9999.ebuild
copy to net-misc/gerbera/gerbera-1.5.0.ebuild
index 11919c4298c..3e0553c702d 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-1.5.0.ebuild
@@ -25,9 +25,11 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic
DEPEND="
acct-user/gerbera
- >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+ >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
>=dev-db/sqlite-3
- dev-libs/expat
+ dev-libs/spdlog
+ dev-libs/pugixml
+ dev-libs/libfmt:0/6
mysql? ( dev-db/mysql-connector-c )
javascript? ( dev-lang/duktape )
taglib? ( >=media-libs/taglib-1.11 )
@@ -36,9 +38,9 @@ DEPEND="
exiv2? ( media-gfx/exiv2 )
ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- curl? ( net-misc/curl net-misc/youtube-dl )
+ curl? ( net-misc/curl )
magic? ( sys-apps/file )
- matroska? ( media-libs/libmatroska )
+ matroska? ( media-libs/libmatroska )
sys-apps/util-linux
sys-libs/zlib
virtual/libiconv
@@ -47,6 +49,10 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~INOTIFY_USER"
+PATCHES=(
+ "${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DWITH_CURL="$(usex curl)" \
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 11919c4298c..adb30342a7a 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -25,9 +25,11 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic
DEPEND="
acct-user/gerbera
- >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+ >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
>=dev-db/sqlite-3
- dev-libs/expat
+ dev-libs/spdlog
+ dev-libs/pugixml
+ dev-libs/libfmt:0/6
mysql? ( dev-db/mysql-connector-c )
javascript? ( dev-lang/duktape )
taglib? ( >=media-libs/taglib-1.11 )
@@ -36,9 +38,9 @@ DEPEND="
exiv2? ( media-gfx/exiv2 )
ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- curl? ( net-misc/curl net-misc/youtube-dl )
+ curl? ( net-misc/curl )
magic? ( sys-apps/file )
- matroska? ( media-libs/libmatroska )
+ matroska? ( media-libs/libmatroska )
sys-apps/util-linux
sys-libs/zlib
virtual/libiconv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
@ 2021-04-11 11:48 Ian Whyman
0 siblings, 0 replies; 6+ messages in thread
From: Ian Whyman @ 2021-04-11 11:48 UTC (permalink / raw
To: gentoo-commits
commit: 139ad0d53ffb5930964a931b8bd07c4d5f1cabfd
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 11:48:14 2021 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 11:48:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139ad0d5
net-misc/gerbera: Bump to 1.8.0, add ~arm64
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>
net-misc/gerbera/Manifest | 2 +-
.../gerbera-1.5.0-incomplete-type-iohandler.patch | 25 ----------------------
.../{gerbera-1.7.0.ebuild => gerbera-1.8.0.ebuild} | 10 +++------
net-misc/gerbera/gerbera-9999.ebuild | 4 ++--
4 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 4f8ba596854..d38d70cae70 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1 @@
-DIST gerbera-1.7.0.tar.gz 3574471 BLAKE2B 32aca4576236f852f7d0c85b86817e88e8539c074c6a3967266920750f89ef7fede6ccfa4e9534534dcf753fc030910500d5bf3dd3282d96c9f64b6492fe4a15 SHA512 32998ce281bdacfd11a0d4f7cfb1edcbea40cc6c5bb1dba4bbebed667ac47eea5049a49333ea15698e50a9954450873b4739f4ce9fcf4c56e1b548f19dee7533
+DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745
diff --git a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
deleted file mode 100644
index 93fd9e198df..00000000000
--- a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001
-From: Ian Whyman <ian@gerbera.io>
-Date: Sat, 9 May 2020 11:22:47 +0100
-Subject: [PATCH] Fix incomplete type iohandler with Ninja generator
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: invalid application of ‘sizeof’ to incomplete type ‘IOHandler’
----
- src/metadata/ffmpeg_handler.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/metadata/ffmpeg_handler.h b/src/metadata/ffmpeg_handler.h
-index 7c134430..565ff773 100644
---- a/src/metadata/ffmpeg_handler.h
-+++ b/src/metadata/ffmpeg_handler.h
-@@ -42,6 +42,7 @@
- namespace fs = std::filesystem;
-
- #include "metadata_handler.h"
-+#include "iohandler/io_handler.h"
-
- // forward declaration
- class AVFormatContext;
diff --git a/net-misc/gerbera/gerbera-1.7.0.ebuild b/net-misc/gerbera/gerbera-1.8.0.ebuild
similarity index 92%
rename from net-misc/gerbera/gerbera-1.7.0.ebuild
rename to net-misc/gerbera/gerbera-1.8.0.ebuild
index 4d3c690cb3c..4539ee1c8f9 100644
--- a/net-misc/gerbera/gerbera-1.7.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S="${WORKDIR}/${P}"
fi
@@ -24,7 +24,7 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic
DEPEND="
acct-user/gerbera
- >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
+ >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp]
>=dev-db/sqlite-3
dev-libs/spdlog:=
dev-libs/pugixml
@@ -35,7 +35,7 @@ DEPEND="
lastfm? ( >=media-libs/lastfmlib-0.4 )
exif? ( media-libs/libexif )
exiv2? ( media-gfx/exiv2 )
- ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
+ ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
curl? ( net-misc/curl )
magic? ( sys-apps/file )
@@ -48,10 +48,6 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~INOTIFY_USER"
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.0-incomplete-type-iohandler.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DWITH_CURL="$(usex curl)" \
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 5757a960069..4539ee1c8f9 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S="${WORKDIR}/${P}"
fi
@@ -24,7 +24,7 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic
DEPEND="
acct-user/gerbera
- >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
+ >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp]
>=dev-db/sqlite-3
dev-libs/spdlog:=
dev-libs/pugixml
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-11 11:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-31 20:56 [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/ Ian Whyman
-- strict thread matches above, loose matches on Subject: below --
2021-04-11 11:48 Ian Whyman
2020-05-09 10:36 Ian Whyman
2019-01-27 21:59 Ian Whyman
2017-09-30 16:10 Ian Whyman
2017-06-17 16:34 Ian Whyman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox