[patch] patch allowing different lua versions

openscenegraph-openmw-9999-lua-versions.patch (text/plain), 2.16 KB, created by Alec Stewart on 2024-10-26 18:21:48 UTC

--- /var/db/repos/gentoo/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild	2024-06-18 13:56:04.481549347 -0500
+++ /var/db/repos/local-repo/dev-games/openscenegraph-openmw/openscenegraph-openmw-9999.ebuild	2024-10-26 13:08:22.954097939 -0500
@@ -3,17 +3,23 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-{1,3,4} luajit )
 
 WX_GTK_VER="3.2-gtk3"
 inherit cmake flag-o-matic lua-single wxwidgets
 
-MY_COMMIT="69cfecebfb6dc703b42e8de39eed750a84a87489"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenMW/osg"
+	EGIT_BRANCH="3.6"
+else
+	MY_COMMIT="b02abe2_tag"
+	SRC_URI="https://github.com/OpenMW/osg/archive/refs/tags/${MY_COMMIT}.zip -> ${P}.tar.gz"
+	S="${WORKDIR}/osg-${MY_COMMIT}"
+fi
 
 DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
 HOMEPAGE="https://github.com/OpenMW/osg"
-SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/osg-${MY_COMMIT}"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
@@ -21,7 +27,7 @@
 IUSE="
 	+collada curl dicom debug doc egl examples fltk fox gdal
 	gif gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
-	+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib
+	+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr zlib
 "
 
 REQUIRED_USE="
@@ -85,13 +91,6 @@
 	x11-base/xorg-proto
 "
 
-PATCHES=(
-	"${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
-	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
-	"${FILESDIR}"/openscenegraph-3.6.5-cmake_lua_version.patch
-	"${FILESDIR}"/openscenegraph-3.6-openexr3.patch
-)
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
@@ -108,6 +107,8 @@
 	local mycmakeargs=(
 		-DDYNAMIC_OPENSCENEGRAPH=ON
 		-DLIB_POSTFIX=${libdir/lib}
+		-DBUILD_OSG_PLUGINS_BY_DEFAULT=0
+		-DBUILD_OSG_PLUGIN_OSG=1
 		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
 		$(cmake_use_find_package collada COLLADA)
 		$(cmake_use_find_package curl CURL)
@@ -140,6 +141,7 @@
 		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
 		$(cmake_use_find_package zlib ZLIB)
 		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+		-DBUILD_OSG_DEPRECATED_SERIALIZERS=0
 		-DCMAKE_RELWITHDEBINFO_POSTFIX=
 	)