From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D617A1388BF for ; Sun, 10 Jan 2016 01:59:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11F8B21C019; Sun, 10 Jan 2016 01:59:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9193B21C015 for ; Sun, 10 Jan 2016 01:59:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67CDB340775 for ; Sun, 10 Jan 2016 01:59:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E334CD24 for ; Sun, 10 Jan 2016 01:59:28 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1452391138.2f1bb65c02b810f2639aa38e5b2082a6191a3b49.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/files/, media-libs/ffmpegsource/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/ffmpegsource/Manifest media-libs/ffmpegsource/ffmpegsource-2.17.ebuild media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild media-libs/ffmpegsource/files/ffmpegsource-2.17-ffmpeg.patch X-VCS-Directories: media-libs/ffmpegsource/files/ media-libs/ffmpegsource/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 2f1bb65c02b810f2639aa38e5b2082a6191a3b49 X-VCS-Branch: master Date: Sun, 10 Jan 2016 01:59:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 872a770f-9b54-40c7-94ef-78379933c934 X-Archives-Hash: 6181be3175149ea10c41f858287fcb88 commit: 2f1bb65c02b810f2639aa38e5b2082a6191a3b49 Author: Ilya Tumaykin gmail com> AuthorDate: Sat Jan 9 18:48:49 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Sun Jan 10 01:58:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1bb65c media-libs/ffmpegsource: remove old Package-Manager: portage-2.2.26 media-libs/ffmpegsource/Manifest | 2 - media-libs/ffmpegsource/ffmpegsource-2.17.ebuild | 39 -------- media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild | 28 ------ .../files/ffmpegsource-2.17-ffmpeg.patch | 102 --------------------- 4 files changed, 171 deletions(-) diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest index ab2fa50..26d9dff 100644 --- a/media-libs/ffmpegsource/Manifest +++ b/media-libs/ffmpegsource/Manifest @@ -1,4 +1,2 @@ -DIST ffmpegsource-2.19.1.tar.gz 512381 SHA256 39c8a5f6c6735d10b3b0a3830f71ef0182b42e747cbceb6bf9b8dcc0532c99db SHA512 e6e9a49af8eb9c1f5a54db8a74879cefbd4876329b71b09ebf79fc6f25808a12cc020ebe275607773127b908c67fc7c92f264b49e02ce08ec209a7d94e9d3a67 WHIRLPOOL 469519aee1a7364e21bb988481e6709af8ee53d18cd5be4d00c148a5e0f940491d6c777d387d3fcdbf74fde5c3c6da843205dd378e7fb301f65981daddf71760 DIST ffmpegsource-2.20.tar.gz 539587 SHA256 c7d880172756c253f2c5673044dabf03c19890dcfe64da5104ee9f42a1a573a0 SHA512 77cfb027a6be21952700fadee66467d18bc0521569cf3d5eef3f7fd3ff9785ba1c6b7a251a5ccfb8b6e8dd965aef9928cf27459dca28591eeddd1fd5a2905295 WHIRLPOOL 321cc4a3ff37201def87bfb7596e84e76cb58fb05a43d99901eaca8f46f712fa4d86af9cdc65a24749c2715a4f52c9106ab2b24d7060cfe87f5401e520ac7fb1 DIST ffmpegsource-2.22.tar.gz 487244 SHA256 7c5202fa2e49186fb3bb815e5b12ca71f05ec09cb707ffd9465852e21a06fdad SHA512 af92766f19b5db15c2f0b08e4d894e26bb66f93360b12461d37f38983a4e1916656514d52bf86f8a5def83207e2433d04f58384b1cf8f617ab19aafd2f0d7d56 WHIRLPOOL 2fb1b189ba573fd2e1f65e61cfa365201a419a3bb066ef54e06c07c5f8eabcfb93dc3191c860a8816a797eb9e47a62929a35c1c786a43712ab80ac2df69ee811 -DIST ffms-2.17-src.tar.bz2 394862 SHA256 991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d SHA512 18a7ccbc9a665c1293dc17dccf3253fc4cad4449fc774242b773360eacb4eceb3440cd0dedbf4dfca51b40c5b2759bdd8b524cfba38339aff2460967ef8f0aa3 WHIRLPOOL 4f7ab6b1897d78b4a67c1ae5a1fce1c0d657454d6174fd738dbf8f0ecf77a5e137b6d263be0a8feb6b65db7b7f6ba7d0f601d719e6edb0e68850bf9662b39cb9 diff --git a/media-libs/ffmpegsource/ffmpegsource-2.17.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.17.ebuild deleted file mode 100644 index c1613d6..0000000 --- a/media-libs/ffmpegsource/ffmpegsource-2.17.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -MY_P="ffms-${PV}-src" -DESCRIPTION="An FFmpeg based source library for easy frame accurate access" -HOMEPAGE="https://code.google.com/p/ffmpegsource/" -SRC_URI="https://ffmpegsource.googlecode.com/files/${MY_P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs" - -RDEPEND=" - sys-libs/zlib - >=virtual/ffmpeg-0.9 -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" ) - -src_configure() { - local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - autotools-utils_src_configure -} diff --git a/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild deleted file mode 100644 index 5ada343..0000000 --- a/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -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/3" -KEYWORDS="amd64 x86" -IUSE="libav static-libs" - -RDEPEND=" - sys-libs/zlib - libav? ( >=media-video/libav-9.17:0= ) - !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -S="${WORKDIR}/ffms2-${PV}" diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.17-ffmpeg.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.17-ffmpeg.patch deleted file mode 100644 index 41c4fb5..0000000 --- a/media-libs/ffmpegsource/files/ffmpegsource-2.17-ffmpeg.patch +++ /dev/null @@ -1,102 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=417983 -Backported from upstream. - -Index: ffms-2.17-src/configure.in -=================================================================== ---- ffms-2.17-src.orig/configure.in -+++ ffms-2.17-src/configure.in -@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV], - #include - #include - ]],[[ -- avcodec_init(); -+ av_register_all(); - swscale_version(); - #ifdef FFMS_USE_FFMPEG_COMPAT - int bogus = CODEC_ID_G2M; -Index: ffms-2.17-src/include/ffmscompat.h -=================================================================== ---- ffms-2.17-src.orig/include/ffmscompat.h -+++ ffms-2.17-src/include/ffmscompat.h -@@ -84,6 +84,14 @@ - # else - # define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1)) - # endif -+# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100) -+# define FFMS_ID(x) (CODEC_ID_##x) -+# define FFMS_CodecID CodecID -+# else -+# define FFMS_ID(x) (AV_CODEC_ID_##x) -+# define FFMS_CodecID AVCodecID -+# undef CodecID -+# endif - #endif - - #ifdef LIBAVUTIL_VERSION_INT -Index: ffms-2.17-src/src/core/codectype.cpp -=================================================================== ---- ffms-2.17-src.orig/src/core/codectype.cpp -+++ ffms-2.17-src/src/core/codectype.cpp -@@ -25,7 +25,7 @@ - - typedef struct CodecTags { - char str[20]; -- CodecID id; -+ FFMS_CodecID id; - } CodecTags; - - static const CodecTags mkv_codec_tags[] = { -@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[] - }; - - typedef struct AVCodecTag { -- enum CodecID id; -+ enum FFMS_CodecID id; - unsigned int tag; - } AVCodecTag; - -@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa - } - } - --CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) { -+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) { - /* Look up native codecs */ - for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){ - if(!strncmp(mkv_codec_tags[i].str, Codec, -@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec, - - // Uncompressed and exotic format fixup - // This list is incomplete -- CodecID CID = mkv_codec_tags[i].id; -+ FFMS_CodecID CID = mkv_codec_tags[i].id; - switch (CID) { - case CODEC_ID_PCM_S16LE: - switch (BitsPerSample) { -Index: ffms-2.17-src/src/core/codectype.h -=================================================================== ---- ffms-2.17-src.orig/src/core/codectype.h -+++ ffms-2.17-src/src/core/codectype.h -@@ -27,5 +27,5 @@ extern "C" { - #include "ffmscompat.h" - - FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT); --CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0); -+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0); - const char *GetLAVCSampleFormatName(AVSampleFormat s); -Index: ffms-2.17-src/src/core/matroskaparser.h -=================================================================== ---- ffms-2.17-src.orig/src/core/matroskaparser.h -+++ ffms-2.17-src/src/core/matroskaparser.h -@@ -32,6 +32,11 @@ - #ifndef MATROSKA_PARSER_H - #define MATROSKA_PARSER_H - -+/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */ -+#ifdef CodecID -+#undef CodecID -+#endif -+ - /* Random notes: - * - * The parser does not process frame data in any way and does not read it into