commit: 9cda6edb27c2288e01ced3a797afb86b5bd9f2b1 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Jan 30 06:10:02 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Jan 30 06:17:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cda6edb
www-client/chromium: conditionally apply system-ffmpeg patch This patch causes chromium to segfault when using the bundled ffmpeg. Bug: https://bugs.gentoo.org/607454 Package-Manager: Portage-2.3.3_p42_p352298, Repoman-2.3.1_p35_p352298 ...6.0.2924.76.ebuild => chromium-56.0.2924.76-r1.ebuild} | 15 ++++++++------- www-client/chromium/chromium-57.0.2987.13.ebuild | 12 +++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/www-client/chromium/chromium-56.0.2924.76.ebuild b/www-client/chromium/chromium-56.0.2924.76-r1.ebuild similarity index 98% rename from www-client/chromium/chromium-56.0.2924.76.ebuild rename to www-client/chromium/chromium-56.0.2924.76-r1.ebuild index f72fda4..aa48b74 100644 --- a/www-client/chromium/chromium-56.0.2924.76.ebuild +++ b/www-client/chromium/chromium-56.0.2924.76-r1.ebuild @@ -155,13 +155,6 @@ For other desktop environments, try one of the following: - x11-themes/tango-icon-theme " -PATCHES=( - "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" - "${FILESDIR}/${PN}-widevine-r1.patch" - "${FILESDIR}/${PN}-glibc-2.24.patch" - "${FILESDIR}/${PN}-56-gcc4.patch" -) - pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then local -x CPP="$(tc-getCXX) -E" @@ -201,6 +194,14 @@ pkg_setup() { } src_prepare() { + local PATCHES=( + "${FILESDIR}/${PN}-widevine-r1.patch" + "${FILESDIR}/${PN}-glibc-2.24.patch" + "${FILESDIR}/${PN}-56-gcc4.patch" + ) + + use system-ffmpeg && PATCHES+=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" ) + default local keeplibs=( diff --git a/www-client/chromium/chromium-57.0.2987.13.ebuild b/www-client/chromium/chromium-57.0.2987.13.ebuild index 139ec0c..f9ea586 100644 --- a/www-client/chromium/chromium-57.0.2987.13.ebuild +++ b/www-client/chromium/chromium-57.0.2987.13.ebuild @@ -155,11 +155,6 @@ For other desktop environments, try one of the following: - x11-themes/tango-icon-theme " -PATCHES=( - "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" - "${FILESDIR}/${PN}-widevine-r1.patch" -) - pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then local -x CPP="$(tc-getCXX) -E" @@ -201,6 +196,13 @@ pkg_setup() { } src_prepare() { + local PATCHES=( + "${FILESDIR}/${PN}-widevine-r1.patch" + "${FILESDIR}/${PN}-FORTIFY_SOURCE.patch" + ) + + use system-ffmpeg && PATCHES+=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" ) + default local keeplibs=(
