diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..16e0285 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +agg-free-2.5.tar.gz diff --git a/agg-2.4-depends.patch b/agg-2.4-depends.patch new file mode 100644 index 0000000..9d4f6e3 --- /dev/null +++ b/agg-2.4-depends.patch @@ -0,0 +1,48 @@ +--- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100 ++++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -4,8 +4,9 @@ + agginclude_HEADERS = agg_font_freetype.h + lib_LTLIBRARIES = libaggfontfreetype.la + +-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ ++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ + libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp + libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ ++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@ + endif + +--- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100 ++++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -5,6 +5,6 @@ + libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ + libaggplatformsdl_la_SOURCES = agg_platform_support.cpp + libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@ +-libaggplatformsdl_la_LIBADD = @SDL_LIBS@ ++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@ + endif + +--- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100 ++++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000 +@@ -122,7 +122,8 @@ + fi + AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) + AC_SUBST(x_includes) +-AC_SUBST(x_libraries) ++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries" ++AC_SUBST(X_LDFLAGS) + dnl ############################################### + + dnl Settung up library version +--- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000 ++++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000 +@@ -1,8 +1,8 @@ + 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@ @X_LDFLAGS@ + libaggplatformX11_la_SOURCES = agg_platform_support.cpp + libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ +-libaggplatformX11_la_LIBADD = -lX11 ++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11 + endif diff --git a/agg-2.5-pkgconfig.patch b/agg-2.5-pkgconfig.patch new file mode 100644 index 0000000..a303bfb --- /dev/null +++ b/agg-2.5-pkgconfig.patch @@ -0,0 +1,10 @@ +--- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000 ++++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000 +@@ -6,5 +6,6 @@ + Name: libagg + Description: Anti Grain Geometry - A High Quality Rendering Engine for C++ + Version: @VERSION@ +-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg ++Requires.private: freetype2 ++Libs: -L${libdir} -lagg + Cflags: -I${includedir} diff --git a/agg-generate-tarball.sh b/agg-generate-tarball.sh new file mode 100644 index 0000000..9b13619 --- /dev/null +++ b/agg-generate-tarball.sh @@ -0,0 +1,17 @@ +#! /bin/sh + +version=$1 + +[ -z $version ] && exit 1 + +dir=agg-${version} +file=agg-${version}.tar.gz +result=agg-free-${version}.tar.gz + +rm -rf agg-${version} +tar xzf $file +for file in copying.txt VERSIONS.TXT gpc.c gpc.h; do + rm agg-${version}/gpc/$file +done +rm -f $result +tar czf $result $dir diff --git a/agg.spec b/agg.spec new file mode 100644 index 0000000..daac311 --- /dev/null +++ b/agg.spec @@ -0,0 +1,133 @@ +Summary: Anti-Grain Geometry graphical rendering engine +Name: agg +Version: 2.5 +Release: 6%{?dist} +Group: System Environment/Libraries +URL: http://www.antigrain.com +License: GPLv2+ +#Source0: http://www.antigrain.com/%{name}-%{version}.tar.gz +Source0: %{name}-free-%{version}.tar.gz +# agg contains gpc.c, 'free for non-commercial use', we cannot ship. +# We use this script to remove the non-free code before shipping it. +# Download the upstream tarball and invoke this script while in the +# tarball's directory: +# sh agg-generate-tarball.sh 2.5 +Source1: agg-generate-tarball.sh + +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel + +Patch0: agg-2.4-depends.patch +Patch1: agg-2.5-pkgconfig.patch + +%description +A High Quality Rendering Engine for C++. + +%package devel +Summary: Support files necessary to compile applications with agg +Group: Development/Libraries +Requires: agg = %{version}-%{release}, freetype-devel +# for _datadir/automake ownership +Requires: automake + +%description devel +Libraries, headers, and support files necessary to compile applications +using agg. + +%prep +%setup -q +%patch0 -p1 -b .depends +%patch1 -p1 -b .pkgconfig +aclocal +autoheader +autoconf +libtoolize --force +automake --foreign --add-missing --ignore-deps + +%build +%configure --disable-static --disable-gpc +# parallel build fails in examples/ because the .la is in _LDFLAGS instead of +# _LIBADD +make #%%{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p' +rm $RPM_BUILD_ROOT/%{_libdir}/*.la + +rm -rf __dist_examples __clean_examples +cp -a examples __clean_examples +make -C __clean_examples distclean +rm -rf __clean_examples/Makefile.am __clean_examples/{win32*,macosx*,BeOS} +mkdir __dist_examples +mv __clean_examples __dist_examples/examples + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc authors copying readme news +%{_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root,-) +%doc __dist_examples/examples +%{_libdir}/*.so +%{_libdir}/pkgconfig/libagg.pc +%{_includedir}/agg2/ +%{_datadir}/aclocal/libagg.m4 + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Tue Feb 5 2008 Patrice Dumas - 2.5-6 +- remove non free files +- minor cleanups +- parallel build fails + +* Fri Aug 03 2007 Caolan McNamara - 2.5-4 +- clarify license +- source upstream silently changed even though version remained + unchanged + +* Tue Jun 26 2007 Caolan McNamara - 2.5-3 +- Resolves: rhbz#245650 -devel Require: freetype-devel + +* Mon Apr 23 2007 Caolan McNamara - 2.5-2 +- Resolves: rhbz#237493 misapplied patch + +* Sat Jan 06 2007 Caolan McNamara - 2.5-1 +- bump to 2.5 + +* Fri Nov 10 2006 Caolan McNamara - 2.4-3 +- Resolves: rhbz#214970 rebuild with new 2.4 sources + +* Wed Jul 12 2006 Jesse Keating - 2.4-2.1 +- rebuild + +* Mon Jul 10 2006 Caolan McNamara - 2.4-2 +- rh#198174# add extra links from libs to their runtime requirements + +* Wed May 10 2006 Caolan McNamara - 2.4-1 +- next version + +* Fri Feb 17 2006 Karsten Hopp 2.3-4 +- add BuildRequires freetype-devel for ft2build.h + +* Mon Feb 13 2006 Caolan McNamara - 2.3-3 +- BuildRequires + +* Fri Feb 10 2006 Jesse Keating - 2.3-2.1 +- bump again for double-long bug on ppc(64) + +* Wed Feb 08 2006 Caolan McNamara - 2.3-2 +- rh#180341# BuildRequires + +* Tue Feb 07 2006 Jesse Keating - 2.3-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Nov 23 2005 Caolan McNamara 2.3-1 +- initial import diff --git a/dead.package b/dead.package deleted file mode 100644 index 79f95ed..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -No longer used within Fedora due to changes not accepted upstream from several projects diff --git a/sources b/sources new file mode 100644 index 0000000..555ff79 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +2ecb9b5e3ba333157265fb0b308dc857 agg-free-2.5.tar.gz