[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: 0f642d8f09b589166f0e0c0fc84df7673990bf3f Author: Alexey Sokolov asokolov org> AuthorDate: Thu Feb 17 00:54:13 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 02:13:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f642d8f dev-games/openscenegraph: adjust to unslotted OpenEXR 3 Closes: https://bugs.gentoo.org/833491 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/24222 Signed-off-by: Sam James gentoo.org> .../files/openscenegraph-3.6.5-openexr3.patch | 68 + .../openscenegraph-3.6.5-r111.ebuild | 170 + 2 files changed, 238 insertions(+) diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch new file mode 100644 index ..6a6aa57950d6 --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch @@ -0,0 +1,68 @@ +https://bugs.gentoo.org/833491 + +--- 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/openscenegraph-3.6.5-r111.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r111.ebuild new file mode 100644 index ..590ea4490896 --- /dev/null +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r111.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2022 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_PN="OpenSceneGraph" +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Open source high performance 3D graphics toolkit" +HOMEPAGE="http://www.openscenegraph.org/"; +SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"; +S="${WORKDIR}/${MY_PN}-${MY_P}" + +LICENSE="wxWinLL-3 LGPL-2.1" +SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~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=" + 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/w
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/, profiles/
commit: 6e9055b49516243cf12d1ebe1c04edb4b5252330 Author: Marek Szuba gentoo org> AuthorDate: Mon Dec 21 22:53:23 2020 + Commit: Marek Szuba gentoo org> CommitDate: Mon Dec 21 23:14:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9055b4 dev-games/openscenegraph: migrate to lua-single.eclass The usual cmake FindPackage(Lua) version hack. Lua compatibility as per upstream build scripts. Nb. The unmigrated 3.6.5 ebuild does not set -DOSG_USE_LOCAL_LUA_SOURCE=OFF in src_configure so it is a) always built with Lua support, and b) linked against bundled Lua. Closes: https://bugs.gentoo.org/752573 Signed-off-by: Marek Szuba gentoo.org> .../openscenegraph-3.6.5-cmake_lua_version.patch | 14 ++ .../openscenegraph-3.6.5-r100.ebuild | 159 + profiles/package.mask | 1 + 3 files changed, 174 insertions(+) diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-cmake_lua_version.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-cmake_lua_version.patch new file mode 100644 index 000..1373b296da0 --- /dev/null +++ b/dev-games/openscenegraph/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/openscenegraph-3.6.5-r100.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild new file mode 100644 index 000..59773cf373c --- /dev/null +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1,2} ) + +MY_PN="OpenSceneGraph" +MY_P=${MY_PN}-${PV} +WX_GTK_VER="3.0-gtk3" +inherit cmake flag-o-matic lua-single wxwidgets + +DESCRIPTION="Open source high performance 3D graphics toolkit" +HOMEPAGE="http://www.openscenegraph.org/"; +SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"; + +LICENSE="wxWinLL-3 LGPL-2.1" +SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="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: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer +BDEPEND=" + app-arch/unzip + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +RDEPEND=" + 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 ) + 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-1.37.0:* + x11-base/xorg-proto +" + +S="${WORKDIR}/${MY_PN}-${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.3-cmake.patch + "${FILESDIR}"/${PN}-3.6.3-docdir.patch + "${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch + "${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_configure() { + if use examples && use wxwidgets; then + need-wxwidgets unicode + fi + + # Needed by FFmpeg + append-cppflags -D__STDC_CONSTANT_MACROS + + local l
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: 574d283a2aaaf0510b4f7f9447f24933d397b3a0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 4 14:11:09 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 4 14:11:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574d283a dev-games/openscenegraph: Drop 3.5.5 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-games/openscenegraph/Manifest | 1 - .../files/openscenegraph-3.5.1-jpeg-9.patch| 34 --- .../files/openscenegraph-3.5.5-cmake.patch | 281 - .../openscenegraph/openscenegraph-3.5.5.ebuild | 142 --- 4 files changed, 458 deletions(-) diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 9cb2176a3d3..845c83da61a 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -1,3 +1,2 @@ -DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch deleted file mode 100644 index f6e85e8e352..000 --- a/dev-games/openscenegraph/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/files/openscenegraph-3.5.5-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch deleted file mode 100644 index 6b8ea7abe60..000 --- a/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch +++ /dev/null @@ -1,281 +0,0 @@ OpenSceneGraph-3.4.0/CMakeLists.txt -+++ OpenSceneGraph-3.4.0/CMakeLists.txt -@@ -607,6 +607,7 @@ - - # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") - -+INCLUDE(MacroOptionalFindPackage) - - - # Set Version header file -@@ -716,42 +716,42 @@ - ANDROID_3RD_PARTY() - ELSE() - # Common to all platforms except android: --FIND_PACKAGE(Freetype) --FIND_PACKAGE(Inventor) --FIND_PACKAGE(Jasper) --FIND_PACKAGE(OpenEXR) --FIND_PACKAGE(COLLADA) --FIND_PACKAGE(FBX) --FIND_PACKAGE(ZLIB) --FIND_PACKAGE(Xine) --FIND_PACKAGE(OpenVRML) --FIND_PACKAGE(GDAL) --FIND_PACKAGE(GTA) --FIND_PACKAGE(CURL) --FIND_PACKAGE(LibVNCServer) --FIND_PACKAGE(OurDCMTK) --FIND_PACKAGE(FFmpeg) --FIND_PACKAGE(GStreamer COMPONENTS app pbutils) --FIND_PACKAGE(GLIB COMPONENTS gobject) -+MACRO_OPTIONAL_FIND_PACKAGE(Freetype) -+MACRO_OPTIONAL_FIND_PACKAGE(Inventor) -+MACRO_OPTIONAL_FIND_PACKAGE(Jasper) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) -+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) -+MACRO_OPTIONAL_FIND_PACKAGE(FBX) -+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) -+MACRO_OPTI
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: b6c6e173a19bc36335b2ae19e16a19b7b372950b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 18 00:55:29 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 18 09:37:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c6e173 dev-games/openscenegraph: Drop 3.5.1 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-games/openscenegraph/Manifest | 1 - .../files/openscenegraph-3.4.0-cmake.patch | 297 - .../files/openscenegraph-3.5.1-ffmpeg-3.patch | 173 .../openscenegraph/openscenegraph-3.5.1-r2.ebuild | 159 --- 4 files changed, 630 deletions(-) diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 029e665e152..bb69360afc5 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -1,2 +1 @@ -DIST OpenSceneGraph-3.5.1.zip 8353019 BLAKE2B 5f16fc4be3f7cd3c9a4214586920a3e1943a2858ee5d7d86f20a6b35c53c662b952db3596f0ab5c8be0c97c11a2d4537d1d9261b746ec67d88ce6da404b31e44 SHA512 5d419cb2e59efaf1e9b2efdb3a28e1deb5bf8b62a1be2ab4fed06e50064c4c4fb9f1332e65e0bfe0c6d8e99fe0cc134f863ba46965eda9546d125fbd22151057 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch deleted file mode 100644 index 59f971c9438..000 --- a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch +++ /dev/null @@ -1,297 +0,0 @@ OpenSceneGraph-3.4.0/CMakeLists.txt -+++ OpenSceneGraph-3.4.0/CMakeLists.txt -@@ -607,6 +607,7 @@ - - # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") - -+INCLUDE(MacroOptionalFindPackage) - - - # Set Version header file -@@ -651,53 +652,53 @@ - ANDROID_3RD_PARTY() - ELSE() - # Common to all platforms except android: --FIND_PACKAGE(Freetype) --FIND_PACKAGE(Inventor) --FIND_PACKAGE(Jasper) --FIND_PACKAGE(OpenEXR) --FIND_PACKAGE(COLLADA) --FIND_PACKAGE(FBX) --FIND_PACKAGE(ZLIB) --FIND_PACKAGE(Xine) --FIND_PACKAGE(OpenVRML) --FIND_PACKAGE(Performer) --FIND_PACKAGE(GDAL) --FIND_PACKAGE(GTA) --FIND_PACKAGE(CURL) --FIND_PACKAGE(LibVNCServer) --FIND_PACKAGE(OurDCMTK) --FIND_PACKAGE(FFmpeg) --FIND_PACKAGE(GStreamer COMPONENTS app pbutils) --FIND_PACKAGE(GLIB COMPONENTS gobject) -+MACRO_OPTIONAL_FIND_PACKAGE(Freetype) -+MACRO_OPTIONAL_FIND_PACKAGE(Inventor) -+MACRO_OPTIONAL_FIND_PACKAGE(Jasper) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) -+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) -+MACRO_OPTIONAL_FIND_PACKAGE(FBX) -+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) -+MACRO_OPTIONAL_FIND_PACKAGE(Xine) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML) -+MACRO_OPTIONAL_FIND_PACKAGE(Performer) -+MACRO_OPTIONAL_FIND_PACKAGE(GDAL) -+MACRO_OPTIONAL_FIND_PACKAGE(GTA) -+MACRO_OPTIONAL_FIND_PACKAGE(CURL) -+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer) -+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK) -+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg) -+MACRO_OPTIONAL_FIND_PACKAGE(GStreamer COMPONENTS app pbutils) -+MACRO_OPTIONAL_FIND_PACKAGE(GLIB COMPONENTS gobject) - FIND_PACKAGE(DirectShow) --FIND_PACKAGE(SDL2) --FIND_PACKAGE(SDL) --FIND_PACKAGE(Poppler-glib) --FIND_PACKAGE(RSVG) --FIND_PACKAGE(GtkGl) -+MACRO_OPTIONAL_FIND_PACKAGE(SDL2) -+MACRO_OPTIONAL_FIND_PACKAGE(SDL) -+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib) -+MACRO_OPTIONAL_FIND_PACKAGE(RSVG) -+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) - FIND_PACKAGE(DirectInput) --FIND_PACKAGE(NVTT) -+MACRO_OPTIONAL_FIND_PACKAGE(NVTT) - IF (NOT WIN32) --FIND_PACKAGE(Asio) -+MACRO_OPTIONAL_FIND_PACKAGE(Asio) - ENDIF() - FIND_PACKAGE(ZeroConf) - --FIND_PACKAGE(LIBLAS) -+MACRO_OPTIONAL_FIND_PACKAGE(LIBLAS) - - IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) --FIND_PACKAGE(Lua52) -+MACRO_OPTIONAL_FIND_PACKAGE(Lua) - IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR)) --FIND_PACKAGE(Lua51) -+MACRO_OPTIONAL_FIND_PACKAGE(Lua51) - ENDIF() - ENDIF() - - # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. --# FIND_PACKAGE(V8) --# FIND_PACKAGE(PythonLibs) -+# MACRO_OPTIONAL_FIND_PACKAGE(V8) -+# MACRO_OPTIONAL_FIND_PACKAGE(PythonLibs) - ENDIF() - - IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) --FIND_PACKAGE(ITK) -+MACRO_OPTIONAL_FIND_PACKAG
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: abeaff9e841a6d6a7065655870c329b9ed1ea583 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 11 23:03:01 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 11 23:03:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abeaff9e dev-games/openscenegraph: Re-add 3.5.1 We can't drop it before OSG-Qt is stable. Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-games/openscenegraph/Manifest | 1 + .../files/openscenegraph-3.4.0-cmake.patch | 297 + .../files/openscenegraph-3.5.1-ffmpeg-3.patch | 173 .../openscenegraph/openscenegraph-3.5.1-r2.ebuild | 159 +++ 4 files changed, 630 insertions(+) diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index bb69360afc5..029e665e152 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -1 +1,2 @@ +DIST OpenSceneGraph-3.5.1.zip 8353019 BLAKE2B 5f16fc4be3f7cd3c9a4214586920a3e1943a2858ee5d7d86f20a6b35c53c662b952db3596f0ab5c8be0c97c11a2d4537d1d9261b746ec67d88ce6da404b31e44 SHA512 5d419cb2e59efaf1e9b2efdb3a28e1deb5bf8b62a1be2ab4fed06e50064c4c4fb9f1332e65e0bfe0c6d8e99fe0cc134f863ba46965eda9546d125fbd22151057 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch new file mode 100644 index 000..59f971c9438 --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch @@ -0,0 +1,297 @@ +--- OpenSceneGraph-3.4.0/CMakeLists.txt OpenSceneGraph-3.4.0/CMakeLists.txt +@@ -607,6 +607,7 @@ + + # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") + ++INCLUDE(MacroOptionalFindPackage) + + + # Set Version header file +@@ -651,53 +652,53 @@ + ANDROID_3RD_PARTY() + ELSE() + # Common to all platforms except android: +-FIND_PACKAGE(Freetype) +-FIND_PACKAGE(Inventor) +-FIND_PACKAGE(Jasper) +-FIND_PACKAGE(OpenEXR) +-FIND_PACKAGE(COLLADA) +-FIND_PACKAGE(FBX) +-FIND_PACKAGE(ZLIB) +-FIND_PACKAGE(Xine) +-FIND_PACKAGE(OpenVRML) +-FIND_PACKAGE(Performer) +-FIND_PACKAGE(GDAL) +-FIND_PACKAGE(GTA) +-FIND_PACKAGE(CURL) +-FIND_PACKAGE(LibVNCServer) +-FIND_PACKAGE(OurDCMTK) +-FIND_PACKAGE(FFmpeg) +-FIND_PACKAGE(GStreamer COMPONENTS app pbutils) +-FIND_PACKAGE(GLIB COMPONENTS gobject) ++MACRO_OPTIONAL_FIND_PACKAGE(Freetype) ++MACRO_OPTIONAL_FIND_PACKAGE(Inventor) ++MACRO_OPTIONAL_FIND_PACKAGE(Jasper) ++MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) ++MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) ++MACRO_OPTIONAL_FIND_PACKAGE(FBX) ++MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) ++MACRO_OPTIONAL_FIND_PACKAGE(Xine) ++MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML) ++MACRO_OPTIONAL_FIND_PACKAGE(Performer) ++MACRO_OPTIONAL_FIND_PACKAGE(GDAL) ++MACRO_OPTIONAL_FIND_PACKAGE(GTA) ++MACRO_OPTIONAL_FIND_PACKAGE(CURL) ++MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer) ++MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK) ++MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg) ++MACRO_OPTIONAL_FIND_PACKAGE(GStreamer COMPONENTS app pbutils) ++MACRO_OPTIONAL_FIND_PACKAGE(GLIB COMPONENTS gobject) + FIND_PACKAGE(DirectShow) +-FIND_PACKAGE(SDL2) +-FIND_PACKAGE(SDL) +-FIND_PACKAGE(Poppler-glib) +-FIND_PACKAGE(RSVG) +-FIND_PACKAGE(GtkGl) ++MACRO_OPTIONAL_FIND_PACKAGE(SDL2) ++MACRO_OPTIONAL_FIND_PACKAGE(SDL) ++MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib) ++MACRO_OPTIONAL_FIND_PACKAGE(RSVG) ++MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) + FIND_PACKAGE(DirectInput) +-FIND_PACKAGE(NVTT) ++MACRO_OPTIONAL_FIND_PACKAGE(NVTT) + IF (NOT WIN32) +-FIND_PACKAGE(Asio) ++MACRO_OPTIONAL_FIND_PACKAGE(Asio) + ENDIF() + FIND_PACKAGE(ZeroConf) + +-FIND_PACKAGE(LIBLAS) ++MACRO_OPTIONAL_FIND_PACKAGE(LIBLAS) + + IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) +-FIND_PACKAGE(Lua52) ++MACRO_OPTIONAL_FIND_PACKAGE(Lua) + IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR)) +-FIND_PACKAGE(Lua51) ++MACRO_OPTIONAL_FIND_PACKAGE(Lua51) + ENDIF() + ENDIF() + + # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. +-# FIND_PACKAGE(V8) +-# FIND_PACKAGE(PythonLibs) ++# MACRO_OPTIONAL_FIND_PACKAGE(V8) ++# MACRO_OPTIONAL_FIND_PACKAGE(PythonLibs) + ENDIF() + + IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) +-FIND_PAC
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: 051d3a2f771dd2ae2748fe44bedbc25d5ff07080 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 11 16:38:06 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 11 22:21:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051d3a2f dev-games/openscenegraph: Drop 3.5.1 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-games/openscenegraph/Manifest | 1 - .../files/openscenegraph-3.4.0-cmake.patch | 297 - .../files/openscenegraph-3.5.1-ffmpeg-3.patch | 173 .../openscenegraph/openscenegraph-3.5.1-r2.ebuild | 159 --- 4 files changed, 630 deletions(-) diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 029e665e152..bb69360afc5 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -1,2 +1 @@ -DIST OpenSceneGraph-3.5.1.zip 8353019 BLAKE2B 5f16fc4be3f7cd3c9a4214586920a3e1943a2858ee5d7d86f20a6b35c53c662b952db3596f0ab5c8be0c97c11a2d4537d1d9261b746ec67d88ce6da404b31e44 SHA512 5d419cb2e59efaf1e9b2efdb3a28e1deb5bf8b62a1be2ab4fed06e50064c4c4fb9f1332e65e0bfe0c6d8e99fe0cc134f863ba46965eda9546d125fbd22151057 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch deleted file mode 100644 index 59f971c9438..000 --- a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch +++ /dev/null @@ -1,297 +0,0 @@ OpenSceneGraph-3.4.0/CMakeLists.txt -+++ OpenSceneGraph-3.4.0/CMakeLists.txt -@@ -607,6 +607,7 @@ - - # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") - -+INCLUDE(MacroOptionalFindPackage) - - - # Set Version header file -@@ -651,53 +652,53 @@ - ANDROID_3RD_PARTY() - ELSE() - # Common to all platforms except android: --FIND_PACKAGE(Freetype) --FIND_PACKAGE(Inventor) --FIND_PACKAGE(Jasper) --FIND_PACKAGE(OpenEXR) --FIND_PACKAGE(COLLADA) --FIND_PACKAGE(FBX) --FIND_PACKAGE(ZLIB) --FIND_PACKAGE(Xine) --FIND_PACKAGE(OpenVRML) --FIND_PACKAGE(Performer) --FIND_PACKAGE(GDAL) --FIND_PACKAGE(GTA) --FIND_PACKAGE(CURL) --FIND_PACKAGE(LibVNCServer) --FIND_PACKAGE(OurDCMTK) --FIND_PACKAGE(FFmpeg) --FIND_PACKAGE(GStreamer COMPONENTS app pbutils) --FIND_PACKAGE(GLIB COMPONENTS gobject) -+MACRO_OPTIONAL_FIND_PACKAGE(Freetype) -+MACRO_OPTIONAL_FIND_PACKAGE(Inventor) -+MACRO_OPTIONAL_FIND_PACKAGE(Jasper) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) -+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) -+MACRO_OPTIONAL_FIND_PACKAGE(FBX) -+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) -+MACRO_OPTIONAL_FIND_PACKAGE(Xine) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML) -+MACRO_OPTIONAL_FIND_PACKAGE(Performer) -+MACRO_OPTIONAL_FIND_PACKAGE(GDAL) -+MACRO_OPTIONAL_FIND_PACKAGE(GTA) -+MACRO_OPTIONAL_FIND_PACKAGE(CURL) -+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer) -+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK) -+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg) -+MACRO_OPTIONAL_FIND_PACKAGE(GStreamer COMPONENTS app pbutils) -+MACRO_OPTIONAL_FIND_PACKAGE(GLIB COMPONENTS gobject) - FIND_PACKAGE(DirectShow) --FIND_PACKAGE(SDL2) --FIND_PACKAGE(SDL) --FIND_PACKAGE(Poppler-glib) --FIND_PACKAGE(RSVG) --FIND_PACKAGE(GtkGl) -+MACRO_OPTIONAL_FIND_PACKAGE(SDL2) -+MACRO_OPTIONAL_FIND_PACKAGE(SDL) -+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib) -+MACRO_OPTIONAL_FIND_PACKAGE(RSVG) -+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) - FIND_PACKAGE(DirectInput) --FIND_PACKAGE(NVTT) -+MACRO_OPTIONAL_FIND_PACKAGE(NVTT) - IF (NOT WIN32) --FIND_PACKAGE(Asio) -+MACRO_OPTIONAL_FIND_PACKAGE(Asio) - ENDIF() - FIND_PACKAGE(ZeroConf) - --FIND_PACKAGE(LIBLAS) -+MACRO_OPTIONAL_FIND_PACKAGE(LIBLAS) - - IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) --FIND_PACKAGE(Lua52) -+MACRO_OPTIONAL_FIND_PACKAGE(Lua) - IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR)) --FIND_PACKAGE(Lua51) -+MACRO_OPTIONAL_FIND_PACKAGE(Lua51) - ENDIF() - ENDIF() - - # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. --# FIND_PACKAGE(V8) --# FIND_PACKAGE(PythonLibs) -+# MACRO_OPTIONAL_FIND_PACKAGE(V8) -+# MACRO_OPTIONAL_FIND_PACKAGE(PythonLibs) - ENDIF() - - IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) --FIND_PACKAGE(ITK) -+MACRO_OPTIONAL_FIND_PACKAG
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: 87f44f56ae0765df802f10271bdf6ed4ee5dd59a Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 7 01:19:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 7 01:58:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f44f56 dev-games/openscenegraph: Fix build with jpeg-9 Closes: https://bugs.gentoo.org/646454 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/openscenegraph-3.5.1-jpeg-9.patch| 34 ++ .../openscenegraph/openscenegraph-3.5.1-r2.ebuild | 3 +- .../openscenegraph/openscenegraph-3.5.5.ebuild | 3 +- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch new file mode 100644 index 000..f6e85e8e352 --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch @@ -0,0 +1,34 @@ +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/openscenegraph-3.5.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild index e37bfe37e56..655369b1064 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -92,6 +92,7 @@ DOCS=( AUTHORS.txt ChangeLog NEWS.txt ) PATCHES=( "${FILESDIR}"/${PN}-3.4.0-cmake.patch "${FILESDIR}"/${P}-ffmpeg-3.patch + "${FILESDIR}"/${P}-jpeg-9.patch ) src_configure() { diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index bd6fba7e3d2..202234ac484 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -83,6 +83,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-3.5.5-cmake.patch + "${FILESDIR}"/${PN}-3.5.1-jpeg-9.patch ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: 8190a16feff3187eace8da69dd791bbcc0a87689 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 18 15:43:01 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 18 15:52:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8190a16f dev-games/openscenegraph: Fix build w/ ffmpeg-3, add USE=libav Gentoo-bug: 601794 Package-Manager: portage-2.3.3 .../files/openscenegraph-3.5.1-ffmpeg-3.patch | 173 + .../openscenegraph/openscenegraph-3.5.1-r2.ebuild | 159 +++ 2 files changed, 332 insertions(+) diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.1-ffmpeg-3.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-ffmpeg-3.patch new file mode 100644 index 00..3a2792e199 --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-3.5.1-ffmpeg-3.patch @@ -0,0 +1,173 @@ +From e85d5743341585c6e6eb1ac693884f80e1fa06ce Mon Sep 17 00:00:00 2001 +From: Andreas Cadhalpun +Date: Wed, 1 Jun 2016 10:32:35 +0100 +Subject: [PATCH] Replace deprecated FFmpeg API to fix build with ffmpeg-3.0.x + +--- + src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp | 3 +- + src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp | 48 +--- + src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp | 4 +-- + src/osgPlugins/ffmpeg/FFmpegParameters.cpp | 2 +- + 4 files changed, 26 insertions(+), 31 deletions(-) + +diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp +index 665c68f..636bddd 100644 +--- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp +@@ -227,8 +227,7 @@ printf("### CONVERTING from sample format %s TO %s\n\t\tFROM %d TO %d channels\n + if (avcodec_open2(m_context, p_codec, NULL) < 0) + throw std::runtime_error("avcodec_open() failed"); + +-m_context->get_buffer = avcodec_default_get_buffer; +-m_context->release_buffer = avcodec_default_release_buffer; ++m_context->get_buffer2 = avcodec_default_get_buffer2; + + } + +diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp +index 9375657..083d3db 100644 +--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp +@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * const stream) + findAspectRatio(); + + // Find out whether we support Alpha channel +-m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P); ++m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P); + + // Find out the framerate + #if LIBAVCODEC_VERSION_MAJOR >= 56 +@@ -95,20 +95,19 @@ void FFmpegDecoderVideo::open(AVStream * const stream) + throw std::runtime_error("avcodec_open() failed"); + + // Allocate video frame +-m_frame.reset(avcodec_alloc_frame()); ++m_frame.reset(av_frame_alloc()); + + // Allocate converted RGB frame +-m_frame_rgba.reset(avcodec_alloc_frame()); +-m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height())); ++m_frame_rgba.reset(av_frame_alloc()); ++m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height())); + m_buffer_rgba[1].resize(m_buffer_rgba[0].size()); + + // Assign appropriate parts of the buffer to image planes in m_frame_rgba +-avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height()); ++avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height()); + + // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame. + m_context->opaque = this; +-m_context->get_buffer = getBuffer; +-m_context->release_buffer = releaseBuffer; ++m_context->get_buffer2 = getBuffer; + } + + +@@ -267,8 +266,8 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src, + #ifdef USE_SWSCALE + if (m_swscale_ctx==0) + { +-m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt, +- src_width, src_height, (PixelFormat) dst_pix_fmt, ++m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt, ++ src_width, src_height, (AVPixelFormat) dst_pix_fmt, + /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL); + } + +@@ -315,14 +314,14 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled) + AVPicture * const dst = (AVPicture *) m_frame_rgba.get(); + + // Assign appropriate parts of the buffer to image planes in m_frame_rgba +-avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height()); ++avpicture_fill((AVPi
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/
commit: c775cf1990878ca40eea47c14feabf8bc683c3fc Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Jan 13 01:18:05 2016 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Jan 13 01:18:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c775cf19 dev-games/openscenegraph: add patch to support giflib5, bug 571656 Package-Manager: portage-2.2.26 .../files/openscenegraph-3.2.1-giflib5.patch | 24 ++ .../openscenegraph/openscenegraph-3.2.1-r2.ebuild | 1 + 2 files changed, 25 insertions(+) diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch new file mode 100644 index 000..bd604c3 --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch @@ -0,0 +1,24 @@ +From: Alberto Luaces +Date: Sat, 19 Dec 2015 04:52:52 +0100 +Subject: Compatibility with giflib5. + +--- + OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp | 4 + 1 file changed, 4 insertions(+) + +Index: git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp +=== +--- git2.orig/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp +@@ -561,7 +561,11 @@ GifImageStream** obj) + *width_ret = giffile->SWidth; + *height_ret = giffile->SHeight; + *numComponents_ret = 4; ++#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)) ++DGifCloseFile(giffile, &Error); ++#else + DGifCloseFile(giffile); ++#endif + return buffer; + } + diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild index 37499a8..9ec683a 100644 --- a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild @@ -91,6 +91,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt) PATCHES=( "${FILESDIR}"/${PN}-3.2.1-cmake.patch "${FILESDIR}"/${PN}-3.2.1-gdal-2.0.patch + "${FILESDIR}"/${PN}-3.2.1-giflib5.patch ) src_configure() {