From 9f5ec5ead287ebc6c045f9e6f56bfc7231cf755e Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Tue, 28 Dec 2021 10:42:07 -0500 Subject: dev-games/openscenegraph-openmw: drop 3.4_p20200425-r101 All in-tree openmw versions depend on >=3.6, failing to see a reason to keep this one. Signed-off-by: Ionen Wolkens --- dev-games/openscenegraph-openmw/Manifest | 1 - .../files/openscenegraph-3.4-cmake.patch | 87 ----------- .../files/openscenegraph-3.4-gcc11.patch | 23 --- .../files/openscenegraph-3.5.1-jpeg-9.patch | 34 ---- ...openscenegraph-openmw-3.4_p20200425-r101.ebuild | 172 --------------------- 5 files changed, 317 deletions(-) delete mode 100644 dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch delete mode 100644 dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch delete mode 100644 dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch delete mode 100644 dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild (limited to 'dev-games') diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest index d40ffdebd734..d3f72c953dcc 100644 --- a/dev-games/openscenegraph-openmw/Manifest +++ b/dev-games/openscenegraph-openmw/Manifest @@ -1,3 +1,2 @@ -DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B 43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7 SHA512 9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70 DIST openscenegraph-openmw-3.6_p20210610.tar.gz 5788655 BLAKE2B fdf345502ee7bb742741da758ae212028882544766a6acba3309d27e2fffa230e4a07626c9a39dbdf1310374b765b3941c915d7b6d527fc7cb75ba028230b4a0 SHA512 1964b12fedf297b8baf77d4db2eb4ce6732925bb3974fb4d8d20b1dec751400ceb57faf0b069c2a5cf45728cad83ea434356edbcb19413d650717c3d2ac39a03 DIST openscenegraph-openmw-3.6_p20211017.tar.gz 5788414 BLAKE2B d5ec3c7834bc8138b417d9bf8d92dde201a94f0158560aca477755752fd886378bfdffbd8c2e878ec1c6d35b572a60368c09695a93be9d83e26712de176b6824 SHA512 8985c6abedf2cbbf524aacc4f51e0217a8bd5eb17bae04774afc960b5cf21a6fb22941e08efcbd37e538c3e44cb044ca5cfa02380a75b4c87fe606c6fdfa8155 diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch deleted file mode 100644 index 85eff1ab7907..000000000000 --- a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- OpenSceneGraph-3.4.0/CMakeLists.txt -+++ OpenSceneGraph-3.4.0/CMakeLists.txt -@@ -76,6 +76,7 @@ - SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - ENDIF(NOT CMAKE_BUILD_TYPE) - -+INCLUDE(MacroOptionalFindPackage) - - IF(ANDROID) - INCLUDE(OsgAndroidMacroUtils)--- OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS -+++ OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS -@@ -0,0 +1,22 @@ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions -+are met: -+ -+1. Redistributions of source code must retain the copyright -+ notice, this list of conditions and the following disclaimer. -+2. Redistributions in binary form must reproduce the copyright -+ notice, this list of conditions and the following disclaimer in the -+ documentation and/or other materials provided with the distribution. -+3. The name of the author may not be used to endorse or promote products -+ derived from this software without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---- OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake -+++ OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake -@@ -0,0 +1,28 @@ -+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() -+# MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] ) -+# This macro is a combination of OPTION() and FIND_PACKAGE(), it -+# works like FIND_PACKAGE(), but additionally it automatically creates -+# an option name WITH_, which can be disabled via the cmake GUI. -+# or via -DWITH_=OFF -+# The standard _FOUND variables can be used in the same way -+# as when using the normal FIND_PACKAGE() -+ -+# Copyright (c) 2006, Alexander Neundorf, -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+ -+macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) -+ option(WITH_${_name} "Search for ${_name} package" ON) -+ if (WITH_${_name}) -+ find_package(${_name} ${ARGN}) -+ else (WITH_${_name}) -+ set(${_name}_FOUND) -+ set(${_name}_INCLUDE_DIR) -+ set(${_name}_INCLUDES) -+ set(${_name}_LIBRARY) -+ set(${_name}_LIBRARIES) -+ endif (WITH_${_name}) -+endmacro (MACRO_OPTIONAL_FIND_PACKAGE) -+ ---- OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake -+++ OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake -@@ -463,7 +463,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME) - IF(APPLE) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) - ELSE(APPLE) -- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) -+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples ) - IF(MSVC) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug) - ---- OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt -+++ OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt -@@ -1,6 +1,6 @@ - SET(TARGET_SRC osgviewerFLTK.cpp ) - --SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY}) -+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY}) - - INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ) - diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch deleted file mode 100644 index 0d2dc2d0f73b..000000000000 --- a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/788301 ---- a/include/osgDB/ObjectCache -+++ b/include/osgDB/ObjectCache -@@ -72,7 +72,7 @@ class OSGDB_EXPORT ObjectCache : public osg::Referenced - - class ClassComp { - public: -- bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs); -+ bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const; - }; - - typedef std::pair, double > ObjectTimeStampPair; ---- a/src/osgDB/ObjectCache.cpp -+++ b/src/osgDB/ObjectCache.cpp -@@ -16,7 +16,7 @@ - - using namespace osgDB; - --bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) -+bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const - { - // check if filename are the same - if (lhs.first < rhs.first) return true; diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch deleted file mode 100644 index f6e85e8e352d..000000000000 --- a/dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 34b4e7001522c1b47b4211dac34d2d6a6b994a6f Mon Sep 17 00:00:00 2001 -From: Robert Osfield -Date: Thu, 17 Aug 2017 10:52:59 +0100 -Subject: [PATCH] Added version check for boolean, TRUE and FALSE settings - ---- - src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp -index 9f7f4c38937..115203322a5 100644 ---- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp -+++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp -@@ -70,12 +70,14 @@ namespace osgDBJPEG - - static int jpegerror = ERR_NO_ERROR; - --/* Some versions of jmorecfg.h define boolean, some don't... -- Those that do also define HAVE_BOOLEAN, so we can guard using that. */ --#ifndef HAVE_BOOLEAN -- typedef int boolean; -- #define FALSE 0 -- #define TRUE 1 -+#if JPEG_LIB_VERSION < 90 -+ /* Some versions of jmorecfg.h define boolean, some don't... -+ Those that do also define HAVE_BOOLEAN, so we can guard using that. */ -+ #ifndef HAVE_BOOLEAN -+ typedef int boolean; -+ #define FALSE 0 -+ #define TRUE 1 -+ #endif - #endif - - /* CODE FOR READING/WRITING JPEG FROM STREAMS diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild deleted file mode 100644 index 82dcb9d455c9..000000000000 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} ) -WX_GTK_VER="3.0-gtk3" -inherit cmake flag-o-matic lua-single wxwidgets - -DESCRIPTION="OpenMW-specific fork of OpenSceneGraph" -HOMEPAGE="https://github.com/OpenMW/osg" -MY_COMMIT="8b07809fa674ecffe77338aaea2e223b3aadff0e" -SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="wxWinLL-3 LGPL-2.1" -SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg - lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff - truetype vnc wxwidgets xine xrandr zlib" - -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - sdl2? ( sdl ) - openexr? ( zlib ) -" - -# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK -RDEPEND=" - !dev-games/openscenegraph - media-libs/mesa[egl(+)?] - virtual/glu - virtual/opengl - x11-libs/libSM - x11-libs/libXext - curl? ( net-misc/curl ) - examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) - fox? ( x11-libs/fox:1.6[opengl] ) - glut? ( media-libs/freeglut ) - sdl2? ( media-libs/libsdl2 ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - gdal? ( sci-libs/gdal:= ) - gif? ( media-libs/giflib:= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - jpeg? ( virtual/jpeg:0 ) - lua? ( ${LUA_DEPS} ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - openinventor? ( media-libs/coin ) - pdf? ( app-text/poppler[cairo] ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - sdl? ( media-libs/libsdl ) - svg? ( - gnome-base/librsvg - x11-libs/cairo - ) - tiff? ( media-libs/tiff:0 ) - truetype? ( media-libs/freetype:2 ) - vnc? ( net-libs/libvncserver ) - xrandr? ( x11-libs/libXrandr ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -S="${WORKDIR}/osg-${MY_COMMIT}" - -PATCHES=( - "${FILESDIR}"/openscenegraph-3.4-cmake.patch - "${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch - "${FILESDIR}"/openscenegraph-3.6.3-docdir.patch - "${FILESDIR}"/openscenegraph-3.4-gcc11.patch -) - -pkg_setup() { - if use lua; then - lua-single_pkg_setup - fi -} - -src_prepare() { - sed -i "s/ FIND_PACKAGE/ MACRO_OPTIONAL_FIND_PACKAGE/g" CMakeLists.txt || die "can't replace FIND_PACKAGE" - cmake_src_prepare -} - -src_configure() { - if use examples && use wxwidgets; then - setup-wxwidgets - fi - - # Needed by FFmpeg - append-cppflags -D__STDC_CONSTANT_MACROS - - local libdir=$(get_libdir) - local mycmakeargs=( - -DDYNAMIC_OPENSCENEGRAPH=ON - -DLIB_POSTFIX=${libdir/lib} - -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3 - -DOSG_PROVIDE_READFILE=ON - -DOSG_USE_LOCAL_LUA_SOURCE=OFF - -DWITH_Lua51=OFF # We use CMake-version FindLua52.cmake instead which can find any lua - -DWITH_Lua52=$(usex lua) - -DWITH_Asio=OFF # Fails to build, similar to https://github.com/chriskohlhoff/asio/issues/316 - -DWITH_CURL=$(usex curl) - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_OSG_APPLICATIONS=$(usex osgapps) - -DBUILD_OSG_EXAMPLES=$(usex examples) - -DWITH_FFmpeg=$(usex ffmpeg) - -DWITH_GDAL=$(usex gdal) - -DWITH_GIFLIB=$(usex gif) - -DWITH_GStreamer=$(usex gstreamer) - -DWITH_GLIB=$(usex gstreamer) - -DWITH_GtkGl=OFF - -DWITH_JPEG=$(usex jpeg) - -DWITH_Jasper=OFF - -DWITH_LIBLAS=OFF # dep failed to build https://bugs.gentoo.org/725938 - -DWITH_OpenEXR=$(usex openexr) - -DWITH_Inventor=$(usex openinventor) - -DWITH_Poppler-glib=$(usex pdf) - -DWITH_PNG=$(usex png) - -DWITH_SDL=$(usex sdl) - -DWITH_SDL2=$(usex sdl2) - -DWITH_RSVG=$(usex svg rsvg) - -DWITH_TIFF=$(usex tiff) - -DWITH_Freetype=$(usex truetype) - -DWITH_LibVNCServer=$(usex vnc) - -DWITH_Xine=$(usex xine) - -DOSGVIEWER_USE_XRANDR=$(usex xrandr) - -DWITH_ZLIB=$(usex zlib) - -DOSG_USE_QT=$(usex qt5) - -DDESIRED_QT_VERSION=5 - ) - if use examples; then - mycmakeargs+=( - -DWITH_FLTK=$(usex fltk) - -DWITH_FOX=$(usex fox) - -DWITH_GLUT=$(usex glut) - -DWITH_wxWidgets=$(usex wxwidgets) - ) - fi - if use lua; then - mycmakeargs+=( - -DLUA_INCLUDE_DIR="$(lua_get_include_dir)" - -DLUA_LIBRARY="$(lua_get_shared_lib)" - ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doc_openscenegraph doc_openthreads -} -- cgit v1.2.3-65-gdbad