--- setup.py +++ setup.py @@ -306,39 +306,12 @@ infoline( '################################################') infoline( '#Attempting install of _renderPM') infoline( '#extensions from %r'%RENDERPM) - LIBART_DIR=pjoin(RENDERPM,'libart_lgpl') + LIBART_DIR='@GENTOO_PORTAGE_EPREFIX@/usr/include/libart-2.0' + LIBART_LIB=['art_lgpl_2'] GT1_DIR=pjoin(RENDERPM,'gt1') MACROS=[('ROBIN_DEBUG',None)] MACROS=[] - def libart_version(): - K = ('LIBART_MAJOR_VERSION','LIBART_MINOR_VERSION','LIBART_MICRO_VERSION') - D = {} - for l in open(pjoin(LIBART_DIR,'configure.in'),'r').readlines(): - l = l.strip().split('=') - if len(l)>1 and l[0].strip() in K: - D[l[0].strip()] = l[1].strip() - if len(D)==3: break - return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % '.'.join(map(lambda k,D=D: D.get(k,'?'),K)) - LIBART_VERSION = libart_version() SOURCES=[pjoin(RENDERPM,'_renderPM.c'), - pjoin(LIBART_DIR,'art_vpath_bpath.c'), - pjoin(LIBART_DIR,'art_rgb_pixbuf_affine.c'), - pjoin(LIBART_DIR,'art_rgb_svp.c'), - pjoin(LIBART_DIR,'art_svp.c'), - pjoin(LIBART_DIR,'art_svp_vpath.c'), - pjoin(LIBART_DIR,'art_svp_vpath_stroke.c'), - pjoin(LIBART_DIR,'art_svp_ops.c'), - pjoin(LIBART_DIR,'art_vpath.c'), - pjoin(LIBART_DIR,'art_vpath_dash.c'), - pjoin(LIBART_DIR,'art_affine.c'), - pjoin(LIBART_DIR,'art_rect.c'), - pjoin(LIBART_DIR,'art_rgb_affine.c'), - pjoin(LIBART_DIR,'art_rgb_affine_private.c'), - pjoin(LIBART_DIR,'art_rgb.c'), - pjoin(LIBART_DIR,'art_rgb_rgba_affine.c'), - pjoin(LIBART_DIR,'art_svp_intersect.c'), - pjoin(LIBART_DIR,'art_svp_render_aa.c'), - pjoin(LIBART_DIR,'art_misc.c'), pjoin(GT1_DIR,'gt1-parset1.c'), pjoin(GT1_DIR,'gt1-dict.c'), pjoin(GT1_DIR,'gt1-namecontext.c'), @@ -398,12 +371,12 @@ EXT_MODULES += [Extension( '_renderPM', SOURCES, include_dirs=[RENDERPM,LIBART_DIR,GT1_DIR]+FT_INC_DIR, - define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+MACROS+[('LIBART_VERSION',LIBART_VERSION)], + define_macros=FT_MACROS+MACROS, library_dirs=[]+FT_LIB_DIR, # libraries to link against - libraries=FT_LIB, - #extra_objects=['gt1.lib','libart.lib',], + libraries=FT_LIB+LIBART_LIB, + #extra_objects=['gt1.lib'], #extra_compile_args=['/Z7'], extra_link_args=[] ),