Bug 209056 - graphics/osg: Update to 3.4.0 and fix build with ffmpeg 3.0.x
Summary: graphics/osg: Update to 3.4.0 and fix build with ffmpeg 3.0.x
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Dmitry Marakasov
URL: http://www.openscenegraph.org/index.p...
Keywords: patch
Depends on: 209235 209236
Blocks: 207547
  Show dependency treegraph
 
Reported: 2016-04-25 21:02 UTC by Ben Woods
Modified: 2016-06-09 11:18 UTC (History)
5 users (show)

See Also:
bugzilla: maintainer-feedback? (amdmi3)


Attachments
Patch to update graphics/osg to 3.4.0 and fix build with ffmpeg 3.0.x (25.17 KB, patch)
2016-04-25 21:02 UTC, Ben Woods
woodsb02: maintainer-approval? (amdmi3)
Details | Diff
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options DISABLED against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 10.3 amd64 (gzipped) (64.61 KB, application/gzip)
2016-04-25 21:07 UTC, Ben Woods
no flags Details
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options ENABLED (QT4) against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 10.3 amd64 (gzipped) (79.42 KB, application/gzip)
2016-04-25 21:08 UTC, Ben Woods
no flags Details
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options ENABLED (QT5) against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 10.3 amd64 (gzipped) (79.71 KB, application/gzip)
2016-04-25 21:09 UTC, Ben Woods
no flags Details
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options ENABLED (QT4) against FFmpeg 3.0.1 (from PR 207547) on FreeBSD 10.3 amd64 (gzipped) (95.83 KB, application/gzip)
2016-04-26 08:06 UTC, Ben Woods
no flags Details
QA: Test build of ports which depend on graphics/osg using new version 3.4.0 (2/6 failed) (.tar.gz) (125.55 KB, application/gzip)
2016-05-02 20:14 UTC, Ben Woods
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ben Woods freebsd_committer 2016-04-25 21:02:54 UTC
Created attachment 169697 [details]
Patch to update graphics/osg to 3.4.0 and fix build with ffmpeg 3.0.x

graphics/osg:
- Update to 3.4.0
- Add option to choose build with QT4 or QT5 (both disabled by default)
- Add options to build LIBLAS and Lua plugins
- Mark Gstreamer option as broken, as build fails with error cannot find -lgstreamer-1.0
- Convert to option helpers, tidy up, reduce diff with graphics/osg-devel
- Add patch to allow osg to build successfully once multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is currently still on the 2.8.x branch, however this patch is backwards compatible with ffmpeg 2.8.x.


Changes this release:
  http://www.openscenegraph.org/index.php/community/press-releases/191-openscenegraph-3-4-release
Comment 1 Ben Woods freebsd_committer 2016-04-25 21:07:58 UTC
Created attachment 169698 [details]
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options DISABLED against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 10.3 amd64 (gzipped)
Comment 2 Ben Woods freebsd_committer 2016-04-25 21:08:38 UTC
Created attachment 169699 [details]
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options ENABLED (QT4) against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 10.3 amd64 (gzipped)
Comment 3 Ben Woods freebsd_committer 2016-04-25 21:09:14 UTC
Created attachment 169700 [details]
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options ENABLED (QT5) against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 10.3 amd64 (gzipped)
Comment 4 Ben Woods freebsd_committer 2016-04-26 08:06:50 UTC
Created attachment 169708 [details]
QA: Successful poudriere testport logs for graphics/osg 3.4.0 with ffmpeg3 patch with all options ENABLED (QT4) against FFmpeg 3.0.1 (from PR 207547) on FreeBSD 10.3 amd64 (gzipped)
Comment 6 Dmitry Marakasov freebsd_committer 2016-05-02 08:40:23 UTC
Have you tested that all ports which depend on osg build and work fine after this update?
Comment 7 Ben Woods freebsd_committer 2016-05-02 20:14:56 UTC
Created attachment 169892 [details]
QA: Test build of ports which depend on graphics/osg using new version 3.4.0 (2/6 failed) (.tar.gz)

