This patch file includes patches from both Debian and Laclin. --- agg_2.7.0.r145+dfsg.old/configure.ac +++ agg_2.7.0.r145+dfsg/configure.ac @@ -9,7 +9,6 @@ AC_PROG_CC AC_PROG_CXX AC_ISC_POSIX -dnl AM_C_PROTOTYPES dnl if test "x$U" != "x"; then dnl AC_MSG_ERROR(Compiler not ANSI compliant) dnl fi @@ -127,7 +126,7 @@ dnl ############################################### dnl Settung up library version -AGG_LIB_VERSION="2:7:0" +AGG_LIB_VERSION="4:0:2" dnl current-´ / / dnl revision--´ / dnl age---´ @@ -145,7 +144,6 @@ AC_OUTPUT( Makefile libagg.pc - gpc/Makefile font_freetype/Makefile font_win32_tt/Makefile src/Makefile --- agg_2.7.0.r145+dfsg.old/gpc/gpc.c +++ agg_2.7.0.r145+dfsg/gpc/gpc.c @@ -110,7 +110,7 @@ #define MALLOC(p, b, s, t) {if ((b) > 0) { \ p= (t*)malloc(b); if (!(p)) { \ fprintf(stderr, "gpc malloc failure: %s\n", s); \ - exit(0);}} else p= NULL;} + }} else p= NULL;} #define FREE(p) {if (p) {free(p); (p)= NULL;}} --- agg_2.7.0.r145+dfsg.old/include/agg_renderer_outline_aa.h +++ agg_2.7.0.r145+dfsg/include/agg_renderer_outline_aa.h @@ -1366,7 +1366,7 @@ //--------------------------------------------------------------------- void profile(line_profile_aa& prof) { m_profile = &prof; } const line_profile_aa& profile() const { return *m_profile; } - line_profile_aa& profile() { return *m_profile; } +// line_profile_aa& profile() { return *m_profile; } //--------------------------------------------------------------------- int subpixel_width() const { return m_profile->subpixel_width(); } --- agg_2.7.0.r145+dfsg.old/libagg.pc.in +++ agg_2.7.0.r145+dfsg/libagg.pc.in @@ -6,5 +6,5 @@ Name: libagg Description: Anti Grain Geometry - A High Quality Rendering Engine for C++ Version: @VERSION@ -Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg +Libs: -L${libdir} -lagg Cflags: -I${includedir} --- agg_2.7.0.r145+dfsg.old/Makefile.am +++ agg_2.7.0.r145+dfsg/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = gpc src font_freetype font_win32_tt include examples +SUBDIRS = src font_freetype font_win32_tt include examples pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libagg.pc --- agg_2.7.0.r145+dfsg.old/Makefile.in.Linux +++ agg_2.7.0.r145+dfsg/Makefile.in.Linux @@ -1,7 +1,7 @@ -AGGLIBS= -lagg -AGGCXXFLAGS = -O3 -I/usr/X11R6/include -L/usr/X11R6/lib -CXX = g++ -C = gcc +AGGLIBS= -lagg -lm +AGGCXXFLAGS = -fPIC -O3 -I/usr/X11R6/include -L/usr/X11R6/lib +CXX = clang++ +C = clang #CXX = icc LIB = ar cr --- agg_2.7.0.r145+dfsg.old/Makefile.in.Linux.SDL +++ agg_2.7.0.r145+dfsg/Makefile.in.Linux.SDL @@ -1,7 +1,7 @@ -AGGLIBS= -lagg -lSDL -AGGCXXFLAGS = -O3 -I/usr/include/SDL -L/usr/lib -CXX = g++ -C = gcc +AGGLIBS= -lagg -lSDL -lm +AGGCXXFLAGS = -fPIC -O3 -I/usr/include/SDL -L/usr/lib +CXX = clang++ +C = clang #CXX = icc LIB = ar cr --- agg_2.7.0.r145+dfsg.old/src/Makefile +++ agg_2.7.0.r145+dfsg/src/Makefile @@ -1,4 +1,13 @@ -include ../Makefile.in.$(shell uname) +PLATFORM=$(shell uname) +ifeq (GNU/kFreeBSD,$(PLATFORM)) + PLATFORM=Linux +endif + +ifeq (GNU,$(PLATFORM)) + PLATFORM=Linux +endif + +include ../Makefile.in.$(PLATFORM) CXXFLAGS= $(AGGCXXFLAGS) -I../include -L./ ==== end of patch ====