Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-libs/gmmlib
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/gmmlib')
-rw-r--r--media-libs/gmmlib/Manifest5
-rw-r--r--media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch8
-rw-r--r--media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch (renamed from media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch)26
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.1.ebuild48
-rw-r--r--media-libs/gmmlib/gmmlib-22.3.18.ebuild (renamed from media-libs/gmmlib/gmmlib-21.2.1.ebuild)33
-rw-r--r--media-libs/gmmlib/gmmlib-22.3.19.ebuild (renamed from media-libs/gmmlib/gmmlib-21.2.2.ebuild)33
-rw-r--r--media-libs/gmmlib/gmmlib-9999.ebuild33
-rw-r--r--media-libs/gmmlib/metadata.xml20
8 files changed, 74 insertions, 132 deletions
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index b241a056b2e0..79f9e88b90d5 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,3 +1,2 @@
-DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97
-DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
-DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
+DIST intel-gmmlib-22.3.18.tar.gz 846277 BLAKE2B 79485dfe33537053b9986f2f97771c551757da0f9ba721f82f5ff057bf230aa7ad79818d6915fb26cd354cb49d4da27c770c5adb61e530bdd39b51469fc4f9af SHA512 6dab0522a4d15bd5147cb72899a48170f441d5160dc11224809477380b3762ade845e7498a54df7de6673c0ad44bd037db754713697794e26106837f69eb0636
+DIST intel-gmmlib-22.3.19.tar.gz 846342 BLAKE2B ce3c25740d9c3f556db31f880b47fba8358dd7d7d53d80bc9923bec8c67fdeee3ae4efa5465390c229bfdc2f6c64fa0a7963516f83d12061d34bf51102cb3a64 SHA512 804e4995983884832dbb6d08a4e3c8ca8d60e7ef2c5a0de12d0facfac1fdce619ad229ad1a6b62fdf0ba74a968caf3bb884e283af8cf38babacff350fc9728b9
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 000000000000..628e9f0b295e
--- /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/files/gmmlib-20.4.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
index befd33f83bb6..d4acb515bf3d 100644
--- a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
+++ b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
@@ -4,7 +4,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
--- a/Source/GmmLib/CMakeLists.txt
+++ b/Source/GmmLib/CMakeLists.txt
-@@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM)
+@@ -74,6 +74,10 @@
endif()
endif()
@@ -17,7 +17,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# 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
+@@ -76,7 +76,10 @@
-Werror=format-security
-Werror=non-virtual-dtor
-Werror=return-type
@@ -28,7 +28,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# General optimization options
-march=${GMMLIB_MARCH}
-mpopcnt
-@@ -47,19 +50,31 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+@@ -85,19 +88,31 @@
-msse3
-mssse3
-msse4
@@ -61,7 +61,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# Other common flags
-fstack-protector
-fdata-sections
-@@ -67,10 +82,15 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+@@ -105,11 +120,16 @@
-fmessage-length=0
-fvisibility=hidden
-fPIC
@@ -73,11 +73,12 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# -m32 or -m64
-m${GMMLIB_ARCH}
)
+ endif()
+endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
#Gcc only flags
-@@ -128,13 +148,17 @@ SET( GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL ${GMMLIB_COMPILER_FLAGS_RELEASE})
+@@ -167,10 +187,12 @@
#set predefined compiler flags set
add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}")
@@ -90,9 +91,12 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
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()
-
+@@ -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-21.3.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
deleted file mode 100644
index 4e796e2186d3..000000000000
--- a/media-libs/gmmlib/gmmlib-21.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-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=""
-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="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
-)
-
-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-21.2.1.ebuild b/media-libs/gmmlib/gmmlib-22.3.18.ebuild
index daef825f99e2..0a7ae2c25cdb 100644
--- a/media-libs/gmmlib/gmmlib-21.2.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.18.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-CMAKE_ECLASS=cmake
+EAPI=8
inherit cmake-multilib
@@ -13,36 +11,31 @@ 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=""
else
+ KEYWORDS="amd64"
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="test +custom-cflags"
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
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
+ "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
multilib_src_configure() {
local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ -DBUILD_TESTING="$(usex test)"
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
)
+
cmake_src_configure
}
diff --git a/media-libs/gmmlib/gmmlib-21.2.2.ebuild b/media-libs/gmmlib/gmmlib-22.3.19.ebuild
index 4e796e2186d3..2a09f24b8f3d 100644
--- a/media-libs/gmmlib/gmmlib-21.2.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.19.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-CMAKE_ECLASS=cmake
+EAPI=8
inherit cmake-multilib
@@ -13,36 +11,31 @@ 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=""
else
+ KEYWORDS="~amd64"
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="test +custom-cflags"
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
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
+ "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
multilib_src_configure() {
local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ -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 4e796e2186d3..2a09f24b8f3d 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-CMAKE_ECLASS=cmake
+EAPI=8
inherit cmake-multilib
@@ -13,36 +11,31 @@ 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=""
else
+ KEYWORDS="~amd64"
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="test +custom-cflags"
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
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
+ "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
multilib_src_configure() {
local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ -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 b2e336175431..d2ff24e7cb4c 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <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>
+ <maintainer type="project">
+ <email>vaapi@gentoo.org</email>
+ <name>VA-API Project</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>
+ <upstream>
+ <remote-id type="github">intel/gmmlib</remote-id>
+ </upstream>
</pkgmetadata>