gentoo auto-resync : 31:12:2022 - 20:20:25

4 files changed, 60 insertions, 31 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b8b433766177..bd15dc2e9520 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -9,6 +9,7 @@ AUX opencascade-7.5.3-tbb-2021.patch 1931 BLAKE2B cf4f6895f7418a4af75f164065945a
 AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aafc4e69259cc37e82c266f7af979716bed7d80fd0f680b4b6d6fdad3b26b0214f06fbbc8ee09db08602572a4543ad0aa8ec7b1af98139312cdba291d SHA512 04c7f37e42eeafe6d8ee99df8c50bb5bf8bbc90c8b958fcf486adbfbf79fcba60c4a3bbbf7495388096f5902b0af7280f0561556eae6e6f030b73850df55ca2c
 AUX opencascade-7.7.0-add-missing-include-limits.patch 459 BLAKE2B 507fd80c08c52ea1e9a9e70a0cbc6bee4f7093123de71f2b173e2d43355a1cc8a45f05e4acc7c07dbdfa1035fe13c97d56466a15e386c00c03c283dddd6b71a5 SHA512 048384188731831f7dd47d32d38df115a3e4c6abaf47615233b16c00b0547fee8ec757623d5c7ff0250988c9d47c0821fa06f95a69413fe2c339f0a5a47223d1
 AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4737971b0bf14828acc7c6049ad75920853f565705699ab58bf60d6e4aa5473114c6224938870e19439b569ce2112af2e9b0742c361cc54a68421ae SHA512 202994e6a0b42c2469f8fc11ace7364ce41056192393bd2930fba1468809ce8992169a6ccbe909930ad181d9c633fc9f6169f7ef72ef071c0186ae7f2ecdb456
+AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5
 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
@@ -17,6 +18,6 @@ DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
 EBUILD opencascade-7.5.2-r6.ebuild 4944 BLAKE2B 7478866b004cdb0e8a29b0341646e367dda0637b06ef844e159c5e10449d45a62a79f37cf4386a709a082c4b002db7623de7f75f72a8b0c50a031d1e248c7bed SHA512 dd8bf6a0c7d60e9e1cd20b88805e7106f552f773c736df619885479319d81ee54de6a793e56d6189836421e0ba454d1e780294961760ca9914c25a032959830c
 EBUILD opencascade-7.5.3-r8.ebuild 4977 BLAKE2B 09303b0bd2784d3db5eb2ed08f6cfa961a3a520a415612fd85e17d378bdf8783e57d8aa5400f8667fd73f21e272818e1e30def087dee9f88c5fd961e9b372a46 SHA512 1a3b1c38a9c7a3a04360261e995994c762389512aac0cd82687c08f7beb6491350d768d5343b54b83460538e663788bf5e00b503936f5364b3296a20039da935
-EBUILD opencascade-7.6.3.ebuild 4801 BLAKE2B 7402f2c1ebf69843ca7e249c245cf94a9f45edc5b4b910db040a266c6261fe1729c2da004190ba304e82723b230d8b11e0526c08c6838c66005ee5bfdbe2ca2c SHA512 3661d30160b39f460d03961c26ce72011b98442c0aa193c7f56a31cd7f32de841288168fe9b9d94f870e1ac8f107c5d98e4fd66c7c82cb9b41b36fae9dfc4650
-EBUILD opencascade-7.7.0.ebuild 5164 BLAKE2B f640cc6253c349bcc267bd0ab60ce167b542fb1764279dfd15be8dc74d8f791245d1cb4de8e6fa7ddda21186cdfe9d98d74a5104caa4b22d2a139d6d25988e9e SHA512 e38ca1791b719052eb6faa33427cdd411f487d2e22749fcef25adb42507b31ebc504bc098cac32969b608a829ace68886b04886ea88942d0c75e0ce4d74b551b
+EBUILD opencascade-7.6.3-r1.ebuild 4886 BLAKE2B 69c281d17b0090eb774cc3700d1598c7478e04980e374e84b03b0ce030f42d817108f5c8b16f60312c1251f48b99ad208567252b753ecd9e979c75d43fcd6917 SHA512 8c2e84dcb8a8c8926c871a635d5619dfba09ee5a5a16a705146edafba11de60518d0e34432897a187e17d54db1a8489291f36a3a29da23beccb2988b9a610047
+EBUILD opencascade-7.7.0-r1.ebuild 5009 BLAKE2B 83e7b873df183ee3592b8e4b3384de5dcf93f9ac0d739b9b3bb787f330699b817a79f3d6569750d2327a6a31175b1cd53fe4b343ae60aeeb2d9a0f31debfc7b1 SHA512 38a8370974b89f829d44d5d3489ef3f24ecf7647bb945dd2cec33b824fb242bfec6b430249dcd210e20643d5460ab6638a27a0e51c654a799d201aca7598e844
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
new file mode 100644
index 000000000000..7e744189a8d2
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
@@ -0,0 +1,36 @@
+From: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+From: Aiden Grossman <agrossman154@yahoo.com>
+Date: Mon, 10 Oct 2022 18:25:13 +0000 (-0700)
+Subject: Fix naming conflict between X11 headers and VTK 9.2.2+
+X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+Fix naming conflict between X11 headers and VTK 9.2.2+
+
+Currently, the GLX headers include the X11 headers which use a
+preprocessor define to make Status an int. However, VTK has a class
+called Status, and this define replaces this class name with int which
+results in compilation errors. This patch undefs Status and Success,
+which are both defined in the X11 headers if they exist so that there
+are no conflicts within the VTK headers for newer versions.
+---
+
+--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
++++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -27,6 +27,16 @@
+ #undef AllValues
+ #endif
+ 
++// Prevent naming collisions between X11
++// and VTK versions 9.2.0 and above.
++// X11 is included through glx
++#ifdef Status
++#undef Status
++#endif
++#ifdef Success
++#undef Success
++#endif
++
+ #include <vtkXRenderWindowInteractor.h>
+ #include <vtkXOpenGLRenderWindow.h>
+ #endif
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
index cd7888f8818b..2090e9b45195 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	media-libs/ftgl
 	virtual/glu
 	virtual/opengl
-	x11-libs/libXmu
+	x11-libs/libX11
 	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -49,7 +49,7 @@ RDEPEND="
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
 	tbb? ( dev-cpp/tbb:= )
-	vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
+	vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
 "
 DEPEND="
 	${RDEPEND}
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
 	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 	"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
+	"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
 )
 
 src_prepare() {
@@ -131,18 +132,16 @@ src_configure() {
 	fi
 
 	if use vtk; then
-		if has_version ">=sci-libs/vtk-9.1.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+		)
+		if has_version ">=sci-libs/vtk-9.2.0"; then
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
+		elif has_version ">=sci-libs/vtk-9.1.0"; then
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
 		elif has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
 		fi
 	fi
 
diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index c2f7e7dbf7a4..efd245f9b465 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	virtual/opengl
-	x11-libs/libXmu
+	x11-libs/libX11
 	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch
 	"${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
 	"${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
+	"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
 )
 
 src_prepare() {
@@ -132,24 +133,16 @@ src_configure() {
 	fi
 
 	if use vtk; then
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+		)
 		if has_version ">=sci-libs/vtk-9.2.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
 		elif has_version ">=sci-libs/vtk-9.1.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
 		elif has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
 		fi
 	fi