Commit 5055c39d authored by Caleb Michael Moore's avatar Caleb Michael Moore

further splitting

parent 8c6b1c55
2005-07-21 Caleb Moore <c.moore@student.unsw.edu.au>
* Makefile.am, configure.in, rsvg.c, rsvg-base.c: further split the library into librsvg-2.so, librsvg-2-base.so and librsvg-2-libart.so. Make libart an optional dependancy.
2005-07-20 Dom Lachowicz <cinamod@hotmail.com>
* */Makefile.am: Update things so that we build a librsvg-2.so and
......
SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
if HAVE_GTK
target_rsvg_view = rsvg-view
else
target_rsvg_view =
endif
if HAVE_ART
SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
lib_LTLIBRARIES = librsvg-2-base.la librsvg-2-libart.la librsvg-2.la
bin_PROGRAMS = rsvg $(target_rsvg_view)
noinst_PROGRAMS = test-performance
else
SUBDIRS = . doc data
lib_LTLIBRARIES = librsvg-2-base.la
endif
man_MANS = rsvg.1
......@@ -24,9 +28,9 @@ enum_sources = \
librsvg-enum-types.h \
librsvg-enum-types.c
lib_LTLIBRARIES = librsvg-2.la librsvg-2-libart.la
librsvg_2_la_SOURCES = \
librsvg_2_base_la_SOURCES = \
rsvg-affine.c \
librsvg-features.c \
rsvg-bpath-util.c \
......@@ -43,8 +47,6 @@ librsvg_2_la_SOURCES = \
rsvg-path.h \
rsvg-private.h \
rsvg-file-util.c \
rsvg-filter.c \
rsvg-filter.h \
rsvg-marker.c \
rsvg-marker.h \
rsvg-mask.c \
......@@ -57,12 +59,12 @@ librsvg_2_la_SOURCES = \
rsvg-styles.h \
rsvg-text.c \
rsvg-text.h \
rsvg.c \
rsvg-cond.c \
rsvg-base.c \
librsvg-enum-types.c
librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-dynamic
librsvg_2_la_LIBADD = $(LIBGNOME_VFS_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS)
librsvg_2_base_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-dynamic
librsvg_2_base_la_LIBADD = $(LIBGNOME_VFS_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS)
librsvg_2_libart_la_SOURCES = \
rsvg-art-composite.c \
......@@ -74,10 +76,18 @@ librsvg_2_libart_la_SOURCES = \
rsvg-art-paint-server.c \
rsvg-art-paint-server.h \
rsvg-art-render.c \
rsvg-art-render.h
rsvg-art-render.h \
rsvg-filter.c \
rsvg-filter.h
librsvg_2_libart_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-dynamic
librsvg_2_libart_la_LIBADD = librsvg-2.la $(LIBGNOME_VFS_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS)
librsvg_2_libart_la_LIBADD = librsvg-2-base.la $(LIBGNOME_VFS_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS) $(LIBART_LIBS)
librsvg_2_la_SOURCES = \
rsvg.c
librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-dynamic
librsvg_2_la_LIBADD = librsvg-2-base.la librsvg-2-libart.la $(LIBGNOME_VFS_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS) $(LIBART_LIBS)
librsvgincdir = $(includedir)/librsvg-2/librsvg
librsvginc_HEADERS = \
......@@ -95,7 +105,8 @@ INCLUDES = \
$(GTK_CFLAGS) \
$(GDK_X11_CFLAGS) \
-DG_LOG_DOMAIN=\"librsvg\" \
-DLIBRSVG_DATADIR="\"$(datadir)\""
-DLIBRSVG_DATADIR="\"$(datadir)\""\
$(LIBART_CFLAGS)
DEPS = $(top_builddir)/librsvg-2.la $(top_builddir)/librsvg-2-libart.la
LDADDS = \
......
......@@ -105,7 +105,6 @@ AC_SUBST(FREETYPE_CFLAGS)
PKG_CHECK_MODULES(LIBRSVG, \
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED \
libart-2.0 >= $LIBART_REQUIRED \
libxml-2.0 >= $LIBXML_REQUIRED \
pangoft2 >= $PANGOFT2_REQUIRED \
fontconfig >= $FONTCONFIG_REQUIRED)
......@@ -121,6 +120,33 @@ AC_SUBST(POPT_LIBS)
dnl ===========================================================================
LIBART_CFLAGS=""
LIBART_LIBS=""
test_art=true
AC_ARG_WITH(art,[ --with-art Build the libart backend],[
if test "x$withval" = "xno"; then
test_art=false
fi
])
if test "x$test_art" = "xtrue"; then
PKG_CHECK_MODULES(LIBART, libart-2.0 >= $LIBART_REQUIRED, test_art=true, test_art=false)
fi
if test "x$test_art" = "xtrue"; then
LIBART_CFLAGS="$LIBART_CFLAGS"
else
AC_MSG_WARN([libart backend disabled, as requested (Use --with-art to enable)])
art_warning="
You are building without the libart backend. At this point in time librsvg will not do very much without it, for example it won't draw anything. You are strongly advised to install it if you actually want to use librsvg for more than an ornamental file in your lib directory"
fi
AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS)
AM_CONDITIONAL(HAVE_ART, test "x$test_art" = "xtrue")
dnl ===========================================================================
LIBGSF_CFLAGS=""
LIBGSF_LIBS=""
......@@ -452,3 +478,4 @@ librsvg-$LIBRSVG_VERSION
AC_MSG_RESULT([$croco_warning]);
AC_MSG_RESULT([$gsf_warning]);
AC_MSG_RESULT([$art_warning]);
\ No newline at end of file
......@@ -33,8 +33,10 @@
#include <math.h>
#include <rsvg-art-render.h>
#include <rsvg-art-composite.h>
#include "rsvg-art-render.h"
#include "rsvg-art-composite.h"
#include <libart_lgpl/art_rgba.h>
#include <libart_lgpl/art_rgb_svp.h>
#define PERFECTBLUR 0
......@@ -225,15 +227,8 @@ rsvg_filter_fix_coordinate_system (RsvgFilterContext * ctx, RsvgState * state)
{
int x, y, height, width;
int i;
guchar *pixels;
int stride;
ArtIRect bbox = ((RsvgArtRender *)ctx->ctx->render)->bbox;
/* First for object bounding box coordinates we need to know how much of the
source has been drawn on */
pixels = gdk_pixbuf_get_pixels (ctx->source);
stride = gdk_pixbuf_get_rowstride (ctx->source);
x = bbox.x0;
y = bbox.y0;
width = bbox.x1 - bbox.x0;
......
......@@ -316,6 +316,12 @@ _rsvg_affine_equal (double matrix1[6], double matrix2[6]);
void
rsvg_node_set_atts(RsvgNode * node, RsvgHandle * ctx, RsvgPropertyBag * atts);
RsvgDimensionData
rsvg_get_dimensions(RsvgHandle * handle);
void
rsvg_drawing_ctx_free (RsvgDrawingCtx *handle);
G_END_DECLS
#endif
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment