From: Peter Levine <plevine457@gmail.com>
Date: Sun, 1 Oct 2017 06:10:33 +0000 (-0400)
Subject: media-libs/avidemux-core: Fix building avidemux-plugins with >=cmake-3.9.0
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fff114915bdd5c1de5c27bc0e07e9790c53f3285;p=gentoo.git

media-libs/avidemux-core: Fix building avidemux-plugins with >=cmake-3.9.0

Bug: https://bugs.gentoo.org/625930
Package-Manager: Portage-2.3.10, Repoman-2.3.3
---

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
index 16e22ff152f2..64d78546cff2 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
@@ -54,6 +54,8 @@ DEPEND="
 S="${WORKDIR}/${MY_P}"
 CMAKE_USE_DIR="${S}/${PN/-/_}"
 
+PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch  )
+
 src_prepare() {
 	cmake-utils_src_prepare
 
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
new file mode 100644
index 000000000000..d7df42d31b5f
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/625930
+Backported from https://github.com/mean00/avidemux2/commit/c5edc6cf7b3768ac1409c6cef69ab5980a86596a
+
+diff -Naur a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake
+--- a/cmake/admCheckX264.cmake	2017-04-28 05:22:27.000000000 -0400
++++ b/cmake/admCheckX264.cmake	2017-10-01 01:38:33.249996381 -0400
+@@ -20,9 +20,9 @@
+ 				ELSE (x264_version LESS 67)
+                                         IF (x264_version GREATER 73)
+ 					        FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
++                                        ELSE (x264_version GREATER 73)
++					        FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
+                                         ENDIF (x264_version GREATER 73)
+-				ELSE (x264_version LESS 67)
+-					FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
+ 				ENDIF (x264_version LESS 67)
+                                 IF(X264_FOUND)
+                                         SET(USE_X264 True CACHE BOOL "")