From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- media-libs/libde265/Manifest | 5 +- .../libde265-1.0.3-use-new-FFMPEG-enum-names.patch | 24 +++++++ media-libs/libde265/libde265-1.0.3.ebuild | 75 ++++++++++++++++++++++ media-libs/libde265/libde265-9999.ebuild | 60 ++++++++++++----- 4 files changed, 147 insertions(+), 17 deletions(-) create mode 100644 media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch create mode 100644 media-libs/libde265/libde265-1.0.3.ebuild (limited to 'media-libs/libde265') diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest index 89b9c8bba6e5..6ee1616cf550 100644 --- a/media-libs/libde265/Manifest +++ b/media-libs/libde265/Manifest @@ -1,5 +1,8 @@ AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c +AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549 DIST libde265-1.0.2.tar.gz 381737 BLAKE2B cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 +DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4 EBUILD libde265-1.0.2.ebuild 1145 BLAKE2B 409cf24b55254fd24ea1412d4213c8e1273451b5edea43e5f76ed2ef3b9bffca7bc6962e2567c27b025a7b9daa0c1f76438205d6bb15b3191b0e4b4d64a9ce12 SHA512 0e272b944534f0f6cbd0c32849b90ba41122dbab3881927bb4b7f4e440a894acd8f85e6acef281b94834c4460b888ffff553b0bc340815fe07683912951e4cda -EBUILD libde265-9999.ebuild 1005 BLAKE2B 0a7e866206e91c1bf13dd1d22259fd95b7cfc495eaf9f611a88b0859bd33256bf346e4c7d9848f49d900c1ab95f3b515a58632f5aa3938aad3e8f3044fbef690 SHA512 7d29c80398f718490dcc2183af73484e96896afcc962c84f3ad3b7af10f2ab6cf166adeab3cd5d464d77bd88fc076811f8ba98ce7c447685771e8675c40240ad +EBUILD libde265-1.0.3.ebuild 1652 BLAKE2B 2c30663eb2530f6fb289142628587d4f5cb4aa2f7ba058bc29e8a90eec91a80dfdef4429e328ecda3e528546c20ba1929e220ebc9598c0f5dbabbdf8f7233483 SHA512 ff16256f7373448a88e983953836406e74bcafca4e791b504d3ef64d26fbc531be1768f35bf6b42e5d0617ba3b7d3149e9cef22ad0a5f90fe4a662994796abca +EBUILD libde265-9999.ebuild 1587 BLAKE2B bf6bdc557cdbf839934ab3424012b5cae2637d26992d2f87492fb5877dd8ae3884cf5d57d053d67e81d5cada2dc21d41df8c5541086298b36b51f711aca8e369 SHA512 d147237b24d3fabf9c172c5b2b4d2f29e9ae96244dcd0bb91d00074b1d20e0a87a3d4f1fff982170ae4015538f29af5e7cdc95d33a55cd654567982266189e75 MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273 diff --git a/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch b/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch new file mode 100644 index 000000000000..33e73c15a93f --- /dev/null +++ b/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/575554 + +From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001 +From: Dirk Farin +Date: Thu, 19 Apr 2018 13:15:18 +0200 +Subject: [PATCH] use new FFMPEG enum names + +--- + sherlock265/VideoDecoder.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sherlock265/VideoDecoder.cc b/sherlock265/VideoDecoder.cc +index 119f6152..b829e1c7 100644 +--- a/sherlock265/VideoDecoder.cc ++++ b/sherlock265/VideoDecoder.cc +@@ -237,7 +237,7 @@ void VideoDecoder::convert_frame_swscale(const de265_image* img, QImage & qimg) + } + width = img->get_width(); + height = img->get_height(); +- sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); ++ sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); + } + + int stride[3]; diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild new file mode 100644 index 000000000000..6af70da40898 --- /dev/null +++ b/media-libs/libde265/libde265-1.0.3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" ) + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Open h.265 video codec implementation" +HOMEPAGE="https://github.com/strukturag/libde265" + +LICENSE="GPL-3" +SLOT="0" +IUSE="cpu_flags_x86_sse debug libav qt5 static-libs" + +DEPEND=" + media-libs/libsdl[${MULTILIB_USEDEP}] + !libav? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) + libav? ( media-video/libav:=[${MULTILIB_USEDEP}] ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND}" + +PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch ) + +src_prepare() { + default + + eautoreconf + + # without this, headers would be missing and make would fail + multilib_copy_sources +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable cpu_flags_x86_sse sse) + $(use_enable static-libs static) + $(use_enable debug log-info) + $(use_enable debug log-debug) + $(use_enable debug log-trace) + --enable-log-error + ) + + if ! multilib_is_native_abi; then + myeconfargs+=( --disable-dec265 --disable-sherlock265 ) + else + myeconfargs+=( + $(use_enable qt5 dec265) + $(use_enable qt5 sherlock265) + ) + fi + + econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild index 5fd5bc2676da..8b1ede09936e 100644 --- a/media-libs/libde265/libde265-9999.ebuild +++ b/media-libs/libde265/libde265-9999.ebuild @@ -1,24 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 -inherit git-r3 autotools-multilib +inherit autotools multilib-minimal + +PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" ) + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Open h.265 video codec implementation" HOMEPAGE="https://github.com/strukturag/libde265" -EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="debug qt5 static-libs cpu_flags_x86_sse" +IUSE="cpu_flags_x86_sse debug libav qt5 static-libs" DEPEND=" - media-libs/libsdl - virtual/ffmpeg + media-libs/libsdl[${MULTILIB_USEDEP}] + !libav? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) + libav? ( media-video/libav:=[${MULTILIB_USEDEP}] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -27,19 +34,40 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" ) +src_prepare() { + default + + eautoreconf -src_configure() { + # without this, headers would be missing and make would fail + multilib_copy_sources +} + +multilib_src_configure() { local myeconfargs=( $(use_enable cpu_flags_x86_sse sse) $(use_enable static-libs static) $(use_enable debug log-info) $(use_enable debug log-debug) $(use_enable debug log-trace) - $(use_enable qt5 dec265) - $(use_enable qt5 sherlock265) - --disable-silent-rules --enable-log-error ) - autotools-multilib_src_configure "${myeconfargs[@]}" + + if ! multilib_is_native_abi; then + myeconfargs+=( --disable-dec265 --disable-sherlock265 ) + else + myeconfargs+=( + $(use_enable qt5 dec265) + $(use_enable qt5 sherlock265) + ) + fi + + econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi } -- cgit v1.2.3