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 <[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-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
