diff options
Diffstat (limited to 'media-libs/gmmlib')
-rw-r--r-- | media-libs/gmmlib/Manifest | 9 | ||||
-rw-r--r-- | media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch | 98 | ||||
-rw-r--r-- | media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild | 36 | ||||
-rw-r--r-- | media-libs/gmmlib/gmmlib-22.1.1.ebuild | 33 | ||||
-rw-r--r-- | media-libs/gmmlib/gmmlib-22.1.2.ebuild | 2 | ||||
-rw-r--r-- | media-libs/gmmlib/gmmlib-9999.ebuild | 2 |
6 files changed, 4 insertions, 176 deletions
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 1a29fbfd9df2..09564626b207 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -1,12 +1,7 @@ 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.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d -DIST intel-gmmlib-22.1.1.tar.gz 813482 BLAKE2B 756741d0624a55a9ec3fdcf42a3d98a7e396424901f9035d1540c42f4b5bac281c1eb6dcc3753e0495fb52597a5b90f831cb7c5ef7fc4e5b0014b5cfe9584001 SHA512 5640d3d2b01ffa980be867d63bacefef5a241ca7dc3a1f39d48f9538cfefcc7274f40e3cc259c958e0f5abd1d12edd4e64377dbc245962781c6f0dd922ab298e DIST intel-gmmlib-22.1.2.tar.gz 813247 BLAKE2B 5d2c632239bbe12779f3aa07744de966501a5182ae415746f9bdf141f1ec9f94fae67df21424effeefbbfe2b5bd58d267687ca7623e7d1e736c92da09135868b SHA512 fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53 -EBUILD gmmlib-22.0.3-r1.ebuild 961 BLAKE2B 2f5c2d6559bd93f099d0fe52483d251a099472c7a028b5c1773b6ee9e6bf9060129cf239166998d25619a8fc56510a98061faf243fea9093c2037298f6b2d420 SHA512 a39b38a83da902d4c7e072ac0e4bdffc19c5b1438c96789d58a05b0c142bccec0367ab38a4858a7511b3685e5f8ca96f4085db52f430915aa86e05579453ea87 -EBUILD gmmlib-22.1.1.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd -EBUILD gmmlib-22.1.2.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd -EBUILD gmmlib-9999.ebuild 847 BLAKE2B c9b0e8885ed3223e349447caa3253b3ddca1f2bc1a98404271c0d26085b107240aeaa27bb535a6251707899e204cd7b87a7d3e84a0843c4af4c55418a2eb982a SHA512 93cc4374dfcb1b5af52c1c7fa0845ba57940a823eb0313add092a72dd039afd323cbc73918fdd044426238553c65c2ab95b6e8f90f5e4939761e458d6b0e7423 +EBUILD gmmlib-22.1.2.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902 +EBUILD gmmlib-9999.ebuild 847 BLAKE2B 2d9e1f688b9fe423ed988ca5199dce548db51647063eb047ddeefb064c84f4621d2c9ac7e302755a7b2e81556a0b79ff85fd9cd77b95757b644a7d0cc0b6f7f6 SHA512 d6e6a865ffdfeddf30740cad5c31b2530d5fe60f906d4273b9b7eadccbb992eb25f914a938d2a8066c5f57b1fbb2b3e57c3e357ee8350fd89a1bebd93f8b4f40 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159 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 deleted file mode 100644 index befd33f83bb6..000000000000 --- a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.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("$<$<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() - -+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-22.0.3-r1.ebuild b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild deleted file mode 100644 index bb933ef7407b..000000000000 --- a/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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" -# gmmlib version 22.0.3 made breaking ABI changes without changing the -# soname, so the "_1" subslot suffix was added. There is no need to keep -# this suffix after the next soname version bump. -SLOT="0/12_1" -IUSE="+custom-cflags test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch - "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -DBUILD_TYPE="Release" - -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" - ) - - cmake_src_configure -} diff --git a/media-libs/gmmlib/gmmlib-22.1.1.ebuild b/media-libs/gmmlib/gmmlib-22.1.1.ebuild deleted file mode 100644 index f0fd281de976..000000000000 --- a/media-libs/gmmlib/gmmlib-22.1.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# 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 -} diff --git a/media-libs/gmmlib/gmmlib-22.1.2.ebuild b/media-libs/gmmlib/gmmlib-22.1.2.ebuild index f0fd281de976..7d8a6f81eb26 100644 --- a/media-libs/gmmlib/gmmlib-22.1.2.ebuild +++ b/media-libs/gmmlib/gmmlib-22.1.2.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64" LICENSE="MIT" SLOT="0/12.1" IUSE="+custom-cflags test" diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index a8ca9840f39e..c70f66b3948d 100644 --- a/media-libs/gmmlib/gmmlib-9999.ebuild +++ b/media-libs/gmmlib/gmmlib-9999.ebuild @@ -24,8 +24,8 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch + "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch ) src_configure() { |