[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2023-09-25 Thread Sam James 
commit: a3185f8b5fde29f163e24d010553020be5d53140
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 25 22:47:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 25 22:47:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3185f8b

media-libs/ffmpegsource: Stabilize 2.40-r2 x86, #914648

Signed-off-by: Sam James  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
index 94c2a48dac27..61748ddbefc3 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}"/ffms2-${PV}
 
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="MIT"

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2023-09-25 Thread Sam James 
commit: 2f57a673cc11d51b73ed55197145572d7d6927fb
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 25 22:47:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 25 22:47:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f57a673

media-libs/ffmpegsource: Stabilize 2.40-r2 amd64, #914648

Signed-off-by: Sam James  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
index 61748ddbefc3..8711e6ec40bc 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}"/ffms2-${PV}
 
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT"

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2023-05-31 Thread Nick Sarnie 
commit: b8241129e3de66e1c661eae9f1b5a8ceb8e63aac
Author: Nick Sarnie  gentoo  org>
AuthorDate: Thu Jun  1 00:07:43 2023 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Thu Jun  1 00:09:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8241129

media-libs/ffmpegsource: Fix QA warning

Closes: https://bugs.gentoo.org/899810

Signed-off-by: Nick Sarnie  gentoo.org>

 .../{ffmpegsource-2.40-r1.ebuild => ffmpegsource-2.40-r2.ebuild}   | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40-r1.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
similarity index 89%
rename from media-libs/ffmpegsource/ffmpegsource-2.40-r1.ebuild
rename to media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
index 5b1170bad347..94c2a48dac27 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.40-r1.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40-r2.ebuild
@@ -38,6 +38,13 @@ src_prepare() {
eautoreconf
 }
 
+src_configure() {
+   default
+
+   sed -i -e "s|@FFMS_VERSION@|${PV}|g" \
+   "${S}"/ffms2.pc.in || die
+}
+
 src_install() {
default

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2023-05-31 Thread Nick Sarnie 
commit: 229c1d720358b8cc636f5283a495059f2c5da48b
Author: Nick Sarnie  gentoo  org>
AuthorDate: Wed May 31 23:51:14 2023 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Wed May 31 23:51:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229c1d72

media-libs/ffmpegsource: add myself as a maintainer

Signed-off-by: Nick Sarnie  gentoo.org>

 media-libs/ffmpegsource/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/metadata.xml 
b/media-libs/ffmpegsource/metadata.xml
index dd8b7e80d1de..30fc814c34b3 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   sar...@gentoo.org
+   Nick Sarnie
+   

libffms2 soname version

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

2023-05-31 Thread Nick Sarnie 
commit: d1b13d1f73246abe7be23ab4f2560ea18d5bffb2
Author: Nick Sarnie  gentoo  org>
AuthorDate: Wed May 31 23:45:27 2023 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Wed May 31 23:47:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b13d1f

media-libs/ffmpegsource: Fix build with ffmpeg 5

Signed-off-by: Nick Sarnie  gentoo.org>

 .../ffmpegsource/ffmpegsource-2.40-r1.ebuild   |  45 +
 ...ffmpegsource-2.40-Fix-build-with-ffmpeg-5.patch | 106 +
 2 files changed, 151 insertions(+)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40-r1.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.40-r1.ebuild
new file mode 100644
index ..5b1170bad347
--- /dev/null
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
+inherit autotools
+
+DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
+HOMEPAGE="https://github.com/FFMS/ffms2";
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
+   inherit git-r3
+else
+   SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}"/ffms2-${PV}
+
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/4"
+
+RDEPEND="
+   >=media-video/ffmpeg-2.4:=
+   sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/${P}-Fix-build-with-ffmpeg-5.patch"
+
+src_prepare() {
+   default
+
+   # Cheesy hack from autogen.sh
+   mkdir src/config || die
+   eautoreconf
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+}

