[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: fde4c60fe7c04b0eb77feaf6c8286d08630fc8cf
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Jul 22 13:24:39 2024 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Jul 22 19:14:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde4c60f
dev-games/openscenegraph-openmw: drop 3.6_p20221115
Signed-off-by: Pacho Ramos gentoo.org>
.../openscenegraph-openmw-3.6_p20221115.ebuild | 166 -
1 file changed, 166 deletions(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
deleted file mode 100644
index b519ec51bc22..
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single 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}"/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
-}
-
-src_configure() {
- if use examples && use wxwidgets; then
- setup-wxwidgets unicode
- 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
- $(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)
- $(cmake_use_find_package lua Lua)
-
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 60932f3a2430841494230e8518bb0cc5ef41a0b6
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Jun 16 09:15:40 2024 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Jun 16 09:17:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60932f3a
dev-games/openscenegraph-openmw: Use wxGTK 3.2
Closes: https://bugs.gentoo.org/917435
Signed-off-by: Pacho Ramos gentoo.org>
.../openscenegraph-openmw-3.6_p20221115-r1.ebuild | 166 +
1 file changed, 166 insertions(+)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild
new file mode 100644
index ..ebb83fce663a
--- /dev/null
+++
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2024 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 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}"/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
+}
+
+src_configure() {
+ if use examples && use wxwidgets; then
+ setup-wxwidgets unicode
+ 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
+ $(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)
+
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 4e1d2972b74b47dbcabc002315b00e246d034ef6
Author: Alexey Sokolov asokolov org>
AuthorDate: Sat Sep 30 21:35:08 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Nov 2 01:16:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1d2972
dev-games/openscenegraph-openmw: glut is no longer used
Closes: https://bugs.gentoo.org/907294
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/33143
Signed-off-by: Ionen Wolkens gentoo.org>
.../openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
index ef31dfac302f..94a6a21ef271 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
@@ -20,7 +20,7 @@ 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 glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
+ gif gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib
"
@@ -51,7 +51,6 @@ RDEPEND="
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] )
)
@@ -148,7 +147,6 @@ src_configure() {
mycmakeargs+=(
$(cmake_use_find_package fltk FLTK)
$(cmake_use_find_package fox FOX)
- $(cmake_use_find_package glut GLUT)
$(cmake_use_find_package wxwidgets wxWidgets)
)
fi
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: a38bfa824dc73ffbf90f265bb8acd7af08b76bea Author: Alexey Sokolov asokolov org> AuthorDate: Thu Feb 16 14:04:18 2023 + Commit: David Seifert gentoo org> CommitDate: Thu Feb 16 14:04:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38bfa82 dev-games/openscenegraph-openmw: require dot for docs Bug: https://bugs.gentoo.org/866566 Signed-off-by: Alexey Sokolov asokolov.org> Signed-off-by: David Seifert gentoo.org> .../openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild index 3bdc5cfee08a..ac82aac62f2f 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild @@ -35,7 +35,7 @@ REQUIRED_USE=" BDEPEND=" app-arch/unzip virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-doc/doxygen[dot] ) " RDEPEND=" !dev-games/openscenegraph
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 96123ef466306f73fa68f3f78c9a3c7108e50941
Author: Alexey Sokolov asokolov org>
AuthorDate: Wed Feb 15 23:54:22 2023 +
Commit: David Seifert gentoo org>
CommitDate: Thu Feb 16 09:51:13 2023 +
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 asokolov.org>
Signed-off-by: David Seifert 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 )
"
-# https://github.com/openscenegraph/OpenSceneGraph/issues/
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? (
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 75ac033adf7b6b6fea3fc8c7f4d6265f04f8c51b
Author: Sam James gentoo org>
AuthorDate: Wed Feb 15 06:45:29 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 06:45:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ac033a
dev-games/openscenegraph-openmw: depend on https://bugs.gentoo.org/834425
Signed-off-by: Sam James gentoo.org>
.../openscenegraph-openmw-3.6_p20211017-r3.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild
index 7805850796aa..ea018953264c 100644
---
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild
+++
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -37,6 +37,8 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
+# https://github.com/openscenegraph/OpenSceneGraph/issues/
RDEPEND="
!dev-games/openscenegraph
dev-libs/glib:2
@@ -55,7 +57,7 @@ RDEPEND="
sdl2? ( media-libs/libsdl2 )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
)
- ffmpeg? ( media-video/ffmpeg:0= )
+ ffmpeg? (
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 3a381ba5c3a46fb34f85e07eb8e230beb9c57dd3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 11 05:36:24 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 11 07:37:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a381ba5
dev-games/openscenegraph-openmw: drop 3.6_p20211017-r0
Signed-off-by: Ionen Wolkens gentoo.org>
.../openscenegraph-openmw-3.6_p20211017.ebuild | 168 -
1 file changed, 168 deletions(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
deleted file mode 100644
index 15ae49afe64a..
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-MY_COMMIT="bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"
-
-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 ~x86"
-IUSE="
- +collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
- gif glut 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-doc/doxygen )
-"
-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] )
- 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 )
- las? ( >=sci-geosciences/liblas-1.8.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= )
- sdl? ( media-libs/libsdl )
- svg? (
- gnome-base/librsvg:2
- 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
-"
-
-PATCHES=(
- "${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
- "${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
- "${FILESDIR}"/openscenegraph-3.6.5-cmake_lua_version.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
-
- 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)
- $(cmake_use_find_package ffmpeg FFmpeg)
- $(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)
-
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/files/
commit: a9a04eab96f58ad17c7bf1c712ebf2325f114c74
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun Feb 20 16:13:21 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Feb 22 07:11:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a04eab
dev-games/openscenegraph-openmw: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24284
Signed-off-by: Ionen Wolkens gentoo.org>
.../openscenegraph-3.6.5-use_boost_asio.patch | 263 -
1 file changed, 263 deletions(-)
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
deleted file mode 100644
index f9a32c0dc601..
---
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
+++ /dev/null
@@ -1,263 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -764,7 +764,7 @@
- FIND_PACKAGE(DirectInput)
- FIND_PACKAGE(NVTT)
- IF (NOT WIN32)
--FIND_PACKAGE(Asio)
-+FIND_PACKAGE(Boost)
- ENDIF()
- FIND_PACKAGE(ZeroConf)
-
a/CMakeModules/FindAsio.cmake
-+++ b/CMakeModules/FindAsio.cmake
-@@ -1,22 +0,0 @@
--# Locate ASIO-headers (http://think-async.com/Asio)
--# This module defines
--# ASIO_FOUND, if false, do not try to link to gdal
--# ASIO_INCLUDE_DIR, where to find the headers
--#
--# Created by Stephan Maximilian Huber
--
--FIND_PATH(ASIO_INCLUDE_DIR
-- NAMES
--asio.hpp
-- PATHS
--/usr/include
--/usr/local/include
--)
--
--SET(ASIO_FOUND "NO")
--IF(ASIO_INCLUDE_DIR)
--FIND_PACKAGE( Boost 1.37 )
--IF(Boost_FOUND)
--SET(ASIO_FOUND "YES")
--ENDIF()
--ENDIF()
a/src/osgPlugins/CMakeLists.txt
-+++ b/src/osgPlugins/CMakeLists.txt
-@@ -299,13 +299,13 @@
- #
- # Device integration plugins
- #
--IF (SDL_FOUND)
-+IF(SDL_FOUND)
- ADD_PLUGIN_DIRECTORY(sdl)
--ENDIF(SDL_FOUND)
-+ENDIF()
-
--IF(ASIO_FOUND)
-+IF(Boost_FOUND)
- ADD_PLUGIN_DIRECTORY(RestHttpDevice)
--ENDIF(ASIO_FOUND)
-+ENDIF()
-
-
- IF(ZEROCONF_FOUND)
a/src/osgPlugins/RestHttpDevice/CMakeLists.txt
-+++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt
-@@ -1,6 +1,5 @@
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
--INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
--
-+
- SET(TARGET_SRC
- connection.cpp
- io_service_pool.cpp
-@@ -26,7 +25,7 @@
- RestHttpDevice.hpp
- )
-
--SET(TARGET_ADDED_LIBRARIES osgPresentation )
-+SET(TARGET_ADDED_LIBRARIES osgPresentation)
-
- end var setup ###
- SETUP_PLUGIN(resthttp)
a/src/osgPlugins/RestHttpDevice/connection.cpp
-+++ b/src/osgPlugins/RestHttpDevice/connection.cpp
-@@ -37,14 +37,14 @@
- void connection::start()
- {
- OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
--
-+
- socket_.async_read_some(asio::buffer(buffer_),
- boost::bind(::handle_read, shared_from_this(),
- asio::placeholders::error,
- asio::placeholders::bytes_transferred));
- }
-
--void connection::handle_read(const asio::error_code& e,
-+void connection::handle_read(const boost::system::error_code& e,
- std::size_t bytes_transferred)
- {
- if (!e)
-@@ -82,12 +82,12 @@
- // handler returns. The connection class's destructor closes the socket.
- }
-
--void connection::handle_write(const asio::error_code& e)
-+void connection::handle_write(const boost::system::error_code& e)
- {
- if (!e)
- {
- // Initiate graceful connection closure.
--asio::error_code ignored_ec;
-+boost::system::error_code ignored_ec;
- socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
- }
-
a/src/osgPlugins/RestHttpDevice/connection.hpp
-+++ b/src/osgPlugins/RestHttpDevice/connection.hpp
-@@ -11,7 +11,7 @@
- #ifndef HTTP_SERVER_CONNECTION_HPP
- #define HTTP_SERVER_CONNECTION_HPP
-
--#include
-+#include
- #include
- #include
- #include
-@@ -21,6 +21,8 @@
- #include "request_handler.hpp"
- #include "request_parser.hpp"
-
-+using namespace boost;
-+
- namespace http {
- namespace server {
-
-@@ -42,11 +44,11 @@
- ~connection();
- private:
- /// Handle completion of a read operation.
-- void handle_read(const asio::error_code& e,
-+ void handle_read(const boost::system::error_code& e,
- std::size_t bytes_transferred);
-
- /// Handle completion of a write operation.
-- void handle_write(const asio::error_code& e);
-+ void handle_write(const boost::system::error_code& e);
-
- /// Socket for the connection.
- asio::ip::tcp::socket socket_;
a/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
-+++ b/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
-@@ -11,7 +11,7 @@
- #include "server.hpp"
- #include
- #include
--#include
-+#include
-
- namespace http {
- namespace server {
-@@ -36,17 +36,14 @@
- void io_service_pool::run()
- {
- // Create a
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/, dev-games/openscenegraph-openmw/files/
commit: 96e140368d521dc0694ce959513cc42e337d24c5
Author: Alexey Sokolov asokolov org>
AuthorDate: Wed Feb 16 22:19:58 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 18 02:13:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e14036
dev-games/openscenegraph-openmw: adjust to unslotted OpenEXR 3
Closes: https://bugs.gentoo.org/833492
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Sam James gentoo.org>
.../files/openscenegraph-3.6-openexr3.patch| 68 +
.../openscenegraph-openmw-3.6_p20211017-r1.ebuild | 169 +
2 files changed, 237 insertions(+)
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6-openexr3.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6-openexr3.patch
new file mode 100644
index ..1cfab7715f10
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6-openexr3.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/833492
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -752,7 +752,6 @@ ELSE()
+-FIND_PACKAGE(ilmbase)
+ FIND_PACKAGE(Inventor)
+ FIND_PACKAGE(Jasper)
+-FIND_PACKAGE(OpenEXR)
++FIND_PACKAGE(OpenEXR CONFIG)
+ FIND_PACKAGE(OpenCascade)
+ FIND_PACKAGE(COLLADA)
+ FIND_PACKAGE(FBX)
+--- a/src/osgPlugins/CMakeLists.txt
b/src/osgPlugins/CMakeLists.txt
+@@ -105,7 +105,7 @@ ENDIF()
+ IF(JASPER_FOUND)
+ ADD_PLUGIN_DIRECTORY(jp2)
+ ENDIF()
+-IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
++IF(OpenEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+ ADD_PLUGIN_DIRECTORY(exr)
+ ENDIF()
+ IF(GIFLIB_FOUND)
+--- a/src/osgPlugins/exr/CMakeLists.txt
b/src/osgPlugins/exr/CMakeLists.txt
+@@ -1,9 +1,7 @@
+-INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
+-INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )
+-
+ SET(TARGET_SRC ReaderWriterEXR.cpp )
+
+-SET(TARGET_LIBRARIES_VARS ${OPENEXR_LIBRARIES_VARS} ${ILMBASE_LIBRARIES_VARS}
ZLIB_LIBRARIES)
++SET(OPENEXR_LIBRARIES_VARS OpenEXR::OpenEXR)
++SET(TARGET_LIBRARIES_VARS OPENEXR_LIBRARIES_VARS ZLIB_LIBRARIES)
+
+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ REMOVE_CXX_FLAG(-Wshadow)
+--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp
b/src/osgPlugins/exr/ReaderWriterEXR.cpp
+@@ -41,11 +41,11 @@ public:
+ {
+ return _inStream->read(c,n).good();
+ };
+- virtual Int64tellg ()
++ virtual uint64_ttellg ()
+ {
+ return _inStream->tellg();
+ };
+- virtual voidseekg (Int64 pos)
++ virtual voidseekg (uint64_t pos)
+ {
+ _inStream->seekg(pos);
+ };
+@@ -69,11 +69,11 @@ public:
+ {
+ _outStream->write(c,n);
+ };
+- virtual Int64tellp ()
++ virtual uint64_ttellp ()
+ {
+ return _outStream->tellp();
+ };
+- virtual void seekp (Int64 pos)
++ virtual void seekp (uint64_t pos)
+ {
+ _outStream->seekp(pos);
+ };
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r1.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r1.ebuild
new file mode 100644
index ..c0e8f55f2dbd
--- /dev/null
+++
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+MY_COMMIT="bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"
+
+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 ~x86"
+IUSE="
+ +collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
+ gif glut 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-doc/doxygen )
+"
+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] )
+
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 0b0a983835c52803da7588fbf18a45008f24acf9
Author: Alexey Sokolov asokolov org>
AuthorDate: Wed Feb 16 20:52:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 18 02:13:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0a9838
dev-games/openscenegraph-openmw: drop old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Sam James gentoo.org>
dev-games/openscenegraph-openmw/Manifest | 1 -
.../openscenegraph-openmw-3.6_p20210610.ebuild | 167 -
2 files changed, 168 deletions(-)
diff --git a/dev-games/openscenegraph-openmw/Manifest
b/dev-games/openscenegraph-openmw/Manifest
index d3f72c953dcc..a0bb9edc7c9b 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,2 +1 @@
-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/openscenegraph-openmw-3.6_p20210610.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
deleted file mode 100644
index 21e4584df2bd..
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-MY_COMMIT="b02abe200c4847e73b887b064a89ea1758a5b733"
-
-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 ~x86"
-IUSE="
- collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
- gif glut 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-doc/doxygen )
-"
-RDEPEND="
- !dev-games/openscenegraph
- 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] )
- 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 )
- las? ( >=sci-geosciences/liblas-1.8.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= )
- 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}
- dev-libs/boost
- x11-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
- "${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
- "${FILESDIR}"/openscenegraph-3.6.5-use_boost_asio.patch
- "${FILESDIR}"/openscenegraph-3.6.5-cmake_lua_version.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
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: d2a696e2f6f572fd5c18fb27b37478e92d7c91f7
Author: Sam James gentoo org>
AuthorDate: Wed Dec 8 03:34:12 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 8 03:34:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a696e2
dev-games/openscenegraph-openmw: keyword 3.6_p20211017 for ~arm64
Signed-off-by: Sam James gentoo.org>
.../openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
index 1db53cd3148e..15ae49afe64a 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/osg-${MY_COMMIT}"
LICENSE="wxWinLL-3 LGPL-2.1"
SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="
+collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 6e4a5f7567700923082fa63650d3c9829acd21e1
Author: Sam James gentoo org>
AuthorDate: Wed Dec 8 03:32:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 8 03:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4a5f75
dev-games/openscenegraph-openmw: Keyword 3.6_p20210610 arm64, #806776
Signed-off-by: Sam James gentoo.org>
.../openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
index 1fe85653833c..21e4584df2bd 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/osg-${MY_COMMIT}"
LICENSE="wxWinLL-3 LGPL-2.1"
SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="
collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 3000a333c3e713979370f474b21bc8b461d53cf2
Author: Sam James gentoo org>
AuthorDate: Wed Dec 8 03:32:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 8 03:32:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3000a333
dev-games/openscenegraph-openmw: Keyword 3.4_p20200425-r101 arm64, #806776
Signed-off-by: Sam James gentoo.org>
.../openscenegraph-openmw-3.4_p20200425-r101.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 409ac1f6275c..82dcb9d455c9 100644
---
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild
+++
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.g
LICENSE="wxWinLL-3 LGPL-2.1"
SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 67a7abb232c292b9945b530c2be4ed20d168861b
Author: Alexey Sokolov asokolov org>
AuthorDate: Sat Nov 6 01:25:21 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Nov 6 15:35:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a7abb2
dev-games/openscenegraph-openmw: new snapshot
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/22838
Signed-off-by: Ionen Wolkens gentoo.org>
dev-games/openscenegraph-openmw/Manifest | 1 +
.../openscenegraph-openmw-3.6_p20211017.ebuild | 168 +
2 files changed, 169 insertions(+)
diff --git a/dev-games/openscenegraph-openmw/Manifest
b/dev-games/openscenegraph-openmw/Manifest
index f6fca44cefb..d40ffdebd73 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,2 +1,3 @@
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/openscenegraph-openmw-3.6_p20211017.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
new file mode 100644
index 000..1db53cd3148
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+MY_COMMIT="bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"
+
+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 ~x86"
+IUSE="
+ +collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
+ gif glut 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-doc/doxygen )
+"
+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] )
+ 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 )
+ las? ( >=sci-geosciences/liblas-1.8.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= )
+ sdl? ( media-libs/libsdl )
+ svg? (
+ gnome-base/librsvg:2
+ 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
+"
+
+PATCHES=(
+ "${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
+
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: f1b1718922ce3ec838ca890381c16e2228094613 Author: Alexey Sokolov asokolov org> AuthorDate: Thu Jul 29 23:58:24 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jul 31 00:59:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b17189 dev-games/openscenegraph-openmw: update metadata Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/21747 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/openscenegraph-openmw/metadata.xml | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-games/openscenegraph-openmw/metadata.xml b/dev-games/openscenegraph-openmw/metadata.xml index c9b5ea504b4..ffea23ade5e 100644 --- a/dev-games/openscenegraph-openmw/metadata.xml +++ b/dev-games/openscenegraph-openmw/metadata.xml @@ -14,11 +14,16 @@ Gentoo Games Project - OpenSceneGraph on steroids. This fork was created to experiment with performance enhancements for OpenMW that are too controversial to be included in the general purpose OSG project - either for design reasons or backward compatibility reasons. OpenMW still works with "vanilla" OpenSceneGraph, but it is recommended to use the fork for better performance (around 10-15% on most devices). Note that the improvements are very specific to OpenMW and its animation code in particular; other OpenSceneGraph applications are not likely to see the same speed-up, or any speed-up at all if they are already GPU limited. + OpenSceneGraph on steroids. This fork was created to experiment with + performance enhancements for OpenMW that are too controversial to be + included in the general purpose OSG project - either for design reasons + or backward compatibility reasons. OpenMW still works with "vanilla" + OpenSceneGraph, but it is recommended to use the fork for better + performance (around 10-15% on most devices). Note that the improvements + are very specific to OpenMW and its animation code in particular; other + OpenSceneGraph applications are not likely to see the same speed-up, or + any speed-up at all if they are already GPU limited. - - OpenMW/osg - Enable DAE file support via dev-libs/collada-dom Enable DICOM medical image file support via sci-libs/dcmtk @@ -31,4 +36,7 @@ Use media-libs/libsdl2 additionally to media-libs/libsdl Enable support for the X xrandr extension + + OpenMW/osg +
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: adcc5eb3f42b0dcf88c5b35791ced0f102ba88d9 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jul 30 22:47:10 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jul 31 00:59:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcc5eb3 dev-games/openscenegraph-openmw: update older ebuild with egl(+) Already done on the newest, preparation for mesa's IUSE=egl removal. Signed-off-by: Ionen Wolkens gentoo.org> ...0425-r100.ebuild => openscenegraph-openmw-3.4_p20200425-r101.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild similarity index 99% rename from dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild rename to dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild index 08efaabecea..409ac1f6275 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE=" # TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK RDEPEND=" !dev-games/openscenegraph - media-libs/mesa[egl?] + media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/files/, dev-games/openscenegraph-openmw/
commit: 4087e26ba7a542e391b3705e88e93a14bf032410
Author: Alexey Sokolov asokolov org>
AuthorDate: Thu Jul 22 19:10:30 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jul 31 00:59:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4087e26b
dev-games/openscenegraph-openmw: new version 3.6_p20210610
Based on openscenegraph-3.6.5-r110
Also apply egl patch from https://github.com/gentoo/gentoo/pull/21742
Bug: https://bugs.gentoo.org/797403
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-games/openscenegraph-openmw/Manifest | 1 +
.../files/openscenegraph-3.6.3-cmake.patch | 12 +
.../openscenegraph-3.6.5-cmake_lua_version.patch | 14 ++
.../openscenegraph-3.6.5-use_boost_asio.patch | 263 +
dev-games/openscenegraph-openmw/metadata.xml | 6 +
.../openscenegraph-openmw-3.6_p20210610.ebuild | 167 +
6 files changed, 463 insertions(+)
diff --git a/dev-games/openscenegraph-openmw/Manifest
b/dev-games/openscenegraph-openmw/Manifest
index 16fc597107e..f6fca44cefb 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1 +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
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-cmake.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-cmake.patch
new file mode 100644
index 000..708c6865968
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-cmake.patch
@@ -0,0 +1,12 @@
+--- a/CMakeModules/OsgMacroUtils.cmake
b/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)
+
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-cmake_lua_version.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-cmake_lua_version.patch
new file mode 100644
index 000..1373b296da0
--- /dev/null
+++
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-cmake_lua_version.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -771,10 +771,7 @@
+ FIND_PACKAGE(LIBLAS)
+
+ IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
+-FIND_PACKAGE(Lua52)
+-IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
+-FIND_PACKAGE(Lua51)
+-ENDIF()
++FIND_PACKAGE(Lua ${LUA_VERSION} EXACT)
+ ENDIF()
+
+ # V8 and Python plugins are tests for linking against these libraries but
aren't functionality beyond this.
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
new file mode 100644
index 000..f9a32c0dc60
--- /dev/null
+++
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
@@ -0,0 +1,263 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -764,7 +764,7 @@
+ FIND_PACKAGE(DirectInput)
+ FIND_PACKAGE(NVTT)
+ IF (NOT WIN32)
+-FIND_PACKAGE(Asio)
++FIND_PACKAGE(Boost)
+ ENDIF()
+ FIND_PACKAGE(ZeroConf)
+
+--- a/CMakeModules/FindAsio.cmake
b/CMakeModules/FindAsio.cmake
+@@ -1,22 +0,0 @@
+-# Locate ASIO-headers (http://think-async.com/Asio)
+-# This module defines
+-# ASIO_FOUND, if false, do not try to link to gdal
+-# ASIO_INCLUDE_DIR, where to find the headers
+-#
+-#
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/files/, dev-games/openscenegraph-openmw/
commit: ad26594a82336cbc51a19077c8baa27bca7066cb
Author: Alexey Sokolov google com>
AuthorDate: Thu May 6 01:01:47 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jun 5 08:40:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad26594a
dev-games/openscenegraph-openmw: fix build with gcc 11
Closes: https://bugs.gentoo.org/788301
Signed-off-by: Alexey Sokolov google.com>
Closes: https://github.com/gentoo/gentoo/pull/21127
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/openscenegraph-3.4-gcc11.patch | 23 ++
...openscenegraph-openmw-3.4_p20200425-r100.ebuild | 3 ++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
new file mode 100644
index 000..0d2dc2d0f73
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
@@ -0,0 +1,23 @@
+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/openscenegraph-openmw-3.4_p20200425-r100.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
index 202f18429af..08efaabecea 100644
---
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
+++
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -87,6 +87,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: f8fac71b40df176c5d717c5da71c53ec81ae206d
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Mar 26 19:11:15 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Mar 26 19:45:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8fac71b
dev-games/openscenegraph-openmw: drop old version
Dropping old version, which does not support slotted lua.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
.../openscenegraph-openmw-3.4_p20200425.ebuild | 156 -
1 file changed, 156 deletions(-)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
deleted file mode 100644
index 42fc8ce26dc..000
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic 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"
-S="${WORKDIR}/osg-${MY_COMMIT}"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~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="
- sdl2? ( sdl )
- openexr? ( zlib )
-"
-
-# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
-BDEPEND="
- app-arch/unzip
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-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? ( >=dev-lang/lua-5.1.5:0= )
- 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
-"
-
-PATCHES=(
- "${FILESDIR}"/openscenegraph-3.4-cmake.patch
- "${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
- "${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
-)
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/
commit: 26c980d57980db71849d25c204c0a539337744ab Author: Marek Szuba gentoo org> AuthorDate: Thu Dec 3 12:58:03 2020 + Commit: Marek Szuba gentoo org> CommitDate: Thu Dec 3 13:10:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c980d5 dev-games/openscenegraph-openmw: limit unmigrated ebuilds to dev-lang/lua:0 Signed-off-by: Marek Szuba gentoo.org> .../openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild index fe26f799c8c..42fc8ce26dc 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild @@ -53,7 +53,7 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) - lua? ( >=dev-lang/lua-5.1.5:* ) + lua? ( >=dev-lang/lua-5.1.5:0= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:=
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/, profiles/
commit: 209e13656f39a72efab3f2b2f76bdd4e8c13672e
Author: Alexey Sokolov google com>
AuthorDate: Thu Nov 12 09:27:06 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Nov 23 13:28:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209e1365
dev-games/openscenegraph-openmw: migrate to lua-single.eclass
Closes: https://bugs.gentoo.org/752576
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/18229
Signed-off-by: Joonas Niilola gentoo.org>
...openscenegraph-openmw-3.4_p20200425-r100.ebuild | 171 +
profiles/package.mask | 1 +
2 files changed, 172 insertions(+)
diff --git
a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
new file mode 100644
index 000..202f18429af
--- /dev/null
+++
b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 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 ~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
+)
+
+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)
+
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/, dev-games/openscenegraph-openmw/files/
commit: 74f618175eb32e95a00361c9af621febaa4de09c
Author: Alexey Sokolov google com>
AuthorDate: Fri May 29 01:22:32 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jul 8 05:44:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f61817
dev-games/openscenegraph-openmw: new package
This is mostly copied from openscenegraph-3.5.5.ebuild
Bug: https://bugs.gentoo.org/673864
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Joonas Niilola gentoo.org>
dev-games/openscenegraph-openmw/Manifest | 1 +
.../files/openscenegraph-3.4-cmake.patch | 87
.../files/openscenegraph-3.5.1-jpeg-9.patch| 34 +
.../files/openscenegraph-3.6.3-docdir.patch| 73 ++
dev-games/openscenegraph-openmw/metadata.xml | 28
.../openscenegraph-openmw-3.4_p20200425.ebuild | 156 +
6 files changed, 379 insertions(+)
diff --git a/dev-games/openscenegraph-openmw/Manifest
b/dev-games/openscenegraph-openmw/Manifest
new file mode 100644
index 000..16fc597107e
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -0,0 +1 @@
+DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B
43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7
SHA512
9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70
diff --git
a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch
b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch
new file mode 100644
index 000..85eff1ab790
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-cmake.patch
@@ -0,0 +1,87 @@
+--- 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)
