Merge branch 'openscenegraph-bump' of https://github.com/tgurr/hasufell-repository
This commit is contained in:
		
						commit
						1d065bd169
					
				| @ -10,17 +10,14 @@ require cmake [ api=2 ] | ||||
| 
 | ||||
| SUMMARY="High performance 3D graphics toolkit" | ||||
| DESCRIPTION=" | ||||
|     The OpenSceneGraph is an open source high performance 3D graphics toolkit, | ||||
|     used by application developers in fields such as visual simulation, games, | ||||
|     virtual reality, scientific visualization and modelling. Written entirely | ||||
|     in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, | ||||
|     IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph | ||||
|     is now well established as the world leading scene graph technology, used | ||||
|     widely in the vis-sim, space, scientific, oil-gas, games and virtual reality | ||||
|     industries. | ||||
| The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application | ||||
| developers in fields such as visual simulation, games, virtual reality, scientific visualization | ||||
| and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, | ||||
| GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well | ||||
| established as the world leading scene graph technology, used widely in the vis-sim, space, | ||||
| scientific, oil-gas, games and virtual reality industries. | ||||
| " | ||||
| 
 | ||||
| HOMEPAGE="http://${PN}.org" | ||||
| HOMEPAGE+=" http://${PN}.org" | ||||
| 
 | ||||
| LICENCES="wxWinLL-3 LGPL-2.1" | ||||
| SLOT="0" | ||||
| @ -1,32 +0,0 @@ | ||||
| From a20af6ee2e4b666fec79c2f545e548bd9470bbe6 Mon Sep 17 00:00:00 2001 | ||||
| From: Julian Ospald <hasufell@posteo.de> | ||||
| Date: Wed, 16 Mar 2016 21:51:29 +0100 | ||||
| Subject: [PATCH] Fix wrong jpeg boolean handling | ||||
| 
 | ||||
| Upstream: reported only https://github.com/openscenegraph/OpenSceneGraph/issues/58 | ||||
| ---
 | ||||
|  src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 8 -------- | ||||
|  1 file changed, 8 deletions(-) | ||||
| 
 | ||||
| diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
 | ||||
| index dd681e8..73480fb 100644
 | ||||
| --- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
 | ||||
| +++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
 | ||||
| @@ -70,14 +70,6 @@ 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
 | ||||
| -#endif
 | ||||
| -
 | ||||
|  /* CODE FOR READING/WRITING JPEG FROM STREAMS | ||||
|   *  This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source) | ||||
|   *  and modified to use a std::istream/ostream* instead of a FILE* | ||||
| -- 
 | ||||
| 2.7.3 | ||||
| 
 | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user