| 1 |
commit: 2550cb9a9478bebfe3fa141f7a2278448694c666 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 09:45:37 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 09:45:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2550cb9a |
| 7 |
|
| 8 |
media-video/ffmpeg: Bump to 3.2.3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
media-video/ffmpeg/Manifest | 2 +- |
| 13 |
.../{ffmpeg-3.2.2.ebuild => ffmpeg-3.2.3.ebuild} | 2 -- |
| 14 |
media-video/ffmpeg/files/chromaprint14.patch | 24 ---------------------- |
| 15 |
3 files changed, 1 insertion(+), 27 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest |
| 18 |
index 4994b85..27c2e2a 100644 |
| 19 |
--- a/media-video/ffmpeg/Manifest |
| 20 |
+++ b/media-video/ffmpeg/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
DIST ffmpeg-2.8.10.tar.bz2 8585304 SHA256 d1ce1a73503dce6e2b1e208cb93a2a8a7e89f9c64357ddc3e4da3cab33dea9c9 SHA512 1ca8b0060361c49de201afc463bcd7c9340f09bbd116dff2539653bc36411d60cdf667874d2ec51664e141ee7a7be8bebc94e158687cb97db6bdfa40f00ec193 WHIRLPOOL 4ff9271290c138ad5caa50835da9fd6685fabf5a589cb6c068cfff6698ded948d93e9d40656dca3b516f9e591119d204e6283d57f7d2f0747a4f7ef9b322ebce |
| 23 |
-DIST ffmpeg-3.2.2.tar.bz2 9611373 SHA256 0b129a56d1b8d06101b1fcbfaa9f4f5eee3182d1ad6e44f511a84c12113a366b SHA512 7cb61684081bbe905ef324f60d259fd543e8be1ed2593167beb9324bec8bbc012cccff40a73e8be0ccc6bb0a20acd98a3dbac0d1d39403016cb381c1410b45db WHIRLPOOL fe43df569f88b79d5bfaab1d16929d3f3eaf7deecd3ca42a922d67cd971d8ac0a17b2dfc6db75b706a93da7e877887dcc75a38609e62e2ea4781b9363292a872 |
| 24 |
+DIST ffmpeg-3.2.3.tar.bz2 9614810 SHA256 e9a41be04e8a7f62f83d0ff5ecaa9c82a857f9200f61b02ef5f304a16fb9b072 SHA512 97f44497b2b9beccbefe8c28e1f82629e74537a585720323adc60620af2782d376498fd3558ddf0d39b9010cbddc3fb62907e3c214ccac72ec1fcbd64baf4b0f WHIRLPOOL 1b45cdc6e0eac48d65105fe04b3eea1ae6ae719abbfa5700d4e103e061e69a47caab544f71de8fce3d8c3aa83bba2e452b1b4a06c8e2c0aad3ec5f6bf34ff249 |
| 25 |
|
| 26 |
diff --git a/media-video/ffmpeg/ffmpeg-3.2.2.ebuild b/media-video/ffmpeg/ffmpeg-3.2.3.ebuild |
| 27 |
similarity index 99% |
| 28 |
rename from media-video/ffmpeg/ffmpeg-3.2.2.ebuild |
| 29 |
rename to media-video/ffmpeg/ffmpeg-3.2.3.ebuild |
| 30 |
index 0bd671e..576150b 100644 |
| 31 |
--- a/media-video/ffmpeg/ffmpeg-3.2.2.ebuild |
| 32 |
+++ b/media-video/ffmpeg/ffmpeg-3.2.3.ebuild |
| 33 |
@@ -284,8 +284,6 @@ RESTRICT=" |
| 34 |
|
| 35 |
S=${WORKDIR}/${P/_/-} |
| 36 |
|
| 37 |
-PATCHES=( "${FILESDIR}/chromaprint14.patch" ) |
| 38 |
- |
| 39 |
MULTILIB_WRAPPED_HEADERS=( |
| 40 |
/usr/include/libavutil/avconfig.h |
| 41 |
) |
| 42 |
|
| 43 |
diff --git a/media-video/ffmpeg/files/chromaprint14.patch b/media-video/ffmpeg/files/chromaprint14.patch |
| 44 |
deleted file mode 100644 |
| 45 |
index d166247..00000000 |
| 46 |
--- a/media-video/ffmpeg/files/chromaprint14.patch |
| 47 |
+++ /dev/null |
| 48 |
@@ -1,24 +0,0 @@ |
| 49 |
-commit 581f93f37ef2e7a00662828ed0348d1edb9041fe |
| 50 |
-Author: Georgi D. Sotirov <gdsotirov@×××.bg> |
| 51 |
-Date: Tue Dec 6 21:07:59 2016 +0100 |
| 52 |
- |
| 53 |
- lavf/chromaprint: Update for version 1.4 |
| 54 |
- |
| 55 |
- Fixes ticket #5997. |
| 56 |
- |
| 57 |
-diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c |
| 58 |
-index 8c9a6c0111..4da02bef76 100644 |
| 59 |
---- a/libavformat/chromaprint.c |
| 60 |
-+++ b/libavformat/chromaprint.c |
| 61 |
-@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext { |
| 62 |
- int silence_threshold; |
| 63 |
- int algorithm; |
| 64 |
- FingerprintFormat fp_format; |
| 65 |
-+#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0) |
| 66 |
-+ ChromaprintContext *ctx; |
| 67 |
-+#else |
| 68 |
- ChromaprintContext ctx; |
| 69 |
-+#endif |
| 70 |
- } ChromaprintMuxContext; |
| 71 |
- |
| 72 |
- static void cleanup(ChromaprintMuxContext *cpr) |
Archives