commit:     28bd50ca5e3936ca3f4f9fc5f59ef1b08b1c17fa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 30 14:01:53 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 31 23:24:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28bd50ca

dev-games/openscenegraph-openmw: drop 3.6_p20221115-r2, 3.6_p20251012

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-games/openscenegraph-openmw/Manifest           |   1 -
 dev-games/openscenegraph-openmw/metadata.xml       |   1 -
 .../openscenegraph-openmw-3.6_p20221115-r2.ebuild  | 168 ---------------------
 .../openscenegraph-openmw-3.6_p20251012.ebuild     | 168 ---------------------
 4 files changed, 338 deletions(-)

diff --git a/dev-games/openscenegraph-openmw/Manifest 
b/dev-games/openscenegraph-openmw/Manifest
index afce1b5bce2c..9d34115d933d 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,2 +1 @@
-DIST openscenegraph-openmw-3.6_p20221115.tar.gz 5789008 BLAKE2B 
312544e8cb06146f1ba4f2ba87cbb7abcea166bfb88fb0252ab003eb35f6b84e96f85ca9d9f07a78a9b8fe692b43a976f57c2f4b326fc8612f564f8fa2baadd6
 SHA512 
0f54d98069674d016bfca08512d8322f3a744eb21c6ab7c798dc11896aba85270a64404e24f217217f5fd5e191b106aff645dbaec4f7828e8cc5f94328574977
 DIST openscenegraph-openmw-3.6_p20251012.tar.gz 5790388 BLAKE2B 
2ee32e73d810271039e06f9f19013ceecff0faeded12adbe2cd75e7362fbc813c20da8eeaf53775ad3607d692cc2bf7426ddca971e04b16829fb6077900eb0d5
 SHA512 
13fa0b544ae604416a456d8c148c29d92b13d1550e39ea2028f617775b56654d58b660d649e5ee6ec691d4031849509b819d765dc35f59501dc478c85c7f9abb

diff --git a/dev-games/openscenegraph-openmw/metadata.xml 
b/dev-games/openscenegraph-openmw/metadata.xml
index 95b4405f0657..ee74fe29f6cd 100644
--- a/dev-games/openscenegraph-openmw/metadata.xml
+++ b/dev-games/openscenegraph-openmw/metadata.xml
@@ -29,7 +29,6 @@
                <flag name="dicom">Enable DICOM medical image file support via 
<pkg>sci-libs/dcmtk</pkg></flag>
                <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> 
library</flag>
                <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> 
library</flag>
-               <flag name="las">Enable support for geospatial data LAS LiDAR 
format using <pkg>sci-geosciences/liblas</pkg></flag>
                <flag name="openinventor">Build OpenInventor plugin</flag>
                <flag name="osgapps">Build osg applications</flag>
                <flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> 
additionally to <pkg>media-libs/libsdl</pkg></flag>

