diff options
Diffstat (limited to 'media-libs/libde265')
| -rw-r--r-- | media-libs/libde265/Manifest | 7 | ||||
| -rw-r--r-- | media-libs/libde265/files/libde265-1.0.2-qtbindir.patch | 47 | ||||
| -rw-r--r-- | media-libs/libde265/libde265-1.0.2.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/libde265/libde265-9999.ebuild | 2 |
4 files changed, 55 insertions, 3 deletions
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest index 31b52b6dce12..89b9c8bba6e5 100644 --- a/media-libs/libde265/Manifest +++ b/media-libs/libde265/Manifest @@ -1,4 +1,5 @@ -DIST libde265-1.0.2.tar.gz 381737 SHA256 c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8 SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 WHIRLPOOL 39daca6fc9d6b68cf69c696467343f780d3e1333e0ff0b94ff942e893deb3898a2d91070d07c64b7c7a5eb24d4097c4bf55b7466327110566bfa4fc87fa9073a -EBUILD libde265-1.0.2.ebuild 1098 BLAKE2B 84a8b0c4e82413bd92860d18dec011b3844857b530ab9a5d13c6de7dd12dad5ba85aced8a81b173364ce6adc0eca7e2f3ec28c984622c35dc611be794c8e2384 SHA512 0509b0a2c7d41d48b681123b07e66d82fe11458a761220bb6a7ae95d768abd6d39f3ab965563d9a342d5ef5cfdfba7bd2d15cfab97ebb168391333c808a182b4 -EBUILD libde265-9999.ebuild 951 BLAKE2B 7bd796f4ffdd2d39e3bd9ffa20074ade6a8eefbfe91010acbe9ed6ae805f2cf72a65eebc9ca622250ffebe7e5069723d75f8e98d7623c24770a2b36ca494a900 SHA512 081400525be8e5600d90adecbfaf4df5e21ca469d191fb1f63614a9450774f2523a1329feec06aad393bf0667c32bedd0fcd2396916db4e93e97a0a0e6dc9e6c +AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c +DIST libde265-1.0.2.tar.gz 381737 BLAKE2B cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 +EBUILD libde265-1.0.2.ebuild 1145 BLAKE2B 409cf24b55254fd24ea1412d4213c8e1273451b5edea43e5f76ed2ef3b9bffca7bc6962e2567c27b025a7b9daa0c1f76438205d6bb15b3191b0e4b4d64a9ce12 SHA512 0e272b944534f0f6cbd0c32849b90ba41122dbab3881927bb4b7f4e440a894acd8f85e6acef281b94834c4460b888ffff553b0bc340815fe07683912951e4cda +EBUILD libde265-9999.ebuild 1005 BLAKE2B 0a7e866206e91c1bf13dd1d22259fd95b7cfc495eaf9f611a88b0859bd33256bf346e4c7d9848f49d900c1ab95f3b515a58632f5aa3938aad3e8f3044fbef690 SHA512 7d29c80398f718490dcc2183af73484e96896afcc962c84f3ad3b7af10f2ab6cf166adeab3cd5d464d77bd88fc076811f8ba98ce7c447685771e8675c40240ad MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273 diff --git a/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch b/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch new file mode 100644 index 000000000000..e73d43b52744 --- /dev/null +++ b/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch @@ -0,0 +1,47 @@ +From 88924722c0e25566953276c52df7ef5040714cc5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Tue, 5 Dec 2017 01:19:53 +0100 +Subject: [PATCH] Fix Qt5 moc detection, throw away Qt4 + +--- + configure.ac | 24 ++++++------------------ + 1 file changed, 6 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6580963..eb4ccec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -325,24 +325,12 @@ if eval "test $enable_sherlock265 = yes" && eval "test $have_videogfx != yes" && + fi + + if eval "test $enable_sherlock265 = yes" ; then +- PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets], [found_qt=5], [found_qt=no]) +- if eval "test $found_qt = no" ; then +- PKG_CHECK_MODULES([QT], [QtCore QtGui], [found_qt=4]) +- fi +- AC_PATH_PROGS([QTCHOOSER],[qtchooser]) +- if eval "test x$QTCHOOSER = x" ; then +- AC_PATH_PROGS([QTMOC],[moc-qt$found_qt moc]) +- if eval "test x$QTMOC = x" ; then +- AC_MSG_ERROR([Need the "moc" commandline tool which is required to generate the Qt files required for sherlock265.]) +- fi +- else +- QTMOC="$QTCHOOSER -run-tool=moc -qt=$found_qt" +- fi +- AC_MSG_CHECKING([for version of $QTMOC]) +- QTMOC_VERSION=`$QTMOC -v 2>&1 | $GREP -o '[[0-9]]\+.[[0-9]]\+.[[0-9]]\+'` +- AC_MSG_RESULT([$QTMOC_VERSION]) +- AX_COMPARE_VERSION([$QTMOC_VERSION], [lt], [$found_qt], +- [AC_MSG_ERROR([Please install "moc" for Qt$found_qt (found $QTMOC_VERSION).])]) ++ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Gui Qt5Widgets], [ ++ QT_PATH="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )" ++ AC_PATH_PROGS([QTMOC], [moc-qt5 moc], [moc], [$QT_PATH]) ++ ], [ ++ AC_MSG_ERROR([Qt5 moc not found, which is required to generate the Qt files for sherlock265.]) ++ ]) + AC_SUBST(QTMOC) + fi + +-- +2.15.1 + diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild index 59318a1ef2cd..a4b6724cc51f 100644 --- a/media-libs/libde265/libde265-1.0.2.ebuild +++ b/media-libs/libde265/libde265-1.0.2.ebuild @@ -27,6 +27,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" ) + src_prepare() { sed -ri 's/(PIX_FMT_)/AV_\1/g' sherlock265/VideoDecoder.cc || die autotools-multilib_src_prepare diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild index 6fd9decdd8cc..5fd5bc2676da 100644 --- a/media-libs/libde265/libde265-9999.ebuild +++ b/media-libs/libde265/libde265-9999.ebuild @@ -27,6 +27,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" ) + src_configure() { local myeconfargs=( $(use_enable cpu_flags_x86_sse sse) |