diff --git 
a/media-libs/ffmpegsource/files/ffmpegsource-2.40-Fix-build-with-ffmpeg-5.patch 
b/media-libs/ffmpegsource/files/ffmpegsource-2.40-Fix-build-with-ffmpeg-5.patch
new file mode 100644
index ..2a2cd0f0a5e1
--- /dev/null
+++ 
b/media-libs/ffmpegsource/files/ffmpegsource-2.40-Fix-build-with-ffmpeg-5.patch
@@ -0,0 +1,106 @@
+From 586d87de3f896d0c4ff01b21f572375e11f9c3f1 Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis 
+Date: Tue, 4 May 2021 14:20:47 +0100
+Subject: [PATCH] configure: Remove deprecated API use
+
+Signed-off-by: Derek Buitenhuis 
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b35ef80bcd..d19714d0f6 100644
+--- a/configure.ac
 b/configure.ac
+@@ -102,10 +102,10 @@ CFLAGS="$_CFLAGS $FFMPEG_CFLAGS"
+ 
+ AC_DEFUN([TEST_FFMPEG],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+-#include 
++#include 
+ #include 
+ ]],[[
+-avcodec_register_all();
++avformat_network_init();
+ swscale_version();
+ ]])], [eval $1=yes], [eval $1=no])
+ ])
+From 45673149e9a2f5586855ad472e3059084eaa36b1 Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis 
+Date: Tue, 4 May 2021 14:41:21 +0100
+Subject: [PATCH] Use auto for AVCodec
+
+The geniuses over at FFmpeg decided to constify this API, so old
+versions of the library will return AVCodec *, while new versions
+of the libary will return const AVCodec *, which, in C++, are not
+OK to convert between.
+
+Rather than use some macro hell in ffmscompat.h, we can work around
+this by using auto.
+
+Gross.
+
+Signed-off-by: Derek Buitenhuis 
+---
+ src/core/audiosource.cpp | 2 +-
+ src/core/indexing.cpp| 6 +++---
+ src/core/videosource.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp
+index e4ce97cdb..ac0966636 100644
+--- a/src/core/audiosource.cpp
 b/src/core/audiosource.cpp
+@@ -469,7 +469,7 @@ void FFMS_AudioSource::OpenFile() {
+
+ LAVFOpenFile(SourceFile.c_str(), FormatContext, TrackNumber);
+
+-AVCodec *Codec = 
avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id);
++auto *Codec = 
avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id);
+ if (Codec == nullptr)
+ throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC,
+ "Audio codec not found");
+diff --git a/src/core/indexing.cpp b/src/core/indexing.cpp
+index e547c5abf..59fb4e8ea 100644
+--- a/src/core/indexing.cpp
 b/src/core/indexing.cpp
+@@ -384,7 +384,7 @@ FFMS_TrackType FFMS_Indexer::GetTrackType(int Track) {
+ }
+
+ const char *FFMS_Indexer::GetTrackCodec(int Track) {
+-AVCodec *codec = 
avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id);
++auto *codec = 
avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id);
+ return codec ? codec->name : nullptr;
+ }
+
+@@ -402,7 +402,7 @@ FFMS_Index *FFMS_Indexer::DoIndexing() {
+ UseDTS);
+
+ if (IndexMask.cou

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2022-08-29 Thread Joonas Niilola 
commit: e2ee9967fbc601addd471aff55395c57a9ea2fa7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Aug 29 08:16:52 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Aug 29 08:16:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ee9967

Revert "media-libs/ffmpegsource: Revert "drop 2.23""

This reverts commit db0b33791aaa3bf57eec58da60ecbd0edf729e04.

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/ffmpegsource/Manifest |  1 -
 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 46 
 2 files changed, 47 deletions(-)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index e72577602b7a..58f673a2e731 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,2 +1 @@
-DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 
0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e
 SHA512 
dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
 DIST ffmpegsource-2.40.tar.gz 140356 BLAKE2B 
57fbc3d979f31108b257b6720045f4e157fca6714bf0f8601e8123c0026a14bb55d343549ff6b246b55a44b4f69c541c58f4b19f1051e338f1f97b2b7557b6de
 SHA512 
407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
deleted file mode 100644
index 4356ad9fb866..
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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"
-
-RDEPEND="
-   sys-libs/zlib
-   >=media-video/ffmpeg-2.4:0=
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-ffms_check_compiler() {
-   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
-}
-
-pkg_pretend() {
-   ffms_check_compiler
-}
-
-pkg_setup() {
-   ffms_check_compiler
-}
-
-src_prepare() {
-   default_src_prepare
-   eautoreconf
-}
-
-src_install() {
-   default_src_install
-   find "${ED}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2022-08-29 Thread Jakov Smolić 
commit: db0b33791aaa3bf57eec58da60ecbd0edf729e04
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug 29 08:08:39 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug 29 08:09:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0b3379

media-libs/ffmpegsource: Revert "drop 2.23"

media-video/aegisub-3.2.2_p20160518-r103 requires this version
This reverts commit 0e492d6522470f5e7d30beec99f5e16e5ad6ecb8.

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/ffmpegsource/Manifest |  1 +
 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 46 
 2 files changed, 47 insertions(+)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 58f673a2e731..e72577602b7a 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1 +1,2 @@
+DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 
0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e
 SHA512 
dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
 DIST ffmpegsource-2.40.tar.gz 140356 BLAKE2B 
57fbc3d979f31108b257b6720045f4e157fca6714bf0f8601e8123c0026a14bb55d343549ff6b246b55a44b4f69c541c58f4b19f1051e338f1f97b2b7557b6de
 SHA512 
407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
new file mode 100644
index ..4356ad9fb866
--- /dev/null
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools 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"
+
+RDEPEND="
+   sys-libs/zlib
+   >=media-video/ffmpeg-2.4:0=
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+ffms_check_compiler() {
+   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
+}
+
+pkg_pretend() {
+   ffms_check_compiler
+}
+
+pkg_setup() {
+   ffms_check_compiler
+}
+
+src_prepare() {
+   default_src_prepare
+   eautoreconf
+}
+
+src_install() {
+   default_src_install
+   find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2022-08-29 Thread Joonas Niilola 
commit: 0e492d6522470f5e7d30beec99f5e16e5ad6ecb8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Aug 29 07:15:58 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Aug 29 07:22:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e492d65

media-libs/ffmpegsource: drop 2.23

Bug: https://bugs.gentoo.org/867139
Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/ffmpegsource/Manifest |  1 -
 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 46 
 2 files changed, 47 deletions(-)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index e72577602b7a..58f673a2e731 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,2 +1 @@
-DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 
0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e
 SHA512 
dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
 DIST ffmpegsource-2.40.tar.gz 140356 BLAKE2B 
57fbc3d979f31108b257b6720045f4e157fca6714bf0f8601e8123c0026a14bb55d343549ff6b246b55a44b4f69c541c58f4b19f1051e338f1f97b2b7557b6de
 SHA512 
407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
deleted file mode 100644
index 4356ad9fb866..
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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"
-
-RDEPEND="
-   sys-libs/zlib
-   >=media-video/ffmpeg-2.4:0=
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-ffms_check_compiler() {
-   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
-}
-
-pkg_pretend() {
-   ffms_check_compiler
-}
-
-pkg_setup() {
-   ffms_check_compiler
-}
-
-src_prepare() {
-   default_src_prepare
-   eautoreconf
-}
-
-src_install() {
-   default_src_install
-   find "${ED}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2022-08-29 Thread Joonas Niilola 
commit: e2a68d166da909313896ba2fa474182969e72097
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Aug 29 07:03:43 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Aug 29 07:21:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a68d16

media-libs/ffmpegsource: Stabilize 2.40 x86, #867139

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
index a3272a191e96..156ad2599e29 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}"/ffms2-${PV}
 
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT"

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2022-07-26 Thread Sam James 
commit: 28702e2a5310ec37e3957e761c8419237daf1ef1
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 26 21:23:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 26 21:38:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28702e2a

media-libs/ffmpegsource: add 2.40

Closes: https://bugs.gentoo.org/851066
Closes: https://bugs.gentoo.org/834381
Closes: https://bugs.gentoo.org/859865
Signed-off-by: Sam James  gentoo.org>

 media-libs/ffmpegsource/Manifest |  1 +
 media-libs/ffmpegsource/ffmpegsource-2.40.ebuild | 43 +
 media-libs/ffmpegsource/ffmpegsource-.ebuild | 48 +++-
 3 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 31437963fc7a..e72577602b7a 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1 +1,2 @@
 DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 
0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e
 SHA512 
dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
+DIST ffmpegsource-2.40.tar.gz 140356 BLAKE2B 
57fbc3d979f31108b257b6720045f4e157fca6714bf0f8601e8123c0026a14bb55d343549ff6b246b55a44b4f69c541c58f4b19f1051e338f1f97b2b7557b6de
 SHA512 
407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
new file mode 100644
index ..1ea646b97aa7
--- /dev/null
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
+inherit autotools
+
+DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
+HOMEPAGE="https://github.com/FFMS/ffms2";
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
+   inherit git-r3
+else
+   SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}"/ffms2-${PV}
+
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/4"
+
+RDEPEND="
+   >=media-video/ffmpeg-2.4:=
+   sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+   default
+
+   # Cheesy hack from autogen.sh
+   mkdir src/config || die
+   eautoreconf
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+}

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 6393bcca9c70..1ea646b97aa7 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -1,47 +1,43 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools flag-o-matic git-r3
+QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
+inherit autotools
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
 HOMEPAGE="https://github.com/FFMS/ffms2";
-EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
+   inherit git-r3
+else
+   SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}"/ffms2-${PV}
+
+   KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS=""
 
 RDEPEND="
