gentoo resync : 15.12.2019

4 files changed, 10 insertions, 33 deletions

diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index f2c9a878c98a..22f9b48efd53 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,8 +1,7 @@
-AUX intel-neo-19.16.12873_cmake_no_libva_automagic.patch 330 BLAKE2B a38c4a03d1837102168b907049c1a8fec93035f7efadd5e5cfb17296fd5fbf17dac1961affaa625847cd7c0cb3694d9d5c36b96d45f8c036334e8dc707100db0 SHA512 5c7133d355e0f4f8c0f8f0c84264d5f2a8cba6126d59b8a509354759a97d1a6f96b5deddcaacbce2ceb32e2014dd2f13e613a7db1973d3f865b906b803e8866e
-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.22.13062.ebuild 1346 BLAKE2B f370b74e4661c304cff1460da5c47d07b5768b08b1e67417308ed5965f4c4ef43f140e87b7f4256950935788fa244500c0dde0bc3defde0b7edd52626a2f6557 SHA512 982efe953499958ca48523a3ee7ddf271182221ed04a4ad756c862a5a906e9ac2f3c3c44c5cf1eb0fc154f0b468c50614d9bf3046da906f8b402efd13b063467
-EBUILD intel-neo-19.30.13641.ebuild 1346 BLAKE2B 3c5ba144dbb4faa6cfeac7138369f6dca9d2c3ba688a7e2ebf0fa27eb28e07174441261c44ad4227a16f7631661b1f9feed38e4929f9734ac9e40750bcd189fe SHA512 35953a7456361f0bf0e76b35ba659c99dd06a4b7bbed9130f87e05b0f5a3d477cb24d984a4f35add6c9ef683d72d1b761e5a12ac73583a3ba9faf7adb468a0b5
+DIST intel-neo-19.46.14807.tar.gz 2582591 BLAKE2B 07f65bf191e81a863e840a85c89d7632edfde814da0a00beaac0124293bf44a4d7bc45abdb0d8444dafcdaba24f83194d37df55297e0d0b32c91f622498e75c4 SHA512 fdf37bd51ffbf286d00ec395ba7f6bd53e0555610ed88ef201f2baaf1a03fb73137d0cd502119aba4cb6e146d2cd03c08bd20e004e6be3381104af9e24381820
+DIST intel-neo-19.48.14977.tar.gz 2633172 BLAKE2B 296c85c89833e49f66c428b62fda9753de260bfc819ee24846bc100021f103d2dcc432a9a8a60d310737470c7a4afece4fef557f72da40470ea950f8198bda0e SHA512 24a5f5306b90c763e803c34d3f20227ae0f22e6ff4192a0550e9e3050173b50f2b2e391250f1733676eca45002a061e2c753e7546db7dd21af7c1ed0857f329f
 EBUILD intel-neo-19.38.14237.ebuild 1265 BLAKE2B 6c2129e46819eb6e8f380e81a82728969b38743fe8ab2eb5840cb3c44927e64846f1c71da032fe3d56509721fddfba2609efb7789bba5c42181014abe3831f72 SHA512 06a356aa7aa56997c7cb4ce3d71eee2068819b1002d8de65bf0b5b8ff33c07539624a48e3ae82835d8bc2c4e02dbeea31a5ca17b724abeaee9c342fd80ad71ac
+EBUILD intel-neo-19.46.14807.ebuild 1267 BLAKE2B 5c39258b76a32e3ac770caf113fd457039cd255eac71494b3ca33076ab85232715f22ced75f20d08cc77bf6ac300e6d386dfe8065bb8248816f54d57227bfa86 SHA512 01ad25ca97b3a75495a73f6d46d0242aa8f805a17666fc0b444543e752da15c1b095b5dfdf5dd4c31383d0dbf6a93973d5fd4f4a45e6dd93ca9364efb690fd32
+EBUILD intel-neo-19.48.14977.ebuild 1267 BLAKE2B ba1c0f82596ae418fdf8c38a61039fed601b28f81430b16b610eb2c3f45d8e6a0d2bed49fcffd7b87444b71d0d57e6b710b78d807d63600e165ec740d1386bfa SHA512 ba43a79823c69965de75dddac8e886399e60bcf5fcf282e032ebffff277702b918a8796d781abc3c5ff82c491b098a910074495b23bbed527493b4c727f198a4
 MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch b/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch
deleted file mode 100644
index fbfdfd32dffe..000000000000
--- a/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -374,9 +374,9 @@
- endif()
- 
- # LibVA detection
--if(UNIX)
-+if(UNIX AND ENABLE_VAAPI_MEDIA_SHARING)
-   set(IGDRCL__LIBVA_IS_REQUIRED "")
--  if(IGDRCL_FORCE_USE_LIBVA)
-+  if(IGDRCL_FORCE_USE_LIBVA OR ENABLE_VAAPI_MEDIA_SHARING)
-     set(IGDRCL__LIBVA_IS_REQUIRED "REQUIRED")
-   endif()
- 
diff --git a/dev-libs/intel-neo/intel-neo-19.22.13062.ebuild b/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
index fa2b3c8393e5..0209ef1590c5 100644
--- a/dev-libs/intel-neo/intel-neo-19.22.13062.ebuild
+++ b/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
@@ -19,8 +19,8 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	dev-util/intel-graphics-compiler
-	>=media-libs/gmmlib-19.0.0
+	>=dev-util/intel-graphics-compiler-1.0.2878
+	>=media-libs/gmmlib-19.3.4
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		>=x11-libs/libva-2.0.0
@@ -35,16 +35,12 @@ DOCS=(
 	documentation/LIMITATIONS.md
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
-)
-
 S="${WORKDIR}"/${MY_P}
 
 src_configure() {
 	local mycmakeargs=(
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		-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.
diff --git a/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild b/dev-libs/intel-neo/intel-neo-19.48.14977.ebuild
index b9fc9e809d42..09ff894e4be2 100644
--- a/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild
+++ b/dev-libs/intel-neo/intel-neo-19.48.14977.ebuild
@@ -19,8 +19,8 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	dev-util/intel-graphics-compiler
-	>=media-libs/gmmlib-19.2.3
+	>=dev-util/intel-graphics-compiler-1.0.2990
+	>=media-libs/gmmlib-19.3.4
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		>=x11-libs/libva-2.0.0
@@ -35,16 +35,12 @@ DOCS=(
 	documentation/LIMITATIONS.md
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
-)
-
 S="${WORKDIR}"/${MY_P}
 
 src_configure() {
 	local mycmakeargs=(
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		-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.