[gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2019-11-20 13:56 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-11-20 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e3d3e1c491e52758f673ee642027408f43d19629
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 01:54:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 13:56:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d3e1c4

media-libs/gmmlib: Drop old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/gmmlib/Manifest                         |  3 --
 .../files/gmmlib-19.1.2_so_patch_version.patch     | 11 ------
 media-libs/gmmlib/gmmlib-18.3.0.ebuild             | 41 --------------------
 media-libs/gmmlib/gmmlib-18.4.1.ebuild             | 41 --------------------
 media-libs/gmmlib/gmmlib-19.1.2.ebuild             | 45 ----------------------
 5 files changed, 141 deletions(-)

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 71d7b72b2da..d63b49af577 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,6 +1,3 @@
-DIST intel-gmmlib-18.3.0.tar.gz 620491 BLAKE2B 555a733b42b8e4c40170db9ecabc25bb04779c3aba38b9141f021df1dbe83d74e385a3437d4a87577d9e5ff4df21ce618393909cd98fce4a59ec19aeff4eb44d SHA512 358598873556822be6748a282cd1447ca3e0bcaeb11c2bb8862414bac2ab8e57deee9581fa14bfe22d33d712e567db936332b7fe715dae9816b31121af934dec
-DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4f732ce1aaf72cc959f993af73df9b355f0c4c7c97af4102cc1996e7732597dac4fe0abaf359806e2accbee1bf852d90 SHA512 8dcb5892cfc98822e8173d0a71dfb4883e1ef838de8c936a9b36fb05d61137b7c7d7edf941d3ebd532a1126d8d8b978b95843afb3514ba8cbf3eec54f05c8b8b
-DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
 DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
 DIST intel-gmmlib-19.2.3.tar.gz 633252 BLAKE2B 81fcb541cc1a5fe3bd8ebbb2d98b5d4d7d6af409f1b837327c4cc322da7cc77c80992cc22ef6920cfe3704d6cd030bbf5e36936cb7f205e38f65807297a58dcb SHA512 d82973a18804474708e252cd1f0d5205e72dea0b7b14401ff7bad351f94ad7a53ada7def16f62da0810bfa6a747135fb2c7649e4a1fa6fbc4e8f5a38cf948d6b
 DIST intel-gmmlib-19.2.4.tar.gz 633227 BLAKE2B e7ce9143ced27c8be87b807eeb6fa66dec7f0931dda83d7f1ee597682e593798fda6edf665471723df23bb0ca8b730ff88070211728b83478340d80ad982b089 SHA512 7921b11abc2c0658b614decf5bad92a63155aadd35439eb1885e0314ece1b9a983d44ed28b48ae2259f949cb913272583a0c4f064cfacd698dd5c7013d6bff52

diff --git a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch b/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
deleted file mode 100644
index 1fd45de157f..00000000000
--- a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/GmmLib/CMakeLists.txt
-+++ b/Source/GmmLib/CMakeLists.txt
-@@ -40,7 +40,7 @@
- endif()
- 
- if(NOT DEFINED GMMLIB_API_PATCH_VERSION)
--    set(GMMLIB_API_PATCH_VERSION PATCH_VERSION)
-+    set(GMMLIB_API_PATCH_VERSION "${PATCH_VERSION}")
- endif()
- 
- message(STATUS "API version: ${GMMLIB_API_MAJOR_VERSION}.${GMMLIB_API_MINOR_VERSION}.${GMMLIB_API_PATCH_VERSION}")

diff --git a/media-libs/gmmlib/gmmlib-18.3.0.ebuild b/media-libs/gmmlib/gmmlib-18.3.0.ebuild
deleted file mode 100644
index f0dd8d2cd69..00000000000
--- a/media-libs/gmmlib/gmmlib-18.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}

diff --git a/media-libs/gmmlib/gmmlib-18.4.1.ebuild b/media-libs/gmmlib/gmmlib-18.4.1.ebuild
deleted file mode 100644
index 93070e071d2..00000000000
--- a/media-libs/gmmlib/gmmlib-18.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}

diff --git a/media-libs/gmmlib/gmmlib-19.1.2.ebuild b/media-libs/gmmlib/gmmlib-19.1.2.ebuild
deleted file mode 100644
index dd16c51e2ef..00000000000
--- a/media-libs/gmmlib/gmmlib-19.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.1.2_so_patch_version.patch
-)
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2021-01-11 18:55 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-01-11 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     185d05c99b7f70791c23e5b93586a3cbc3a95a6f
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Fri Jan  8 15:50:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 18:55:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185d05c9

media-libs/gmmlib: added USE flag for user CFLAGS

Added patch and USE flag to disable override of user CFLAGS in cmake
configuration. Now CFLAGS like -march=native are honoured.

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/18952
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gmmlib/files/gmmlib-20.4.1_custom_cflags.patch | 92 ++++++++++++++++++++++
 media-libs/gmmlib/gmmlib-20.4.1.ebuild             |  4 +-
 media-libs/gmmlib/gmmlib-9999.ebuild               |  4 +-
 media-libs/gmmlib/metadata.xml                     |  3 +
 4 files changed, 101 insertions(+), 2 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
new file mode 100644
index 00000000000..47e5288e62e
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
@@ -0,0 +1,92 @@
+diff --git a/Source/GmmLib/CMakeLists.txt b/Source/GmmLib/CMakeLists.txt
+--- 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 .
+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
+     -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
+@@ -50,16 +53,28 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+     -msse4.1
+     -msse4.2
+     -mfpmath=sse
++    )
++endif()
++
++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     -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-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
index a09ec1ab123..09b5bcec53f 100644
--- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
+IUSE="test +custom-cflags"
 
 RESTRICT="!test? ( test )"
 
@@ -36,12 +36,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
 )
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TYPE=Release
 		-DBUILD_TESTING=$(usex test)
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
 	)
 	cmake_src_configure
 }

diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index a09ec1ab123..09b5bcec53f 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
+IUSE="test +custom-cflags"
 
 RESTRICT="!test? ( test )"
 
@@ -36,12 +36,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
 )
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TYPE=Release
 		-DBUILD_TESTING=$(usex test)
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
 	)
 	cmake_src_configure
 }

diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index 648c3cc2422..61c45b70c77 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -8,4 +8,7 @@
     <email>k2k@narod.ru</email>
     <name>Evgeny Grin</name>
   </maintainer>
+  <use>
+    <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2021-01-14 20:15 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-01-14 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     8faadb60e5edae6a42398bdb34680338bfdeac73
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 20:15:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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("$<$<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-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() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2021-10-30 21:24 Conrad Kostecki
  0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-10-30 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     ade3ea6a875a5db0711c8ca12fca4f8560624d98
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 20:54:38 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 20:54:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3ea6a

media-libs/gmmlib: update live ebuild

Changes:
- Bump to EAPI=8
- Fix CMake warnings
- Drop multilib, as not rdep package exists with multilib

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../gmmlib/files/gmmlib-20.3.2_cmake_project.patch |  8 +++++++
 media-libs/gmmlib/gmmlib-9999.ebuild               | 27 ++++++++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
new file mode 100644
index 00000000000..628e9f0b295
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
++project(gmmlib)
+ 
+ include(CTest)
+ 

diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 4e796e2186d..1f972c3b191 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -17,32 +15,25 @@ fi
 
 DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
+SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
 IUSE="test +custom-cflags"
-
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-
 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
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
-		-DBUILD_TYPE=Release
-		-DBUILD_TESTING=$(usex test)
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
 	)
+
 	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2022-03-21 20:04 Conrad Kostecki
  0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2022-03-21 20:04 UTC (permalink / raw
  To: gentoo-commits

commit:     393fb763363e84b84e5a681f334b1cd5f7151dbd
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 20:03:49 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 20:03:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393fb763

media-libs/gmmlib: add 22.1.1

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-libs/gmmlib/Manifest                         |   1 +
 .../gmmlib/files/gmmlib-22.1.1_custom_cflags.patch | 102 +++++++++++++++++++++
 media-libs/gmmlib/gmmlib-22.1.1.ebuild             |  33 +++++++
 3 files changed, 136 insertions(+)

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 918847298cfb..4a2b14e99b5f 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,2 +1,3 @@
 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

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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2022-04-23 18:33 Conrad Kostecki
  0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2022-04-23 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     603b17c876825feae0d7301a8a1541cbf0dac290
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 18:27:42 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 18:33:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=603b17c8

media-libs/gmmlib: drop 22.0.3-r1, 22.1.1

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-libs/gmmlib/Manifest                         |  2 -
 .../gmmlib/files/gmmlib-20.4.1_custom_cflags.patch | 98 ----------------------
 media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild          | 36 --------
 media-libs/gmmlib/gmmlib-22.1.1.ebuild             | 33 --------
 4 files changed, 169 deletions(-)

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 52839518e80f..bcf3baba645f 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,3 +1 @@
-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

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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2023-06-17  5:42 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-06-17  5:42 UTC (permalink / raw
  To: gentoo-commits

commit:     346510d96fcfdc79f4b4448135bbf58679120f53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 05:10:57 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 05:40:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346510d9

media-libs/gmmlib: fix build error

Closes: https://bugs.gentoo.org/908592
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gmmlib/files/gmmlib-22.3.7_ambiguating.patch   | 27 ++++++++++++++++++++++
 media-libs/gmmlib/gmmlib-22.3.7.ebuild             |  1 +
 2 files changed, 28 insertions(+)

diff --git a/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
new file mode 100644
index 000000000000..889573ed94a5
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/908592
+https://github.com/intel/gmmlib/issues/103
+https://github.com/intel/gmmlib/pull/104
+
+From 2526286f29d8ad3d3a5833bdc29e23e5f3300b34 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Mon, 12 Jun 2023 11:49:51 +0200
+Subject: [PATCH] Fix ambiguating new declaration LockMAContextSyncMutex()
+
+This fixes https://github.com/intel/gmmlib/issues/103 introduced by
+commit 5e12695c2c "Multi-threaded fixes for GMM Context info"
+
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+--- a/Source/GmmLib/inc/External/Common/GmmInfo.h
++++ b/Source/GmmLib/inc/External/Common/GmmInfo.h
+@@ -627,8 +627,8 @@ typedef struct _GMM_ADAPTER_INFO_
+         GMM_ADAPTER_INFO *              GetAdapterNode(ADAPTER_BDF sBdf);   // Replacement for GetAdapterIndex, now get adapter node from the linked list
+ 
+         // Mutexes which protect the below thread unsafe functions
+-        GMM_STATUS                      LockMAContextSyncMutex();
+-        GMM_STATUS                      UnLockMAContextSyncMutex();
++        GMM_STATUS GMM_STDCALL          LockMAContextSyncMutex();
++        GMM_STATUS GMM_STDCALL          UnLockMAContextSyncMutex();
+ 
+         // thread unsafe functions; these must be protected with LockMAContextSyncMutex
+         GMM_ADAPTER_INFO *              GetAdapterNodeUnlocked(ADAPTER_BDF sBdf);
+

diff --git a/media-libs/gmmlib/gmmlib-22.3.7.ebuild b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
index 21abbf34e428..9cd65afb169d 100644
--- a/media-libs/gmmlib/gmmlib-22.3.7.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
@@ -22,6 +22,7 @@ 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
+	"${FILESDIR}"/${PN}-22.3.7_ambiguating.patch
 )
 
 multilib_src_configure() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/
@ 2023-11-25 17:07 Matt Turner
  0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2023-11-25 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6c8323d82b3b663567bcdd6127c0f529264d7266
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 17:03:14 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 17:06:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8323d8

media-libs/gmmlib: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/gmmlib/Manifest                         |  5 ---
 .../gmmlib/files/gmmlib-22.3.7_ambiguating.patch   | 27 ----------------
 media-libs/gmmlib/gmmlib-22.3.10.ebuild            | 35 ---------------------
 media-libs/gmmlib/gmmlib-22.3.11.ebuild            | 35 ---------------------
 media-libs/gmmlib/gmmlib-22.3.5.ebuild             | 35 ---------------------
 media-libs/gmmlib/gmmlib-22.3.7.ebuild             | 36 ----------------------
 media-libs/gmmlib/gmmlib-22.3.9.ebuild             | 35 ---------------------
 7 files changed, 208 deletions(-)

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index d7dc67ea5121..ee6246e14c33 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,7 +1,2 @@
-DIST intel-gmmlib-22.3.10.tar.gz 845575 BLAKE2B 2a8a58627ac6a626fe173537d8a97611a1298df1072da039ed1b96aba5b5d318229ad1a4a9838db610c539d40266d7d8b9f39154b80f81fe83bf5a13a7d5d0a1 SHA512 0522b04c4a7039cada42bf06370d3f0e6c712cf8c7d8be932ad55cfc4ed603c50b0a4672d589793a8f4d7930d20bc9635bdf66d2238daa920087363cf25b7967
-DIST intel-gmmlib-22.3.11.tar.gz 845664 BLAKE2B 1ca439ba59a230aad5d9f9b6da69c1069f370a6a1fd2f5d587f83f1472240bc734bea02c65aaa970e9a1a3463669bfd8f696812dd8262957b997cf72e107e09e SHA512 adbeb65a8377d49d139d788f1b013b39bed543b558c0307e766fb01a307685b0dda94c344992bd9d83f7900d1b93de8e06e76aa73749c40b11dff9520791e6b9
 DIST intel-gmmlib-22.3.12.tar.gz 845783 BLAKE2B 343e99e316b9dd18bc20f911b61ca3e555cef303916be6a64aab27abbd39d6d8527f5bb958a16a91490d0aad890f53aa0254ea68a1675ccc2bce384fd9641a57 SHA512 afe64aaaddac9b72ff12aa41faeb668141999e1b9c644fa21ced8fd851cf698ec57bac1080c87c0fae5c464b47ea5b94e6290c0e4c0c24ec010071f535c60e42
 DIST intel-gmmlib-22.3.14.tar.gz 845841 BLAKE2B b766ab36aa24d226a2299c68f47aaaa41341ae9f4d2a6366b68ee7b82669ac78f41097c572e28aa9cac69d06a5d7a246fd0f9cfacc33213423209b8c708e8075 SHA512 7474f3a4899bd4474e2856ff98dd434ee73a1f53b836224cb6fccaace48bd26940d7c907ce00ae5c6d31af9378f33460a9df4299cabdec6c9c233b5730bf31a6
-DIST intel-gmmlib-22.3.5.tar.gz 843587 BLAKE2B 671f09a2be66962762dc47c8ab51dbc3454f197b2f8a8da73e09d1f1cef2284d69ca97ff78a6b9fd1c7c93baf0b5773a89e0e7fa22f7bf106e7205f0f681e5f4 SHA512 1440fd9afdf9bdb6b9ab45529ec48cd434d7a9410cbf026c3dc7dc60b09a8fa067993540b953c354805a766ff001ef56c756a4c37d465a2ca801f6cc179ca532
-DIST intel-gmmlib-22.3.7.tar.gz 845054 BLAKE2B 0a5c284bc5aa32a6b79d0e36689665b8fb6157765e26f33b7aef800e515c6dc26527c011512d633d5d6160463f9f16a720a4e23fcbc9bb35c853a25a41a339ec SHA512 145e54da5c80c6f750847c496146c5853f92b90d1fa66695140052e0264d884069a459cf27bea7b742f1ac10817c00a369067512b9f2666c8b3c6cadf0233a2e
-DIST intel-gmmlib-22.3.9.tar.gz 845228 BLAKE2B e7f25e84f124e72b0479bd0dc10bdc70c174c282ab86ab6ce1557b45a3953e68460cb1974d90135d41562a64f6ddaaa077f66c12889b7b194dcee769a8cccc31 SHA512 5dae51b028ff604ecdee4b939c31ff029a289a75485a820547976ef15de7ce7793f45fa9b9594022435c30237548fff212dc7cbbbefbdaadee3a5be6e4a75401

diff --git a/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
deleted file mode 100644
index 889573ed94a5..000000000000
--- a/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/908592
-https://github.com/intel/gmmlib/issues/103
-https://github.com/intel/gmmlib/pull/104
-
-From 2526286f29d8ad3d3a5833bdc29e23e5f3300b34 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Mon, 12 Jun 2023 11:49:51 +0200
-Subject: [PATCH] Fix ambiguating new declaration LockMAContextSyncMutex()
-
-This fixes https://github.com/intel/gmmlib/issues/103 introduced by
-commit 5e12695c2c "Multi-threaded fixes for GMM Context info"
-
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
---- a/Source/GmmLib/inc/External/Common/GmmInfo.h
-+++ b/Source/GmmLib/inc/External/Common/GmmInfo.h
-@@ -627,8 +627,8 @@ typedef struct _GMM_ADAPTER_INFO_
-         GMM_ADAPTER_INFO *              GetAdapterNode(ADAPTER_BDF sBdf);   // Replacement for GetAdapterIndex, now get adapter node from the linked list
- 
-         // Mutexes which protect the below thread unsafe functions
--        GMM_STATUS                      LockMAContextSyncMutex();
--        GMM_STATUS                      UnLockMAContextSyncMutex();
-+        GMM_STATUS GMM_STDCALL          LockMAContextSyncMutex();
-+        GMM_STATUS GMM_STDCALL          UnLockMAContextSyncMutex();
- 
-         // thread unsafe functions; these must be protected with LockMAContextSyncMutex
-         GMM_ADAPTER_INFO *              GetAdapterNodeUnlocked(ADAPTER_BDF sBdf);
-

diff --git a/media-libs/gmmlib/gmmlib-22.3.10.ebuild b/media-libs/gmmlib/gmmlib-22.3.10.ebuild
deleted file mode 100644
index 21abbf34e428..000000000000
--- a/media-libs/gmmlib/gmmlib-22.3.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake-multilib
-
-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.3"
-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
-)
-
-multilib_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.3.11.ebuild b/media-libs/gmmlib/gmmlib-22.3.11.ebuild
deleted file mode 100644
index 21abbf34e428..000000000000
--- a/media-libs/gmmlib/gmmlib-22.3.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake-multilib
-
-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.3"
-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
-)
-
-multilib_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.3.5.ebuild b/media-libs/gmmlib/gmmlib-22.3.5.ebuild
deleted file mode 100644
index fde806b4ef82..000000000000
--- a/media-libs/gmmlib/gmmlib-22.3.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake-multilib
-
-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.3"
-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
-)
-
-multilib_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.3.7.ebuild b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
deleted file mode 100644
index c7fb2a84fe1a..000000000000
--- a/media-libs/gmmlib/gmmlib-22.3.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake-multilib
-
-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.3"
-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
-	"${FILESDIR}"/${PN}-22.3.7_ambiguating.patch
-)
-
-multilib_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.3.9.ebuild b/media-libs/gmmlib/gmmlib-22.3.9.ebuild
deleted file mode 100644
index 21abbf34e428..000000000000
--- a/media-libs/gmmlib/gmmlib-22.3.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake-multilib
-
-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.3"
-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
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-11-25 17:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-30 21:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2023-11-25 17:07 Matt Turner
2023-06-17  5:42 Sam James
2022-04-23 18:33 Conrad Kostecki
2022-03-21 20:04 Conrad Kostecki
2021-01-14 20:15 Sam James
2021-01-11 18:55 Sam James
2019-11-20 13:56 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox