From aa747484a2d667dbd7f91cc929ba108c8ef4d0ca Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 10 Mar 2013 04:23:36 +0000 Subject: [PATCH] sci-libs/rsl: Update to RSL 1.43 --- sci-libs/rsl/ChangeLog | 9 +++- sci-libs/rsl/Manifest | 11 ++--- sci-libs/rsl/files/rsl-automake.patch | 43 ++++++------------- sci-libs/rsl/files/rsl-with_hdf.patch | 27 ++++++++++++ sci-libs/rsl/metadata.xml | 3 ++ .../rsl/{rsl-1.41.ebuild => rsl-1.43.ebuild} | 13 +++--- 6 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 sci-libs/rsl/files/rsl-with_hdf.patch rename sci-libs/rsl/{rsl-1.41.ebuild => rsl-1.43.ebuild} (70%) diff --git a/sci-libs/rsl/ChangeLog b/sci-libs/rsl/ChangeLog index 25f0581a8..54eed5514 100644 --- a/sci-libs/rsl/ChangeLog +++ b/sci-libs/rsl/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for sci-libs/rsl -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*rsl-1.43 (10 Mar 2013) + + 10 Mar 2013; Andy Spencer -rsl-1.41.ebuild, + +rsl-1.43.ebuild, +files/rsl-with_hdf.patch, files/rsl-automake.patch, + metadata.xml: + Update to RSL 1.43, add patch so that hdf isn't always required. + 24 Jun 2011; Andy Spencer -rsl-1.40.ebuild, +rsl-1.41.ebuild, files/rsl-automake.patch, -files/rsl-type_str.patch, -files/rsl-valgrind.patch, -files/rsl-warnings.patch: diff --git a/sci-libs/rsl/Manifest b/sci-libs/rsl/Manifest index 933399468..8d0576cba 100644 --- a/sci-libs/rsl/Manifest +++ b/sci-libs/rsl/Manifest @@ -1,5 +1,6 @@ -AUX rsl-automake.patch 8612 RMD160 9ac4e5f7735e38c2668d5ac5759715bbdcf8498e SHA1 37bf07c356148cac785f8ffc5875684028531748 SHA256 3e311f8f3c7c0ee5c06fc3f29203c01b73698f9d7a5f982ed2aa89b07956e579 -DIST rsl-v1.41.tar.gz 803824 RMD160 b238e2cd3357e0db1d659b2061b8aafd5dd9b29a SHA1 144e3e5542b6918210c8bb00d867fadbcf2aae7c SHA256 13fc54ac237e8b228d490ff35fe374e2d08a5f79814b4739865ac5b45b123adf -EBUILD rsl-1.41.ebuild 562 RMD160 ff4d855ed308346052d6fe0f15ed280241eacc6e SHA1 6f5a4b2a43639bf1afdfff079b7eb706ffd41298 SHA256 e9e252eaee90ad554efa2b98c80307ed8c91fe82af49a23d0b744d3cb3573240 -MISC ChangeLog 803 RMD160 1cd0cbbf0ceef1c91d51e70b87b5f610c486c5bc SHA1 042f63fec7858d3970aa87cb10630b5f9fb50812 SHA256 ee249c7e88ae4a368bfa8d2da6e63f9b5adc174091837fa55235dd325d868d22 -MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 +AUX rsl-automake.patch 8089 SHA256 1f12f1767f86cbfb8f3fe7d153973ba751f8468e5d4f9ab894d792d0fa549425 SHA512 a25853ebbd40b5c666566a6e946e74601320af4b1261dcb92f2b1928420432f65900ddd4a519ca76847e93149f7a5154588996db2c6f7b0ad47474df48b54e45 WHIRLPOOL bfc068f888976d8337de19fbcdacdc3fad8dd6f01042abf850a4663c4508ff969fd03e2a0ea6b54bfe611c86e795ce8b2d0273c2839d0936a82f58ce64bf16b9 +AUX rsl-with_hdf.patch 1174 SHA256 6fe5c09dc6861eebea3af03015865dc00dd71d5a1dd6a649cee93a63971581c3 SHA512 3dd7b2967af374ea49924bd6e7600561f90d3f75462b7cf0282af9b54910782b97587430c25215b95fe5a47bc6e17ac4117c3b59600b00835c960872aa280243 WHIRLPOOL 685a8ded9dbf262ec868ec82ca3df2bb9ebd7e595f10c83a137c4e31f43b777b7798733f10890cebbcb2e243c6560c54961a76d67af8c17a4f7dfc645fccd67a +DIST rsl-v1.43.tar.gz 799036 SHA256 6c1b4f3895c02a5724f555a745d566363802780f5fb976040d1d987dd64f2b5c +EBUILD rsl-1.43.ebuild 617 SHA256 ecfb7641d30d472bd6082f53d03e693c2d2f88e1e8ca754f41b625bd3d9fc015 SHA512 3730a59a5b7778c0f3eced980ae5fb1863859608fa4f93e2954529230b8ece1c46108e9597ca274cf269930cb1413eda298cd9960b83eccf17942521ebf52d23 WHIRLPOOL 7553f40f591b037387d205e44e95c2f4d940594483fa2fc7ad2fa48ff05f3400b2b4b1c17ade42f21ea8d08a2a85e26133abbb4c1536b65b637378180beba911 +MISC ChangeLog 1008 SHA256 085e2f0620903808e43a310d76867078ed7d62508ab79e0f0521c59337d8c5d6 SHA512 2e452e1b8a03205d2beaca5be76a2c559a245f0a65d4d2c61c5f7cbdce219dfe119d208f0fa2175df8de92b91a2cf66f863ed6d735ac08235bc5f7981740b368 WHIRLPOOL aec38649e355f2b8d88d4434d0eff86ec70fb628a0c2fe8d3badd65ca5075530ccc045e662590aa50b0c66a45c8fa0b5ac028b31ac0c55c6f160a41f7e37a8d1 +MISC metadata.xml 289 SHA256 836b1ddd0065f30c60c145318e7161e86476574775b29261ca7c9617bfb00224 SHA512 68119749892e4f7bbb0da73994e254aef0c4140873b6f2fb70eceadf5e84ba9aa3af209052f2d19ccb706219bab50aa4aff221c3f85bb4efa72ad87fce615660 WHIRLPOOL 11962a58880c87813112a747ed0c16c6a957dd2a18d27c3923f75fa8b2624e9e0927abfb0dadca871b857b3349ba23a5d4b51cd8407125f1657f1cf84aaaf26f diff --git a/sci-libs/rsl/files/rsl-automake.patch b/sci-libs/rsl/files/rsl-automake.patch index 270873a6b..675eca157 100644 --- a/sci-libs/rsl/files/rsl-automake.patch +++ b/sci-libs/rsl/files/rsl-automake.patch @@ -1,22 +1,22 @@ -diff --git a/colors/Makefile.am b/colors/Makefile.am -index 709a367..b043f7f 100644 +Update automake files + +* Avoid modifying source code at compile time +* Avoid install-exec-hook --- a/colors/Makefile.am +++ b/colors/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -colordir = $(prefix)/lib/colors -+colordir = $(datadir)/rsl/colors ++colordir = $(datadir)/rsl1/colors color_DATA = *.??? EXTRA_DIST = $(color_DATA) -diff --git a/Makefile.am b/Makefile.am -index 3c106a8..6aca2ec 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1,73 +1,49 @@ +@@ -1,72 +1,48 @@ ## Process w/ automake. Or, autoreconf; make ## -+AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\"" ++AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl1\"" AUTOMAKE_OPTIONS = foreign SUBDIRS = . colors doc examples INCLUDES = -I. -I$(srcdir) -I$(prefix)/include -I$(prefix)/toolkit/include @@ -26,12 +26,11 @@ index 3c106a8..6aca2ec 100644 - lib_LTLIBRARIES = librsl.la --librsl_la_LDFLAGS = -version-info 1:41 +-librsl_la_LDFLAGS = -version-info 1:43 -librsl_la_SOURCES = \ -$(rapic_c) $(radtec_c)\ -dorade.c dorade_print.c dorade_to_radar.c\ -lassen.c lassen_to_radar.c \ --edge_to_radar.c \ - radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \ - range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \ - carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \ @@ -44,7 +43,7 @@ index 3c106a8..6aca2ec 100644 - radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers) - -librsl_la_DEPENDENCIES = $(build_headers) -+wsr88ddir = $(datadir)/rsl/ ++wsr88ddir = $(datadir)/rsl1/ +dist_wsr88d_DATA = wsr88d_locations.dat -build_headers = rsl.h wsr88d.h toolkit_1BC-51_appl.h @@ -57,12 +56,11 @@ index 3c106a8..6aca2ec 100644 + wsr88d.h \ + $(include_HEADERS) + -+librsl_la_LDFLAGS = -version-info 1:41 ++librsl_la_LDFLAGS = -version-info 1:43 +librsl_la_SOURCES = \ + $(rapic_c) $(radtec_c) \ + dorade.c dorade_print.c dorade_to_radar.c \ + lassen.c lassen_to_radar.c \ -+ edge_to_radar.c \ + radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \ + range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \ + carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \ @@ -112,8 +110,6 @@ index 3c106a8..6aca2ec 100644 EXTRA_DIST = CHANGES Copyright GPL LGPL wsr88d_locations.dat rapic.h DISTCLEANFILES = rapic.c rapic-lex.c -diff --git a/radar.c b/radar.c -index 4078f17..7c07d01 100644 --- a/radar.c +++ b/radar.c @@ -60,7 +60,7 @@ @@ -125,8 +121,6 @@ index 4078f17..7c07d01 100644 } /* Debug printing global variable: radar_verbose_flag */ -diff --git a/radar_to_uf.c b/radar_to_uf.c -index 0d3af56..53d2d8d 100644 --- a/radar_to_uf.c +++ b/radar_to_uf.c @@ -321,7 +321,7 @@ void RSL_radar_to_uf_fp(Radar *r, FILE *fp) @@ -138,8 +132,6 @@ index 0d3af56..53d2d8d 100644 if (little_endian()) swap2(&uf_ma[40], 8/2); uf_ma[44] = (signed short)UF_NO_DATA; len_ma = 45; -diff --git a/read_write.c b/read_write.c -index 644a7b2..1e5f319 100644 --- a/read_write.c +++ b/read_write.c @@ -314,7 +314,7 @@ int RSL_write_radar_fp(Radar *radar, FILE *fp) @@ -151,15 +143,13 @@ index 644a7b2..1e5f319 100644 n += fwrite(title, sizeof(char), sizeof(title), fp); memset(header_buf, 0, sizeof(header_buf)); -diff --git a/rsl.h b/rsl.h -index a821765..597069c 100644 --- a/rsl.h +++ b/rsl.h @@ -27,8 +27,6 @@ #include "config.h" #endif --#define RSL_VERSION_STR "v1.41" +-#define RSL_VERSION_STR "v1.43" - /**********************************************************************/ /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/ @@ -168,7 +158,7 @@ index a821765..597069c 100644 /* so you shouldn't have to modify anything here. */ /**********************************************************************/ #ifndef COLORDIR --#define COLORDIR "/usr/local/trmm/GVBOX/lib/colors" +-#define COLORDIR "/usr/local/trmm/lib/colors" +#define COLORDIR DATADIR "/colors" #endif @@ -204,21 +194,17 @@ index a821765..597069c 100644 #define RAINFALL_RED_FILE COLORDIR "/red_rainfall.clr" #define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr" #define RAINFALL_BLUE_FILE COLORDIR "/blu_rainfall.clr" -diff --git a/wsr88d.h b/wsr88d.h -index ecad620..7d22427 100644 --- a/wsr88d.h +++ b/wsr88d.h @@ -7,7 +7,7 @@ * The directory should be the same as the LIBDIR in the makefile. */ #ifndef WSR88D_SITE_INFO_FILE --#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/GVBOX/lib/wsr88d_locations.dat" +-#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/lib/wsr88d_locations.dat" +#define WSR88D_SITE_INFO_FILE DATADIR "/wsr88d_locations.dat" #endif /*===============================================================*/ typedef struct { -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 6acc059..d4fc3fd 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,12 +1,3 @@ @@ -235,6 +221,3 @@ index 6acc059..d4fc3fd 100644 - $(INSTALL) -m 444 ../README $(docdir) - $(INSTALL) -m 444 ../CHANGES $(docdir) +dist_doc_DATA = *.html *.gif *.jpg *.fig ../README ../CHANGES --- -1.7.3.4 - diff --git a/sci-libs/rsl/files/rsl-with_hdf.patch b/sci-libs/rsl/files/rsl-with_hdf.patch new file mode 100644 index 000000000..313243183 --- /dev/null +++ b/sci-libs/rsl/files/rsl-with_hdf.patch @@ -0,0 +1,27 @@ +Add --without-hdf flag + +Prevent automagic dependencies as per: + http://www.gentoo.org/proj/en/qa/automagic.xml + +--- a/configure.in ++++ b/configure.in +@@ -49,11 +49,14 @@ LIBS="-lz -lm" + # If mounting with shared libraries we may have to specify all possible libraries. + # First check with simple LIBS list, if it fails, then expand the list. + +-AC_CHECK_LIB(implode, _implode, ,,$LIBDIR) +-AC_CHECK_LIB(jpeg, jpeg_CreateCompress,,,$LIBDIR) +-AC_CHECK_LIB(df, DFopen, ,,$LIBDIR) +-AC_CHECK_LIB(mfhdf, SDstart, ,,$LIBDIR) +-AC_CHECK_LIB(tsdistk, TKopen, ,,$LIBDIR) ++AC_ARG_WITH([hdf], AS_HELP_STRING([--without-hdf], [Build without hdf library (default: test)])) ++AS_IF([test "x$with_hdf" != "xno"], [ ++ AC_CHECK_LIB(implode, _implode, ,,$LIBDIR) ++ AC_CHECK_LIB(jpeg, jpeg_CreateCompress,,,$LIBDIR) ++ AC_CHECK_LIB(df, DFopen, ,,$LIBDIR) ++ AC_CHECK_LIB(mfhdf, SDstart, ,,$LIBDIR) ++ AC_CHECK_LIB(tsdistk, TKopen, ,,$LIBDIR) ++]) + + # Because -letor may depend on RSL being installed, just check for + # the library libetor.a in a couple of places. diff --git a/sci-libs/rsl/metadata.xml b/sci-libs/rsl/metadata.xml index 31dc017fa..c9837047e 100644 --- a/sci-libs/rsl/metadata.xml +++ b/sci-libs/rsl/metadata.xml @@ -2,4 +2,7 @@ maintainer-wanted@gentoo.org + + Enable Hierarchical Data format support + diff --git a/sci-libs/rsl/rsl-1.41.ebuild b/sci-libs/rsl/rsl-1.43.ebuild similarity index 70% rename from sci-libs/rsl/rsl-1.41.ebuild rename to sci-libs/rsl/rsl-1.43.ebuild index 5d950bd03..a4a7d25d8 100644 --- a/sci-libs/rsl/rsl-1.41.ebuild +++ b/sci-libs/rsl/rsl-1.43.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -15,15 +15,18 @@ SRC_URI="ftp://trmm-fc.gsfc.nasa.gov/software/${MY_P}.tar.gz" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="hdf" -RDEPEND="sci-libs/hdf - virtual/jpeg" +RDEPEND="hdf? ( sci-libs/hdf )" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}/${PN}-automake.patch" + epatch "${FILESDIR}/${PN}-"{automake,with_hdf}".patch" eautoreconf } + +src_configure() { + econf $(use_with hdf) +} -- 2.43.2