rpms/mingw32-OpenSceneGraph/devel mingw32-OSG-disable-problematic-plugins.diff, 1.1, 1.2 mingw32-OpenSceneGraph.spec, 1.3, 1.4 sources, 1.4, 1.5

[stefanriemens]

Author: stefanriemens

Update of /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26561

Modified Files:
	mingw32-OSG-disable-problematic-plugins.diff 
	mingw32-OpenSceneGraph.spec sources 
Log Message:
Update to version 2.8.3


mingw32-OSG-disable-problematic-plugins.diff:
 CMakeLists.txt |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: mingw32-OSG-disable-problematic-plugins.diff
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel/mingw32-OSG-disable-problematic-plugins.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-OSG-disable-problematic-plugins.diff	3 Jan 2010 18:30:56 -0000	1.1
+++ mingw32-OSG-disable-problematic-plugins.diff	17 Jul 2010 15:05:40 -0000	1.2
@@ -1,5 +1,5 @@
---- OpenSceneGraph-2.8.2.orig/src/osgPlugins/CMakeLists.txt	2009-01-14 21:32:06.000000000 +0100
-+++ OpenSceneGraph-2.8.2/src/osgPlugins/CMakeLists.txt	2009-10-15 22:20:26.000000000 +0200
+--- OpenSceneGraph-2.8.3/src/osgPlugins/CMakeLists.txt.orig	2010-04-01 11:13:18.000000000 +0200
++++ OpenSceneGraph-2.8.3/src/osgPlugins/CMakeLists.txt	2010-07-17 16:58:37.195801767 +0200
 @@ -87,9 +87,9 @@
  IF(JPEG_FOUND)
      ADD_SUBDIRECTORY(jpeg)
@@ -13,12 +13,18 @@
  IF(OPENEXR_FOUND)
      ADD_SUBDIRECTORY(exr)
  ENDIF(OPENEXR_FOUND)
-@@ -185,7 +185,7 @@
- ADD_SUBDIRECTORY(osgtgz)
- ADD_SUBDIRECTORY(tgz)
+@@ -195,10 +195,10 @@
+ ADD_SUBDIRECTORY(bsp)
+ ADD_SUBDIRECTORY(mdl)
  
--ADD_SUBDIRECTORY(txp)
-+#ADD_SUBDIRECTORY(txp)
- ADD_SUBDIRECTORY(shp)
- ADD_SUBDIRECTORY(txf)
+-IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
+-    ADD_SUBDIRECTORY(ply)
+-    ADD_SUBDIRECTORY(txp)
+-ENDIF()
++#IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
++#    ADD_SUBDIRECTORY(ply)
++#    ADD_SUBDIRECTORY(txp)
++#ENDIF()
  
+ IF(XINE_FOUND)
+     ADD_SUBDIRECTORY(xine)


Index: mingw32-OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel/mingw32-OpenSceneGraph.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-OpenSceneGraph.spec	3 Jul 2010 15:32:44 -0000	1.3
+++ mingw32-OpenSceneGraph.spec	17 Jul 2010 15:05:41 -0000	1.4
@@ -4,12 +4,12 @@
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
 
-%global apivers 2.8.2
-%global srcvers 2.8.2
+%global apivers 2.8.3
+%global srcvers 2.8.3
 
 Name:           mingw32-OpenSceneGraph
 Version:        %{apivers}
-Release:        4%{?dist}
+Release:        0%{?dist}
 Summary:        Fedora mingw high performance real-time graphics toolkit
 
 Group:          Development/Libraries
@@ -26,7 +26,6 @@ Patch0:         OpenSceneGraph-%{version
 
 # mingw specific patches:
 Patch100:       mingw32-OSG-disable-problematic-plugins.diff
-Patch101:       mingw32-OSG-jpeg-boolean-fix.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,7 +66,6 @@ for rapid development of graphics applic
 cd %{OSGSRCDIR}
 %patch0 -p1
 %patch100 -p1
-%patch101 -p1
 cd ..
 
 %build
@@ -228,6 +226,9 @@ compile-time in a shared object library.
 %{_mingw32_includedir}/OpenThreads
 
 %changelog
+* Sat Jul 17 2010 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.3-0
+- Update to new upstream version
+
 * Sat Jul 3 2010 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.2-4
 - Needed to update sources file -- I have already uploaded new sources
 - but want to build with the old sources again


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jul 2010 15:29:10 -0000	1.4
+++ sources	17 Jul 2010 15:05:41 -0000	1.5
@@ -1 +1 @@
-99d0b37f403b85b4559514b6b9849d9e  OpenSceneGraph-2.8.2.zip
+dc43b9161555c4eab7f5a678dd4e01ab  OpenSceneGraph-2.8.3.zip