(In reply to Dmitry Marakasov from comment #6)
> Have you tested that all ports which depend on osg build and work fine
> after this update?

Test builds have just completed with the following results:
games/fgrun		fgrun-3.2.0		Build ok with osg-3.4.0
games/flightgear	flightgear-2016.1.1	Build ok with osg-3.4.0
games/openmw		openmw-0.38.0		Build ok with osg-3.4.0
devel/simgear		simgear-2016.1.1	Build ok with osg-3.4.0
graphics/osgearth	osgearth-2.5_6		Build failed with osg-3.4.0
games/palomino		palomino-20131231_2	Build failed with osg-3.4.0


osgearth-2.5_6 build error:
/wrkdirs/usr/ports/graphics/osgearth/work/osgearth-osgearth-2.5/src/osgEarth/Capabilities.cpp:203:49: error: called object type 'bool' is not a function or function pointer
            _supportsGLSL = GL2->isGlslSupported();
                            ~~~~~~~~~~~~~~~~~~~~^
/wrkdirs/usr/ports/graphics/osgearth/work/osgearth-osgearth-2.5/src/osgEarth/Capabilities.cpp:208:33: error: no member named 'getLanguageVersion' in 'osg::GLExtensions'
            _GLSLversion = GL2->getLanguageVersion();
                           ~~~  ^
2 errors generated.


palomino-20131231_2 build error:
/wrkdirs/usr/ports/games/palomino/work/palomino/src/input/device_keyboard_osg.hh:60:40: error: no type named 'GUIEventHandlerVisitor' in namespace 'osgGA'; did you mean 'GUIEventHandler'?
        virtual void    accept( osgGA::GUIEventHandlerVisitor& visitor );
                                ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~
                                       GUIEventHandler
/usr/local/include/osgGA/GUIEventHandler:49:20: note: 'GUIEventHandler' declared here
class OSGGA_EXPORT GUIEventHandler : public EventHandler
                   ^
In file included from /wrkdirs/usr/ports/games/palomino/work/palomino/src/input/conf.cc:22:
In file included from /wrkdirs/usr/ports/games/palomino/work/palomino/src/input/module.hh:63:
/wrkdirs/usr/ports/games/palomino/work/palomino/src/input/device_mouse_osg.hh:44:40: error: no type named 'GUIEventHandlerVisitor' in namespace 'osgGA'; did you mean 'GUIEventHandler'?
        virtual void    accept( osgGA::GUIEventHandlerVisitor& visitor );
                                ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~
                                       GUIEventHandler
/usr/local/include/osgGA/GUIEventHandler:49:20: note: 'GUIEventHandler' declared here
class OSGGA_EXPORT GUIEventHandler : public EventHandler
                   ^
2 errors generated.
Comment 8 Ben Woods freebsd_committer 2016-05-02 23:10:44 UTC
I am working on fixes for both graphics/osgearth and games/palomino to allow them to build with osg-3.4.0.
Comment 9 Dmitry Marakasov freebsd_committer 2016-05-13 12:07:12 UTC
I need some more time to review and test the update, I'll process it next week.
Comment 10 Anton Saietskii 2016-06-03 13:56:53 UTC
(In reply to Dmitry Marakasov from comment #9)

The "next week" and even more already passed. Is there any progress on this?
Comment 11 Ben Woods freebsd_committer 2016-06-09 08:42:01 UTC
(In reply to Dmitry Marakasov from comment #9)
> I need some more time to review and test the update, I'll process it next week.

Hi Dmitry,

I can do build testing to ensure it doesn't break any builds on any supported versions of FreeBSD. However, I am not in a position to do runtime testing.

If you are happy with me to only do build testing, I can confirm it is ok and then commit on your behalf if you like?

Regards,
Ben
Comment 12 Dmitry Marakasov freebsd_committer 2016-06-09 11:12:11 UTC
This really required some testing, but I think it's OK now. It required some patches to fix 9.x builds with some non-default options though.
Comment 13 commit-hook freebsd_committer 2016-06-09 11:12:45 UTC
A commit references this bug:

Author: amdmi3
Date: Thu Jun  9 11:12:14 UTC 2016
New revision: 416590
URL: https://svnweb.freebsd.org/changeset/ports/416590

Log:
  - Update to 3.4.0 and fix build with ffmpeg 3.0.x

  PR:		209056
  Submitted by:	woodsb02@gmail.com

Changes:
  head/graphics/osg/Makefile
  head/graphics/osg/distinfo
  head/graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake
  head/graphics/osg/files/patch-ffmpeg3
  head/graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp
  head/graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt
  head/graphics/osg/pkg-plist
Comment 14 commit-hook freebsd_committer 2016-06-09 11:15:49 UTC
A commit references this bug:

Author: amdmi3
Date: Thu Jun  9 11:15:16 UTC 2016
New revision: 416592
URL: https://svnweb.freebsd.org/changeset/ports/416592

Log:
  - Chase graphics/osg update

  PR:		209056

Changes:
  head/graphics/osgearth/Makefile
Comment 15 Ben Woods freebsd_committer 2016-06-09 11:18:59 UTC
Great, thanks Dmitry!