media-gfx/openpgl: add 0.6.0, use PV as subslot

Bug: https://bugs.gentoo.org/926890
Closes: https://bugs.gentoo.org/927244
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35969
Signed-off-by: Sam James <sam@gentoo.org>

10 files changed, 74 insertions, 16 deletions

diff --git a/media-gfx/blender/blender-3.6.0.ebuild b/media-gfx/blender/blender-3.6.0.ebuild
index f9473c4b808a..0e65b2f2660c 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	openpgl? ( media-libs/openpgl )
+	openpgl? ( media-libs/openpgl:0/0.5= )
 	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-3.6.5.ebuild b/media-gfx/blender/blender-3.6.5.ebuild
index 5e22e3d048ee..d353ecd72f39 100644
--- a/media-gfx/blender/blender-3.6.5.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -86,7 +86,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	openpgl? ( media-libs/openpgl )
+	openpgl? ( media-libs/openpgl:0/0.5= )
 	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8.ebuild
index 5e22e3d048ee..d353ecd72f39 100644
--- a/media-gfx/blender/blender-3.6.8.ebuild
+++ b/media-gfx/blender/blender-3.6.8.ebuild
@@ -86,7 +86,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	openpgl? ( media-libs/openpgl )
+	openpgl? ( media-libs/openpgl:0/0.5= )
 	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-4.0.1-r1.ebuild b/media-gfx/blender/blender-4.0.1-r1.ebuild
index 00be180d9573..0b6b4edad7b5 100644
--- a/media-gfx/blender/blender-4.0.1-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.1-r1.ebuild
@@ -90,7 +90,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	openpgl? ( >=media-libs/openpgl-0.5.0 )
+	openpgl? ( media-libs/openpgl:0/0.5= )
 	opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
 	openvdb? (
 		>=media-gfx/openvdb-10.1.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-4.0.2.ebuild b/media-gfx/blender/blender-4.0.2.ebuild
index a1cc16edc1ed..8c0b8c7c87cc 100644
--- a/media-gfx/blender/blender-4.0.2.ebuild
+++ b/media-gfx/blender/blender-4.0.2.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	openpgl? ( >=media-libs/openpgl-0.5.0 )
+	openpgl? ( media-libs/openpgl:0/0.5= )
 	opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
 	openvdb? (
 		>=media-gfx/openvdb-10.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 29230caa962b..fa9d2597436b 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -90,7 +90,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	openpgl? ( >=media-libs/openpgl-0.5.0 )
+	openpgl? ( media-libs/openpgl:= )
 	opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
 	openvdb? (
 		>=media-gfx/openvdb-10.1.0:=[nanovdb?]
diff --git a/media-libs/openpgl/Manifest b/media-libs/openpgl/Manifest
index 6b2d7becd00d..b923542376cb 100644
--- a/media-libs/openpgl/Manifest
+++ b/media-libs/openpgl/Manifest
@@ -1 +1,2 @@
 DIST openpgl-0.5.0.tar.gz 10767365 BLAKE2B 051b26c17300506dd20989ba9dc1aa83b0baf77c5f24650c74518ae56081b5a0ecca88c13d5d79a71cb0b6fa4a5b4841ee03e5223ec91ab16bb5655f2e52a9d7 SHA512 9b992ffa17ad6f9fcde48add5d9cc1e58be2daacd40478fb1babe0741a6c7a64f12f36c9c1f7d5ec6f79cdd847c082d39e03e58cfd9af1a903adca56f1ac19e1
+DIST openpgl-0.6.0.tar.gz 10824550 BLAKE2B a08f5469cce808c51eb64a619621de31923318a230e49ababad2140d00b53d3ad688e095c4f7aba1ac6ebfd874ed1357e4a501bee5f45a826c39cddbab4fa3cd SHA512 a40161d79e9f340e631eda9dedbabd9c71fb0184c65f45e0abcb64ce53289a65b7434c11678f845f76006a0ce579c4458a39200dc8caca1c455f18739488e173
diff --git a/media-libs/openpgl/openpgl-0.5.0.ebuild b/media-libs/openpgl/openpgl-0.5.0-r1.ebuild
index 2ee1fc5e7840..79487e34b3a1 100644
--- a/media-libs/openpgl/openpgl-0.5.0.ebuild
+++ b/media-libs/openpgl/openpgl-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,13 +10,17 @@ HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl"
 SRC_URI="https://github.com/OpenPathGuidingLibrary/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="-* ~amd64 ~arm64"
 
 X86_CPU_FLAGS=( sse4_2 avx2 avx512dq )
-CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="${CPU_FLAGS[@]} debug"
-REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )"
+CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+IUSE="${CPU_FLAGS[*]} debug"
+
+REQUIRED_USE="
+	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
+	arm64? ( cpu_flags_arm_neon )
+"
 
 RDEPEND="
 	media-libs/embree:=
@@ -26,18 +30,19 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DOPENPGL_ISA_AVX2=$(usex cpu_flags_x86_avx2)
-		-DOPENPGL_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
-		-DOPENPGL_ISA_SSE4=$(usex cpu_flags_x86_sse4_2)
+		-DOPENPGL_ISA_SSE4="$(usex cpu_flags_x86_sse4_2)"
+		-DOPENPGL_ISA_AVX2="$(usex cpu_flags_x86_avx2)"
+		-DOPENPGL_ISA_AVX512="$(usex cpu_flags_x86_avx512dq)"
+		-DOPENPGL_ISA_NEON="$(usex cpu_flags_arm_neon)"
 		# TODO look into neon 2x support
-		-DOPENPGL_ISA_NEON=$(usex cpu_flags_arm_neon)
+		# -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm_neon2x)"
 	)
 
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use cpu_flags_arm_neon && append-flags -flax-vector-conversions
 
 	# Disable asserts
-	append-cppflags $(usex debug '' '-DNDEBUG')
+	append-cppflags "$(usex debug '' '-DNDEBUG')"
 
 	cmake_src_configure
 }
