|
Thomas Spura |
81fc2e8 |
--- setupext.py.orig 2013-08-02 09:39:43.914247832 +0200
|
|
Thomas Spura |
81fc2e8 |
+++ setupext.py 2013-08-02 09:40:14.785304342 +0200
|
|
|
dd3b8ab |
@@ -914,28 +914,13 @@ class LibAgg(SetupPackage):
|
|
|
dd3b8ab |
self.__class__.found_external = True
|
|
|
dd3b8ab |
try:
|
|
|
dd3b8ab |
return self._check_for_pkg_config(
|
|
|
dd3b8ab |
- 'libagg', 'agg2/agg_basics.h', min_version='PATCH')
|
|
|
dd3b8ab |
+ 'libagg', 'agg2/agg_basics.h', min_version='2.5.0')
|
|
|
dd3b8ab |
except CheckFailed as e:
|
|
|
dd3b8ab |
self.__class__.found_external = False
|
|
Thomas Spura |
81fc2e8 |
return str(e) + ' Using local copy.'
|
|
Thomas Spura |
81fc2e8 |
|
|
Thomas Spura |
81fc2e8 |
def add_flags(self, ext):
|
|
Thomas Spura |
81fc2e8 |
- if self.found_external:
|
|
Thomas Spura |
81fc2e8 |
- pkg_config.setup_extension(ext, 'libagg')
|
|
Thomas Spura |
81fc2e8 |
- else:
|
|
|
dd3b8ab |
- ext.include_dirs.append('extern/agg24/include')
|
|
Thomas Spura |
81fc2e8 |
- agg_sources = [
|
|
Thomas Spura |
81fc2e8 |
- 'agg_bezier_arc.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_curves.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_image_filters.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_trans_affine.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_vcgen_contour.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_vcgen_dash.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_vcgen_stroke.cpp',
|
|
Thomas Spura |
81fc2e8 |
- 'agg_vpgen_segmentator.cpp'
|
|
Thomas Spura |
81fc2e8 |
- ]
|
|
Thomas Spura |
81fc2e8 |
- ext.sources.extend(
|
|
|
dd3b8ab |
- os.path.join('extern', 'agg24', 'src', x) for x in agg_sources)
|
|
Thomas Spura |
81fc2e8 |
+ pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
|
|
Thomas Spura |
81fc2e8 |
|
|
Thomas Spura |
81fc2e8 |
|
|
Thomas Spura |
81fc2e8 |
class FreeType(SetupPackage):
|