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 <[email protected]>
-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
