| 1 |
commit: fff114915bdd5c1de5c27bc0e07e9790c53f3285 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 1 06:10:33 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 4 08:01:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff11491 |
| 7 |
|
| 8 |
media-libs/avidemux-core: Fix building avidemux-plugins with >=cmake-3.9.0 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/625930 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
.../avidemux-core/avidemux-core-2.6.20-r1.ebuild | 2 ++ |
| 14 |
.../files/avidemux-core-2.6.20-fix-cmake.patch | 18 ++++++++++++++++++ |
| 15 |
2 files changed, 20 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild |
| 18 |
index 16e22ff152f..64d78546cff 100644 |
| 19 |
--- a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild |
| 20 |
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild |
| 21 |
@@ -54,6 +54,8 @@ DEPEND=" |
| 22 |
S="${WORKDIR}/${MY_P}" |
| 23 |
CMAKE_USE_DIR="${S}/${PN/-/_}" |
| 24 |
|
| 25 |
+PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch ) |
| 26 |
+ |
| 27 |
src_prepare() { |
| 28 |
cmake-utils_src_prepare |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..d7df42d31b5 |
| 34 |
--- /dev/null |
| 35 |
+++ b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch |
| 36 |
@@ -0,0 +1,18 @@ |
| 37 |
+Bug: https://bugs.gentoo.org/625930 |
| 38 |
+Backported from https://github.com/mean00/avidemux2/commit/c5edc6cf7b3768ac1409c6cef69ab5980a86596a |
| 39 |
+ |
| 40 |
+diff -Naur a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake |
| 41 |
+--- a/cmake/admCheckX264.cmake 2017-04-28 05:22:27.000000000 -0400 |
| 42 |
++++ b/cmake/admCheckX264.cmake 2017-10-01 01:38:33.249996381 -0400 |
| 43 |
+@@ -20,9 +20,9 @@ |
| 44 |
+ ELSE (x264_version LESS 67) |
| 45 |
+ IF (x264_version GREATER 73) |
| 46 |
+ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version}) |
| 47 |
++ ELSE (x264_version GREATER 73) |
| 48 |
++ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) |
| 49 |
+ ENDIF (x264_version GREATER 73) |
| 50 |
+- ELSE (x264_version LESS 67) |
| 51 |
+- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) |
| 52 |
+ ENDIF (x264_version LESS 67) |
| 53 |
+ IF(X264_FOUND) |
| 54 |
+ SET(USE_X264 True CACHE BOOL "") |
Archives