Bug 77257 - [PATCH] graphics/osg: unbreak, update to 0.9.8, adopt
Summary: [PATCH] graphics/osg: unbreak, update to 0.9.8, adopt
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Thierry Thomas
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-02-08 10:50 UTC by Sam Lawrance
Modified: 2005-03-02 18:51 UTC (History)
1 user (show)

See Also:


Attachments
osg-0.9.8.patch (53.67 KB, patch)
2005-02-08 10:50 UTC, Sam Lawrance
no flags Details | Diff
file.diff (26.83 KB, patch)
2005-02-08 10:50 UTC, Sam Lawrance
no flags Details | Diff
osg_carriage_return_patch (824 bytes, text/plain)
2005-02-25 02:28 UTC, Sam Lawrance
no flags Details
osg-dot-depend-patch (300 bytes, text/plain)
2005-03-02 00:54 UTC, Sam Lawrance
no flags Details
osg-dotorig-remove-patch (337 bytes, text/plain)
2005-03-02 03:14 UTC, Sam Lawrance
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Sam Lawrance 2005-02-08 10:50:18 UTC
- Update to 0.9.8
- 1 new file to add (files/freebsd4-osg-patches)
- Take maintainership. I've had no response from the maintainer since
  I emailed them on 23 Jan 2005 asking about this, so consider it timed
  out.

Just in case:
When building, I recommend using ccache: CXX="ccache g++". The build
takes quite a while, and ccache really speeds up rebuilds when tweaking.

Port maintainer (yinjieh@csie.nctu.edu.tw) is cc'd.

Generated with FreeBSD Port Tools 0.63
Comment 1 Thierry Thomas freebsd_committer freebsd_triage 2005-02-08 20:27:10 UTC
State Changed
From-To: open->feedback


Waiting for maintainer's approval. 



Comment 2 Thierry Thomas freebsd_committer freebsd_triage 2005-02-08 20:27:10 UTC
Responsible Changed
From-To: freebsd-ports-bugs->thierry


Take it.
Comment 3 Thierry Thomas freebsd_committer freebsd_triage 2005-02-23 20:52:31 UTC
Le Mar  8 fév 05 à 21:28:40 +0100, Thierry Thomas <thierry@FreeBSD.org>
 écrivait :
> Synopsis: [PATCH] graphics/osg: unbreak, update to 0.9.8, adopt
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: thierry
> State-Changed-When: Tue Feb 8 20:27:10 GMT 2005
> State-Changed-Why: 
> 
> Waiting for maintainer's approval.
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=77257


Hello,

Two weeks later, I'm ready to commit it, with maintainer's time-out
approval.

Unfortunately, it does not patch cleanly on FreeBSD-4.11:

===>  Extracting for osg-0.9.8
=> Checksum OK for OSG_OP_OT-0.9.8-2.zip.
===>   osg-0.9.8 depends on executable: unzip - found
===>  Patching for osg-0.9.8
===>  Applying extra patch /usr/ports/graphics/osg/files/freebsd4-osg-patches
1 out of 1 hunks failed--saving rejects to ./examples/osgtesselate/osgtesselate.cpp.rej
*** Error code 1

Stop in /usr/ports/graphics/osg.


Please note that master site has been updated, and it's now:
MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/

Regards,
-- 
Th. Thomas.
Comment 4 Sam Lawrance 2005-02-24 02:04:35 UTC
On Wed, 2005-02-23 at 21:52 +0100, Thierry Thomas wrote:
> Hello,
> 
> Two weeks later, I'm ready to commit it, with maintainer's time-out
> approval.
> 
> Unfortunately, it does not patch cleanly on FreeBSD-4.11:
> 
> ===>  Extracting for osg-0.9.8
> => Checksum OK for OSG_OP_OT-0.9.8-2.zip.
> ===>   osg-0.9.8 depends on executable: unzip - found
> ===>  Patching for osg-0.9.8
> ===>  Applying extra patch /usr/ports/graphics/osg/files/freebsd4-osg-patches
> 1 out of 1 hunks failed--saving rejects to ./examples/osgtesselate/osgtesselate.cpp.rej
> *** Error code 1
> 
> Stop in /usr/ports/graphics/osg.
> 
> 
> Please note that master site has been updated, and it's now:
> MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/

Something is not right. Has your copy of the port makefile been
clobbered somehow? My PR already includes the new mastersite, and the
patch applies fine here.

I can't work out what's wrong :-(
Comment 5 Thierry Thomas freebsd_committer freebsd_triage 2005-02-24 18:33:36 UTC
Le Jeu 24 fév 05 à  3:04:35 +0100, Sam Lawrance <boris@brooknet.com.au>
 écrivait :
> > Unfortunately, it does not patch cleanly on FreeBSD-4.11:
> > 
> > ===>  Extracting for osg-0.9.8
> > => Checksum OK for OSG_OP_OT-0.9.8-2.zip.
> > ===>   osg-0.9.8 depends on executable: unzip - found
> > ===>  Patching for osg-0.9.8
> > ===>  Applying extra patch /usr/ports/graphics/osg/files/freebsd4-osg-patches
> > 1 out of 1 hunks failed--saving rejects to ./examples/osgtesselate/osgtesselate.cpp.rej
> > *** Error code 1
> > 
> > Stop in /usr/ports/graphics/osg.
> > 
> > 
> > Please note that master site has been updated, and it's now:
> > MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
> 
> Something is not right. Has your copy of the port makefile been
> clobbered somehow? My PR already includes the new mastersite, and the
> patch applies fine here.
> 
> I can't work out what's wrong :-(

Check your PR (in raw mode), at
<http://www.freebsd.org/cgi/query-pr.cgi?pr=77257&f=raw>.

At line 80, there is:
+MASTER_SITES=	http://www.openscenegraph.org/downloads/

Perhaps have you sent a bad version of your patch? Could you please send
it again?

Best regards,
-- 
Th. Thomas.
Comment 6 Sam Lawrance 2005-02-25 02:28:22 UTC
On Thu, 2005-02-24 at 19:33 +0100, Thierry Thomas wrote:
> 
> Check your PR (in raw mode), at
> <http://www.freebsd.org/cgi/query-pr.cgi?pr=77257&f=raw>.
> 
> At line 80, there is:
> +MASTER_SITES=	http://www.openscenegraph.org/downloads/
> 
> Perhaps have you sent a bad version of your patch? Could you please send
> it again?

Aha! Not a bad version - the mastersite was indeed not updated, and the
reason the patch failed was because of carriage return characters.  Of
course I didn't see it until I tried updating with my patch.  A fix is
attached.








Comment 7 Thierry Thomas freebsd_committer freebsd_triage 2005-02-25 21:00:20 UTC
Le Ven 25 fév 05 à  3:28:22 +0100, Sam Lawrance <boris@brooknet.com.au>
 écrivait :
> Aha! Not a bad version - the mastersite was indeed not updated, and the
> reason the patch failed was because of carriage return characters.  Of
> course I didn't see it until I tried updating with my patch.  A fix is
> attached.

Thanks! This is better, but it does not compile on FreeBSD-4.11:

g++  -O -pipe -march=pentiumpro -W -Wall -I../../../include -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include -c ../osganimate.cpp
In file included from ../../../include/osg/Referenced:28,
                 from ../../../include/osg/Object:17,
                 from ../../../include/osg/Node:18,
                 from ../../../include/osg/Group:17,
                 from ../../../include/osg/Transform:17,
                 from ../../../include/osg/MatrixTransform:17,
                 from ../osganimate.cpp:2:
/usr/local/include/OpenThreads/Mutex: In method `OpenThreads::Mutex::Mutex(const OpenThreads::Mutex &)':
/usr/local/include/OpenThreads/Mutex:77: warning: unused parameter `const class OpenThreads::Mutex & m'
/usr/local/include/OpenThreads/Mutex: In method `class OpenThreads::Mutex & OpenThreads::Mutex::operator =(const OpenThreads::Mutex &)':
/usr/local/include/OpenThreads/Mutex:82: warning: unused parameter `const class OpenThreads::Mutex & m'
In file included from ../../../include/osgDB/DatabasePager:22,
                 from ../../../include/osgDB/Registry:23,
                 from ../osganimate.cpp:9:
/usr/local/include/OpenThreads/Thread: In method `OpenThreads::Thread::Thread(const OpenThreads::Thread &)':
/usr/local/include/OpenThreads/Thread:331: warning: unused parameter `const class OpenThreads::Thread & t'
/usr/local/include/OpenThreads/Thread: In method `class OpenThreads::Thread & OpenThreads::Thread::operator =(const OpenThreads::Thread &)':
/usr/local/include/OpenThreads/Thread:336: warning: unused parameter `const class OpenThreads::Thread & t'
In file included from ../../../include/osgDB/DatabasePager:25,
                 from ../../../include/osgDB/Registry:23,
                 from ../osganimate.cpp:9:
/usr/local/include/OpenThreads/Condition: In method `OpenThreads::Condition::Condition(const OpenThreads::Condition &)':
/usr/local/include/OpenThreads/Condition:81: warning: unused parameter `const class OpenThreads::Condition & c'
/usr/local/include/OpenThreads/Condition: In method `class OpenThreads::Condition & OpenThreads::Condition::operator =(const OpenThreads::Condition &)':
/usr/local/include/OpenThreads/Condition:86: warning: unused parameter `const class OpenThreads::Condition & c'
In file included from /usr/X11R6/include/Producer/CameraGroup:14,
                 from ../../../include/osgProducer/OsgCameraGroup:18,
                 from ../../../include/osgProducer/Viewer:29,
                 from ../osganimate.cpp:16:
/usr/local/include/OpenThreads/Barrier: In method `OpenThreads::Barrier::Barrier(const OpenThreads::Barrier &)':
/usr/local/include/OpenThreads/Barrier:70: warning: unused parameter `const class OpenThreads::Barrier & b'
/usr/local/include/OpenThreads/Barrier: In method `class OpenThreads::Barrier & OpenThreads::Barrier::operator =(const OpenThreads::Barrier &)':
/usr/local/include/OpenThreads/Barrier:75: warning: unused parameter `const class OpenThreads::Barrier & b'
g++  -O -pipe -march=pentiumpro -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -rpath /usr/X11R6/lib -pthread -L../../../lib/FreeBSD   osganimate.o    -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg -lGLU -lGL  -lXmu -lX11 -lOpenThreads -pthread  -o osganimate
osganimate.o: In function `createAnimationPath(osg::Vec3f const &, float, double)':
osganimate.o(.text+0x5e7): undefined reference to `osg::Quat::makeRotate(double, osg::Vec3f const &)'
osganimate.o(.text+0x62f): undefined reference to `osg::Quat::makeRotate(double, osg::Vec3f const &)'
osganimate.o: In function `createMovingModel(osg::Vec3f const &, float)':
osganimate.o(.text+0x2ec3): undefined reference to `osgDB::Registry::instance(bool)'
osganimate.o(.text+0x2ed9): undefined reference to `osgDB::readNodeFile(basic_string<char, string_char_traits<char>, __default_alloc_template<false, 0> > const &, osgDB::ReaderWriter::Options const *)'
osganimate.o(.text+0x3365): undefined reference to `osg::Matrixd::makeRotate(double, double, double, double)'
osganimate.o(.text+0x3d47): undefined reference to `osgDB::Registry::instance(bool)'
osganimate.o(.text+0x3d5d): undefined reference to `osgDB::readNodeFile(basic_string<char, string_char_traits<char>, __default_alloc_template<false, 0> > const &, osgDB::ReaderWriter::Options const *)'
osganimate.o(.text+0x41f8): undefined reference to `osg::Matrixd::makeRotate(double, double, double, double)'
osganimate.o: In function `main':
osganimate.o(.text+0x5712): undefined reference to `osg::ApplicationUsage::addCommandLineOption(basic_string<char, string_char_traits<char>, __default_alloc_template<false, 0> > const &, basic_string<char, string_char_traits<char>, __default_alloc_template<false, 0> > const &, basic_string<char, string_char_traits<char>, __default_alloc_template<false, 0> > const &)'
osganimate.o(.text+0x5ad7): undefined reference to `osg::ApplicationUsage::write(ostream &, unsigned int, unsigned int, bool)'
osganimate.o(.text+0x5cac): undefined reference to `osg::Matrixd::makeRotate(double, double, double, double)'
osganimate.o(.text+0x5ff4): undefined reference to `osgUtil::Optimizer::~Optimizer(void)'
osganimate.o(.text+0x6016): undefined reference to `osgUtil::Optimizer::optimize(osg::Node *)'
gmake[4]: *** [osganimate] Erreur 1
gmake[4]: Leaving directory `/usr/ports/graphics/osg/work/OSG_OP_OT-0.9.8-2/OpenSceneGraph/examples/osganimate/FreeBSD.Opt'
gmake[3]: *** [osganimate.opt] Erreur 2
gmake[3]: Leaving directory `/usr/ports/graphics/osg/work/OSG_OP_OT-0.9.8-2/OpenSceneGraph/examples/osganimate'
gmake[2]: *** [opt] Erreur 1
gmake[2]: Leaving directory `/usr/ports/graphics/osg/work/OSG_OP_OT-0.9.8-2/OpenSceneGraph/examples'
gmake[1]: *** [opt] Erreur 1
gmake[1]: Leaving directory `/usr/ports/graphics/osg/work/OSG_OP_OT-0.9.8-2/OpenSceneGraph/src'
gmake: *** [opt] Erreur 1
*** Error code 2

Stop in /usr/ports/graphics/osg.

Regards,
-- 
Th. Thomas.
Comment 8 Sam Lawrance 2005-03-02 00:54:15 UTC
On Tue, 2005-03-01 at 19:53 +0100, Thierry Thomas wrote:
> Le Lun 28 fév 05 à 19:03:37 +0100, Thierry Thomas <thierry@FreeBSD.org>
>  écrivait :
> > I have only one machine with 4.11-STABLE able to build this port, but
> > I'll try again in a clean jail.
> 
> Sorry for the delay! You are right: I built it successfully in a clean
> 4.11 jail. It should conflict with another port, but I don't know which.
> 
> There is a warning:
> 
> dot: not found
> Problems running dot. Check your installation!
> 
> Then I guess it should BUILD_DEPENDS upon
> dot:${PORTSDIR}/graphics/graphviz
> 

I already had graphviz installed, but I wrongly assumed doxygen had
run-depends on it. Patch attached.

Comment 9 Sam Lawrance 2005-03-02 03:14:51 UTC
On Tue, 2005-03-01 at 21:29 +0100, Thierry Thomas wrote:
> And yet another problem on FreeBSD-4.11: patches are installed, and it
> cannot be deinstalled cleanly. The folowing files remain, and should be
> removed at post-patch or pre-build:
> 
> /usr/X11R6/include/osg
> /usr/X11R6/include/osg/AnimationPath.orig
> /usr/X11R6/include/osg/ApplicationUsage.orig
> ...

Patch attached to remove the .orig files pre-install, before they have a
chance to escape from WRKSRC.



Comment 10 Thierry Thomas freebsd_committer freebsd_triage 2005-03-02 18:51:10 UTC
State Changed
From-To: feedback->closed


Committed, thanks!