--- agg-2.5+dfsg1.orig/debian/changelog +++ agg-2.5+dfsg1/debian/changelog @@ -0,0 +1,111 @@ +agg (2.5+dfsg1-1ubuntu1.9.10.1) karmic-proposed; urgency=low + + * debian/patches/07_fix_missing_includes.dpatch: Fix missing + includes causes compilation problem. (LP: #393923, Closes: #575620) + * debian/patches/06_fix_recursion_crash.dpatch: Update patch, + it's necessary to fix compilation problem. + + -- Artur Rona Mon, 23 Aug 2010 23:59:59 +0200 + +agg (2.5+dfsg1-1ubuntu1) jaunty; urgency=low + + [ Andrew Straw ] + * patches/05_x11_makefile_am.dpatch: Fix FTBFS on Jaunty: remove spurious + Makefile.am argument (LP: #348299) + + [ Brian Murray ] + * patches/06_fix_recursion_patch: Avoid a crash when drawing extremely long lines + (LP: #344849) + + -- Brian Murray Thu, 02 Apr 2009 18:39:54 -0700 + +agg (2.5+dfsg1-1) unstable; urgency=low + + * debian/rules: clean rule now runs before unpatching, added some commands + to remove autotools generated stuff not deleted by make distclean itself. + Addding --disable-gpc value to autogen.sh variables to disable gpc definitely. + * patches/01_no_gpc.dpatch: removed, replacing it with a new patch + * patches/01_disable_gpc.dpatch: patch added for checking whether gpc is enabled + and then changing SUBDIRS value inside Makefile.am file. + * re-adding the gpc folder previously deleted with its Makefile.am only (no copyright issues + for this file only) preventing a FTBFS after applying the new patch. + * patches/02_maintainer_mode.dpatch: patch added to prevent a FTBFS if the package + get built twice in a row. Thanks to Luis Rodrigo Gallardo Cruz for helping out on + this and reporting a fix into debian BTS. Updated patches/00list to match + the new patch as well. (Closes: #424091) + * debian/copyright: updated to match current agg license, now moved to GPL. (Closes: #436695) + + -- Andrea Veri Sun, 07 Oct 2007 21:51:55 +0200 + +agg (2.5+dfsg-1) unstable; urgency=low + + * Deleting gpc source dir, which is not-free, so cannot be + distributed with the package. Moving version to dfsg. Thanks + to Rene Engelhard for the report. (Closes: #431987) + + -- Andrea Veri Tue, 03 Jul 2007 23:33:08 +0200 + +agg (2.5-1) unstable; urgency=low + + * New upstream release. + * New maintainer. I gonna take care of this package from now on. + * Previous versions's co-maintainers won't appear more in + uploaders field in debian/control. + * Added XS-Vcs-Bzr field that points directly to the bzr branch + in launchpad where this package will be maintained. + + -- Andrea Veri Mon, 18 Jun 2007 11:16:40 +0100 + +agg (2.4+20060719-3) unstable; urgency=low + + * upload to unstable + + -- Rene Engelhard Sun, 22 Oct 2006 15:16:27 +0200 + +agg (2.4+20060719-2) experimental; urgency=low + + * --disable-examples + * add missed pkg-config, libtool and libx11-dev to Build-Depends + * build and install _pic again + + -- Rene Engelhard Fri, 20 Oct 2006 13:12:00 +0200 + +agg (2.4+20060719-1) experimental; urgency=low + + * update to the "new" agg 2.4 from June 19th.... (closes: #391936) + * use auto* build + - add autoconf, automake, libsdl1.2-dev, libfreetype6-dev to Build-Depends + - rework rules + This installs agg_font_freetype.h, so closes: #382351 + * temporary disable libagg.pc returning -lagg_pic, libagg_pic.a building + needs some more rework + + -- Rene Engelhard Fri, 20 Oct 2006 11:51:14 +0200 + +agg (2.4-1) unstable; urgency=low + + * new upstream release + * add patch from Petr Salinger to fix FTBFS on GNU/kFreeBSD, thanks + (closes: #374944) + * Standards-Version: 3.7.2 (no changes needed) + + -- Rene Engelhard Mon, 24 Jul 2006 16:08:17 +0200 + +agg (2.3-3) unstable; urgency=low + + * make pkg-config return -lagg_pic, thanks Cedric Borgese (closes: #351359) + + -- Rene Engelhard Wed, 1 Mar 2006 18:06:22 +0100 + +agg (2.3-2) unstable; urgency=low + + * build libagg_pic.a... + + -- Rene Engelhard Tue, 29 Nov 2005 02:02:41 +0100 + +agg (2.3-1) unstable; urgency=low + + * Initial release + + -- Rene Engelhard Tue, 22 Nov 2005 23:03:50 +0100 + --- agg-2.5+dfsg1.orig/debian/control +++ agg-2.5+dfsg1/debian/control @@ -0,0 +1,21 @@ +Source: agg +Priority: optional +Maintainer: Andrea Veri +Build-Depends: debhelper (>= 4.0.0), dpatch, autoconf, automake1.9, libsdl1.2-dev, libfreetype6-dev, pkg-config, libtool, libx11-dev +Standards-Version: 3.7.2 +Section: libs +XS-Vcs-Bzr: https://code.launchpad.net/~bluekuja/libagg/debian.source + +Package: libagg-dev +Section: libdevel +Conflicts: libagg23-dev +Architecture: any +Description: The AntiGrain Geometry graphical toolkit (development files) + Anti-Grain Geometry (AGG) is a general purpose graphical toolkit written + completely in standard and platform independent C++. It can be used in many + areas of computer programming where high quality 2D graphics is an essential + part of the project. + . + This package contains the development files for building applications using + agg. + --- agg-2.5+dfsg1.orig/debian/copyright +++ agg-2.5+dfsg1/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Rene Engelhard on +Tue, 22 Nov 2005 23:03:50 +0100. + +It was downloaded from http://www.antigrain.com + +Copyright Holder: Maxim Shemanarev + +License: + +Anti-Grain Geometry (AGG) - Version 2.5 +A high quality rendering engine for C++ +Copyright (C) 2002-2006 Maxim Shemanarev + +AGG is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +AGG is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AGG; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. --- agg-2.5+dfsg1.orig/debian/rules +++ agg-2.5+dfsg1/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g + +include /usr/share/dpatch/dpatch.make + +# shared library versions, option 1 +#version=2.0.5 +#major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + + sh autogen.sh --prefix=/usr --disable-examples --disable-gpc + $(MAKE) + $(MAKE) install DESTDIR=$(CURDIR)/debian/libagg-dev + find $(CURDIR)/debian/libagg-dev/usr/lib -name "*.so*" | xargs rm + find $(CURDIR)/debian/libagg-dev/usr/lib -name "*.la" | xargs rm + $(MAKE) clean + ./configure --prefix=/usr --disable-examples --with-pic + $(MAKE) + install -m644 ./font_freetype/.libs/libaggfontfreetype.a \ + $(CURDIR)/debian/libagg-dev/usr/lib/libaggfontfreetype_pic.a + install -m644 ./src/platform/sdl/.libs/libaggplatformsdl.a \ + $(CURDIR)/debian/libagg-dev/usr/lib/libaggplatformsdl_pic.a + install -m644 ./src/platform/X11/.libs/libaggplatformX11.a \ + $(CURDIR)/debian/libagg-dev/usr/lib/libaggplatformX11_pic.a + install -m644 ./src/.libs/libagg.a \ + $(CURDIR)/debian/libagg-dev/usr/lib/libagg_pic.a + touch build-stamp + + +clean: patch-stamp clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) distclean + + # Remove all autotools-created files + dh_clean Makefile.in aclocal.m4 config.guess config.sub configure \ + install-sh ltmain.sh missing \ + examples/Makefile.in font_freetype/Makefile.in \ + font_win32_tt/Makefile.in include/Makefile.in include/config.h.in \ + include/ctrl/Makefile.in include/platform/Makefile.in \ + include/util/Makefile.in src/Makefile.in src/ctrl/Makefile.in \ + src/platform/AmigaOS/Makefile.in src/platform/BeOS/Makefile.in \ + src/platform/Makefile.in src/platform/X11/Makefile.in \ + src/platform/mac/Makefile.in src/platform/sdl/Makefile.in \ + src/platform/win32/Makefile.in + +binary-indep: build + +binary-arch: build + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- agg-2.5+dfsg1.orig/debian/docs +++ agg-2.5+dfsg1/debian/docs @@ -0,0 +1 @@ +readme --- agg-2.5+dfsg1.orig/debian/compat +++ agg-2.5+dfsg1/debian/compat @@ -0,0 +1 @@ +4 --- agg-2.5+dfsg1.orig/debian/patches/02_maintainer_mode.dpatch +++ agg-2.5+dfsg1/debian/patches/02_maintainer_mode.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_maintainer_mode.dpatch by +## +## DP: Use AM_MAINTAINER_MODE, to avoid re-running autotools +## DP: except when explicitely called in debian/rules + +@DPATCH@ +diff -urNad agg-2.5+dfsg~/configure.in agg-2.5+dfsg/configure.in +--- agg-2.5+dfsg~/configure.in 2007-07-21 19:58:06.966030999 -0500 ++++ agg-2.5+dfsg/configure.in 2007-07-21 19:58:33.595695250 -0500 +@@ -2,7 +2,7 @@ + AC_CANONICAL_TARGET + AC_CONFIG_HEADERS(include/config.h) + AM_INIT_AUTOMAKE(agg, 2.5.0) +- ++AM_MAINTAINER_MODE + + dnl Checks for programs. + AC_PROG_CC --- agg-2.5+dfsg1.orig/debian/patches/07_fix_missing_includes.dpatch +++ agg-2.5+dfsg1/debian/patches/07_fix_missing_includes.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## From: Artur Rona +## Description: Add missing includes for fix compile. +## Bug: https://launchpad.net/bugs/393923 +## Origin: upstream, https://trac.mapnik.org/changeset/1801 +## Author: Dane Springmeyer + +@DPATCH@ + +diff -pruN -x '*~' agg-2.5+dfsg1.orig/include/agg_rasterizer_cells_aa.h agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h +--- agg-2.5+dfsg1.orig/include/agg_rasterizer_cells_aa.h 2007-10-11 00:06:16.000000000 +0200 ++++ agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h 2010-08-23 01:51:07.000000000 +0200 +@@ -40,7 +40,8 @@ + #define AGG_RASTERIZER_CELLS_AA_INCLUDED + + #include +-#include ++#include ++#include + #include "agg_math.h" + #include "agg_array.h" + --- agg-2.5+dfsg1.orig/debian/patches/03_pkg_config_pic.dpatch +++ agg-2.5+dfsg1/debian/patches/03_pkg_config_pic.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_pkg_config_pic.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad agg-2.3~/libagg.pc.in agg-2.3/libagg.pc.in +--- agg-2.3~/libagg.pc.in 2005-02-18 03:27:48.000000000 +0100 ++++ agg-2.3/libagg.pc.in 2006-03-01 18:08:26.906950512 +0100 +@@ -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} -Wl,-rpath,${exec_prefix}/lib -lagg_pic + Cflags: -I${includedir} --- agg-2.5+dfsg1.orig/debian/patches/01_disable_gpc.dpatch +++ agg-2.5+dfsg1/debian/patches/01_disable_gpc.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_disable_gpc.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad debian.source~/Makefile.am debian.source/Makefile.am +--- debian.source~/Makefile.am 2007-10-10 16:13:11.000000000 +0200 ++++ debian.source/Makefile.am 2007-10-10 16:26:51.000000000 +0200 +@@ -1,4 +1,7 @@ ++SUBDIRS = src font_freetype font_win32_tt include examples ++if ENABLE_GPC + SUBDIRS = gpc src font_freetype font_win32_tt include examples ++endif + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libagg.pc --- agg-2.5+dfsg1.orig/debian/patches/00list +++ agg-2.5+dfsg1/debian/patches/00list @@ -0,0 +1,7 @@ +01_disable_gpc +02_maintainer_mode.dpatch +03_pkg_config_pic.dpatch +04_no_rpath +05_x11_makefile_am.dpatch +06_fix_recursion_crash.dpatch +07_fix_missing_includes.dpatch --- agg-2.5+dfsg1.orig/debian/patches/04_no_rpath.dpatch +++ agg-2.5+dfsg1/debian/patches/04_no_rpath.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_no_rpath.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad agg-2.4~/libagg.pc.in agg-2.4/libagg.pc.in +--- agg-2.4~/libagg.pc.in 2006-07-10 11:27:16.000000000 +0200 ++++ agg-2.4/libagg.pc.in 2006-07-10 11:28:51.000000000 +0200 +@@ -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_pic ++Libs: -L${libdir} -lagg_pic + Cflags: -I${includedir} --- agg-2.5+dfsg1.orig/debian/patches/05_x11_makefile_am.dpatch +++ agg-2.5+dfsg1/debian/patches/05_x11_makefile_am.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_x11_makefile_am.dpatch by Andrew Straw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: remove argument causing FTBFS in Makefile.am + +@DPATCH@ + +--- agg-2.5+dfsg1/src/platform/X11/Makefile.am 2007-10-10 15:06:16.000000000 -0700 ++++ agg-2.5+dfsg1.ads/src/platform/X11/Makefile.am 2009-03-24 23:08:14.169427113 -0700 +@@ -1,7 +1,7 @@ + if ENABLE_X11 + lib_LTLIBRARIES = libaggplatformX11.la + +-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ ++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ + libaggplatformX11_la_SOURCES = agg_platform_support.cpp + libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ + libaggplatformX11_la_LIBADD = -lX11 --- agg-2.5+dfsg1.orig/debian/patches/06_fix_recursion_crash.dpatch +++ agg-2.5+dfsg1/debian/patches/06_fix_recursion_crash.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_fix_recursion_crash.dpatch by Brian Murray +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Ubuntu: http://launchpad.net/bugs/344849 +## DP: Patch: https://trac.mapnik.org/ticket/253, http://trac.mapnik.org/changeset/1801 +## DP: Description: Avoid a crash caused by an infinite recursion when drawing extremely long lines + +@DPATCH@ +diff -urNad agg-2.5+dfsg1~/include/agg_rasterizer_cells_aa.h agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h +--- agg-2.5+dfsg1~/include/agg_rasterizer_cells_aa.h 2007-10-10 15:06:16.000000000 -0700 ++++ agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h 2009-04-02 18:34:07.000000000 -0700 +@@ -333,6 +333,12 @@ + { + int cx = (x1 + x2) >> 1; + int cy = (y1 + y2) >> 1; ++ ++ // Bail if values are so large they are likely to wrap ++ if ((std::abs(x1) >= std::numeric_limits::max()/2) || (std::abs(y1) >= std::numeric_limits::max()/2) || ++ (std::abs(x2) >= std::numeric_limits::max()/2) || (std::abs(y2) >= std::numeric_limits::max()/2)) ++ return; ++ + line(x1, y1, cx, cy); + line(cx, cy, x2, y2); + }