| Summary: | Version bump: dev-games/openscenegraph-2.8.3 | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Samuli Suominen (RETIRED) <ssuominen> |
| Component: | Current packages | Assignee: | Tupone Alfredo <tupone> |
| Status: | RESOLVED FIXED | ||
| Severity: | enhancement | CC: | esigra, games, xmw |
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | |||
| Bug Blocks: | 324953 | ||
| Attachments: |
updated ebuild for version bump to 2.8.3
updated magicoff.patch, dos line braks, options to turn off tests for FFmpeg and OpenAL openscenegraph-2.8.3 cmake patch metadata typo |
||
|
Description
Samuli Suominen (RETIRED)
2010-04-24 15:39:26 UTC
I've tested a version bump today with following results: - some files switched from unix newlines to dos ones. - updated the -magicoff.patch to respect newlines and new tests for FBX ( plugin for http://www.autodesk.com/fbx ), OpenAL and FFmpeg. - I've found nothing to fulfill the FBX dependency, no new USE flag or OPTION. - OpenAL and FFmpeg were optional -> added global USE flags and CMkae OPTIONs. - the -libpng14.patch is now included in upstream, thus obsolete. (I've now run find ... -type f -exec dos2unix {} \; for my further tests). - didn't find any new PKG_CONFIG automagic stuff. - sorted the *DEPEND alphabetically - removed the version info from poppler, (matched by all versions in tree) The strange behaviour is that it doesn't #include any of the openal headers. grep -r on al.h, alc.h or alext.h in ${WORKDIR} is empty. I think that the build system uses /usr/share/cmake/Modules/FindOpenAL.cmake since ther is no shipped copy inside ${WORKDIR}/OpenSceneGraph-2.8.3/CMakeModules. -> I've dropped the use flag. Created attachment 231397 [details]
updated ebuild for version bump to 2.8.3
--- /usr/portage/dev-games/openscenegraph/openscenegraph-2.8.2.ebuild 2010-03-11 16:35:26.000000000 +0100
+++ openscenegraph-2.8.3.ebuild 2010-05-14 08:27:11.000000000 +0200
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.2.ebuild,v 1.9 2010/03/11 15:08:10 ssuominen Exp $
+# $Header: $
EAPI=2
inherit eutils versionator base cmake-utils
@@ -14,28 +14,29 @@
LICENSE="wxWinLL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="curl gif jpeg jpeg2k osgapps pdf png svg tiff truetype xine xrandr xulrunner"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="curl ffmpeg gif jpeg jpeg2k osgapps pdf png svg tiff truetype xine xrandr xulrunner"
-RDEPEND="virtual/opengl
- virtual/glu
- png? ( media-libs/libpng )
- jpeg? ( media-libs/jpeg )
- gif? ( media-libs/giflib )
- tiff? ( media-libs/tiff )
- truetype? ( media-libs/freetype:2 )
+RDEPEND="virtual/glu
+ virtual/opengl
x11-libs/libSM
x11-libs/libXext
- xrandr? ( x11-libs/libXrandr )
curl? ( net-misc/curl )
- xulrunner? ( net-libs/xulrunner:1.8 )
- svg? ( gnome-base/librsvg )
+ ffmpeg? ( media-video/ffmpeg )
+ gif? ( media-libs/giflib )
jpeg2k? ( media-libs/jasper )
+ jpeg? ( media-libs/jpeg )
+ pdf? ( app-text/poppler[cairo] )
+ png? ( media-libs/libpng )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2 )
xine? ( media-libs/xine-lib )
- pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )"
+ xrandr? ( x11-libs/libXrandr )
+ xulrunner? ( net-libs/xulrunner:1.8 )"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
- app-arch/unzip"
+ app-arch/unzip
+ dev-util/pkgconfig"
S=${WORKDIR}/${MY_P}
@@ -43,7 +44,6 @@
PATCHES=(
"${FILESDIR}"/${P}-magicoff.patch
- "${FILESDIR}"/${P}-libpng14.patch
)
src_configure() {
@@ -61,6 +61,7 @@
$(cmake-utils_use_enable jpeg)
$(cmake-utils_use_enable tiff)
$(cmake-utils_use_enable xrandr)
+ $(cmake-utils_use_enable ffmpeg)
"
cmake-utils_src_configure
}
Created attachment 231399 [details, diff]
updated magicoff.patch, dos line braks, options to turn off tests for FFmpeg and OpenAL
forgot to mention that the update breaks linking of flightgear-2.0.0 in a revdep-rebuild fixable style. michael@pandora ~ % /usr/games/bin/fgfs /usr/games/bin/fgfs: error while loading shared libraries: libosgParticle.so.55: cannot open shared object file: No such file or directory maybe flightgear should link to the .so symlinks instead of the .55/.65 symlinks. Next problem is a linking error during flightgear-rebuild, *sigh* Looks like the build system only links to -losgParticle -losgSim -losgViewer -losgGA -losgText -losgDB -losgUtil -losg -lOpenThreads -losgFX but pkg-config --libs openscenegraph tells -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer -losgWidget -losgShadow -losgAnimation -losgVolume -lOpenThreads i check that later. The situations is as follows: simgear depends on to openscenegraph, too. It contains only static libs (.a) and headers. And I think that it's broken after the openscenegraph version bump, but this is not detectable for revdev-rebuild. And emerge of flightgear against this simgear fails. After an `emerge -1 simgear` the `emerge -1 flightgear` succeeded. I've reporoduced that by -downgrading openscrenegraph -reemerge simgear -compilation of flightgear is ok. -updating openscrenegraph -compilation of flightgear fails -reemerge simgear -compilation of flightgear is ok again. I don't know how to solve this w/o a dummy revbump containing a additional DEPEND on>=openscenegraph-2.8.3 for simgear, and a DEPEND on the bumped simgear for flightgear. Sry. Hello Alfredo, flightgear authors suggest openscenegraph-2.9.7, there is a tag in their subversion repo http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags/OpenSceneGraph-2.9.7 which I've tarball'ed to http://xmw.de/mirror/openscenegraph/openscenegraph-2.9.7_p11431.tar.bz2 The linebreaks were back to unix style and there's a new option for SDL, I've added to the magicoff.patch. Please take a look at http://svn.xmw.de/websvn/gentoo-overlay/dev-games/openscenegraph/ and can you please add this on to the tree, too? Thanks I have better ebuild for OSG-2.8.3, will commit it soon. Please attach it here so the maintainer can review it. Please remove the support for obsolete & vulnerable xulrunner:1.8 while at it, see bug 324953. Created attachment 236521 [details]
openscenegraph-2.8.3
Well, if you insist.
Changes:
- add bunch of use flags for automagic deps: ffmpeg gdal Inventor sdl vnc openexr
- build examples for qt4, fltk, fox, gtkglext, glut, wx toolkits
- fix building with ffmpeg 0.6
- build API documentation
- handle static libs
- dependencies cleaup (added pkgconfig, xextproto, randrproto)
Notes:
- xulrunner disabled (support present), OpenAL disabled (support missing but checks exists in buildsystem so may appear in next release or have just been removed from tarball)
TODO:
- following optional deps, missing in tree: COLLADA, FBX, OpenVRML, Performer, ITK, DCMTK
Created attachment 236523 [details, diff]
cmake patch
Fixes automagic, docs installation paths, FLTK detection, examples installation paths.
Created attachment 236527 [details]
metadata
Created attachment 236529 [details]
typo
This depend: fox? ( x11-libs/fox[opengl] ) Needs to be fixed so fox-1.4 doesn't satify the depend, or the soon-to-be-added 1.8. So. use e.g. x11-libs/fox:1.6[opengl] I will take a look at the patches the next days. Thank In cmake it wants 1.6 so i think slot dep is appropriate. @Alfredo I've added it to tree, I hope you don't mind. (In reply to comment #17) > @Alfredo > I've added it to tree, I hope you don't mind. I do mind. But well, that is done now, and I'm not more the maintainer of it You have inserted this file +# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. But you forget to add the COPYING-CMAKE-SCRIPTS. I think he (Alexander Neundorf) deserve it Well, I know Alex and he wouldn't mind. Anyway, I've added the file. So.. you're stepping down as maintainer because I bumped your package (so that you don't have to deal with dicovering dependencies etc) |