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 02A071382C5 for ; Thu, 14 Jan 2021 20:15:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52F69E0831; Thu, 14 Jan 2021 20:15:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 26E99E0831 for ; Thu, 14 Jan 2021 20:15:20 +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 B603D335C29 for ; Thu, 14 Jan 2021 20:15:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 586FB32B for ; Thu, 14 Jan 2021 20:15:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1610655308.8faadb60e5edae6a42398bdb34680338bfdeac73.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags_v2.patch media-libs/gmmlib/gmmlib-20.4.1.ebuild media-libs/gmmlib/gmmlib-9999.ebuild X-VCS-Directories: media-libs/gmmlib/ media-libs/gmmlib/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8faadb60e5edae6a42398bdb34680338bfdeac73 X-VCS-Branch: master Date: Thu, 14 Jan 2021 20:15:17 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09f3d08f-547f-46ff-9aa4-64cc7e1eeb88 X-Archives-Hash: 6617459e1370bd46138bd9cfd23f39b9 commit: 8faadb60e5edae6a42398bdb34680338bfdeac73 Author: Sam James gentoo org> AuthorDate: Thu Jan 14 20:15:08 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 14 20:15:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8faadb60 media-libs/gmmlib: drop old patch Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../gmmlib/files/gmmlib-20.4.1_custom_cflags.patch | 16 ++-- .../files/gmmlib-20.4.1_custom_cflags_v2.patch | 98 ---------------------- media-libs/gmmlib/gmmlib-20.4.1.ebuild | 2 +- media-libs/gmmlib/gmmlib-9999.ebuild | 2 +- 4 files changed, 13 insertions(+), 105 deletions(-) diff --git a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch index 47e5288e62e..ebc41d01c9c 100644 --- a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch +++ b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch @@ -1,4 +1,7 @@ -diff --git a/Source/GmmLib/CMakeLists.txt b/Source/GmmLib/CMakeLists.txt + Prevent overriding of user-define CFLAGS, including -march flag. + The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code. + Note: code should detect CPU features at runtime and use sse4.1 paths only if supported by CPU. + --- a/Source/GmmLib/CMakeLists.txt +++ b/Source/GmmLib/CMakeLists.txt @@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM) @@ -12,7 +15,6 @@ diff --git a/Source/GmmLib/CMakeLists.txt b/Source/GmmLib/CMakeLists.txt # begin -- label bldsys file prologue # WARNING: The "project" statement triggers reading of CMAKE_TOOLCHAIN_FILE # and so must precede the inclusion below of bs_init.cmake . -diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake --- a/Source/GmmLib/Linux.cmake +++ b/Source/GmmLib/Linux.cmake @@ -38,7 +38,10 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON @@ -26,14 +28,18 @@ diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake # General optimization options -march=${GMMLIB_MARCH} -mpopcnt -@@ -50,16 +53,28 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON - -msse4.1 +@@ -47,19 +50,31 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON + -msse3 + -mssse3 + -msse4 +- -msse4.1 -msse4.2 - -mfpmath=sse + ) +endif() + +list (APPEND GMMLIB_COMPILER_FLAGS_COMMON ++ -msse4.1 # SSE4.1 compiler support is required to build + -mfpmath=sse -finline-functions -fno-short-enums -Wa,--noexecstack diff --git a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags_v2.patch b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags_v2.patch deleted file mode 100644 index ebc41d01c9c..00000000000 --- a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags_v2.patch +++ /dev/null @@ -1,98 +0,0 @@ - Prevent overriding of user-define CFLAGS, including -march flag. - The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code. - Note: code should detect CPU features at runtime and use sse4.1 paths only if supported by CPU. - ---- a/Source/GmmLib/CMakeLists.txt -+++ b/Source/GmmLib/CMakeLists.txt -@@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM) - endif() - endif() - -+if(NOT DEFINED OVERRIDE_COMPILER_FLAGS) -+ option(OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON) -+endif() -+ - # begin -- label bldsys file prologue - # WARNING: The "project" statement triggers reading of CMAKE_TOOLCHAIN_FILE - # and so must precede the inclusion below of bs_init.cmake . ---- a/Source/GmmLib/Linux.cmake -+++ b/Source/GmmLib/Linux.cmake -@@ -38,7 +38,10 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON - -Werror=format-security - -Werror=non-virtual-dtor - -Werror=return-type -+ ) - -+if (OVERRIDE_COMPILER_FLAGS) -+ list (APPEND GMMLIB_COMPILER_FLAGS_COMMON - # General optimization options - -march=${GMMLIB_MARCH} - -mpopcnt -@@ -47,19 +50,31 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON - -msse3 - -mssse3 - -msse4 -- -msse4.1 - -msse4.2 -+ ) -+endif() -+ -+list (APPEND GMMLIB_COMPILER_FLAGS_COMMON -+ -msse4.1 # SSE4.1 compiler support is required to build - -mfpmath=sse - -finline-functions - -fno-short-enums - -Wa,--noexecstack - -fno-strict-aliasing -+ ) -+ -+if (OVERRIDE_COMPILER_FLAGS) -+ list (APPEND GMMLIB_COMPILER_FLAGS_COMMON - # Common defines - -DUSE_MMX - -DUSE_SSE - -DUSE_SSE2 - -DUSE_SSE3 - -DUSE_SSSE3 -+ ) -+endif() -+ -+list (APPEND GMMLIB_COMPILER_FLAGS_COMMON - # Other common flags - -fstack-protector - -fdata-sections -@@ -67,10 +82,15 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON - -fmessage-length=0 - -fvisibility=hidden - -fPIC -+ ) -+ -+if (OVERRIDE_COMPILER_FLAGS) -+ list (APPEND GMMLIB_COMPILER_FLAGS_COMMON - -g - # -m32 or -m64 - -m${GMMLIB_ARCH} - ) -+endif() - - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - #Gcc only flags -@@ -128,13 +148,17 @@ SET( GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL ${GMMLIB_COMPILER_FLAGS_RELEASE}) - - #set predefined compiler flags set - add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}") -+if (OVERRIDE_COMPILER_FLAGS) - add_compile_options("$<$:${GMMLIB_COMPILER_FLAGS_DEBUG}>") - add_compile_options("$<$:${GMMLIB_COMPILER_FLAGS_RELEASE}>") - add_compile_options("$<$:${GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL}>") - #cmake 3.3+, add_compile_options("$<$:${GMMLIB_COMPILER_CXX_FLAGS_COMMON}>") -+endif() - foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON}) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") - endforeach() - -+if (OVERRIDE_COMPILER_FLAGS) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}") -+endif() - diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild index 96d61c91c6f..09b5bcec53f 100644 --- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild +++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild @@ -36,7 +36,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.4.1_custom_cflags_v2.patch + "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch ) multilib_src_configure() { diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index 96d61c91c6f..09b5bcec53f 100644 --- a/media-libs/gmmlib/gmmlib-9999.ebuild +++ b/media-libs/gmmlib/gmmlib-9999.ebuild @@ -36,7 +36,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.4.1_custom_cflags_v2.patch + "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch ) multilib_src_configure() {