From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
Date: Wed, 4 Oct 2017 08:02:13 +0000 (UTC) [thread overview]
Message-ID: <1507104102.fff114915bdd5c1de5c27bc0e07e9790c53f3285.aballier@gentoo> (raw)
commit: fff114915bdd5c1de5c27bc0e07e9790c53f3285
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 06:10:33 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> 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 "")
next reply other threads:[~2017-10-04 8:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 8:02 Alexis Ballier [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-08-07 23:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/ Andreas Sturmlechner
2020-08-11 23:10 Thomas Deutschmann
2023-08-10 4:08 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507104102.fff114915bdd5c1de5c27bc0e07e9790c53f3285.aballier@gentoo \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox