diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2009-03-28 12:55:30 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-03-28 12:55:30 +0000 |
commit | 52706042c0276031bcb52d14f0b67ab85781c6f8 (patch) | |
tree | 163ee115945b29137ea17d91b87cfaa273947c19 /x11-misc/xaos | |
parent | Bump to 2.3.8. Adds Assamese fonts, some bug fixes. (diff) | |
download | gentoo-2-52706042c0276031bcb52d14f0b67ab85781c6f8.tar.gz gentoo-2-52706042c0276031bcb52d14f0b67ab85781c6f8.tar.bz2 gentoo-2-52706042c0276031bcb52d14f0b67ab85781c6f8.zip |
Fixed for forced stripping (bug #252099), png magic (bug #263310), added gtk driver, desktop files, and some patch from debian
(Portage version: 2.2_rc27/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xaos')
-rw-r--r-- | x11-misc/xaos/ChangeLog | 13 | ||||
-rw-r--r-- | x11-misc/xaos/files/xaos-3.4-include.patch | 7 | ||||
-rw-r--r-- | x11-misc/xaos/files/xaos-3.4-makefile.patch | 23 | ||||
-rw-r--r-- | x11-misc/xaos/files/xaos-3.4-png.patch | 11 | ||||
-rw-r--r-- | x11-misc/xaos/files/xaos-3.4-x11.patch | 10 | ||||
-rw-r--r-- | x11-misc/xaos/files/xaos.png | bin | 0 -> 319 bytes | |||
-rw-r--r-- | x11-misc/xaos/metadata.xml | 8 | ||||
-rw-r--r-- | x11-misc/xaos/xaos-3.4-r1.ebuild | 93 |
8 files changed, 163 insertions, 2 deletions
diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog index 772cf4cf9e51..338ef630b0de 100644 --- a/x11-misc/xaos/ChangeLog +++ b/x11-misc/xaos/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-misc/xaos -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.28 2008/07/31 22:36:54 markusle Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.29 2009/03/28 12:55:30 bicatali Exp $ + +*xaos-3.4-r1 (28 Mar 2009) + + 28 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> + +files/xaos-3.4-include.patch, +files/xaos-3.4-makefile.patch, + +files/xaos-3.4-png.patch, +files/xaos-3.4-x11.patch, +files/xaos.png, + metadata.xml, +xaos-3.4-r1.ebuild: + Fixed for forced stripping (bug #252099), png magic (bug #263310), added + gtk driver, desktop files, and some patch from debian 31 Jul 2008; Markus Dittrich <markusle@gentoo.org> xaos-3.4.ebuild: Force the use of sci-libs/gsl to avoid accidental generation of x86 diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch new file mode 100644 index 000000000000..65f7b8c5630c --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.4-include.patch @@ -0,0 +1,7 @@ +--- src/util/thread.c.orig 2009-03-28 10:50:49.817619387 +0000 ++++ src/util/thread.c 2009-03-28 10:59:40.048185946 +0000 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #ifndef _plan9_ + #include <signal.h> + #include <stdio.h> diff --git a/x11-misc/xaos/files/xaos-3.4-makefile.patch b/x11-misc/xaos/files/xaos-3.4-makefile.patch new file mode 100644 index 000000000000..db387b4ee1f8 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.4-makefile.patch @@ -0,0 +1,23 @@ +--- Makefile.in.orig 2009-03-28 11:04:21.000000000 +0000 ++++ Makefile.in 2009-03-28 12:37:10.000000000 +0000 +@@ -32,11 +32,10 @@ + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/tutorial + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/examples + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/catalogs +- @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help + @INSTALL@ -d $(DESTDIR)$(bindir) + @INSTALL@ -d $(DESTDIR)$(mandir)/man6 +- @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir) ++ @INSTALL@ bin/xaos $(DESTDIR)$(bindir) + @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial + + @INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples +@@ -48,7 +47,6 @@ + + @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs + @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help +- @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 + -@STICKY@ + test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch new file mode 100644 index 000000000000..454f8acaa994 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.4-png.patch @@ -0,0 +1,11 @@ +--- configure.in.orig 2009-03-28 09:50:18.764999182 +0000 ++++ configure.in 2009-03-28 09:49:18.685947638 +0000 +@@ -98,7 +98,7 @@ + AC_ARG_WITH(png, + [ --with-png=yes/no enables/disables PNG saving support],[ + if test x$withval = xyes; then +- png=test ++ png=yes + fi + if test x$withval = xno; then + png=no diff --git a/x11-misc/xaos/files/xaos-3.4-x11.patch b/x11-misc/xaos/files/xaos-3.4-x11.patch new file mode 100644 index 000000000000..46e8aae30980 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.4-x11.patch @@ -0,0 +1,10 @@ +--- src/ui/ui-drv/x11/ui_x11.c.orig ++++ src/ui/ui-drv/x11/ui_x11.c +@@ -430,6 +430,7 @@ + replay = XCreateFontCursor (d->display, XC_dot); + if (d->truecolor || d->privatecolormap) + x11_driver.flags &= ~RANDOM_PALETTE_SIZE; ++ xupdate_size (d); /* get real window size (#452284) --JEH */ + if (!alloc_image (d)) + { + xfree_display (d); diff --git a/x11-misc/xaos/files/xaos.png b/x11-misc/xaos/files/xaos.png Binary files differnew file mode 100644 index 000000000000..43853c502234 --- /dev/null +++ b/x11-misc/xaos/files/xaos.png diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml index b229aec85b8f..02e05a435d1c 100644 --- a/x11-misc/xaos/metadata.xml +++ b/x11-misc/xaos/metadata.xml @@ -2,4 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>sci</herd> +<longdescription lang="en"> + XaoS is a fast, portable real-time interactive fractal zoomer. It + displays the Mandelbrot set (among other escape time fractals) and + allows you zoom smoothly into the fractal. Various coloring modes are + provided for both the points inside and outside the selected set. XaoS + supports switching between Julia and Mandelbrot fractal types and + on-the-fly plane switching. +</longdescription> </pkgmetadata> diff --git a/x11-misc/xaos/xaos-3.4-r1.ebuild b/x11-misc/xaos/xaos-3.4-r1.ebuild new file mode 100644 index 000000000000..d1ee485e64b1 --- /dev/null +++ b/x11-misc/xaos/xaos-3.4-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.4-r1.ebuild,v 1.1 2009/03/28 12:55:30 bicatali Exp $ + +EAPI=2 +inherit eutils autotools + +MY_PN=XaoS +MY_P=${MY_PN}-${PV} + +DESCRIPTION="A very fast real-time fractal zoomer" +HOMEPAGE="http://xaos.sf.net/" +SRC_URI="mirror://sourceforge/xaos/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="aalib doc gtk nls png svga threads X" + +RDEPEND="sys-libs/zlib + sci-libs/gsl + aalib? ( media-libs/aalib ) + gtk? ( >=x11-libs/gtk+-2 ) + png? ( media-libs/libpng ) + svga? ( media-libs/svgalib ) + X? ( x11-libs/libX11 + x11-libs/libXxf86dga + x11-libs/libXext + x11-libs/libXxf86vm )" +# xaos has ggi support, but it doesn't build +# ggi? ( media-libs/libggi ) + +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( virtual/latex-base ) + X? ( x11-proto/xf86vidmodeproto + x11-proto/xextproto + x11-proto/xf86dgaproto + x11-proto/xproto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-png.patch + epatch "${FILESDIR}"/${P}-include.patch + epatch "${FILESDIR}"/${P}-x11.patch + eautoreconf +} + +src_configure() { + # use gsl and not nasm (see bug #233318) + econf \ + --with-sffe=yes \ + --with-ggi-driver=no \ + --with-i386asm=no \ + --with-gsl=yes \ + $(use_enable nls) \ + $(use_with png) \ + $(use_with aalib aa-driver) \ + $(use_with gtk gtk-driver) \ + $(use_with svga svga-driver) \ + $(use_with threads pthread) \ + $(use_with X x11-driver) \ + $(use_with X x) +} + +src_compile() { + emake || die "emake failed" + if use doc; then + cd "${S}"/doc + emake xaos.dvi || die + dvipdf xaos.dvi || die + cd "${S}"/help + emake html || die + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog* TODO RELEASE_NOTES \ + doc/README{,.bugs} doc/{AUTHORS,PROBLEMS,SPONSORS} + if use doc; then + insinto /usr/share/doc/${PF} + doins doc/xaos.pdf || die + dohtml help/* || die + fi + local driver="x11" + use gtk && driver="\"GTK+ Driver\"" + make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \ + xaos "Application;Education;Math;Graphics;" + doicon "${FILESDIR}"/${PN}.png +} |