diff --git a/media-libs/openpgl/openpgl-0.6.0.ebuild b/media-libs/openpgl/openpgl-0.6.0.ebuild
new file mode 100644
index 000000000000..79487e34b3a1
--- /dev/null
+++ b/media-libs/openpgl/openpgl-0.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Open Path Guiding Library"
+HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl"
+SRC_URI="https://github.com/OpenPathGuidingLibrary/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm64"
+
+X86_CPU_FLAGS=( sse4_2 avx2 avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+IUSE="${CPU_FLAGS[*]} debug"
+
+REQUIRED_USE="
+	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
+	arm64? ( cpu_flags_arm_neon )
+"
+
+RDEPEND="
+	media-libs/embree:=
+	dev-cpp/tbb:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPENPGL_ISA_SSE4="$(usex cpu_flags_x86_sse4_2)"
+		-DOPENPGL_ISA_AVX2="$(usex cpu_flags_x86_avx2)"
+		-DOPENPGL_ISA_AVX512="$(usex cpu_flags_x86_avx512dq)"
+		-DOPENPGL_ISA_NEON="$(usex cpu_flags_arm_neon)"
+		# TODO look into neon 2x support
+		# -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm_neon2x)"
+	)
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use cpu_flags_arm_neon && append-flags -flax-vector-conversions
+
+	# Disable asserts
+	append-cppflags "$(usex debug '' '-DNDEBUG')"
+
+	cmake_src_configure
+}
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index d18139adf64a..c95fe6418e75 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Paul Zander <negril.nx+gentoo@gmail.com> (2024-04-02)
+# Supports 64-bit NEON
+media-libs/openpgl -cpu_flags_arm_neon
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-03-21)
 # virt-firmware is keyworded here
 sys-kernel/installkernel -efistub