From 2929788def9a92c1eb237eed93fbdb0c02838bbf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 13 Oct 2019 22:11:03 +0100
Subject: Revert "gentoo resync : 13.10.2019"
This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.
---
dev-libs/intel-neo/Manifest | 4 +-
dev-libs/intel-neo/intel-neo-19.16.12873.ebuild | 56 +++++++++++++++++++++++++
dev-libs/intel-neo/intel-neo-19.38.14237.ebuild | 54 ------------------------
3 files changed, 58 insertions(+), 56 deletions(-)
create mode 100644 dev-libs/intel-neo/intel-neo-19.16.12873.ebuild
delete mode 100644 dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
(limited to 'dev-libs/intel-neo')
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index f2c9a878c98a..f4080278780e 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,8 +1,8 @@
AUX intel-neo-19.16.12873_cmake_no_libva_automagic.patch 330 BLAKE2B a38c4a03d1837102168b907049c1a8fec93035f7efadd5e5cfb17296fd5fbf17dac1961affaa625847cd7c0cb3694d9d5c36b96d45f8c036334e8dc707100db0 SHA512 5c7133d355e0f4f8c0f8f0c84264d5f2a8cba6126d59b8a509354759a97d1a6f96b5deddcaacbce2ceb32e2014dd2f13e613a7db1973d3f865b906b803e8866e
+DIST intel-neo-19.16.12873.tar.gz 2370395 BLAKE2B 2efc76c9729d3ec000455270e923df1e3d0ec5d0a5c31cd156401b37c63ba01ee2a6051f487a98c4db10f61c2a70434f994f15472f54741ef4a80a71b036636f SHA512 1ec8b7883bfeefc1ed2095eac6111803a44e3c88e8bd1a478fb89a5baa4484fc96894f7ef0c01f4b6b9cb94731cdfc633f38ef2f636fdeb2d5e4344ca4aaa2ae
DIST intel-neo-19.22.13062.tar.gz 2402939 BLAKE2B e47f19fa602444cb260a2cdd9b676201ec8e4c50fe55c4216f779b8edab3497b5249071edcf5d162457be4f72cd33868cf7a971d99b1ae60e7a5e3714a795e82 SHA512 81ad69d051add3eb8d64373ad2ede0b323a4330c9f18010130e9b3db4d78d6e30e2e37f01c0cb7a77e378af62d9d6dd62755a21b153ae753417a6a2556d61b66
DIST intel-neo-19.30.13641.tar.gz 2446018 BLAKE2B 640b3076c928eab80911d219dabda85029f544d62ff7d39de465f89844f244e75afe053f8475db79aba88a969252d3d5141f0167c8bc7f05120a71fd9ccfda26 SHA512 70aaccc74d74c1ecc9098e579fd6ad154b22eb6024f84aab626d92ece33f5d5d75bdded1656fa7250f34b5b69f69767f39e22b9777601152a5ae6b32d8e1c796
-DIST intel-neo-19.38.14237.tar.gz 2480609 BLAKE2B d44b00038009d6fc549f7cb17f248f83b6848d152cbb0a0815a5537b4e6131e5087ec231d777eb425b13aee27954c4526ede4859305e5312ad34cc7ec32b0897 SHA512 5886c1565405410da27fd3f2f38e78e9d7017968ec92a2819206e53eeeace3903c3d14fae9b5a5abf582cece5fe1d54bc1db18301846c668af768fcac5854c91
+EBUILD intel-neo-19.16.12873.ebuild 1239 BLAKE2B 9f656d45ae8dd12435ee39fbfc0c47b00d4556482db1dbd1298940d140e0dca46e5c58684f7388a3e04a68a67cf3d6cba8996c3d3f331135c59077e487054551 SHA512 4fb62c57384aca36eecc1734401ef7a7262811e27650f25fd84d854d217dc9209015ac9685662cf09becf355bf9fa5f6f3826ba11c6bb6aeb453bcf8183cfa10
EBUILD intel-neo-19.22.13062.ebuild 1346 BLAKE2B f370b74e4661c304cff1460da5c47d07b5768b08b1e67417308ed5965f4c4ef43f140e87b7f4256950935788fa244500c0dde0bc3defde0b7edd52626a2f6557 SHA512 982efe953499958ca48523a3ee7ddf271182221ed04a4ad756c862a5a906e9ac2f3c3c44c5cf1eb0fc154f0b468c50614d9bf3046da906f8b402efd13b063467
EBUILD intel-neo-19.30.13641.ebuild 1346 BLAKE2B 3c5ba144dbb4faa6cfeac7138369f6dca9d2c3ba688a7e2ebf0fa27eb28e07174441261c44ad4227a16f7631661b1f9feed38e4929f9734ac9e40750bcd189fe SHA512 35953a7456361f0bf0e76b35ba659c99dd06a4b7bbed9130f87e05b0f5a3d477cb24d984a4f35add6c9ef683d72d1b761e5a12ac73583a3ba9faf7adb468a0b5
-EBUILD intel-neo-19.38.14237.ebuild 1265 BLAKE2B 6c2129e46819eb6e8f380e81a82728969b38743fe8ab2eb5840cb3c44927e64846f1c71da032fe3d56509721fddfba2609efb7789bba5c42181014abe3831f72 SHA512 06a356aa7aa56997c7cb4ce3d71eee2068819b1002d8de65bf0b5b8ff33c07539624a48e3ae82835d8bc2c4e02dbeea31a5ca17b724abeaee9c342fd80ad71ac
MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild b/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild
new file mode 100644
index 000000000000..ac08c8c0ab25
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="vaapi"
+
+COMMON="dev-libs/ocl-icd
+ dev-util/intel-graphics-compiler
+ >=media-libs/gmmlib-19.0.0
+ vaapi? (
+ x11-libs/libdrm[video_cards_intel]
+ >=x11-libs/libva-2.0.0
+ )"
+DEPEND="${COMMON}
+ virtual/pkgconfig"
+RDEPEND="${COMMON}"
+
+DOCS=(
+ README.md
+ documentation/FAQ.md
+ documentation/LIMITATIONS.md
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+ # If enabled, tests are automatically run during the compile phase
+ # - and we cannot run them because they require permissions to access
+ # the hardware.
+ -DSKIP_UNIT_TESTS=ON
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ "${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild b/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
deleted file mode 100644
index 843898c5f91f..000000000000
--- a/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON="dev-libs/ocl-icd
- >=dev-util/intel-graphics-compiler-1.0.11
- >=media-libs/gmmlib-19.2.4
- vaapi? (
- x11-libs/libdrm[video_cards_intel]
- >=x11-libs/libva-2.0.0
- )"
-DEPEND="${COMMON}
- media-libs/mesa" # for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
- README.md
- documentation/FAQ.md
- documentation/LIMITATIONS.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
- local mycmakeargs=(
- -DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
- -DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
- # If enabled, tests are automatically run during the compile phase
- # - and we cannot run them because they require permissions to access
- # the hardware.
- -DSKIP_UNIT_TESTS=ON
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- "${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
--
cgit v1.2.3