commit: 980810e3f0147f4e7be57f8c786d1b2e185b9f9e Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Tue Jan 10 15:40:31 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Thu Jan 12 14:06:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980810e3
media-libs/ffmpegsource: remove old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3420 media-libs/ffmpegsource/Manifest | 1 - media-libs/ffmpegsource/ffmpegsource-2.22.ebuild | 39 ---------------------- .../ffmpegsource-2.22-add-missing-extern-C.patch | 27 --------------- .../ffmpegsource-2.22-fix-pixfmt-define.patch | 31 ----------------- .../ffmpegsource-2.22-include-missing-header.patch | 22 ------------ 5 files changed, 120 deletions(-) diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest index 2c14a15..7827337 100644 --- a/media-libs/ffmpegsource/Manifest +++ b/media-libs/ffmpegsource/Manifest @@ -1,2 +1 @@ -DIST ffmpegsource-2.22.tar.gz 487244 SHA256 7c5202fa2e49186fb3bb815e5b12ca71f05ec09cb707ffd9465852e21a06fdad SHA512 af92766f19b5db15c2f0b08e4d894e26bb66f93360b12461d37f38983a4e1916656514d52bf86f8a5def83207e2433d04f58384b1cf8f617ab19aafd2f0d7d56 WHIRLPOOL 2fb1b189ba573fd2e1f65e61cfa365201a419a3bb066ef54e06c07c5f8eabcfb93dc3191c860a8816a797eb9e47a62929a35c1c786a43712ab80ac2df69ee811 DIST ffmpegsource-2.23.tar.gz 488940 SHA256 b09b2aa2b1c6f87f94a0a0dd8284b3c791cbe77f0f3df57af99ddebcd15273ed SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c WHIRLPOOL 432967d5b4aae29102fe2e8d4473e06b457101a9e93db4def30e6d29a792698471dd55d65afca7febf9f18dc0fc3c35997e78e4ce6474803e446530e995218ba diff --git a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild deleted file mode 100644 index 4103c1a..00000000 --- a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils flag-o-matic vcs-snapshot - -DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access" -HOMEPAGE="https://github.com/FFMS/ffms2"; -SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/4" -KEYWORDS="amd64 x86" -IUSE="libav static-libs" - -RDEPEND=" - sys-libs/zlib - !libav? ( >=media-video/ffmpeg-2.4:0= ) - libav? ( >=media-video/libav-9:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-fix-pixfmt-define.patch" - "${FILESDIR}/${P}-include-missing-header.patch" - "${FILESDIR}/${P}-add-missing-extern-C.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then - die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." - fi -} diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch deleted file mode 100644 index 9ef42d7..00000000 --- a/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 1dc922cdd0798d5522331f1c98657f494d18c6b9 -Author: Derek Buitenhuis <[email protected]> -Date: Sun Dec 27 18:37:59 2015 -0500 - - track: Wrap C headers in extern "C" properly - - This fixes av_rescale being undefiend during linking with some - GCC versions (e.g. 4.8.4 on Ubuntu 14.04). - - Signed-off-by: Derek Buitenhuis <[email protected]> - -diff --git a/src/core/track.cpp b/src/core/track.cpp -index 136bc21..23e57ad 100644 ---- a/src/core/track.cpp -+++ b/src/core/track.cpp -@@ -25,9 +25,11 @@ - - #include <algorithm> - -+extern "C" { - #include <libavutil/avutil.h> - #include <libavutil/common.h> - #include <libavutil/mathematics.h> -+} - - namespace { - FrameInfo ReadFrame(ZipFile &stream, FrameInfo const& prev, const FFMS_TrackType TT) { diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch deleted file mode 100644 index 9815edc..00000000 --- a/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit d4cf0fcdb355319e2f868d4e474a6b78b36848fd -Author: Derek Buitenhuis <[email protected]> -Date: Sun Dec 27 18:36:27 2015 -0500 - - ffmscompat: Use a separate version check for pixfmt flags - - These changed during a separate version bump from the pixfmts themselves. - - What a mess. - - Signed-off-by: Derek Buitenhuis <[email protected]> - -diff --git a/include/ffmscompat.h b/include/ffmscompat.h -index be99db8..eea9029 100644 ---- a/include/ffmscompat.h -+++ b/include/ffmscompat.h -@@ -88,9 +88,13 @@ static void av_frame_free(AVFrame **frame) { av_freep(frame); } - # if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 51, 42, 0, 51, 74, 100) - # define AVPixelFormat PixelFormat - # define FFMS_PIX_FMT(x) PIX_FMT_##x --# define FFMS_PIX_FMT_FLAG(x) PIX_FMT_##x - # else - # define FFMS_PIX_FMT(x) AV_PIX_FMT_##x -+# endif -+ -+# if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 52, 11, 0, 52, 32, 100) -+# define FFMS_PIX_FMT_FLAG(x) PIX_FMT_##x -+# else - # define FFMS_PIX_FMT_FLAG(x) AV_PIX_FMT_FLAG_##x - # endif - diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.22-include-missing-header.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.22-include-missing-header.patch deleted file mode 100644 index bae86ec..00000000 --- a/media-libs/ffmpegsource/files/ffmpegsource-2.22-include-missing-header.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 848f7656e1e912352345f84b9499ab4483902d3b -Author: Derek Buitenhuis <[email protected]> -Date: Sun Dec 27 18:37:28 2015 -0500 - - track: Include missing header - - This is requried for av_rescale. - - Signed-off-by: Derek Buitenhuis <[email protected]> - -diff --git a/src/core/track.cpp b/src/core/track.cpp -index 3300094..136bc21 100644 ---- a/src/core/track.cpp -+++ b/src/core/track.cpp -@@ -27,6 +27,7 @@ - - #include <libavutil/avutil.h> - #include <libavutil/common.h> -+#include <libavutil/mathematics.h> - - namespace { - FrameInfo ReadFrame(ZipFile &stream, FrameInfo const& prev, const FFMS_TrackType TT) {
