|
 |
cdbc42 |
diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
|
|
|
cdbc42 |
--- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:49:21.295712608 -0200
|
|
|
cdbc42 |
+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:49:31.508712999 -0200
|
|
|
cdbc42 |
@@ -96,7 +96,6 @@ BUILT_GDK = False
|
|
|
cdbc42 |
BUILT_PATH = False
|
|
|
cdbc42 |
BUILT_TRI = False
|
|
|
cdbc42 |
|
|
|
cdbc42 |
-AGG_VERSION = 'agg24'
|
|
|
cdbc42 |
TCL_TK_CACHE = None
|
|
|
cdbc42 |
|
|
|
cdbc42 |
# for nonstandard installation/build with --prefix variable
|
|
|
cdbc42 |
@@ -621,7 +620,8 @@ def add_agg_flags(module):
|
|
|
cdbc42 |
# before adding the freetype flags since -z comes later
|
|
|
cdbc42 |
add_base_flags(module)
|
|
|
cdbc42 |
add_numpy_flags(module)
|
|
|
cdbc42 |
- module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
|
|
|
cdbc42 |
+ module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
|
|
|
cdbc42 |
+ module.libraries.append('agg')
|
|
|
cdbc42 |
|
|
|
cdbc42 |
# put these later for correct link order
|
|
|
cdbc42 |
module.libraries.extend(std_libs)
|
|
|
cdbc42 |
@@ -1220,17 +1220,7 @@ def build_agg(ext_modules, packages):
|
|
|
cdbc42 |
global BUILT_AGG
|
|
|
cdbc42 |
if BUILT_AGG: return # only build it if you you haven't already
|
|
|
cdbc42 |
|
|
|
cdbc42 |
- agg = (
|
|
|
cdbc42 |
- 'agg_trans_affine.cpp',
|
|
|
cdbc42 |
- 'agg_bezier_arc.cpp',
|
|
|
cdbc42 |
- 'agg_curves.cpp',
|
|
|
cdbc42 |
- 'agg_vcgen_dash.cpp',
|
|
|
cdbc42 |
- 'agg_vcgen_stroke.cpp',
|
|
|
cdbc42 |
- 'agg_image_filters.cpp',
|
|
|
cdbc42 |
- )
|
|
|
cdbc42 |
-
|
|
|
cdbc42 |
- deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
|
|
|
cdbc42 |
- deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
|
|
|
cdbc42 |
+ deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
|
|
|
cdbc42 |
deps.extend(glob.glob('CXX/*.cxx'))
|
|
|
cdbc42 |
deps.extend(glob.glob('CXX/*.c'))
|
|
|
cdbc42 |
temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
|
|
|
cdbc42 |
@@ -1253,16 +1243,7 @@ def build_path(ext_modules, packages):
|
|
|
cdbc42 |
global BUILT_PATH
|
|
|
cdbc42 |
if BUILT_PATH: return # only build it if you you haven't already
|
|
|
cdbc42 |
|
|
|
cdbc42 |
- agg = (
|
|
|
cdbc42 |
- 'agg_vcgen_contour.cpp',
|
|
|
cdbc42 |
- 'agg_curves.cpp',
|
|
|
cdbc42 |
- 'agg_bezier_arc.cpp',
|
|
|
cdbc42 |
- 'agg_trans_affine.cpp',
|
|
|
cdbc42 |
- 'agg_vcgen_stroke.cpp',
|
|
|
cdbc42 |
- )
|
|
|
cdbc42 |
-
|
|
|
cdbc42 |
- deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
|
|
|
cdbc42 |
- deps.extend(glob.glob('CXX/*.cxx'))
|
|
|
cdbc42 |
+ deps = glob.glob('CXX/*.cxx')
|
|
|
cdbc42 |
deps.extend(glob.glob('CXX/*.c'))
|
|
|
cdbc42 |
|
|
|
cdbc42 |
temp_copy('src/_path.cpp', 'src/path.cpp')
|
|
|
cdbc42 |
@@ -1287,14 +1268,8 @@ def build_image(ext_modules, packages):
|
|
|
cdbc42 |
global BUILT_IMAGE
|
|
|
cdbc42 |
if BUILT_IMAGE: return # only build it if you you haven't already
|
|
|
cdbc42 |
|
|
|
cdbc42 |
- agg = ('agg_trans_affine.cpp',
|
|
|
cdbc42 |
- 'agg_image_filters.cpp',
|
|
|
cdbc42 |
- 'agg_bezier_arc.cpp',
|
|
|
cdbc42 |
- )
|
|
|
cdbc42 |
-
|
|
|
cdbc42 |
temp_copy('src/_image.cpp', 'src/image.cpp')
|
|
|
cdbc42 |
deps = ['src/image.cpp', 'src/mplutils.cpp']
|
|
|
cdbc42 |
- deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
|
|
|
cdbc42 |
deps.extend(glob.glob('CXX/*.cxx'))
|
|
|
cdbc42 |
deps.extend(glob.glob('CXX/*.c'))
|
|
|
cdbc42 |
|