From c622fcf1ff9e931f2f15efdd0e2e338016b76fbe Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Sun, 13 Sep 2009 12:36:50 +0000 Subject: sci-visualization/spyview: Version bump with additional colormap creation features. Needs some minor patches to actually compile and install. svn path=/sunrise/; revision=9226 --- sci-visualization/spyview/ChangeLog | 8 ++++ sci-visualization/spyview/Manifest | 8 +++- .../spyview/files/spyview-20090910-assert.patch | 24 +++++++++++ .../spyview/files/spyview-20090910-cmaps.patch | 22 ++++++++++ .../spyview/files/spyview-20090910-datadir.patch | 23 ++++++++++ .../spyview/files/spyview-20090910-fltkjpeg.patch | 22 ++++++++++ sci-visualization/spyview/spyview-20090910.ebuild | 49 ++++++++++++++++++++++ 7 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 sci-visualization/spyview/files/spyview-20090910-assert.patch create mode 100644 sci-visualization/spyview/files/spyview-20090910-cmaps.patch create mode 100644 sci-visualization/spyview/files/spyview-20090910-datadir.patch create mode 100644 sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch create mode 100644 sci-visualization/spyview/spyview-20090910.ebuild (limited to 'sci-visualization/spyview') diff --git a/sci-visualization/spyview/ChangeLog b/sci-visualization/spyview/ChangeLog index 44056d13e..bcb045e52 100644 --- a/sci-visualization/spyview/ChangeLog +++ b/sci-visualization/spyview/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Sep 2009; Andreas K. Huettel (dilfridge) + +spyview-20090910.ebuild, +files/spyview-20090910-assert.patch, + +files/spyview-20090910-cmaps.patch, + +files/spyview-20090910-datadir.patch, + +files/spyview-20090910-fltkjpeg.patch: + Version bump with additional colormap creation features. Needs some minor + patches to actually compile and install. + 10 Sep 2009; Andreas K. Huettel (dilfridge) -spyview-20090828.ebuild, +spyview-20090828-r1.ebuild, +files/spyview-20090828-cmaps.patch: diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest index aff86bf31..22a1fa122 100644 --- a/sci-visualization/spyview/Manifest +++ b/sci-visualization/spyview/Manifest @@ -1,5 +1,11 @@ AUX spyview-20090828-cmaps.patch 573 RMD160 397b1ba954cf23e800686046cc81dd88e5c1cd10 SHA1 aa3df403f66bcd373ee19032349e2cd0728f4623 SHA256 e928e17eaa125ca511d2b4c074d3f09348f23e71ff83ae68cbd7211cf5c499ae +AUX spyview-20090910-assert.patch 857 RMD160 9b81aac4663125728a6adb8ce201c81cc215990e SHA1 d154b4ae10ae0d7db6697f5daa203cd00ed3f949 SHA256 7f7ada265467dbb4c401831f4c2f9b9d24ba349075dc8d1856786abeec91b0ee +AUX spyview-20090910-cmaps.patch 821 RMD160 9e0048a961ef5737a4bd4945a64db882df50c4ce SHA1 8a605b814f4cd616343e39ecc9ffbfcf1d98e982 SHA256 2561156996de678e2cc20fc99429438323d405d66b4578d9f228ff8ba4314da9 +AUX spyview-20090910-datadir.patch 930 RMD160 ff32d4b3626aced7df6d12128fa8f26574156eaa SHA1 1bebbc70b3e49380c7ef8c7d361b28dc337d0070 SHA256 1e60a72f52149097df2f3de781933d61356116ebf14a414607de0a4ccd6b9c40 +AUX spyview-20090910-fltkjpeg.patch 1435 RMD160 9cebd85eed2e9635c57a3b2964edff352c3111db SHA1 e93da5ba86f947499c26a81c99fb7abc49922d1f SHA256 476be54e3f38f37f33914ab143469639bc56684bfeed783a2d5150e9004f5ccb DIST spyview-20090828.tar.gz 3305696 RMD160 8732b9b85852e7b3a3a00afb37e7541bb38176f2 SHA1 3876cfb383acaf21da9417b984a509c2f11ed7fc SHA256 dd6266670deb33da3c82f6f61bcd8f9c2c52003d1a0ea57ab16c344f4de076e2 +DIST spyview-20090910.tar.gz 3432322 RMD160 e929aa3c00f6a1919006d5e5754c5f7cdb9f2ba6 SHA1 0170214dbb6ed8dae500e77fc287b14261049307 SHA256 21348817269fb58cdf9d054f8cd2a7bc6b8e1f16dcfda433489970fbac42fc00 EBUILD spyview-20090828-r1.ebuild 993 RMD160 c6ba3877b46e3843c908e3f8cbd98474a5b47e71 SHA1 48da3a5635c846210c44b60885619a17fd2e4c03 SHA256 eb001e71640491d4e8739cfc22b8b70e3b76383c6bbf4cc924c79915ec32552f -MISC ChangeLog 624 RMD160 d74ad0ed02835cb943a61b13ae1ea6011d112e90 SHA1 9726584b4f8c82deab3119a0512cf42e038807c0 SHA256 80d2f7d362bf4234b8b6e844ca85bfbbc13619dc3654f06a0d89b31b82313fdf +EBUILD spyview-20090910.ebuild 1076 RMD160 85eb8f8c5e410c7801c5e670c8bc7ef91fec7023 SHA1 bf7e161e876fdaa9fd3c2f75aaf788690410f3ec SHA256 58253c2a80369f0088b68efb6bce92355cf85e57b281d441b53f29f99528e157 +MISC ChangeLog 998 RMD160 56379d442a28bbb36786f36e252d9bf6a09c37bb SHA1 be1b438e982f884ffa528221902eeb0441dd2a70 SHA256 8cb49e3c4100059f73c973cb0cdf080aeb27b704a9040c5a12acb0be250cb736 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf diff --git a/sci-visualization/spyview/files/spyview-20090910-assert.patch b/sci-visualization/spyview/files/spyview-20090910-assert.patch new file mode 100644 index 000000000..e4381bf04 --- /dev/null +++ b/sci-visualization/spyview/files/spyview-20090910-assert.patch @@ -0,0 +1,24 @@ +diff -U 9 -r spyview-2009-09-10-00_02.orig/spyview/spyview.C spyview-2009-09-10-00_02/spyview/spyview.C +--- spyview-2009-09-10-00_02.orig/spyview/spyview.C 2009-09-09 13:20:18.000000000 +0200 ++++ spyview-2009-09-10-00_02/spyview/spyview.C 2009-09-11 23:47:14.000000000 +0200 +@@ -843,19 +843,19 @@ + { + spypal->win->show(); + colormap_callback = spypal_cb; + spypal_cb(); + return; + } + else + colormap_callback = NULL; + +- assert(index > 0); ++ assert(index >= 0); //lets see what this does + assert(index < cmapfiles.size()); + + //info("userdata for %s is %d\n", cmapch->value(), index); + const char *filename = cmapfiles[index].c_str(); + //info("loading file _%s_ from index %d, text _%s_\n", cmapfiles[index].c_str(), index, cmapch->text(cmapch->value())); + pixel **image; + pixval maxval; + int rows, cols; + diff --git a/sci-visualization/spyview/files/spyview-20090910-cmaps.patch b/sci-visualization/spyview/files/spyview-20090910-cmaps.patch new file mode 100644 index 000000000..73132762b --- /dev/null +++ b/sci-visualization/spyview/files/spyview-20090910-cmaps.patch @@ -0,0 +1,22 @@ +diff -r -U 8 spyview-2009-09-10-00_02.orig/spyview/spyview.C spyview-2009-09-10-00_02/spyview/spyview.C +--- spyview-2009-09-10-00_02.orig/spyview/spyview.C 2009-09-09 13:20:18.000000000 +0200 ++++ spyview-2009-09-10-00_02/spyview/spyview.C 2009-09-10 16:54:32.000000000 +0200 +@@ -124,17 +124,17 @@ + } + else if (fl_filename_isdir((path+namelist[i]->d_name).c_str())) + subdirs.push_back(namelist[i]->d_name); + if ((count != 0) && (count%30 == 0)) + pretty_path += "More/"; + } + for(subdirs_t::iterator i = subdirs.begin(); i != subdirs.end(); i++) + { +- if(*i == "./" || *i == "../") ++ if(*i == "./" || *i == "../" || *i == "") + continue; + find_cmaps(path+*i,pretty_path+*i); + } + } + + int add_file(const char *name) + { + // We store the actual filenames in a STL vector of strings diff --git a/sci-visualization/spyview/files/spyview-20090910-datadir.patch b/sci-visualization/spyview/files/spyview-20090910-datadir.patch new file mode 100644 index 000000000..42d1cda28 --- /dev/null +++ b/sci-visualization/spyview/files/spyview-20090910-datadir.patch @@ -0,0 +1,23 @@ +diff -r -U 8 spyview-2009-09-10-00_02.orig/spyview/Makefile.am spyview-2009-09-10-00_02/spyview/Makefile.am +--- spyview-2009-09-10-00_02.orig/spyview/Makefile.am 2009-09-09 23:58:08.000000000 +0200 ++++ spyview-2009-09-10-00_02/spyview/Makefile.am 2009-09-10 17:52:17.000000000 +0200 +@@ -89,12 +89,14 @@ + %.C: %.fl + @FLUID@ -c -o $(basename $<).C -h $(basename $<).h $< + + %.h: %.fl + @FLUID@ -c -o $(basename $<).C -h $(basename $<).h $< + + #Manual rules to install colormap files + install-data-local: +- $(INSTALL) -d $(datadir) +- $(INSTALL_DATA) help.txt $(datadir) +- $(INSTALL) -d $(datadir)/html +- $(INSTALL_DATA) html/*.html $(datadir)/html +\ Kein Zeilenumbruch am Dateiende. ++ $(INSTALL) -d $(DESTDIR)$(datadir) ++ $(INSTALL_DATA) help.txt $(DESTDIR)$(datadir) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/html ++# not sure what exactly you are trying to install here... ah ++# $(INSTALL_DATA) html/*.html $(DESTDIR)$(datadir)/html ++# diff --git a/sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch b/sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch new file mode 100644 index 000000000..191a42c4f --- /dev/null +++ b/sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch @@ -0,0 +1,22 @@ +diff -r -U 8 spyview-2009-09-10-00_02.orig/configure.ac spyview-2009-09-10-00_02/configure.ac +--- spyview-2009-09-10-00_02.orig/configure.ac 2009-09-09 13:20:18.000000000 +0200 ++++ spyview-2009-09-10-00_02/configure.ac 2009-09-10 17:03:43.000000000 +0200 +@@ -56,17 +56,17 @@ + AC_CHECK_LIB(wsock32,main,[],AC_MSG_ERROR([cannot find libwsock32])) + AC_CHECK_LIB(uuid,main,[],AC_MSG_ERROR([cannot find libuuid])) + fi + + AC_LANG_PUSH([C++]) + AC_CHECK_LIB([z], [main], , AC_MSG_ERROR([libz not found])) + AC_CHECK_LIB([png], [main], , AC_MSG_ERROR([libpng not found])) + AC_CHECK_LIB([fltk], [main], , AC_MSG_ERROR([libfltk not found])) +-AC_CHECK_LIB([fltk_jpeg], [main], , AC_MSG_ERROR([libz not found])) ++AC_CHECK_LIB([fltk_jpeg], [main], , AC_MSG_WARN([libfltk_jpeg not found - assuming you use system jpeg and continuing anyway])) + AC_CHECK_LIB([fltk_images], [main], , AC_MSG_ERROR([libfltk_images not found])) + AC_CHECK_LIB([fltk_gl], [main], ,AC_MSG_ERROR([libfltk_gl not found])) + AC_CHECK_LIB([boost_serialization],[main],,AC_CHECK_LIB([boost_serialization-mt],[main],,AC_MSG_ERROR([libboost-serialization-dev library not found.]))) + AC_CHECK_LIB([boost_regex],[main],,AC_CHECK_LIB([boost_regex-mt],[main],,AC_MSG_ERROR([libboost-regex-dev library not found.]))) + AC_LANG_POP + + #AC_CHECK_LIB([gnuplot_i], [gnuplot_init], , AC_MSG_ERROR([libgnuplot_i not found])) + #AC_CHECK_LIB([pgm], [main], , AC_MSG_ERROR([libpgm not found])) diff --git a/sci-visualization/spyview/spyview-20090910.ebuild b/sci-visualization/spyview/spyview-20090910.ebuild new file mode 100644 index 000000000..f97f917ab --- /dev/null +++ b/sci-visualization/spyview/spyview-20090910.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +EAPI=2 + +inherit base flag-o-matic eutils autotools multilib + +DESCRIPTION="Interactive plotting program" +HOMEPAGE="http://kavli.nano.tudelft.nl/~gsteele/spyview/" +SRC_URI="http://kavli.nano.tudelft.nl/~gsteele/${PN}/versions/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND=">=dev-libs/boost-1.36 + media-libs/netpbm + >=x11-libs/fltk-1.1.9:1.1 + virtual/ghostscript" + +DEPEND="${COMMON_DEPEND} + sys-apps/groff" + +RDEPEND="${COMMON_DEPEND} + sci-visualization/gnuplot" + +S=${WORKDIR}/spyview-2009-09-10-00_02 + +PATCHES=( "${FILESDIR}"/${P}-{cmaps,fltkjpeg,datadir,assert}.patch ) + +src_prepare() { + base_src_prepare + + append-cflags $(fltk-config --cflags) + append-cxxflags $(fltk-config --cxxflags) -I/usr/include/netpbm + + # append-ldflags $(fltk-config --ldflags) + # this one leads to an insane amount of warnings + + append-ldflags -L/usr/$(get_libdir)/fltk-1.1 + + eautoreconf +} + +src_configure() { + econf --datadir=/usr/share/spyview +} -- cgit v1.2.3-18-g5258