New upstream version 3.4.1+dfsg1

parent 0a14e2c6
doc/all_Doxyfile
doc/auto_Doxyfile
doc/core_Doxyfile
doc/openscenegraph.doxyfile
doc/openthreads.doxyfile
doc/OpenSceneGraphReferenceDocs/
doc/OpenThreadsReferenceDocs/
cmake_uninstall.cmake
include/OpenThreads/Config
include/OpenThreads/Version
include/osg/Config
include/osg/GL
include/osg/Version
include/osgQt/Version
src/osgQt/__
lib/
bin/
*.pc
*.conf
CMakeCache.txt
CMakeFiles
CMakeScripts
Makefile
cmake_install.cmake
install_manifest*.txt
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
# Platform Specifics - auto generated files
PlatformSpecifics/Windows/*.rc
# Visual studio - project files
*.sln
*.suo
*.vcxproj
*.vcxproj.filters
*.vcxproj.user
# Visual Studio - Build Results
[Dd]ebug/
[Rr]elease/
[Mm]in[Ss]ize[Rr]el/
[Rr]el[Ww]ith[Dd]eb[Ii]nfo/
# Visual Studio - Browsing Database File
*.sdf
*.opensdf
#osx xcode
DerivedData/
*.DS_Store
*.build
*.xcodeproj
#CPACK related files
CPackConfig-*.cmake
_CPack_Packages/
#packages
*.tar.gz
*.zip
matrix:
fast_finish: true
include:
#Linux build
- os: linux
dist: trusty
language: cpp
env:
#- LLVM_VERSION=3.8
sudo: false
cache:
apt: true
directories:
- $HOME/.ccache
compiler:
#- clang
- g++
addons:
apt:
sources:
#- llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test
packages:
#- clang-3.8
- g++
- cmake
# OSX build
- os: osx
language: cpp
script:
- mkdir build
- cd build
- travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product -DBUILD_OSG_EXAMPLES=ON ..
- make install -j3
OpenSceneGraph Library 3.4.0
OpenSceneGraph Library 3.4.1
550 Contributors:
562 Contributors:
Firstname Surname
-----------------
Robert Osfield
Don Burns
Stephan Huber
Paul Martz
Farshid Lashkari
......@@ -20,28 +19,29 @@ Eric Wing
Cedric Pinson
Brede Johansen
Bob Kuehne
Wojciech Lewandowski
Michael Platings
Geoff Michel
Wojciech Lewandowski
Eric Sokolowsky
David Callu
Laurens Voerman
David Callu
Colin McDonald
Trajce Nikolov
Tim Moore
Martin Lavery
Mattias Helsing
Tree
Jason Beverage
Tree
Pjotr Svetachov
Luigi Calori
Alberto Luaces
Mike Wittman
Jan Peciva
Chris Hanson
Alberto Luaces
Roland Smeenk
Roger James
Jeremy Moles
Jannik Heller
J.P. Delport
Andy Skinner
Magnus Kessler
......@@ -52,6 +52,7 @@ Luc Frauciel
Aurelien Albert
Pavel Moloshtan
Brad Christiansen
Torben Dannhauer
Terry Welsh
Olaf Flebbe
Mathieu Marache
......@@ -61,23 +62,21 @@ Art Tevs
Philip Lowman
Per Fahlberg
Norman Vine
Jannik Heller
Chris Denham
Sherman Wilcox
Serge Lages
Romano Jos Magacho da Silva
Alberto Farre
Torben Dannhauer
Sherman Wilcox
Robert Michael
Mourad Boufarguine
Alberto Farre
Glenn Waldron
Andr Garneau
Adrian Egli
Ruben Lopez
Randall Hopper
Jan Ciger
Sebastian Messerschmidt
Randall Hopper
Kristofer Tingdahl
Jan Ciger
Ruben Lopez
Robert Michael
Gideon May
Don Tidrow
Stephane Lamoliatte
......@@ -87,10 +86,10 @@ Joakim Simonsson
David Spilling
Daniel Sjlie
Bryan Thrall
Andreas Ekstrand
Rafa Gaitan
Mike Connell
Fabien Lavignotte
Andreas Ekstrand
Thomas Hogarth
Riccardo Corsi
Melchior Franz
......@@ -99,9 +98,9 @@ Johannes Baeuerle
Neil Hughes
Martin Beckett
Marc Helbling
Jordi Torres
Joran Jessurun
Gino van den Bergen
Frederic Marmond
David Guthrie
Csaba Halasz
Cory Riddell
......@@ -111,21 +110,21 @@ Yefei He
Sondra Iverson
Simon Julier
Rune Schmidt Jensen
Ravi Mathur
Rainer Oder
Nico Kruithof
Martin Aumueller
Mario Valle
Lukasz Izdebski
Jorge Izquierdo Ciges
Jordi Torres
Gordon Tomlinson
Frederic Marmond
Frederic Bouvier
Carlo Camporesi
Ben Discoe
Bjrn Blissing
Alexander Sinditskiy
Thibault Genessay
Sasa Bistrovic
Ravi Mathur
Ralf Habacker
Neil Groves
Mikhail Izmestev
......@@ -133,8 +132,10 @@ Markus Trenkwalder
Loic Dachary
Joseph Steel
John Shue
Hartwig Wiesmann
Brad Colbert
Bjrn Blissing
Ben Discoe
Vladimir Chebaev
Vivek Rajan
Uwe Woessner
Tony Horrobin
......@@ -154,9 +155,9 @@ Martins Innus
Maciej Krol
Lilin Xiong
Leandro Motta Barros
Julien Valentin
Johan Nouvel
Javier Taibo
Hartwig Wiesmann
Donn Mielcarek
Corbin Holtz
Blasius Czink
......@@ -167,7 +168,6 @@ Rudolf Wiedemann
Maria Ten
Liang Aibin
Katharina Plugge
Julien Valentin
John Vidar Larring
John Kelso
John Ivar
......@@ -182,10 +182,9 @@ Bradley Anderegg
Andreas Goebel
Alok Priyadarshi
Ali Botorabi
Alberto Barbati
Alan Dickinson
Wee See
Vladimir Shabanov
Vladimir Chebaev
Tugkan Calapoglu
Tim Daoust
Sylvain Marie
......@@ -196,8 +195,10 @@ Ryan Pavlik
Robert Milharcic
Rene Molenaar
Piotr Domagalski
Philippe Renon
Phil Atkin
Pawel Ksiezopolski
Patrick Neary
Nathan Monteleone
Miha Ravelj
Miguel Escriva
......@@ -225,6 +226,7 @@ Fabio Mierlo
Doug McCorkle
Donald Cipperly
Don Leich
Don Burns
Dietmar Funck
Colin Cochran
Christian Ruzicka
......@@ -239,9 +241,9 @@ Andreas Henne
Anders Backman
Alexander Wiebel
Alessandro Terenzi
Alberto Barbati
Zach Deedler
Yuzhong Shen
Wee See
Warren Macchi
Vincent Bourdier
Terrex
......@@ -256,11 +258,9 @@ Raymond de Vries
Ralf Kern
Piotr Gwiazdowski
Pierre Haritchabalet
Philippe Renon
Perry Miller
Paul Palumbo
Paul Obermeier
Patrick Neary
Nguyen Van Truong
Nathan Cournia
Morten Haukness
......@@ -268,7 +268,6 @@ Morn
Michael Mc Donnell
Michael Henheffer
Michael Guerrero
Maya Leonard
Max Bandazian
Mathias Fiedler
Mathew May
......@@ -302,7 +301,6 @@ Giampaolo Vigan
Gerrick Bivins
George Tarantilis
Ferdi Smit
Eric Buehler
Eduardo Poyart
Edgar Ellis
Dmitry Marakasov
......@@ -318,6 +316,7 @@ Christian Kehl
Bradley Baker Searles
Brad Anderegg
Aric Aumann
Anish Thomas
Andrew Sampson
Andrew Lorino
Alexandre Amalric
......@@ -340,6 +339,8 @@ Valeriy Dubov
Vaclav Bilek
Tyge Lvset
Troy Yee
Torben Dannahauer
Tony Vasile
Tomas Hogarth
Tomas Hnilica
Todd Furlong
......@@ -362,6 +363,7 @@ Shane Arnott
Sergey Kurdakov
Sebastien Kuntz
Ruth Lang
Ruben The
Ruben Smelik
Ross Anderson
Ronny Krueger
......@@ -403,12 +405,14 @@ Oren Fromberg
Oliver Neumann
Ole-Morten Duesund
Nicolas Brodu
Nick Thu
Nick Black
Mojtaba Fathi
Mirko Viviani
Mikkel Gjl
Mike Krus
Mike Garrity
Mick Thu
Michal Durkovic
Michael Schanne
Michael Polak
......@@ -416,6 +420,8 @@ Michael Morrison
Michael Logan
Michael Kapelko
Michael Bach Jensen
Maya Thu
Maya Leonard
Max Rhiener
Max Behensky
Mauricio Hofmam
......@@ -432,9 +438,9 @@ Martin Beck
Marius Kintel
Mario Guimaraes
Marcus Hein
Marco Thu
Marco Sciabica
Marco Lehmann
Maik Keller
Lukas Diduch
Louis Hamilton
Likasz Izebski
......@@ -456,11 +462,14 @@ Juan Hernando
Josh Portway
Jonathan Greig
John Tan
John Hedström
John Grant
John Farrier
John Donovan
John Davis
John Cummings
John Argentieri
Joe Thompson
Joan Abadie
Jim Brooks
Jeroen den Dekker
......@@ -479,8 +488,10 @@ Hartmut Seichter
Gunter Huber
Gregory Jaegy
Graeme Harkness
Github It
Gian Lorenzetto
George Papagiannakis
Geoff Thu
Galen Faidley
Frida Schlaug
Frederic Smith
......@@ -495,6 +506,8 @@ Ferdinand Cornelissen
Fajran Iman
Fabien Dachicourt
Erik Johnson
Eric Thu
Eric Buehler
Eduardo Alberto
Edmond Gheury
Ed Ralston
......@@ -526,8 +539,8 @@ Carlos Garcea
Bryce Eldridge
Bruno Herbelin
Brian Keener
Brede Thu
Brandon Hamm
Bora Utka
Bill Prendergast
Bernardt Duvenhage
Benoit Laniel
......@@ -537,7 +550,6 @@ Bart Gallet
Axel Volley
Arjun Ramamurthy
Anthousis Andreadis
Anish Thomas
Andy Preece
Andrew Reyonolds
Andreas Roth
......
......@@ -53,11 +53,11 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 4)
SET(OPENSCENEGRAPH_PATCH_VERSION 0)
SET(OPENSCENEGRAPH_SOVERSION 130)
SET(OPENSCENEGRAPH_PATCH_VERSION 1)
SET(OPENSCENEGRAPH_SOVERSION 131)
# set to 0 when not a release candidate, non zero means that any generated
# svn tags will be treated as release candidates of given number
# git tags will be treated as release candidates of given number
SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
......@@ -114,27 +114,15 @@ IF(CMAKE_SYSTEM MATCHES IRIX)
SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
ENDIF()
OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making git branches, tags, updating ChangeLog." OFF)
IF (OSG_MAINTAINER)
#SET(OPENSCENEGRAPH_SVN "trunk")
SET(OPENSCENEGRAPH_SVN "branches")
SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
#
# Provide target for tagging a release
#
SET(SVNCOMMAND svn)
SET(SVNTRUNKDIR http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk)
SET(SVNTAGDIR http://svn.openscenegraph.org/osg/OpenSceneGraph/tags)
SET(SVNBRANCHDIR http://svn.openscenegraph.org/osg/OpenSceneGraph/branches)
IF (OPENSCENEGRAPH_SVN STREQUAL "trunk")
SET(SVNSOURCEDIR ${SVNTRUNKDIR})
ELSE()
SET(SVNSOURCEDIR ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH})
ENDIF()
SET(GITCOMMAND git)
IF (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
......@@ -142,31 +130,38 @@ IF (OSG_MAINTAINER)
SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
ENDIF()
SET(RELEASE_MESSAGE "Release ${RELEASE_NAME}")
SET(BRANCH_MESSAGE "Branch ${OPENSCENEGRAPH_BRANCH}")
ADD_CUSTOM_TARGET(tag-test
COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
COMMAND echo ${GITCOMMAND} tag -a ${RELEASE_NAME} -m ${RELEASE_MESSAGE}
COMMAND echo ${GITCOMMAND} push origin ${RELEASE_NAME}
)
ADD_CUSTOM_TARGET(tag-run
COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
COMMAND ${GITCOMMAND} tag -a ${RELEASE_NAME} -m ${RELEASE_MESSAGE}
COMMAND ${GITCOMMAND} push origin ${RELEASE_NAME}
)
ADD_CUSTOM_TARGET(branch-test
COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
COMMAND echo ${GITCOMMAND} branch ${OPENSCENEGRAPH_BRANCH} -m ${BRANCH_MESSAGE}
COMMAND echo ${GITCOMMAND} push origin ${OPENSCENEGRAPH_BRANCH}
)
ADD_CUSTOM_TARGET(branch-run
COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
COMMAND ${GITCOMMAND} branch ${OPENSCENEGRAPH_BRANCH} -m ${BRANCH_MESSAGE}
COMMAND ${GITCOMMAND} push origin ${OPENSCENEGRAPH_BRANCH}
)
#
# Provide target for generating ChangeLog
#
SET(GENERATELOGS svn2cl)
SET(GITLOGFORMAT "%aD%nChecked in by : %an%n%s%b%n")
SET(GENERATELOGS git log --pretty=format:${GITLOGFORMAT})
ADD_CUSTOM_TARGET(ChangeLog
COMMAND ${SVNCOMMAND} update
COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
COMMAND ${GENERATELOGS} > ChangeLog
)
ENDIF(OSG_MAINTAINER)
......@@ -398,6 +393,7 @@ ENDIF()
OPTION(OSG_DISABLE_MSVC_WARNINGS "Set to OFF to not disable MSVC warnings generated by OSG headers." ON)
MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS)
OPTION(OSG_PROVIDE_READFILE "Set to ON for include/osgDB/ReadFile to provide the osgDB::read*File(() methods. " ON)
OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
......@@ -519,39 +515,39 @@ ELSE()
ENDIF()
IF (OSG_GL1_AVAILABLE)
SET(OSG_GL1_FEATURES "true")
SET(OSG_GL1_FEATURES 1)
ELSE()
SET(OSG_GL1_FEATURES "false")
SET(OSG_GL1_FEATURES 0)
ENDIF()
IF (OSG_GL2_AVAILABLE)
SET(OSG_GL2_FEATURES "true")
SET(OSG_GL2_FEATURES 1)
ELSE()
SET(OSG_GL2_FEATURES "false")
SET(OSG_GL2_FEATURES 0)
ENDIF()
IF (OSG_GL3_AVAILABLE)
SET(OSG_GL3_FEATURES "true")
SET(OSG_GL3_FEATURES 1)
ELSE()
SET(OSG_GL3_FEATURES "false")
SET(OSG_GL3_FEATURES 0)
ENDIF()
IF (OSG_GLES1_AVAILABLE)
SET(OSG_GLES1_FEATURES "true")
SET(OSG_GLES1_FEATURES 1)
ELSE()
SET(OSG_GLES1_FEATURES "false")
SET(OSG_GLES1_FEATURES 0)
ENDIF()
IF (OSG_GLES2_AVAILABLE)
SET(OSG_GLES2_FEATURES "true")
SET(OSG_GLES2_FEATURES 1)
ELSE()
SET(OSG_GLES2_FEATURES "false")
SET(OSG_GLES2_FEATURES 0)
ENDIF()
IF (OSG_GLES3_AVAILABLE)
SET(OSG_GLES3_FEATURES "true")
SET(OSG_GLES3_FEATURES 1)
ELSE()
SET(OSG_GLES3_FEATURES "false")
SET(OSG_GLES3_FEATURES 0)
ENDIF()