* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/
@ 2021-01-17 2:38 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-01-17 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 3f93bbe16831b01a0f6619957afaac8e0195a603
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Tue Jan 12 19:07:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 02:38:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f93bbe1
x11-libs/libva-intel-media-driver: fixed build
Fixed build with user CFLAGS
Closes: https://bugs.gentoo.org/765511
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ntel-media-driver-20.4.5_custom_cflags_v2.patch | 136 +++++++++++++++++++++
.../libva-intel-media-driver-20.4.5.ebuild | 2 +-
.../libva-intel-media-driver-9999.ebuild | 2 +-
3 files changed, 138 insertions(+), 2 deletions(-)
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags_v2.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags_v2.patch
new file mode 100644
index 00000000000..436e2fe892e
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags_v2.patch
@@ -0,0 +1,136 @@
+ 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.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
+
+ option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
+
++option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
++
+ include(GNUInstallDirs)
+
+ if (BUILD_CMRTLIB)
+
+--- a/cmrtlib/linux/CMakeLists.txt
++++ b/cmrtlib/linux/CMakeLists.txt
+@@ -33,15 +33,19 @@ endif()
+
+ # Set up compile options that will be used for the Linux build
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
++if (OVERRIDE_COMPILER_FLAGS)
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
+ endif()
++endif()
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
++if (OVERRIDE_COMPILER_FLAGS)
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
+ endif()
++endif()
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
+
+
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ -Werror=format-security
+ -Werror=non-virtual-dtor
+ -Werror=return-type
++)
+
++if (OVERRIDE_COMPILER_FLAGS)
++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # General optimization options
+ -march=${UFO_MARCH}
+ -mpopcnt
+@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ -msse2
+ -msse3
+ -mssse3
+- -msse4.1
+ -msse4.2
+ -msse4
++)
++endif(OVERRIDE_COMPILER_FLAGS)
++
++list (APPEND MEDIA_COMPILER_FLAGS_COMMON
++ -msse4.1 # SSE4.1 support is required to build the library
+ -mfpmath=sse
+ -finline-functions
+ -funswitch-loops
+ -fno-short-enums
+ -Wa,--noexecstack
+ -fno-strict-aliasing
++)
+
++if (OVERRIDE_COMPILER_FLAGS)
++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # Common defines
+ -DUSE_MMX
+ -DUSE_SSE
+ -DUSE_SSE2
+ -DUSE_SSE3
+ -DUSE_SSSE3
++)
++endif(OVERRIDE_COMPILER_FLAGS)
+
++list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # Other common flags
+ -fmessage-length=0
+ -fvisibility=hidden
+@@ -68,16 +81,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ -fdata-sections
+ -ffunction-sections
+ -Wl,--gc-sections
++)
+
++if (OVERRIDE_COMPILER_FLAGS)
++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # -m32 or -m64
+ -m${ARCH}
++)
++endif(OVERRIDE_COMPILER_FLAGS)
+
++list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # Global defines
+ -DLINUX=1
+ -DLINUX
+ -DNO_RTTI
+ -DNO_EXCEPTION_HANDLING
+ -DINTEL_NOT_PUBLIC
++)
++
++if (OVERRIDE_COMPILER_FLAGS)
++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ -g
+ )
+
+@@ -90,6 +113,7 @@ if(${UFO_MARCH} STREQUAL "slm")
+ -mtune=atom
+ )
+ endif()
++endif(OVERRIDE_COMPILER_FLAGS)
+
+ if(${ARCH} STREQUAL "64")
+ set(MEDIA_COMPILER_FLAGS_COMMON
+@@ -206,9 +230,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
+ if(${PLATFORM} STREQUAL "linux")
+ #set predefined compiler flags set
+ add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
++if (OVERRIDE_COMPILER_FLAGS)
+ add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
+ add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
+ add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
++endif(OVERRIDE_COMPILER_FLAGS)
+
+ foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+
+
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
index 03687e6cb76..2ea142b97ef 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.4.5_custom_cflags_v2.patch
"${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
)
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 03687e6cb76..2ea142b97ef 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.4.5_custom_cflags_v2.patch
"${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/
@ 2021-01-17 2:38 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-01-17 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 7344ade5c13e5cdd24a314124485ad400b298dec
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 02:38:15 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 02:38:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7344ade5
x11-libs/libva-intel-media-driver: rename patches
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
...a-intel-media-driver-20.4.5_custom_cflags.patch | 19 ++-
...ntel-media-driver-20.4.5_custom_cflags_v2.patch | 136 ---------------------
...-media-driver-20.4.5_testing_in_src_test.patch} | 0
.../libva-intel-media-driver-20.4.5.ebuild | 4 +-
.../libva-intel-media-driver-9999.ebuild | 4 +-
5 files changed, 18 insertions(+), 145 deletions(-)
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
index 90051719f30..436e2fe892e 100644
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
@@ -1,4 +1,7 @@
-diff --git a/CMakeLists.txt b/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.
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
@@ -10,7 +13,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
include(GNUInstallDirs)
if (BUILD_CMRTLIB)
-diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
+
--- a/cmrtlib/linux/CMakeLists.txt
+++ b/cmrtlib/linux/CMakeLists.txt
@@ -33,15 +33,19 @@ endif()
@@ -33,7 +36,7 @@ diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
-diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+
--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON
@@ -47,14 +50,19 @@ diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_dr
# General optimization options
-march=${UFO_MARCH}
-mpopcnt
-@@ -48,19 +51,29 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ -msse2
+ -msse3
+ -mssse3
+- -msse4.1
-msse4.2
-msse4
- -mfpmath=sse
+)
+endif(OVERRIDE_COMPILER_FLAGS)
+
+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
++ -msse4.1 # SSE4.1 support is required to build the library
+ -mfpmath=sse
-finline-functions
-funswitch-loops
-fno-short-enums
@@ -125,3 +133,4 @@ diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_dr
foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags_v2.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags_v2.patch
deleted file mode 100644
index 436e2fe892e..00000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags_v2.patch
+++ /dev/null
@@ -1,136 +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.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
-
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
-
-+option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+
- include(GNUInstallDirs)
-
- if (BUILD_CMRTLIB)
-
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -33,15 +33,19 @@ endif()
-
- # Set up compile options that will be used for the Linux build
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
-
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -Werror=format-security
- -Werror=non-virtual-dtor
- -Werror=return-type
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # General optimization options
- -march=${UFO_MARCH}
- -mpopcnt
-@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -msse2
- -msse3
- -mssse3
-- -msse4.1
- -msse4.2
- -msse4
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-+
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-+ -msse4.1 # SSE4.1 support is required to build the library
- -mfpmath=sse
- -finline-functions
- -funswitch-loops
- -fno-short-enums
- -Wa,--noexecstack
- -fno-strict-aliasing
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Common defines
- -DUSE_MMX
- -DUSE_SSE
- -DUSE_SSE2
- -DUSE_SSE3
- -DUSE_SSSE3
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Other common flags
- -fmessage-length=0
- -fvisibility=hidden
-@@ -68,16 +81,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -fdata-sections
- -ffunction-sections
- -Wl,--gc-sections
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # -m32 or -m64
- -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Global defines
- -DLINUX=1
- -DLINUX
- -DNO_RTTI
- -DNO_EXCEPTION_HANDLING
- -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- -g
- )
-
-@@ -90,6 +113,7 @@ if(${UFO_MARCH} STREQUAL "slm")
- -mtune=atom
- )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- if(${ARCH} STREQUAL "64")
- set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -206,9 +230,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
- #set predefined compiler flags set
- add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-
-
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_tesing_in_src_test.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch
similarity index 100%
rename from x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_tesing_in_src_test.patch
rename to x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
index 2ea142b97ef..33551ed4938 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
@@ -34,8 +34,8 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags_v2.patch
- "${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
+ "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
)
src_configure() {
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 2ea142b97ef..33551ed4938 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -34,8 +34,8 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags_v2.patch
- "${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
+ "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/
@ 2021-06-29 17:37 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-06-29 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 17befa36302a513bcf3e80930815c5050b6c91e6
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Sun Jun 27 11:59:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 17:37:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17befa36
x11-libs/libva-intel-media-driver: updated to version 21.2.2 pre
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/21423
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/libva-intel-media-driver/Manifest | 1 +
...a-intel-media-driver-21.2.2_custom_cflags.patch | 52 ++++++++++++++++++++++
... => libva-intel-media-driver-21.2.2_pre.ebuild} | 6 +--
.../libva-intel-media-driver-9999.ebuild | 4 +-
4 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 3bfeb9f0b70..bedf5dcb761 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -3,3 +3,4 @@ DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5be
DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
+DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
new file mode 100644
index 00000000000..c0f598ce6cd
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
@@ -0,0 +1,52 @@
+ Prevent overriding of user-defined CFLAGS.
+
+
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ -fdata-sections
+ -ffunction-sections
+ -Wl,--gc-sections
++)
+
++if (OVERRIDE_COMPILER_FLAGS)
++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # -m32 or -m64
+ -m${ARCH}
++)
++endif(OVERRIDE_COMPILER_FLAGS)
+
++list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ # Global defines
+ -DLINUX=1
+ -DLINUX
+ -DNO_RTTI
+ -DNO_EXCEPTION_HANDLING
+ -DINTEL_NOT_PUBLIC
++)
++
++if (OVERRIDE_COMPILER_FLAGS)
++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+ -g
+ )
+
+@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
+ -mtune=atom
+ )
+ endif()
++endif(OVERRIDE_COMPILER_FLAGS)
+
+ if(${ARCH} STREQUAL "64")
+ set(MEDIA_COMPILER_FLAGS_COMMON
+@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
+ if(${PLATFORM} STREQUAL "linux")
+ #set predefined compiler flags set
+ add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
++if (OVERRIDE_COMPILER_FLAGS)
+ add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
+ add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
+ add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
++endif(OVERRIDE_COMPILER_FLAGS)
+
+ foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
similarity index 91%
copy from x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
copy to x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
index 072d1d906b9..6eec248e7f0 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
@@ -15,7 +15,7 @@ else
MY_PV="${PV%_pre}"
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="~amd64"
+ KEYWORDS="" # no keywords for '_pre' releases
fi
DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.1
+DEPEND=">=media-libs/gmmlib-21.1.3
>=x11-libs/libva-2.11.0[X?]
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
+ "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
)
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 072d1d906b9..7e53505dd38 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.1
+DEPEND=">=media-libs/gmmlib-21.1.3
>=x11-libs/libva-2.11.0[X?]
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
+ "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/
@ 2021-11-19 18:27 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2021-11-19 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 56839cf49595a75b8aba32c6dc91d476f28dd499
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 17 05:21:27 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 18:26:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56839cf4
x11-libs/libva-intel-media-driver: Drop old
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22978
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/libva-intel-media-driver/Manifest | 8 --
...a-intel-media-driver-21.1.2_custom_cflags.patch | 87 ----------------------
.../libva-intel-media-driver-20.1.1-r2.ebuild | 53 -------------
.../libva-intel-media-driver-20.2.0-r2.ebuild | 55 --------------
.../libva-intel-media-driver-21.1.2_pre.ebuild | 63 ----------------
.../libva-intel-media-driver-21.1.3.ebuild | 62 ---------------
.../libva-intel-media-driver-21.2.2_pre.ebuild | 62 ---------------
.../libva-intel-media-driver-21.2.3.ebuild | 62 ---------------
.../libva-intel-media-driver-21.3.2_pre.ebuild | 62 ---------------
.../libva-intel-media-driver-21.3.3_pre.ebuild | 62 ---------------
10 files changed, 576 deletions(-)
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 42890e41964f..60fe56dd80d4 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,11 +1,3 @@
-DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25
-DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b
DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
-DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
-DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
-DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a
-DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348cc5ce1e2446063c743fa89072ae46c6a4af0c71001fb8249b0306d67a220312f883a8f54dde1981078e6ee8fad71eaaa1 SHA512 b12ff5b3afbc4d4f34353c7a4ea50b1c66746b33920e450d7d17cffdc234921e82fc4c1afb025274caf2a5efbe87e577b6790d0648a52de08ea19b11a103ac81
-DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
-DIST intel-media-21.3.3.tar.gz 23092541 BLAKE2B 083cc368095bbc9cf333953855ad94d7a8d633337b967f4f93d94e3c8e23bbcdadad19c1b1032cafc671ae9a9df9be547498ebe84426ad9d91a9e82557095eb8 SHA512 a9da8a627420c5ea0de9413ce0aeb471f40a0886abd67380ead7ffba32de4abbc1741c47cfcfc73d42b14456090266f4dad8d363c8ad590cef521ef48e42f692
DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch
deleted file mode 100644
index 4aebd7cdc032..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch
+++ /dev/null
@@ -1,87 +0,0 @@
- Prevent overriding of user-defined CFLAGS.
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
-
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
-
-+option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+
- include(GNUInstallDirs)
-
- if (BUILD_CMRTLIB)
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -33,15 +33,19 @@ endif()
-
- # Set up compile options that will be used for the Linux build
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -fdata-sections
- -ffunction-sections
- -Wl,--gc-sections
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # -m32 or -m64
- -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Global defines
- -DLINUX=1
- -DLINUX
- -DNO_RTTI
- -DNO_EXCEPTION_HANDLING
- -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- -g
- )
-
-@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
- -mtune=atom
- )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- if(${ARCH} STREQUAL "64")
- set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
- #set predefined compiler flags set
- add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-
-
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild
deleted file mode 100644
index 91a9328035e4..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="X set-as-default"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch )
-
-DEPEND=">=media-libs/gmmlib-${PV}
- >=x11-libs/libva-2.7.1[X?]
- >=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=OFF
- -DUSE_X11=$(usex X)
- -DINSTALL_DRIVER_SYSCONF=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use 'set-as-default' ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild
deleted file mode 100644
index 45e9262fd45c..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="X set-as-default"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch )
-
-DEPEND=">=media-libs/gmmlib-20.2.2
- >=x11-libs/libva-2.8.0[X?]
- >=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=OFF
- -DBUILD_TYPE=release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DINSTALL_DRIVER_SYSCONF=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use 'set-as-default' ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
deleted file mode 100644
index 885636cf2e39..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- # No keywords for _pre releases
- #KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-20.4.1
- >=x11-libs/libva-2.10.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
deleted file mode 100644
index 072d1d906b99..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.1
- >=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
deleted file mode 100644
index 6eec248e7f0f..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="" # no keywords for '_pre' releases
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
deleted file mode 100644
index fc67874d04cd..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.2.1
- >=x11-libs/libva-2.12.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
deleted file mode 100644
index 6eec248e7f0f..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="" # no keywords for '_pre' releases
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild
deleted file mode 100644
index 6eec248e7f0f..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="" # no keywords for '_pre' releases
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/
@ 2022-03-05 13:09 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-03-05 13:09 UTC (permalink / raw
To: gentoo-commits
commit: fd5741f1396dc1900c5671be4a3fad88b12951fd
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 13:06:27 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 13:08:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd5741f1
x11-libs/libva-intel-media-driver: drop versions
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-libs/libva-intel-media-driver/Manifest | 5 -
...a-intel-media-driver-20.4.5_custom_cflags.patch | 136 ---------------------
...a-intel-media-driver-21.2.2_custom_cflags.patch | 52 --------
.../libva-intel-media-driver-20.4.5-r2.ebuild | 63 ----------
.../libva-intel-media-driver-21.3.5-r2.ebuild | 65 ----------
.../libva-intel-media-driver-21.4.0-r2.ebuild | 65 ----------
.../libva-intel-media-driver-21.4.2-r2.ebuild | 56 ---------
.../libva-intel-media-driver-21.4.3.ebuild | 56 ---------
8 files changed, 498 deletions(-)
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 8a4b2cf287ed..eb6a0e5daa75 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,6 +1 @@
-DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
-DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
-DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
-DIST intel-media-21.4.2.tar.gz 23185132 BLAKE2B 257f1a8a65928aee897d84ed8df69a129958bcf5fd6ea263283e1f2341a845651a86367cff7988c0d4b04accf48664dbd4d1e0bd106883e92feff095e5f88225 SHA512 1b906ce75ef70395e36296de1e1e4b39d4a82c8b8532497faf47bcb101cf2103bba67a125da7ea1be9f901699288520f704b43fef01339a1f1b7691040d7618e
-DIST intel-media-21.4.3.tar.gz 23192939 BLAKE2B d013b60c330df97dc29e51a95a78bd91a38c789c4690fde12c304e1bf0695024e5488d0485b60fa603e8490b932210163aec590bcfca031c1f19d7b16161b420 SHA512 d2e2db1ddc2cbdc022273f53d873f2156e992420d382285de0b9559340d912e847a4780ed2adfe67f06a7c4bcac83aadca1104cf051b9a3d43b3ffd931a3db22
DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
deleted file mode 100644
index 436e2fe892e6..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
+++ /dev/null
@@ -1,136 +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.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
-
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
-
-+option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+
- include(GNUInstallDirs)
-
- if (BUILD_CMRTLIB)
-
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -33,15 +33,19 @@ endif()
-
- # Set up compile options that will be used for the Linux build
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
-
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -Werror=format-security
- -Werror=non-virtual-dtor
- -Werror=return-type
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # General optimization options
- -march=${UFO_MARCH}
- -mpopcnt
-@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -msse2
- -msse3
- -mssse3
-- -msse4.1
- -msse4.2
- -msse4
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-+
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-+ -msse4.1 # SSE4.1 support is required to build the library
- -mfpmath=sse
- -finline-functions
- -funswitch-loops
- -fno-short-enums
- -Wa,--noexecstack
- -fno-strict-aliasing
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Common defines
- -DUSE_MMX
- -DUSE_SSE
- -DUSE_SSE2
- -DUSE_SSE3
- -DUSE_SSSE3
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Other common flags
- -fmessage-length=0
- -fvisibility=hidden
-@@ -68,16 +81,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -fdata-sections
- -ffunction-sections
- -Wl,--gc-sections
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # -m32 or -m64
- -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Global defines
- -DLINUX=1
- -DLINUX
- -DNO_RTTI
- -DNO_EXCEPTION_HANDLING
- -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- -g
- )
-
-@@ -90,6 +113,7 @@ if(${UFO_MARCH} STREQUAL "slm")
- -mtune=atom
- )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- if(${ARCH} STREQUAL "64")
- set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -206,9 +230,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
- #set predefined compiler flags set
- add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-
-
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
deleted file mode 100644
index c0f598ce6cd0..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
- Prevent overriding of user-defined CFLAGS.
-
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
- -fdata-sections
- -ffunction-sections
- -Wl,--gc-sections
-+)
-
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # -m32 or -m64
- -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- # Global defines
- -DLINUX=1
- -DLINUX
- -DNO_RTTI
- -DNO_EXCEPTION_HANDLING
- -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+ list (APPEND MEDIA_COMPILER_FLAGS_COMMON
- -g
- )
-
-@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
- -mtune=atom
- )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- if(${ARCH} STREQUAL "64")
- set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
- #set predefined compiler flags set
- add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
deleted file mode 100644
index 00f2befa1f19..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${PV}"
- KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-20.4.1:=
- media-libs/gmmlib:0/0
- >=x11-libs/libva-2.10.0[X?]
- >=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
deleted file mode 100644
index 05829c3b4ed6..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="amd64"
- fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
- media-libs/gmmlib:0/0
- >=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
deleted file mode 100644
index 5573b2b96933..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~amd64"
- fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
- media-libs/gmmlib:0/0
- >=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use set-as-default ; then
- echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
- doenvd "${T}/55libva-intel-media-driver"
- fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
deleted file mode 100644
index 5ce014edf7eb..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~amd64"
- fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
- media-libs/gmmlib:0/0
- >=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DENABLE_NONFREE_KERNELS=$(usex redistributable)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- )
- local CMAKE_BUILD_TYPE="Release"
- cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
deleted file mode 100644
index 8da9f2236e58..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-else
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="amd64"
- fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
- media-libs/gmmlib:0/0
- >=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
- "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMEDIA_BUILD_FATAL_WARNINGS=OFF
- -DMEDIA_RUN_TEST_SUITE=$(usex test)
- -DBUILD_TYPE=Release
- -DPLATFORM=linux
- -DUSE_X11=$(usex X)
- -DENABLE_NONFREE_KERNELS=$(usex redistributable)
- -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- )
- local CMAKE_BUILD_TYPE="Release"
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-05 13:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-17 2:38 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-03-05 13:09 Conrad Kostecki
2021-11-19 18:27 Matt Turner
2021-06-29 17:37 Sam James
2021-01-17 2:38 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox