| 1 |
nerdboy 11/11/13 02:19:51 |
| 2 |
|
| 3 |
Added: mapnik-2.0.0-gentoo.patch |
| 4 |
Log: |
| 5 |
Added mapnik2 ebuild (currently masked due to gpsdrive breakage). |
| 6 |
|
| 7 |
(Portage version: 2.1.10.32/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mapnik-2.0.0-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- SConstruct.orig 2011-11-06 09:52:20.000000000 -0800 |
| 18 |
+++ SConstruct 2011-11-06 09:55:03.000000000 -0800 |
| 19 |
@@ -314,9 +313,9 @@ |
| 20 |
('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), |
| 21 |
|
| 22 |
# Install Variables |
| 23 |
- ('PREFIX', 'The install path "prefix"', '/usr/local'), |
| 24 |
+ ('PREFIX', 'The install path "prefix"', '/usr'), |
| 25 |
('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''), |
| 26 |
- ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), |
| 27 |
+ ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '${D}'), |
| 28 |
('PATH_INSERT', 'A custom path to append to the $PATH env to prioritize usage of shell programs like pkg-config will be used if multiple are present on the system', ''), |
| 29 |
|
| 30 |
# Boost variables |
| 31 |
@@ -342,15 +341,17 @@ |
| 32 |
PathVariable('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), |
| 33 |
PathVariable('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include', PathVariable.PathAccept), |
| 34 |
PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), |
| 35 |
- PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include', PathVariable.PathAccept), |
| 36 |
- PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA, PathVariable.PathAccept), |
| 37 |
+ PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept), |
| 38 |
+ PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), |
| 39 |
+ PathVariable('AGG_INCLUDES', 'Search path for AGG include files', '/usr/include/agg2', PathVariable.PathAccept), |
| 40 |
+ PathVariable('AGG_LIBS', 'Search path for AGG library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), |
| 41 |
('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''), |
| 42 |
|
| 43 |
# Variables affecting rendering back-ends |
| 44 |
|
| 45 |
BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'), |
| 46 |
|
| 47 |
- BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'), |
| 48 |
+ BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'False'), |
| 49 |
|
| 50 |
BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'), |
| 51 |
|
| 52 |
@@ -1098,6 +1099,7 @@ |
| 53 |
['z', 'zlib.h', True,'C'], |
| 54 |
['proj', 'proj_api.h', True,'C'], |
| 55 |
[env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'], |
| 56 |
+ ['agg','agg2/agg_config.h' , True,'C++'], |
| 57 |
] |
| 58 |
|
| 59 |
if env['JPEG']: |
| 60 |
--- src/build.py.orig 2011-11-05 18:30:33.000000000 -0700 |
| 61 |
+++ src/build.py 2011-11-05 18:31:14.000000000 -0700 |
| 62 |
@@ -37,9 +37,6 @@ |
| 63 |
elif not silent: |
| 64 |
print stderr |
| 65 |
|
| 66 |
-def ldconfig(*args,**kwargs): |
| 67 |
- call('ldconfig') |
| 68 |
- |
| 69 |
if env['LINKING'] == 'static': |
| 70 |
lib_env.Append(CXXFLAGS="-fPIC") |
| 71 |
|
| 72 |
@@ -326,9 +323,6 @@ |
| 73 |
if 'uninstall' not in COMMAND_LINE_TARGETS: |
| 74 |
result = env.InstallAs(target=target, source=mapnik) |
| 75 |
env.Alias(target='install', source=result) |
| 76 |
- if result: |
| 77 |
- env.AddPostAction(result, ldconfig) |
| 78 |
- |
| 79 |
|
| 80 |
# Install symlinks |
| 81 |
target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)) |
Archives