diff --git 
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r2.ebuild 
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r2.ebuild
deleted file mode 100644
index 62ea5288a3b6..000000000000
--- 
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.2-gtk3"
-inherit cmake flag-o-matic lua-single toolchain-funcs wxwidgets
-
-MY_COMMIT="69cfecebfb6dc703b42e8de39eed750a84a87489"
-
-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
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-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
-"
-
-REQUIRED_USE="
-       dicom? ( zlib )
-       lua? ( ${LUA_REQUIRED_USE} )
-       openexr? ( zlib )
-       sdl2? ( sdl )
-"
-
-# TODO: FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-       app-arch/unzip
-       virtual/pkgconfig
-       doc? ( app-text/doxygen[dot] )
-"
-RDEPEND="
-       !dev-games/openscenegraph
-       dev-libs/glib:2
-       media-libs/fontconfig
-       media-libs/mesa[egl(+)?]
-       virtual/glu
-       virtual/opengl
-       x11-libs/libSM
-       x11-libs/libXext
-       collada? ( dev-libs/collada-dom:= )
-       curl? ( net-misc/curl )
-       examples? (
-               fltk? ( x11-libs/fltk:1=[opengl] )
-               fox? ( x11-libs/fox:1.6[opengl] )
-               sdl2? ( media-libs/libsdl2 )
-               wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] )
-       )
-       gdal? ( sci-libs/gdal:= )
-       gif? ( media-libs/giflib:= )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       jpeg? ( media-libs/libjpeg-turbo:= )
-       las? ( >=sci-geosciences/liblas-1.8.0 )
-       lua? ( ${LUA_DEPS} )
-       openexr? (
-               dev-libs/imath:=
-               >=media-libs/openexr-3:=
-       )
-       openinventor? ( media-libs/coin )
-       pdf? ( app-text/poppler:=[cairo] )
-       png? ( media-libs/libpng:0= )
-       sdl? ( media-libs/libsdl )
-       svg? (
-               gnome-base/librsvg:2
-               x11-libs/cairo
-       )
-       tiff? ( media-libs/tiff:= )
-       truetype? ( media-libs/freetype:2 )
-       vnc? ( net-libs/libvncserver )
-       xrandr? ( x11-libs/libXrandr )
-       zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-       x11-base/xorg-proto
-"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-cmake4.patch # bug 960858
-       "${FILESDIR}"/${P}-cmake.patch # GNUInstalldirs, paths
-       "${FILESDIR}"/${P}-cmake-lua_version.patch # downstream patch
-       "${FILESDIR}"/openscenegraph-3.6-openexr3.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-       if use examples && use wxwidgets; then
-               setup-wxwidgets unicode
-       fi
-
-       # Needed by FFmpeg
-       append-cppflags -D__STDC_CONSTANT_MACROS
-       # bug #955848
-       tc-is-lto && filter-flags -fno-semantic-interposition
-
-       local libdir=$(get_libdir)
-       local mycmakeargs=(
-               -DDYNAMIC_OPENSCENEGRAPH=ON
-               -DLIB_POSTFIX=${libdir/lib}
-               -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-               $(cmake_use_find_package collada COLLADA)
-               $(cmake_use_find_package curl CURL)
-               -DBUILD_DOCUMENTATION=$(usex doc)
-               $(cmake_use_find_package dicom DCMTK)
-               $(cmake_use_find_package egl EGL)
-               -DBUILD_OSG_EXAMPLES=$(usex examples)
-               -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON
-               $(cmake_use_find_package gdal GDAL)
-               $(cmake_use_find_package gif GIFLIB)
-               $(cmake_use_find_package gstreamer GLIB)
-               $(cmake_use_find_package gstreamer GStreamer)
-               -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-               $(cmake_use_find_package jpeg JPEG)
-               -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-               $(cmake_use_find_package las LIBLAS)
-               -DBUILD_OSG_LUA_PLUGIN=$(usex lua)
-               -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-               $(cmake_use_find_package openexr OpenEXR)
-               $(cmake_use_find_package openinventor Inventor)
-               -DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-               $(cmake_use_find_package pdf Poppler-glib)
-               $(cmake_use_find_package png PNG)
-               $(cmake_use_find_package sdl SDL)
-               $(cmake_use_find_package sdl2 SDL2)
-               $(cmake_use_find_package svg RSVG)
-               $(cmake_use_find_package tiff TIFF)
-               $(cmake_use_find_package truetype Freetype)
-               $(cmake_use_find_package vnc LibVNCServer)
-               -DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-               $(cmake_use_find_package zlib ZLIB)
-               -DOSG_USE_LOCAL_LUA_SOURCE=OFF
-               -DCMAKE_RELWITHDEBINFO_POSTFIX=
-       )
-
-       if use examples; then
-               mycmakeargs+=(
-                       $(cmake_use_find_package fltk FLTK)
-                       $(cmake_use_find_package fox FOX)
-                       $(cmake_use_find_package wxwidgets wxWidgets)
-               )
-       fi
-
-       if use lua; then
-               mycmakeargs+=(
-                       -DLUA_VERSION="$(lua_get_version)"
-               )
-       fi
-
-       cmake_src_configure
-}
-
-src_compile() {
-       cmake_src_compile
-       use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}

