← Back to branch summary

~ubuntu-branches/debian/experimental/openscenegraph/experimental

« back to all changes in this revision

Viewing changes to debian/patches/remove-broken-FindGDAL.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Luaces
  • Date: 2011-01-29 11:36:29 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110129113629-qisrm2kdqlurc7t3
Tags: 2.9.11-1
http://bugs.debian.org/592420
* Removed bug-555869-ftbfs_with_binutils_gold.dpatch since upstream has
  already taken care of the issue.
* Removed bug-528229.dpatch since the pkgconfig files are now also split
  in upstream.
* Removed explicit dependency on GLU.
* Upstream no longer includes osgIntrospection (Closes: #592420).
* Disabled zip plugin as its implementation stores an embedded copy of
  zlib.
* Enabled Qt support. Thanks James Goppert.
* Enabled SVG and PDF plugins. Thanks James Goppert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/remove-broken-FindGDAL.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## remove-broken-FindGDAL.dpatch by  <alberto@negro>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' openscenegraph-2.8.3~/OpenSceneGraph/CMakeModules/FindGDAL.cmake openscenegraph-2.8.3/OpenSceneGraph/CMakeModules/FindGDAL.cmake
9
 
--- openscenegraph-2.8.3~/OpenSceneGraph/CMakeModules/FindGDAL.cmake    2008-11-26 13:07:03.000000000 +0100
10
 
+++ openscenegraph-2.8.3/OpenSceneGraph/CMakeModules/FindGDAL.cmake     1970-01-01 01:00:00.000000000 +0100
11
 
@@ -1,94 +0,0 @@
12
 
-# Locate gdal
13
 
-# This module defines
14
 
-# GDAL_LIBRARY
15
 
-# GDAL_FOUND, if false, do not try to link to gdal 
16
 
-# GDAL_INCLUDE_DIR, where to find the headers
17
 
-#
18
 
-# $GDALDIR is an environment variable that would
19
 
-# correspond to the ./configure --prefix=$GDAL_DIR
20
 
-# used in building gdal.
21
 
-#
22
 
-# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it 
23
 
-# for osgTerrain so I whipped this module together for completeness.
24
 
-# I actually don't know the conventions or where files are typically
25
 
-# placed in distros.
26
 
-# Any real gdal users are encouraged to correct this (but please don't
27
 
-# break the OS X framework stuff when doing so which is what usually seems 
28
 
-# to happen).
29
 
-
30
 
-# This makes the presumption that you are include gdal.h like
31
 
-# #include "gdal.h"
32
 
-
33
 
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
34
 
-  PATHS
35
 
-  $ENV{GDAL_DIR}
36
 
-  NO_DEFAULT_PATH
37
 
-    PATH_SUFFIXES include
38
 
-)
39
 
-
40
 
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
41
 
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
42
 
-    NO_DEFAULT_PATH
43
 
-    PATH_SUFFIXES include
44
 
-)
45
 
-
46
 
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
47
 
-  PATHS
48
 
-  ~/Library/Frameworks/gdal.framework/Headers
49
 
-  /Library/Frameworks/gdal.framework/Headers
50
 
-  /usr/local/include/gdal
51
 
-  /usr/local/include/GDAL
52
 
-  /usr/local/include
53
 
-  /usr/include/gdal
54
 
-  /usr/include/GDAL
55
 
-  /usr/include
56
 
-  /sw/include/gdal 
57
 
-  /sw/include/GDAL 
58
 
-  /sw/include # Fink
59
 
-  /opt/local/include/gdal
60
 
-  /opt/local/include/GDAL
61
 
-  /opt/local/include # DarwinPorts
62
 
-  /opt/csw/include/gdal
63
 
-  /opt/csw/include/GDAL
64
 
-  /opt/csw/include # Blastwave
65
 
-  /opt/include/gdal
66
 
-  /opt/include/GDAL
67
 
-  /opt/include
68
 
-)
69
 
-
70
 
-FIND_LIBRARY(GDAL_LIBRARY 
71
 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
72
 
-  PATHS
73
 
-  $ENV{GDAL_DIR}
74
 
-  NO_DEFAULT_PATH
75
 
-  PATH_SUFFIXES lib64 lib
76
 
-)
77
 
-FIND_LIBRARY(GDAL_LIBRARY 
78
 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
79
 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
80
 
-    NO_DEFAULT_PATH
81
 
-    PATH_SUFFIXES lib64 lib
82
 
-)
83
 
-FIND_LIBRARY(GDAL_LIBRARY 
84
 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
85
 
-  PATHS
86
 
-    ~/Library/Frameworks
87
 
-    /Library/Frameworks
88
 
-    /usr/local
89
 
-    /usr
90
 
-    /sw
91
 
-    /opt/local
92
 
-    /opt/csw
93
 
-    /opt
94
 
-    /usr/freeware
95
 
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
96
 
-  PATH_SUFFIXES lib64 lib
97
 
-)
98
 
-
99
 
-SET(GDAL_FOUND "NO")
100
 
-IF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
101
 
-  SET(GDAL_FOUND "YES")
102
 
-ENDIF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
103
 
-
104
 
-
105
 
-