summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-10-01 02:10:33 -0400
committerAlexis Ballier <aballier@gentoo.org>2017-10-04 10:01:42 +0200
commitfff114915bdd5c1de5c27bc0e07e9790c53f3285 (patch)
treeb612fc412f60e128e75111dd52429f3323d5523d /media-libs/avidemux-core/files
parentapp-admin/apache-tools: Removed old. (diff)
downloadgentoo-fff114915bdd5c1de5c27bc0e07e9790c53f3285.tar.gz
gentoo-fff114915bdd5c1de5c27bc0e07e9790c53f3285.tar.bz2
gentoo-fff114915bdd5c1de5c27bc0e07e9790c53f3285.zip
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
Diffstat (limited to 'media-libs/avidemux-core/files')
-rw-r--r--media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch18
1 files changed, 18 insertions, 0 deletions
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 "")