+   >=media-video/ffmpeg-2.4:=
sys-libs/zlib
-   >=media-video/ffmpeg-2.4:0=
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
 "
-
-ffms_check_compiler() {
-   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
-}
-
-pkg_pretend() {
-   ffms_check_compiler
-}
-
-pkg_setup() {
-   ffms_check_compiler
-}
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-   mkdir -p "${S}/src/config"
-   default_src_prepare
+   default
+
+   # Cheesy hack from autogen.sh
+   mkdir src/config || die
eautoreconf
 }
 
 src_install() {
-   default_src_install
+   default
+
find "${ED}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2020-04-25 Thread Mikle Kolyada 
commit: cd8bb5f95e536bb3a3e3b223d20e400c2c36207f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr 25 19:27:08 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr 25 19:27:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8bb5f9

media-libs/ffmpegsource: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 4 +---
 media-libs/ffmpegsource/ffmpegsource-.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
index 49a76ea1542..09065b7eccb 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -12,12 +12,10 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS="amd64 x86"
-IUSE="libav"
 
 RDEPEND="
sys-libs/zlib
-   !libav? ( >=media-video/ffmpeg-2.4:0= )
-   libav? ( >=media-video/libav-9:0= )
+   >=media-video/ffmpeg-2.4:0=
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 1117295b147..24db4238a96 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -12,12 +12,10 @@ EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS=""
-IUSE="libav"
 
 RDEPEND="
sys-libs/zlib
-   !libav? ( >=media-video/ffmpeg-2.4:0= )
-   libav? ( >=media-video/libav-9:0= )
+   >=media-video/ffmpeg-2.4:0=
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2017-12-24 Thread Patrice Clement 
commit: c9c51bb2d6df3bad3f462ef7177970c70c028b0d
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sun Dec 24 12:36:38 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 24 17:07:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c51bb2

media-libs/ffmpegsource: remove myself from maintainers.

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6618

 media-libs/ffmpegsource/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-libs/ffmpegsource/metadata.xml 
b/media-libs/ffmpegsource/metadata.xml
index 057f0e4daaf..ce8e375ad33 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   itumaykin+gen...@gmail.com
-   Coacher
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
+   

libffms2 soname version

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2017-12-20 Thread Craig Andrews 
commit: d4af9f987b24eb6f61113b0145cb517aeda7165c
Author: Kagami Hiiragi  genshiken  org>
AuthorDate: Sat Nov 25 12:20:11 2017 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Thu Dec 21 00:43:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4af9f98

media-libs/ffmpegsource: fix build of git version

Directory for config needs to be created.
See upstream change: 
https://github.com/FFMS/ffms2/commit/660e23bd2ed6090eb8b79e5b5d1aea61d75c3514

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 7f457d85c06..8f773c387ca 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -38,6 +38,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   mkdir -p "${S}/src/config"
default_src_prepare
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2017-07-30 Thread Michał Górny 
commit: eb9126fca10a1e377dc4868d10c8b550cb921084
Author: David Hicks  hicks  id  au>
AuthorDate: Sat Jul 29 17:39:35 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 09:44:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9126fc

media-libs/ffmpegsource: use HTTPS for GitHub

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index b08717ef9ed..7f457d85c06 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools eutils flag-o-matic git-r3
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
 HOMEPAGE="https://github.com/FFMS/ffms2";
-EGIT_REPO_URI=( {https,git}://github.com/FFMS/ffms2.git )
+EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
 
 LICENSE="MIT"
 SLOT="0/4"

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

2017-01-12 Thread Patrice Clement 
commit: 980810e3f0147f4e7be57f8c786d1b2e185b9f9e
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue Jan 10 15:40:31 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jan 12 14:06:06 2017 +
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..
--- 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..
--- a/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 1dc922cdd0798d5522331f1c98657f494d18c6b9
-Author: Derek Buitenhuis 
-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 
-
-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 
- 
-+extern "C" {
- #include 
- #include 
- #include 
-+}
- 
- 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..
--- a/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit d4cf0fcdb355319e2f868d4e474a6b78b36848fd
-Author: Derek Buitenhuis 
-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 
-
-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 V

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2017-01-10 Thread Agostino Sarubbo 
commit: fcfb81f3589188470d7c1920d97ac72aeecf6f8b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan 10 15:21:17 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan 10 15:21:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcfb81f3

media-libs/ffmpegsource: x86 stable wrt bug #604700

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
index 57d649f..33a9fe7 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2017-01-10 Thread Agostino Sarubbo 
commit: 7a22db79112d689b62a620c86da24039f755a5e7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan 10 14:53:30 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan 10 14:53:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a22db79

media-libs/ffmpegsource: amd64 stable wrt bug #604700

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
index a0244dc..57d649f 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libav"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-10-20 Thread David Seifert 
commit: 5ca0e6f72c367f505b823e03935877838b5b11d2
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Wed Oct 19 18:23:54 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Oct 20 23:39:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca0e6f7

media-libs/ffmpegsource: update live ebuild

Prefer HTTPS URI, drop unneeded '--modules' argument for
prune_libtool_files, do compiler checks in pkg_setup too.

Signed-off-by: David Seifert  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 8e2ad6a..7ce0501 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -8,7 +8,7 @@ inherit autotools eutils flag-o-matic git-r3
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
 HOMEPAGE="https://github.com/FFMS/ffms2";
-EGIT_REPO_URI="git://github.com/FFMS/ffms2.git"
+EGIT_REPO_URI=( {https,git}://github.com/FFMS/ffms2.git )
 
 LICENSE="MIT"
 SLOT="0/4"
@@ -24,12 +24,20 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-pkg_pretend() {
+ffms_check_compiler() {
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
 }
 
+pkg_pretend() {
+   ffms_check_compiler
+}
+
+pkg_setup() {
+   ffms_check_compiler
+}
+
 src_prepare() {
default_src_prepare
eautoreconf
@@ -37,5 +45,5 @@ src_prepare() {
 
 src_install() {
default_src_install
-   prune_libtool_files --modules
+   prune_libtool_files
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-10-20 Thread David Seifert 
commit: f1dc329f673d3064c59fd67a9197f9057233c359
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Wed Oct 19 20:45:08 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Oct 20 23:39:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1dc329f

media-libs/ffmpegsource: verbump to 2.23

Closes: https://github.com/gentoo/gentoo/pull/2602
Package-Manager: portage-2.3.2

Signed-off-by: David Seifert  gentoo.org>

 media-libs/ffmpegsource/Manifest |  1 +
 media-libs/ffmpegsource/ffmpegsource-2.23.ebuild | 49 
 2 files changed, 50 insertions(+)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 323ca2b..2c14a15 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1 +1,2 @@
 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.23.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
new file mode 100644
index ..a0244dc
--- /dev/null
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils 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"
+
+RDEPEND="
+   sys-libs/zlib
+   !libav? ( >=media-video/ffmpeg-2.4:0= )
+   libav? ( >=media-video/libav-9:0= )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+ffms_check_compiler() {
+   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
+}
+
+pkg_pretend() {
+   ffms_check_compiler
+}
+
+pkg_setup() {
+   ffms_check_compiler
+}
+
+src_prepare() {
+   default_src_prepare
+   eautoreconf
+}
+
+src_install() {
+   default_src_install
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-06-26 Thread Göktürk Yüksek 
commit: 8cdd1e2f3c5278e31affe85c21a73592fafeabe3
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sun Jun 26 17:05:59 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Jun 27 00:23:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdd1e2f

media-libs/ffmpegsource: cleanup maintainer list

Acked-By: Maxim Koltsov  gentoo.org>

Package-Manager: portage-2.3.0

 media-libs/ffmpegsource/metadata.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/media-libs/ffmpegsource/metadata.xml 
b/media-libs/ffmpegsource/metadata.xml
index 560f89c..057f0e4 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -4,11 +4,6 @@

itumaykin+gen...@gmail.com
Coacher
-   Proxied maintainer; set to assignee in all 
bugs
-   
-   
-   maksbo...@gentoo.org
-   Maxim Koltsov


proxy-ma...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-05-09 Thread Ian Delaney 
commit: 85ace4e0690d543746149b6be3705eac06f54dcb
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Thu May  5 00:57:04 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon May  9 12:21:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ace4e0

media-libs/ffmpegsource: update live ebuild

Bump EAPI to 6, drop unused static-libs USE.

Closes: https://github.com/gentoo/gentoo/pull/1439
Package-Manager: portage-2.2.28

Signed-off-by: Ian Delaney  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index f057f8a..8e2ad6a 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -2,20 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils flag-o-matic git-r3
+inherit autotools eutils flag-o-matic git-r3
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
 HOMEPAGE="https://github.com/FFMS/ffms2";
-EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
+EGIT_REPO_URI="git://github.com/FFMS/ffms2.git"
 
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS=""
-IUSE="libav static-libs"
+IUSE="libav"
 
 RDEPEND="
sys-libs/zlib
@@ -31,3 +29,13 @@ pkg_pretend() {
die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or 
Clang>=3.3."
fi
 }
+
+src_prepare() {
+   default_src_prepare
+   eautoreconf
+}
+
+src_install() {
+   default_src_install
+   prune_libtool_files --modules
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-03-06 Thread Patrice Clement 
commit: c7462b856bf1dd91cfeb2cb8be530d0a6f53c32d
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Fri Mar  4 09:13:24 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Mar  4 09:16:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7462b85

media-libs/ffmpegsource: add subslot description to metadata.xml

Package-Manager: portage-2.2.27

 media-libs/ffmpegsource/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/ffmpegsource/metadata.xml 
b/media-libs/ffmpegsource/metadata.xml
index a844bb7..560f89c 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -14,6 +14,9 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   libffms2 soname version
+   

FFMS/ffms2

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-02-15 Thread Patrice Clement 
commit: deb8a946d484d0955eb93496e24304224977442e
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sun Feb 14 13:37:41 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Feb 14 13:40:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb8a946

media-libs/ffmpegsource: remove old

Package-Manager: portage-2.2.27

 media-libs/ffmpegsource/Manifest |  1 -
 media-libs/ffmpegsource/ffmpegsource-2.20.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 26d9dff..323ca2b 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,2 +1 @@
-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

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
deleted file mode 100644
index 5ada343..000
--- a/media-libs/ffmpegsource/ffmpegsource-2.20.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}"

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-02-14 Thread Agostino Sarubbo 
commit: 66790026f971e81fe0c14131919242479041d534
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 14 10:08:29 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 14 10:10:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66790026

media-libs/ffmpegsource: x86 stable wrt bug #574364

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
index 47a6d56..4103c1a 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-02-13 Thread Agostino Sarubbo 
commit: 317853e3a0ba169227381ee0828a8368f2a78896
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Feb 13 15:30:27 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Feb 13 15:30:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317853e3

media-libs/ffmpegsource: amd64 stable wrt bug #574364

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/ffmpegsource/ffmpegsource-2.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
index 4a8b2a3..47a6d56 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libav static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-02-02 Thread Patrice Clement 
commit: 86862f53165d5b1ff86b15941fa1d31fe3e469c2
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue Feb  2 02:13:28 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Feb  2 02:13:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86862f53

media-libs/ffmpegsource: drop inactive proxy maintainer

After many pings there's no reply from him. See 8549f2c for reference.

Package-Manager: portage-2.2.27

 media-libs/ffmpegsource/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-libs/ffmpegsource/metadata.xml 
b/media-libs/ffmpegsource/metadata.xml
index 8c85acc..a844bb7 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -7,10 +7,6 @@
Proxied maintainer; set to assignee in all 
bugs


-   nik...@gmx.us
-   Nikoli
-   
-   
maksbo...@gentoo.org
Maxim Koltsov

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-01-09 Thread Ian Delaney 
commit: 8d660890e344106f71de80aa40ed36a24d30c0ab
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 15:20:59 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d660890

media-libs/ffmpegsource: reset minimum ffmpeg version in RDEPEND in 

ffmpegsource can utilize libswresample >= 1.0.0,
which is available in ffmpeg >= 2.4.

Package-Manager: portage-2.2.26

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 44b00c4..450fd0b 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -20,7 +20,7 @@ IUSE="libav static-libs"
 RDEPEND="
sys-libs/zlib
libav? ( >=media-video/libav-9.17:0= )
-   !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
+   !libav? ( >=media-video/ffmpeg-2.4:0= )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-01-09 Thread Ian Delaney 
commit: c2889dbafbd040218e6059813960d4b258a8481a
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 14:17:25 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2889dba

media-libs/ffmpegsource: bump subslot to 0/4 as per upstream SONAME bump

Package-Manager: portage-2.2.26

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 5dedcdf..44b00c4 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/FFMS/ffms2";
 EGIT_REPO_URI="https://github.com/FFMS/ffms2.git";
 
 LICENSE="MIT"
-SLOT="0/3"
+SLOT="0/4"
 KEYWORDS=""
 IUSE="libav static-libs"

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-01-09 Thread Ian Delaney 
commit: 23737029b88271aaeecb41e68bc99ac98f26d9bd
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 15:37:38 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23737029

media-libs/ffmpegsource: reset minimum libav version in RDEPEND in 

All libraries listed in configure.ac are available in libav >= 9.

Package-Manager: portage-2.2.26

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 450fd0b..fa0a03e 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -19,7 +19,7 @@ IUSE="libav static-libs"
 
 RDEPEND="
sys-libs/zlib
-   libav? ( >=media-video/libav-9.17:0= )
+   libav? ( >=media-video/libav-9:0= )
!libav? ( >=media-video/ffmpeg-2.4:0= )
 "
 DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-01-09 Thread Ian Delaney 
commit: f42a3e80ef0dc81ad22bf5c9bb3d64553dab3a48
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 20:28:46 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42a3e80

media-libs/ffmpegsource: add myself as a proxy-maintainer

As agreed upon with Ian Delaney (idella4).

Package-Manager: portage-2.2.26

 media-libs/ffmpegsource/metadata.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-libs/ffmpegsource/metadata.xml 
b/media-libs/ffmpegsource/metadata.xml
index 663a7d6..88c4964 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -3,6 +3,11 @@
 
proxy-maintainers

+   itumaykin+gen...@gmail.com
+   Coacher
+   Proxied maintainer; set to assignee in all 
bugs
+   
+   
nik...@gmx.us
Nikoli

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

2016-01-09 Thread Ian Delaney 
commit: 2f1bb65c02b810f2639aa38e5b2082a6191a3b49
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 18:48:49 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:58 2016 +
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..000
--- 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..000
--- 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..000
--- 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_D

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

2016-01-09 Thread Ian Delaney 
commit: 95b17a979efbb78a23484cbca6447e536552a1ac
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 19:42:57 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b17a97

media-libs/ffmpegsource: verbump to 2.22 wrt bug 564524

Gentoo-Bug: 564524

Package-Manager: portage-2.2.26

 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 insertions(+)

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index c928826..ab2fa50 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,3 +1,4 @@
 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.22.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
new file mode 100644
index 000..4a8b2a3
--- /dev/null
+++ b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
@@ -0,0 +1,39 @@
+# 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
new file mode 100644
index 000..9ef42d7
--- /dev/null
+++ b/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch
@@ -0,0 +1,27 @@
+commit 1dc922cdd0798d5522331f1c98657f494d18c6b9
+Author: Derek Buitenhuis 
+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 
+
+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 
+ 
++extern "C" {
+ #include 
+ #include 
+ #include 
++}
+ 
+ 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.

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-01-09 Thread Ian Delaney 
commit: c85b0ebc4c3dd239db14b4edce521e8d8aca7bd3
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 15:39:07 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85b0ebc

media-libs/ffmpegsource: sort dependencies alphabetically

Package-Manager: portage-2.2.26

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index fa0a03e..56009a4 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -19,8 +19,8 @@ IUSE="libav static-libs"
 
 RDEPEND="
sys-libs/zlib
-   libav? ( >=media-video/libav-9:0= )
!libav? ( >=media-video/ffmpeg-2.4:0= )
+   libav? ( >=media-video/libav-9:0= )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2016-01-09 Thread Ian Delaney 
commit: 7e82ccff9a4699660a250848df2a66c49001c1f8
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan  9 19:40:23 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Jan 10 01:58:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e82ccff

media-libs/ffmpegsource: add compiler check for C++11 support

Package-Manager: portage-2.2.26

 media-libs/ffmpegsource/ffmpegsource-.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-.ebuild
index 56009a4..f057f8a 100644
--- a/media-libs/ffmpegsource/ffmpegsource-.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 
-inherit autotools-utils git-r3
+inherit autotools-utils flag-o-matic git-r3
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate 
access"
 HOMEPAGE="https://github.com/FFMS/ffms2";
@@ -25,3 +25,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
virtual/pkgconfig
 "
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/ffmpegsource/

2015-08-16 Thread Mikle Kolyada 
commit: 83232b86d738f9d4e865821e99b0d81495d0527d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Aug 16 23:14:52 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Aug 16 23:14:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83232b86

media-libs/ffmpegsource: amd64 stable wrt bug #538542

Package-Manager: portage-2.2.20.1

 media-libs/ffmpegsource/ffmpegsource-2.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild 
b/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
index 0f3d877..5ada343 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="libav static-libs"
 
 RDEPEND="