diff --git 
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20251012.ebuild 
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20251012.ebuild
deleted file mode 100644
index 3d4d34bc1f37..000000000000
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20251012.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.2-gtk3"
-inherit cmake flag-o-matic lua-single toolchain-funcs wxwidgets
-
-MY_COMMIT="aa66653fde55365671eb9038b9392cf952ec7a05"
-
-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
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-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
-"
-
-REQUIRED_USE="
-       dicom? ( zlib )
-       lua? ( ${LUA_REQUIRED_USE} )
-       openexr? ( zlib )
-       sdl2? ( sdl )
-"
-
-# TODO: FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-       app-arch/unzip
-       virtual/pkgconfig
-       doc? ( app-text/doxygen[dot] )
-"
-RDEPEND="
-       !dev-games/openscenegraph
-       dev-libs/glib:2
-       media-libs/fontconfig
-       media-libs/mesa[egl(+)?]
-       virtual/glu
-       virtual/opengl
-       x11-libs/libSM
-       x11-libs/libXext
-       collada? ( dev-libs/collada-dom:= )
-       curl? ( net-misc/curl )
-       examples? (
-               fltk? ( x11-libs/fltk:1=[opengl] )
-               fox? ( x11-libs/fox:1.6[opengl] )
-               sdl2? ( media-libs/libsdl2 )
-               wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] )
-       )
-       gdal? ( sci-libs/gdal:= )
-       gif? ( media-libs/giflib:= )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       jpeg? ( media-libs/libjpeg-turbo:= )
-       las? ( >=sci-geosciences/liblas-1.8.0 )
-       lua? ( ${LUA_DEPS} )
-       openexr? (
-               dev-libs/imath:=
-               >=media-libs/openexr-3:=
-       )
-       openinventor? ( media-libs/coin )
-       pdf? ( app-text/poppler:=[cairo] )
-       png? ( media-libs/libpng:0= )
-       sdl? ( media-libs/libsdl )
-       svg? (
-               gnome-base/librsvg:2
-               x11-libs/cairo
-       )
-       tiff? ( media-libs/tiff:= )
-       truetype? ( media-libs/freetype:2 )
-       vnc? ( net-libs/libvncserver )
-       xrandr? ( x11-libs/libXrandr )
-       zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-       x11-base/xorg-proto
-"
-
-PATCHES=(
-       "${FILESDIR}"/openscenegraph-openmw-3.6_p20221115-cmake4.patch # bug 
960858
-       "${FILESDIR}"/openscenegraph-openmw-3.6_p20221115-cmake.patch # 
GNUInstalldirs, paths
-       
"${FILESDIR}"/openscenegraph-openmw-3.6_p20221115-cmake-lua_version.patch # 
downstream patch
-       "${FILESDIR}"/openscenegraph-3.6-openexr3.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-       if use examples && use wxwidgets; then
-               setup-wxwidgets unicode
-       fi
-
-       # Needed by FFmpeg
-       append-cppflags -D__STDC_CONSTANT_MACROS
-       # bug #955848
-       tc-is-lto && filter-flags -fno-semantic-interposition
-
-       local libdir=$(get_libdir)
-       local mycmakeargs=(
-               -DDYNAMIC_OPENSCENEGRAPH=ON
-               -DLIB_POSTFIX=${libdir/lib}
-               -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-               $(cmake_use_find_package collada COLLADA)
-               $(cmake_use_find_package curl CURL)
-               -DBUILD_DOCUMENTATION=$(usex doc)
-               $(cmake_use_find_package dicom DCMTK)
-               $(cmake_use_find_package egl EGL)
-               -DBUILD_OSG_EXAMPLES=$(usex examples)
-               -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON
-               $(cmake_use_find_package gdal GDAL)
-               $(cmake_use_find_package gif GIFLIB)
-               $(cmake_use_find_package gstreamer GLIB)
-               $(cmake_use_find_package gstreamer GStreamer)
-               -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-               $(cmake_use_find_package jpeg JPEG)
-               -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-               $(cmake_use_find_package las LIBLAS)
-               -DBUILD_OSG_LUA_PLUGIN=$(usex lua)
-               -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-               $(cmake_use_find_package openexr OpenEXR)
-               $(cmake_use_find_package openinventor Inventor)
-               -DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-               $(cmake_use_find_package pdf Poppler-glib)
-               $(cmake_use_find_package png PNG)
-               $(cmake_use_find_package sdl SDL)
-               $(cmake_use_find_package sdl2 SDL2)
-               $(cmake_use_find_package svg RSVG)
-               $(cmake_use_find_package tiff TIFF)
-               $(cmake_use_find_package truetype Freetype)
-               $(cmake_use_find_package vnc LibVNCServer)
-               -DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-               $(cmake_use_find_package zlib ZLIB)
-               -DOSG_USE_LOCAL_LUA_SOURCE=OFF
-               -DCMAKE_RELWITHDEBINFO_POSTFIX=
-       )
-
-       if use examples; then
-               mycmakeargs+=(
-                       $(cmake_use_find_package fltk FLTK)
-                       $(cmake_use_find_package fox FOX)
-                       $(cmake_use_find_package wxwidgets wxWidgets)
-               )
-       fi
-
-       if use lua; then
-               mycmakeargs+=(
-                       -DLUA_VERSION="$(lua_get_version)"
-               )
-       fi
-
-       cmake_src_configure
-}
-
-src_compile() {
-       cmake_src_compile
-       use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}

Reply via email to