From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B0AC1396D1 for ; Wed, 4 Oct 2017 08:02:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55030E0E82; Wed, 4 Oct 2017 08:02:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FCA6E0E82 for ; Wed, 4 Oct 2017 08:02:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 174B3341817 for ; Wed, 4 Oct 2017 08:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5476C746E for ; Wed, 4 Oct 2017 08:02:13 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1507104102.fff114915bdd5c1de5c27bc0e07e9790c53f3285.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch X-VCS-Directories: media-libs/avidemux-core/ media-libs/avidemux-core/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: fff114915bdd5c1de5c27bc0e07e9790c53f3285 X-VCS-Branch: master Date: Wed, 4 Oct 2017 08:02:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3bbf87c4-1d85-4aae-80b6-d10264b080d0 X-Archives-Hash: b1bbd3172687b13993e9b1c7afdc1eff commit: fff114915bdd5c1de5c27bc0e07e9790c53f3285 Author: Peter Levine gmail com> AuthorDate: Sun Oct 1 06:10:33 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Wed Oct 4 08:01:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff11491 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 .../avidemux-core/avidemux-core-2.6.20-r1.ebuild | 2 ++ .../files/avidemux-core-2.6.20-fix-cmake.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) 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 16e22ff152f..64d78546cff 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 00000000000..d7df42d31b5 --- /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 "")