gentoo resync : 25.03.2022

3 files changed, 138 insertions, 0 deletions

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 6962cb3eeb81..881d1ec007a3 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,9 +1,12 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
+AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
 DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a
 DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d
+DIST intel-gmmlib-22.1.1.tar.gz 813482 BLAKE2B 756741d0624a55a9ec3fdcf42a3d98a7e396424901f9035d1540c42f4b5bac281c1eb6dcc3753e0495fb52597a5b90f831cb7c5ef7fc4e5b0014b5cfe9584001 SHA512 5640d3d2b01ffa980be867d63bacefef5a241ca7dc3a1f39d48f9538cfefcc7274f40e3cc259c958e0f5abd1d12edd4e64377dbc245962781c6f0dd922ab298e
 EBUILD gmmlib-22.0.2.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
 EBUILD gmmlib-22.0.3-r1.ebuild 962 BLAKE2B b985222af586f9481786480fa90fcb9d53ca94526ee12a52050a557d04d92d7dccbf12738c857ea121e918f53a07b7cd438d26aa4bf83e03fa247b1d7c5c8d7f SHA512 dfbad61d40e0d7ef12b1802e360ea884cd0c6721873cc56f2ea4a201ccdcbcfaf9e3103472966ab04b0361ca8fff81b17c12fc455d63837afc9143e079028048
+EBUILD gmmlib-22.1.1.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
 EBUILD gmmlib-9999.ebuild 1041 BLAKE2B ec38f9b28cd6be9bc9698c2e30e05dce3a67b80069d56a280d86676646537de50c0fa679a92b5bc852941b50cd2cf54187aa9c3a157fc1eb409aa036cc0202cb SHA512 5a9e3bfecc94e7e68d8d1917800323fd39dbed6ee11ec3823b443af4de3c19b980ef9c16ddb76d783165f2c05f4d9df09a428dbc8d5d8db3d62a24943f7bb524
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
new file mode 100644
index 000000000000..d4acb515bf3d
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
@@ -0,0 +1,102 @@
+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
+@@ -74,6 +74,10 @@
+     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
+@@ -76,7 +76,10 @@
+     -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
+@@ -85,19 +88,31 @@
+     -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
+@@ -105,11 +120,16 @@
+     -fmessage-length=0
+     -fvisibility=hidden
+     -fPIC
++    )
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     -g
+     # -m32 or -m64
+     -m${GMMLIB_ARCH}
+     )
+ endif()
++endif()
+ 
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ #Gcc only flags
+@@ -167,10 +187,12 @@
+ 
+ #set predefined compiler flags set
+ add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}")
++if (OVERRIDE_COMPILER_FLAGS)
+ add_compile_options("$<$<CONFIG:Debug>:${GMMLIB_COMPILER_FLAGS_DEBUG}>")
+ add_compile_options("$<$<CONFIG:Release>:${GMMLIB_COMPILER_FLAGS_RELEASE}>")
+ add_compile_options("$<$<CONFIG:ReleaseInternal>:${GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL}>")
+ #cmake 3.3+, add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${GMMLIB_COMPILER_CXX_FLAGS_COMMON}>")
++endif()
+ foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON})
+     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ endforeach()
+@@ -179,6 +201,8 @@
+     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ else()
++    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()
+ endif()
diff --git a/media-libs/gmmlib/gmmlib-22.1.1.ebuild b/media-libs/gmmlib/gmmlib-22.1.1.ebuild
new file mode 100644
index 000000000000..f0fd281de976
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12.1"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}