aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-visualization/opendx')
-rw-r--r--sci-visualization/opendx/ChangeLog4
-rw-r--r--sci-visualization/opendx/Manifest5
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-szip.patch55
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r2.ebuild6
4 files changed, 65 insertions, 5 deletions
diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index b4322ab90..7c1468dbe 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.15 2008/09/14 11:25:38 spock Exp $
+ 14 Jun 2009; Fran├žois Bissey <f.r.bissey@massey.ac.nz>
+ opendx-4.4.4-r2.ebuild, +files/opendx-4.4.4-szip.patch:
+ Patch configure.ac to make szip a proper configure option
+
12 May 2009; Fran├žois Bissey <f.r.bissey@massey.ac.nz>
files/opendx-4.4.4-concurrent-make-fix.patch:
make sure the concurent make fix _always_ works.
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index fc57c24e0..e49a49180 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -6,10 +6,11 @@ AUX opendx-4.4.4-gcc43-fedora.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf
AUX opendx-4.4.4-install.patch 11982 RMD160 2136aca79e909dc28cc18c6fd821014e777c96ea SHA1 7a86aec33dc1d23ab9700dcd6f8cb9d7d08c512d SHA256 75f9ee934b19f9f67fdbfd16b9d52fb692bb4db3d1a1fc8cc666c7ac5c5e447f
AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
AUX opendx-4.4.4-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
+AUX opendx-4.4.4-szip.patch 1482 RMD160 67bef3dade274ac78011bc23913dd8b7724ee13d SHA1 edfb38bb5c73d340716dc6e8ccd01eea0ee5de1a SHA256 c330e0fc642d4f5004fd3173532e2f7223499dc612be298a53b41f423b021a23
AUX opendx-4.4.4-xdg.patch 785 RMD160 ee1a8bce4a352c7bf3335f5e13bd81664f3fd7c3 SHA1 001cb1ee444631926b43857aac137ce2d9336ba2 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1
AUX opendx-compressed-man.patch 496 RMD160 670de4ea728a3f9b5c02f7950ce88c58d1073a7b SHA1 56dd8a6d9710264ae3b45358ad2eb48ad00d6d98 SHA256 2877bd95b592548c1a0a532b49131b84f5ab1077714ef16d768f3e33f50d6aab
DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff
EBUILD opendx-4.4.4-r1.ebuild 2403 RMD160 b3949b577be1888d71ea220e111da11fe59fa4d2 SHA1 6392a006d33e9205fbed11408a458c97c1a37360 SHA256 788ab5b20cd81b19b4c34cce650dac91a4eff4ea12a31b750cae08d527716203
-EBUILD opendx-4.4.4-r2.ebuild 2351 RMD160 98132fc06af505010e4bd32e3b39d44f218bd4de SHA1 9ef227620e29582575209fb491332d173d14f75a SHA256 9fb59baa21606b308716795d3292e60cc73935f3ee2deee529f41df326b8a507
-MISC ChangeLog 6093 RMD160 f63e0bc9d8afeff7fa7e0f9800fcfe39be7a5698 SHA1 74a522485c8312a1b230a17d705a47ad868dd5ad SHA256 cef31f5bff6d602dfaaacc829987d50b94f538551626b457a6bc458e1d037fcc
+EBUILD opendx-4.4.4-r2.ebuild 2349 RMD160 c41235566ae47fe6d9617b8f8ce4dcf92cb4c9df SHA1 c1ef20ad2a60e2121cd400886239c9ecfc208df3 SHA256 6624f2e8169e4cecc5373be1449130a42c7ec3597ef1f9facc7096aa87996d1d
+MISC ChangeLog 6270 RMD160 186702f315f64b27d685b4186ef19d8b3e3f5a00 SHA1 59d356e5e22e987907129f6c6a0575affdda75b1 SHA256 41c2438f61abb39ef9715845fad8340f548c3c01f44e364442282f53afa83033
MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
new file mode 100644
index 000000000..5e63d4e6b
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
@@ -0,0 +1,55 @@
+--- configure.ac.orig 2009-06-14 22:10:24.000000000 +1200
++++ configure.ac 2009-06-14 22:26:29.000000000 +1200
+@@ -148,6 +148,12 @@ AC_ARG_WITH(netcdf,
+ [with_netcdf=$withval],
+ [with_netcdf='yes'])
+
++# Enable szip.
++AC_ARG_WITH(szlib,
++ [ --with-szlib Use szlib library for external szlib I/O (default is yes)],
++ [with_szlib=$withval],
++ [with_szlib='yes'])
++
+ # Enable 64-bit arenas, if supported
+ AC_ARG_WITH(large-arenas,
+ [ --with-large-arenas enable 64-bit arenas, when available (default is no)],
+@@ -790,6 +796,39 @@ fi
+
+
+ #
++# Check for szlib
++#
++have_szlib='no'
++LIB_SZLIB=''
++if test "$with_szlib" != 'no'
++then
++ AS_MESSAGE([checking for szlib ......])
++ failed=0;
++ passed=0;
++ AC_CHECK_HEADERS(szlib.h, passed=`expr $passed + 1`,failed=`expr $failed + 1`)
++ AC_CHECK_LIB(sz, SZ_BufftoBuffCompress,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
++ AC_MSG_CHECKING(if szlib package is complete)
++ if test $passed -gt 0
++ then
++ if test $failed -gt 0
++ then
++ AC_MSG_RESULT(no -- some components failed test)
++ have_szlib='no (failed tests)'
++ else
++ LIB_SZLIB='-lsz'
++ LIBS="$LIB_SZLIB $LIBS"
++ FMT_LIBS="$FMT_LIBS libsz.a"
++ AC_DEFINE(HAVE_LIBSZIP, 1, [Define to 1 if you have the SZLIB libraries])
++ AC_MSG_RESULT(yes)
++ have_szlib='yes'
++ fi
++ else
++ AC_MSG_RESULT(no)
++ fi
++fi
++
++
++#
+ # Check for IMAGEMAGICK
+ #
+ have_magick='no'
diff --git a/sci-visualization/opendx/opendx-4.4.4-r2.ebuild b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
index cb992117a..39acb57ca 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
@@ -44,6 +44,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-libtool.patch"
epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
epatch "${FILESDIR}/${P}-open.patch"
+ epatch "${FILESDIR}/${P}-szip.patch"
eautoreconf
}
@@ -61,12 +62,11 @@ src_configure() {
local GENTOOARCH="${ARCH}"
unset ARCH
- local morelibs=""
- use szip && morelibs="-lsz"
- econf LIBS="${morelibs}" \
+ econf \
"--libdir=/usr/$(get_libdir)" \
"--with-x" \
"--without-javadx" \
+ $(use_with szip szlib) \
$(use_with cdf) \
$(use_with netcdf) \
$(use_with hdf) \