[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/

["David Seifert" <soap@gentoo.org>]

commit:     96123ef466306f73fa68f3f78c9a3c7108e50941
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Feb 15 23:54:22 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 09:51:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96123ef4

dev-games/openscenegraph-openmw: add 3.6_p20221115, drop 3.6_p20211017-r3

Drop support for ffmpeg. Such commit probably shouldn't apply to
upstream OSG though.

Closes: https://github.com/gentoo/gentoo/pull/29599
Bug: https://bugs.gentoo.org/834425
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-games/openscenegraph-openmw/Manifest                         | 2 +-
 ...1017-r3.ebuild => openscenegraph-openmw-3.6_p20221115.ebuild} | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index a0bb9edc7c9b..2e55fa72c8ef 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1 +1 @@
-DIST openscenegraph-openmw-3.6_p20211017.tar.gz 5788414 BLAKE2B d5ec3c7834bc8138b417d9bf8d92dde201a94f0158560aca477755752fd886378bfdffbd8c2e878ec1c6d35b572a60368c09695a93be9d83e26712de176b6824 SHA512 8985c6abedf2cbbf524aacc4f51e0217a8bd5eb17bae04774afc960b5cf21a6fb22941e08efcbd37e538c3e44cb044ca5cfa02380a75b4c87fe606c6fdfa8155
+DIST openscenegraph-openmw-3.6_p20221115.tar.gz 5789008 BLAKE2B 312544e8cb06146f1ba4f2ba87cbb7abcea166bfb88fb0252ab003eb35f6b84e96f85ca9d9f07a78a9b8fe692b43a976f57c2f4b326fc8612f564f8fa2baadd6 SHA512 0f54d98069674d016bfca08512d8322f3a744eb21c6ab7c798dc11896aba85270a64404e24f217217f5fd5e191b106aff645dbaec4f7828e8cc5f94328574977

diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
similarity index 93%
rename from dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild
rename to dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
index ea018953264c..3bdc5cfee08a 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-1 )
 WX_GTK_VER="3.0-gtk3"
 inherit cmake flag-o-matic lua-single wxwidgets
 
-MY_COMMIT="bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"
+MY_COMMIT="69cfecebfb6dc703b42e8de39eed750a84a87489"
 
 DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
 HOMEPAGE="https://github.com/OpenMW/osg"
@@ -19,7 +19,7 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="
-	+collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
+	+collada curl dicom debug doc egl examples fltk fox gdal
 	gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
 	+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib
 "
@@ -37,8 +37,6 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-# <ffmpeg-5 for bug #831486 / bug #834425 and
-# https://github.com/openscenegraph/OpenSceneGraph/issues/1111
 RDEPEND="
 	!dev-games/openscenegraph
 	dev-libs/glib:2
@@ -57,7 +55,6 @@ RDEPEND="
 		sdl2? ( media-libs/libsdl2 )
 		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
 	)
-	ffmpeg? ( <media-video/ffmpeg-5:= )
 	gdal? ( sci-libs/gdal:= )
 	gif? ( media-libs/giflib:= )
 	gstreamer? (
@@ -119,7 +116,7 @@ src_configure() {
 		$(cmake_use_find_package dicom DCMTK)
 		$(cmake_use_find_package egl EGL)
 		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package ffmpeg FFmpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON
 		$(cmake_use_find_package gdal GDAL)
 		$(cmake_use_find_package gif GIFLIB)
 		$(cmake_use_find_package gstreamer GLIB)