* [gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/files/, media-libs/libde265/
@ 2018-09-21 8:50 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2018-09-21 8:50 UTC (permalink / raw
To: gentoo-commits
commit: c54a3c5bd7945246640be1e6e34a2b72d857b097
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 08:50:15 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 08:50:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54a3c5b
media-libs/libde265: Security cleanup
Bug: https://bugs.gentoo.org/665520
Package-Manager: Portage-2.3.49, Repoman-2.3.10
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 deletions(-)
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 7b7d128f6e5..e40b275b4d4 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,2 +1 @@
-DIST libde265-1.0.2.tar.gz 381737 BLAKE2B cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3
DIST libde265-1.0.3.tar.gz 399996 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
deleted file mode 100644
index e73d43b5274..00000000000
--- a/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index a4b6724cc51..00000000000
--- a/media-libs/libde265/libde265-1.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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)
- $(use_enable qt5 dec265)
- $(use_enable qt5 sherlock265)
- --disable-silent-rules
- --enable-log-error
- )
- autotools-multilib_src_configure "${myeconfargs[@]}"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/files/, media-libs/libde265/
@ 2021-02-13 20:59 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2021-02-13 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 5e34d641193b9db174117d3b5cf9b23904ff0bff
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Feb 13 19:45:05 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:59:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e34d641
media-libs/libde265: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
media-libs/libde265/Manifest | 2 -
.../libde265-1.0.3-use-new-FFMPEG-enum-names.patch | 24 ------
media-libs/libde265/libde265-1.0.3.ebuild | 74 ----------------
media-libs/libde265/libde265-1.0.5.ebuild | 99 ----------------------
media-libs/libde265/metadata.xml | 1 -
5 files changed, 200 deletions(-)
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 465223a3e67..2fd004d257a 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,3 +1 @@
-DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
-DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f76701783bc30d81305cf9026a853746449ece5b3092534466ea13d67bac10b3258580c8de07489844bbef0395db SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e
DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
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
deleted file mode 100644
index 33e73c15a93..00000000000
--- a/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/575554
-
-From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <farin@struktur.de>
-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
deleted file mode 100644
index 7eec974a733..00000000000
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 arm64 ~ppc64 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 qt5 static-libs"
-
-DEPEND="
- media-libs/libsdl[${MULTILIB_USEDEP}]
- media-video/ffmpeg:=[${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-1.0.5.ebuild b/media-libs/libde265/libde265-1.0.5.ebuild
deleted file mode 100644
index cd979e8c83f..00000000000
--- a/media-libs/libde265/libde265-1.0.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Open h.265 video codec implementation"
-HOMEPAGE="https://github.com/strukturag/libde265"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
-# IUSE+=" sherlock265" # Require libvideogfx or libswscale
-
-RDEPEND="
- dec265? (
- sdl? ( media-libs/libsdl )
- )
-"
-# Sherlock265 require libvideogfx or libswscale
-#RDEPEND+="
-# sherlock265? (
-# media-libs/libsdl
-# dev-qt/qtcore:5
-# dev-qt/qtgui:5
-# dev-qt/qtwidgets:5
-# media-libs/libswscale
-# )
-#"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dec265? ( virtual/pkgconfig )"
-
-# Sherlock265 require libvideogfx or libswscale
-#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
-
-src_prepare() {
- default
-
- eautoreconf
-
- # without this, headers would be missing and make would fail
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
- ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
- $(use_enable cpu_flags_arm_thumb thumb)
- $(use_enable static-libs static)
- $(use_enable debug log-info)
- $(use_enable debug log-debug)
- $(use_enable debug log-trace)
- $(multilib_native_use_enable enc265 encoder)
- $(multilib_native_use_enable dec265)
- --enable-log-error
- )
-
- # myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
- myeconfargs+=( --disable-sherlock265 )
-
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- # Remove useless, unready and test tools (Why package ever tried to install them??)
- rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
- if ! use tools; then
- rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
- rm -f "${ED}/usr/bin/acceleration_speed" || die
- fi
- else
- # Remove all non-native binary tools
- rm -f "${ED}/usr/bin/"* || die
- fi
-}
-
-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/metadata.xml b/media-libs/libde265/metadata.xml
index 524e76641f5..d63797e27e8 100644
--- a/media-libs/libde265/metadata.xml
+++ b/media-libs/libde265/metadata.xml
@@ -9,7 +9,6 @@
<flag name="dec265">Enable build of dec265 example program</flag>
<flag name="sdl">Enable video output of dec265 example program with <pkg>media-libs/libsdl</pkg></flag>
<flag name="tools">Enable installation of varous binary tools</flag>
- <flag name="static-libs">Enable build of static libraries</flag>
</use>
<upstream>
<remote-id type="github">strukturag/libde265</remote-id>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-13 20:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-21 8:50 [gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/files/, media-libs/libde265/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2021-02-13 20:59 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox