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