* [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-2.8.0-magicoff.patch
@ 2009-02-25 14:00 Alfredo Tupone (tupone)
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone (tupone) @ 2009-02-25 14:00 UTC (permalink / raw
To: gentoo-commits
tupone 09/02/25 14:00:49
Added: openscenegraph-2.8.0-magicoff.patch
Log:
Making xulrunner an optional dependency. Bug #260187
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.1&content-type=text/plain
Index: openscenegraph-2.8.0-magicoff.patch
===================================================================
--- CMakeLists.txt.old 2009-02-25 10:26:47.000000000 +0100
+++ CMakeLists.txt 2009-02-25 10:33:07.000000000 +0100
@@ -287,6 +287,8 @@
INCLUDE(Find3rdPartyDependencies)
ENDIF(WIN32)
+OPTION(ENABLE_XUL "Enable plugin gecko if xulrunner is available" ON)
+
# Common to all platforms:
FIND_PACKAGE(FreeType)
FIND_PACKAGE(Inventor)
@@ -302,7 +304,9 @@
FIND_PACKAGE(ITK)
FIND_PACKAGE(LibVNCServer)
FIND_PACKAGE(OurDCMTK)
+IF(ENABLE_XUL)
FIND_PACKAGE(XUL)
+ENDIF(ENABLE_XUL)
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-2.8.0-magicoff.patch
@ 2009-03-08 20:08 Alfredo Tupone (tupone)
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone (tupone) @ 2009-03-08 20:08 UTC (permalink / raw
To: gentoo-commits
tupone 09/03/08 20:08:59
Modified: openscenegraph-2.8.0-magicoff.patch
Log:
Adding use based dep on poppler bindings. Should fix bug #261575 by Andrey Sh.
Adding pdf use flag to eventually disable poppler usage.
Adding further dependency
(Portage version: 2.1.6.7/cvs/Linux i686)
Revision Changes Path
1.2 dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?r1=1.1&r2=1.2
Index: openscenegraph-2.8.0-magicoff.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openscenegraph-2.8.0-magicoff.patch 25 Feb 2009 14:00:49 -0000 1.1
+++ openscenegraph-2.8.0-magicoff.patch 8 Mar 2009 20:08:59 -0000 1.2
@@ -1,10 +1,11 @@
--- CMakeLists.txt.old 2009-02-25 10:26:47.000000000 +0100
+++ CMakeLists.txt 2009-02-25 10:33:07.000000000 +0100
-@@ -287,6 +287,8 @@
+@@ -287,6 +287,9 @@
INCLUDE(Find3rdPartyDependencies)
ENDIF(WIN32)
+OPTION(ENABLE_XUL "Enable plugin gecko if xulrunner is available" ON)
++OPTION(ENABLE_PDF "Enable plugin pdf if poppler-glib and cairo are available" ON)
+
# Common to all platforms:
FIND_PACKAGE(FreeType)
@@ -19,3 +20,17 @@
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
+--- src/osgPlugins/CMakeLists.txt.old 2009-03-08 17:02:24.000000000 +0100
++++ src/osgPlugins/CMakeLists.txt 2009-03-08 17:02:56.000000000 +0100
+@@ -211,9 +211,9 @@
+ ADD_SUBDIRECTORY(svg)
+ ENDIF(RSVG_FOUND AND CAIRO_FOUND)
+
+-IF (POPPLER_FOUND AND CAIRO_FOUND)
++IF(ENABLE_PDF AND POPPLER_FOUND AND CAIRO_FOUND)
+ ADD_SUBDIRECTORY(pdf)
+-ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
++ENDIF(ENABLE_PDF AND POPPLER_FOUND AND CAIRO_FOUND)
+
+ IF (LIBVNCSERVER_FOUND)
+ ADD_SUBDIRECTORY(vnc)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-2.8.0-magicoff.patch
@ 2009-03-10 15:32 Alfredo Tupone (tupone)
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone (tupone) @ 2009-03-10 15:32 UTC (permalink / raw
To: gentoo-commits
tupone 09/03/10 15:32:08
Modified: openscenegraph-2.8.0-magicoff.patch
Log:
Adding use flags: jpeg2k svg xine
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?r1=1.2&r2=1.3
Index: openscenegraph-2.8.0-magicoff.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openscenegraph-2.8.0-magicoff.patch 8 Mar 2009 20:08:59 -0000 1.2
+++ openscenegraph-2.8.0-magicoff.patch 10 Mar 2009 15:32:08 -0000 1.3
@@ -1,16 +1,31 @@
--- CMakeLists.txt.old 2009-02-25 10:26:47.000000000 +0100
+++ CMakeLists.txt 2009-02-25 10:33:07.000000000 +0100
-@@ -287,6 +287,9 @@
+@@ -287,14 +287,24 @@
INCLUDE(Find3rdPartyDependencies)
ENDIF(WIN32)
-+OPTION(ENABLE_XUL "Enable plugin gecko if xulrunner is available" ON)
-+OPTION(ENABLE_PDF "Enable plugin pdf if poppler-glib and cairo are available" ON)
++OPTION(ENABLE_XUL "Enable gecko plugin" ON)
++OPTION(ENABLE_PDF "Enable pdf plugin" ON)
++OPTION(ENABLE_XINE "Enable xine plugin" ON)
++OPTION(ENABLE_JPEG2K "Enable jp2 plugin" ON)
++OPTION(ENABLE_SVG "Enable svg plugin" ON)
+
# Common to all platforms:
FIND_PACKAGE(FreeType)
FIND_PACKAGE(Inventor)
-@@ -302,7 +304,9 @@
++IF(ENABLE_JPEG2K)
+ FIND_PACKAGE(Jasper)
++ENDIF(ENABLE_JPEG2K)
+ FIND_PACKAGE(OpenEXR)
+ FIND_PACKAGE(COLLADA)
+ FIND_PACKAGE(ZLIB)
++IF(ENABLE_XINE)
+ FIND_PACKAGE(Xine)
++ENDIF(ENABLE_XINE)
+ FIND_PACKAGE(OpenVRML)
+ FIND_PACKAGE(Performer)
+ FIND_PACKAGE(GDAL)
+@@ -302,7 +312,9 @@
FIND_PACKAGE(ITK)
FIND_PACKAGE(LibVNCServer)
FIND_PACKAGE(OurDCMTK)
@@ -20,17 +35,17 @@
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
---- src/osgPlugins/CMakeLists.txt.old 2009-03-08 17:02:24.000000000 +0100
-+++ src/osgPlugins/CMakeLists.txt 2009-03-08 17:02:56.000000000 +0100
-@@ -211,9 +211,9 @@
- ADD_SUBDIRECTORY(svg)
- ENDIF(RSVG_FOUND AND CAIRO_FOUND)
+@@ -319,9 +331,13 @@
+ KG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
+ ENDIF(WIN32)
--IF (POPPLER_FOUND AND CAIRO_FOUND)
-+IF(ENABLE_PDF AND POPPLER_FOUND AND CAIRO_FOUND)
- ADD_SUBDIRECTORY(pdf)
--ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
-+ENDIF(ENABLE_PDF AND POPPLER_FOUND AND CAIRO_FOUND)
++ IF(ENABLE_SVG)
+ PKG_CHECK_MODULES(RSVG librsvg-2.0)
++ ENDIF(ENABLE_SVG)
+ PKG_CHECK_MODULES(CAIRO cairo)
++ IF(ENABLE_PDF)
+ PKG_CHECK_MODULES(POPPLER poppler-glib)
++ ENDIF(ENABLE_PDF)
- IF (LIBVNCSERVER_FOUND)
- ADD_SUBDIRECTORY(vnc)
+ ENDIF(PKG_CONFIG_FOUND)
+
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-2.8.0-magicoff.patch
@ 2009-03-12 13:10 Alfredo Tupone (tupone)
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone (tupone) @ 2009-03-12 13:10 UTC (permalink / raw
To: gentoo-commits
tupone 09/03/12 13:10:54
Modified: openscenegraph-2.8.0-magicoff.patch
Log:
Enable the following USE flags: curl freetype gif jpeg png tiff xrandr
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Revision Changes Path
1.4 dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch?r1=1.3&r2=1.4
Index: openscenegraph-2.8.0-magicoff.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openscenegraph-2.8.0-magicoff.patch 10 Mar 2009 15:32:08 -0000 1.3
+++ openscenegraph-2.8.0-magicoff.patch 12 Mar 2009 13:10:54 -0000 1.4
@@ -1,6 +1,6 @@
---- CMakeLists.txt.old 2009-02-25 10:26:47.000000000 +0100
-+++ CMakeLists.txt 2009-02-25 10:33:07.000000000 +0100
-@@ -287,14 +287,24 @@
+--- CMakeLists.txt.old 2009-03-12 10:39:41.000000000 +0100
++++ CMakeLists.txt 2009-03-12 10:47:37.000000000 +0100
+@@ -287,22 +287,45 @@
INCLUDE(Find3rdPartyDependencies)
ENDIF(WIN32)
@@ -9,9 +9,18 @@
+OPTION(ENABLE_XINE "Enable xine plugin" ON)
+OPTION(ENABLE_JPEG2K "Enable jp2 plugin" ON)
+OPTION(ENABLE_SVG "Enable svg plugin" ON)
++OPTION(ENABLE_FREETYPE "Enable freetype plugin" ON)
++OPTION(ENABLE_CURL "Enable curl plugin" ON)
++OPTION(ENABLE_GIF "Enable gif plugin" ON)
++OPTION(ENABLE_JPEG "Enable jpeg plugin" ON)
++OPTION(ENABLE_PNG "Enable png plugin" ON)
++OPTION(ENABLE_TIFF "Enable tiff plugin" ON)
++OPTION(ENABLE_XRANDR "Enable xrandr usage" ON)
+
# Common to all platforms:
++IF(ENABLE_FREETYPE)
FIND_PACKAGE(FreeType)
++ENDIF(ENABLE_FREETYPE)
FIND_PACKAGE(Inventor)
+IF(ENABLE_JPEG2K)
FIND_PACKAGE(Jasper)
@@ -25,7 +34,9 @@
FIND_PACKAGE(OpenVRML)
FIND_PACKAGE(Performer)
FIND_PACKAGE(GDAL)
-@@ -302,7 +312,9 @@
++IF(ENABLE_CURL)
+ FIND_PACKAGE(CURL)
++ENDIF(ENABLE_CURL)
FIND_PACKAGE(ITK)
FIND_PACKAGE(LibVNCServer)
FIND_PACKAGE(OurDCMTK)
@@ -35,8 +46,8 @@
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
-@@ -319,9 +331,13 @@
- KG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
+@@ -319,9 +342,13 @@
+ PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
ENDIF(WIN32)
+ IF(ENABLE_SVG)
@@ -48,4 +59,43 @@
+ ENDIF(ENABLE_PDF)
ENDIF(PKG_CONFIG_FOUND)
-
+
+@@ -417,10 +444,18 @@
+ # Image readers/writers depend on 3rd party libraries except for OS X which
+ # can use Quicktime.
+ IF(NOT APPLE)
++ IF(ENABLE_GIF)
+ FIND_PACKAGE(GIFLIB)
++ ENDIF(ENABLE_GIF)
++ IF(ENABLE_JPEG)
+ FIND_PACKAGE(JPEG)
++ ENDIF(ENABLE_JPEG)
++ IF(ENABLE_PNG)
+ FIND_PACKAGE(PNG)
++ ENDIF(ENABLE_PNG)
++ IF(ENABLE_TIFF)
+ FIND_PACKAGE(TIFF)
++ ENDIF(ENABLE_TIFF)
+
+ # QuickTime is required for OS X, but optional for Windows.
+ IF(WIN32)
+@@ -843,3 +878,7 @@
+ IMMEDIATE @ONLY)
+ ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type: ${CMAKE_BUILD_TYPE}
++Install path: ${CMAKE_INSTALL_PREFIX}\n")
+--- src/osgViewer/CMakeLists.txt.old 2009-03-12 10:46:01.000000000 +0100
++++ src/osgViewer/CMakeLists.txt 2009-03-12 10:46:48.000000000 +0100
+@@ -91,7 +91,9 @@
+ INCLUDE(FindPkgConfig OPTIONAL)
+ IF (PKG_CONFIG_FOUND)
+
++ IF(ENABLE_XRANDR)
+ PKG_CHECK_MODULES(XRANDR xrandr)
++ ENDIF(ENABLE_XRANDR)
+
+ IF (XRANDR_FOUND)
+ OPTION(OSGVIEWER_USE_XRANDR "Set to ON to enable Xrandr support for GraphicsWindowX11." ON)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-03-12 13:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-25 14:00 [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-2.8.0-magicoff.patch Alfredo Tupone (tupone)
-- strict thread matches above, loose matches on Subject: below --
2009-03-08 20:08 Alfredo Tupone (tupone)
2009-03-10 15:32 Alfredo Tupone (tupone)
2009-03-12 13:10 Alfredo Tupone (tupone)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox