summaryrefslogtreecommitdiff
path: root/dev-games/openscenegraph-openmw
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-16 14:04:41 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-16 14:04:41 +0000
commitb18dbdc69b2be6f0ac0db668b0bc57fb6f766afc (patch)
treee77939b82c93b9689bc1bb0bc8a55132c509cb44 /dev-games/openscenegraph-openmw
parent97f40b36b1afa9726e32962d11f3ac2d0bc5792e (diff)
gentoo auto-resync : 16:02:2023 - 14:04:41
Diffstat (limited to 'dev-games/openscenegraph-openmw')
-rw-r--r--dev-games/openscenegraph-openmw/Manifest4
-rw-r--r--dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild (renamed from dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild)9
2 files changed, 5 insertions, 8 deletions
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index 652ddcadf4ba..715c34508dcf 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -2,6 +2,6 @@ AUX openscenegraph-3.6-openexr3.patch 2014 BLAKE2B a01e4c96bccd4d898a281298b829b
AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107bd429564248fd72c6f4d70c1622b2933273e02f294d5fd3b2529fdbbdef65cdba41db7b441b7334b6180995896b52f8212 SHA512 2905fa5031641f2d3a8cec46c32c1cbf8adfb34b7c460c22eaecca66f5cc0b73c2bda4ed68dca3bda12a5f49385c2257bd5b4f3271b13eb979298eeaefb45789
AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
-DIST openscenegraph-openmw-3.6_p20211017.tar.gz 5788414 BLAKE2B d5ec3c7834bc8138b417d9bf8d92dde201a94f0158560aca477755752fd886378bfdffbd8c2e878ec1c6d35b572a60368c09695a93be9d83e26712de176b6824 SHA512 8985c6abedf2cbbf524aacc4f51e0217a8bd5eb17bae04774afc960b5cf21a6fb22941e08efcbd37e538c3e44cb044ca5cfa02380a75b4c87fe606c6fdfa8155
-EBUILD openscenegraph-openmw-3.6_p20211017-r3.ebuild 4569 BLAKE2B 48db853b3c5a046806511bc860e4f88ec4cc67777cc30aaa919aff6f1c4f5b203e8803e588dc96afa9cf98530284d8f2c72fd373c01b792d1d0da595d9542cf5 SHA512 d378fdb1563d2c5cb75a676efe384a338d7ec561a18f71a95f387667ace935ebd6b35bf263815f25712bec8bd2c93df6900c711ccb7002a833332041228afedc
+DIST openscenegraph-openmw-3.6_p20221115.tar.gz 5789008 BLAKE2B 312544e8cb06146f1ba4f2ba87cbb7abcea166bfb88fb0252ab003eb35f6b84e96f85ca9d9f07a78a9b8fe692b43a976f57c2f4b326fc8612f564f8fa2baadd6 SHA512 0f54d98069674d016bfca08512d8322f3a744eb21c6ab7c798dc11896aba85270a64404e24f217217f5fd5e191b106aff645dbaec4f7828e8cc5f94328574977
+EBUILD openscenegraph-openmw-3.6_p20221115.ebuild 4414 BLAKE2B 1e86c25bd6d615981cf861da4e7ec41eccbac969d92a3ae76dd194154829208c3d6f1184ad9f1f14863e992151d2b35aa0836afbe3e81fa415bc897580840882 SHA512 74212d767184988853f1089b7aba4df7b84b8f050b2f902d50e036f9611fae889f5a805d207f3232d7bb369f4d318c6836a20d1cac51afe32313f97eaef858a5
MISC metadata.xml 2088 BLAKE2B 8a6d83cb201e765310d776e4fae427d16f611cd2800c1d9bb3a315cbf3e37f21eea39604730405f18732203b509ab6f9ccde4c9ae54349c0f1be7b228fd8c44f SHA512 8e0b6cc0489b1651c7e0d67af7cf8e31da2916b3df6e27253beddb5cf0a8bb94224611b559c6ef3a52297964b9258de8f2fac72690aa7894c797cedab28031cd
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
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)