[gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/, media-libs/libde265/files/

2018-09-21 Thread Thomas Deutschmann 
commit: 988c55a52db80f00f6f58bb4cbb4594296be6f22
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Sep 21 12:39:47 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Sep 21 12:41:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988c55a5

Revert "media-libs/libde265: Security cleanup"

This reverts commit c54a3c5bd7945246640be1e6e34a2b72d857b097.

 media-libs/libde265/Manifest   |  1 +
 .../libde265/files/libde265-1.0.2-qtbindir.patch   | 47 
 media-libs/libde265/libde265-1.0.2.ebuild  | 50 ++
 3 files changed, 98 insertions(+)

diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index e40b275b4d4..7b7d128f6e5 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1 +1,2 @@
+DIST libde265-1.0.2.tar.gz 381737 BLAKE2B 
cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b
 SHA512 
714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3
 DIST libde265-1.0.3.tar.gz 36 BLAKE2B 
988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175
 SHA512 
0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4

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 000..e73d43b5274
--- /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 
+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
new file mode 100644
index 000..a4b6724cc51
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-multilib
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265;
+SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug qt5 static-libs cpu_flags_x86_sse"
+
+DEPEND="
+   media-libs/libsdl
+   virtual/ffmpeg
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+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
+}
+
+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)
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/, media-libs/libde265/files/

2018-09-08 Thread Thomas Deutschmann 
commit: ed670c23c665f341bdd8bfd39f7c13a71ee59a81
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  8 21:58:52 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  8 22:04:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed670c23

media-libs/libde265: bump to v1.0.3

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/libde265/Manifest   |  1 +
 .../libde265-1.0.3-use-new-FFMPEG-enum-names.patch | 24 
 media-libs/libde265/libde265-1.0.3.ebuild  | 67 ++
 3 files changed, 92 insertions(+)

diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 1c531c91197..7b7d128f6e5 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1 +1,2 @@
 DIST libde265-1.0.2.tar.gz 381737 BLAKE2B 
cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b
 SHA512 
714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3
+DIST libde265-1.0.3.tar.gz 36 BLAKE2B 
988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175
 SHA512 
0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4

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 000..33e73c15a93
--- /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 000..c9de64e6a52
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.3.ebuild
@@ -0,0 +1,67 @@
+# 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} == "" ]] ; 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"
+
+   PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch )
+fi
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug qt5 static-libs cpu_flags_x86_sse"
+
+DEPEND="
+   media-libs/libsdl
+   virtual/ffmpeg
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+RDEPEND="${DEPEND}"
+
+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)
+   $(use_enable qt5 dec265)
+   $(use_enable qt5 sherlock265)
+   --enable-log-error
+   )
+   econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+   find "${ED}" -name '*.la' -delete || die
+   if ! use static-libs ; then
+   find "${ED}" -name "*.a" -delete || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/, media-libs/libde265/files/

2017-12-04 Thread Andreas Sturmlechner 
commit: 8d89e160b8cc497095359a4e0caf49a01d24d68a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec  5 00:34:19 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec  5 00:34:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d89e160

media-libs/libde265: Fix qtbindir

Closes: https://bugs.gentoo.org/595462
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-libs/libde265/Manifest   |  2 +-
 .../libde265/files/libde265-1.0.2-qtbindir.patch   | 47 ++
 media-libs/libde265/libde265-1.0.2.ebuild  |  2 +
 media-libs/libde265/libde265-.ebuild   |  2 +
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 4dba2d1bb4b..1c531c91197 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1 +1 @@
-DIST libde265-1.0.2.tar.gz 381737 SHA256 
c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8 SHA512 
714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3
 WHIRLPOOL 
39daca6fc9d6b68cf69c696467343f780d3e1333e0ff0b94ff942e893deb3898a2d91070d07c64b7c7a5eb24d4097c4bf55b7466327110566bfa4fc87fa9073a
+DIST libde265-1.0.2.tar.gz 381737 BLAKE2B 
cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b
 SHA512 
714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3

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 000..e73d43b5274
--- /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 
+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 59318a1ef2c..a4b6724cc51 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-.ebuild 
b/media-libs/libde265/libde265-.ebuild
index 6fd9decdd8c..5fd5bc2676d 100644
--- a/media-libs/libde265/libde265-.ebuild
+++ b/media-libs/libde265/libde265-.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)