[mingw32-OpenSceneGraph] Fixed up mingw32-OSG-disable-problematic-plugins.diff to apply
Kalev Lember
kalev at fedoraproject.org
Thu Apr 21 22:52:27 UTC 2011
commit b43a16d81061f80e1dc8dde7594e8ffe562fdcd8
Author: Kalev Lember <kalev at smartlink.ee>
Date: Fri Apr 22 01:39:02 2011 +0300
Fixed up mingw32-OSG-disable-problematic-plugins.diff to apply
mingw32-OSG-disable-problematic-plugins.diff | 40 +++++++++++++-------------
mingw32-OpenSceneGraph.spec | 1 +
2 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/mingw32-OSG-disable-problematic-plugins.diff b/mingw32-OSG-disable-problematic-plugins.diff
index 49b0d61..b9c8c89 100644
--- a/mingw32-OSG-disable-problematic-plugins.diff
+++ b/mingw32-OSG-disable-problematic-plugins.diff
@@ -2,23 +2,23 @@ diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
index 202ca68..04473bc 100644
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
-@@ -88,7 +88,7 @@ IF(JPEG_FOUND)
- ADD_SUBDIRECTORY(jpeg)
- ENDIF(JPEG_FOUND)
- IF(JASPER_FOUND)
-- ADD_SUBDIRECTORY(jp2)
-+# ADD_SUBDIRECTORY(jp2)
- ENDIF(JASPER_FOUND)
- IF(OPENEXR_FOUND)
- ADD_SUBDIRECTORY(exr)
-@@ -196,8 +196,8 @@ ADD_SUBDIRECTORY(bsp)
- ADD_SUBDIRECTORY(mdl)
-
- IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
-- ADD_SUBDIRECTORY(ply)
-- ADD_SUBDIRECTORY(txp)
-+# ADD_SUBDIRECTORY(ply)
-+# ADD_SUBDIRECTORY(txp)
- ENDIF()
-
- IF(XINE_FOUND)
+@@ -88,7 +88,7 @@ IF(JPEG_FOUND)
+ ADD_SUBDIRECTORY(jpeg)
+ ENDIF(JPEG_FOUND)
+ IF(JASPER_FOUND)
+- ADD_SUBDIRECTORY(jp2)
++# ADD_SUBDIRECTORY(jp2)
+ ENDIF(JASPER_FOUND)
+ IF(OPENEXR_FOUND)
+ ADD_SUBDIRECTORY(exr)
+@@ -196,8 +196,8 @@ ADD_SUBDIRECTORY(bsp)
+ ADD_SUBDIRECTORY(mdl)
+
+ IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
+- ADD_SUBDIRECTORY(ply)
+- ADD_SUBDIRECTORY(txp)
++# ADD_SUBDIRECTORY(ply)
++# ADD_SUBDIRECTORY(txp)
+ ENDIF()
+
+ IF(XINE_FOUND)
diff --git a/mingw32-OpenSceneGraph.spec b/mingw32-OpenSceneGraph.spec
index a87ce89..2aa976b 100644
--- a/mingw32-OpenSceneGraph.spec
+++ b/mingw32-OpenSceneGraph.spec
@@ -229,6 +229,7 @@ compile-time in a shared object library.
%changelog
* Fri Apr 22 2011 Kalev Lember <kalev at smartlink.ee> - 2.8.3-3
- Rebuilt for pseudo-reloc version mismatch (#698827)
+- Fixed up mingw32-OSG-disable-problematic-plugins.diff to apply
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list