summaryrefslogtreecommitdiff
path: root/net-misc/gerbera
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /net-misc/gerbera
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'net-misc/gerbera')
-rw-r--r--net-misc/gerbera/Manifest7
-rw-r--r--net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch25
-rw-r--r--net-misc/gerbera/gerbera-1.8.0.ebuild (renamed from net-misc/gerbera/gerbera-1.7.0.ebuild)13
-rw-r--r--net-misc/gerbera/gerbera-9999.ebuild7
4 files changed, 10 insertions, 42 deletions
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 78b6c78625c7..7a7eab0f069e 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,8 +1,7 @@
AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
-AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d
-DIST gerbera-1.7.0.tar.gz 3574471 BLAKE2B 32aca4576236f852f7d0c85b86817e88e8539c074c6a3967266920750f89ef7fede6ccfa4e9534534dcf753fc030910500d5bf3dd3282d96c9f64b6492fe4a15 SHA512 32998ce281bdacfd11a0d4f7cfb1edcbea40cc6c5bb1dba4bbebed667ac47eea5049a49333ea15698e50a9954450873b4739f4ce9fcf4c56e1b548f19dee7533
-EBUILD gerbera-1.7.0.ebuild 2370 BLAKE2B e1e66fe87d5179311ca7368bfc889404ff863c7bf586b8846d08de8ca7f4c5074abe19019cfc639bba070fbc9f76d3804c6f24a44688fbb8ed0f652103e71dac SHA512 388b39d0303a72bea85b195447ccf65975cada83bb82f762cba491d4a60bff2bb67e0f24ba46d32e8e5b499411490503e23cb0263a57306b92609713109ce55d
-EBUILD gerbera-9999.ebuild 2299 BLAKE2B ac17a4ae8a371d35f4ddb6107405559285630f9b989cdec156edb7383a733930b5d78a68646092890a5c7ed068d43aa1962b050e77da275d0a8345906f0db569 SHA512 ddac3d08441b5a3e4797fa69785da72f87175f90a6fccaea23029b6f544af9b0d0d5ecd98375949d4e00354e444445dd33520bd47a92687e0a76b4f9f3c07bb0
+DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745
+EBUILD gerbera-1.8.0.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
+EBUILD gerbera-9999.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
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 93fd9e198dfb..000000000000
--- 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
index 5c8a5e6ac2fb..d68414c66ed6 100644
--- a/net-misc/gerbera/gerbera-1.7.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.8.0.ebuild
@@ -3,15 +3,14 @@
EAPI=7
-inherit cmake eutils linux-info systemd tmpfiles
+inherit cmake linux-info
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
- SRC_URI=""
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 +23,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 +34,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 +47,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 5757a960069a..d68414c66ed6 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -3,15 +3,14 @@
EAPI=7
-inherit cmake eutils linux-info systemd tmpfiles
+inherit cmake linux-info
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
- SRC_URI=""
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 +23,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 23:54:26 +0000