[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/files/, profiles/, sci-visualization/opendx/
commit: 9421065d5d1021074f8bb96e351dfc135f846c78 Author: Jakov Smolić gentoo org> AuthorDate: Tue Aug 16 08:07:39 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Aug 16 08:07:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9421065d sci-visualization/opendx: treeclean Closes: https://bugs.gentoo.org/831874 Closes: https://bugs.gentoo.org/822762 Signed-off-by: Jakov Smolić gentoo.org> profiles/package.mask | 6 - sci-visualization/opendx/Manifest | 2 - .../opendx/files/opendx-4.3.2-sys.h.patch | 23 -- .../files/opendx-4.4.4-concurrent-make-fix.patch | 66 - .../opendx/files/opendx-4.4.4-dx-errno.patch | 11 - .../opendx/files/opendx-4.4.4-gcc43.patch | 315 .../opendx/files/opendx-4.4.4-installpaths.patch | 330 - .../files/opendx-4.4.4-invalid-conversion.patch| 13 - .../opendx/files/opendx-4.4.4-libtool.patch| 11 - .../opendx/files/opendx-4.4.4-null.patch | 14 - .../opendx/files/opendx-4.4.4-open.patch | 34 --- .../opendx/files/opendx-4.4.4-slibtool.patch | 40 --- .../opendx/files/opendx-4.4.4-szip.patch | 55 .../opendx/files/opendx-4.4.4-xdg.patch| 26 -- sci-visualization/opendx/metadata.xml | 26 -- sci-visualization/opendx/opendx-4.4.4-r8.ebuild| 92 -- 16 files changed, 1064 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 1b85e0c91aa8..46f9088315d8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -513,12 +513,6 @@ dev-util/docker-ls # Bug #857948, removal on 2022-08-13. net-misc/csync -# David Seifert (2022-07-14) -# Unmaintained, no other major distro carries this, code quality is -# abysmal, build system has major issues, tons of patches, EAPI 6, -# no other revdeps in tree. Bug #822762, #831874, removal on 2022-08-13. -sci-visualization/opendx - # Marek Szuba (2022-07-13) # Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them), # which have seriously messed up dependency handling and trigger several diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest deleted file mode 100644 index e36d98d42167.. --- a/sci-visualization/opendx/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dx-4.4.4.tar.gz 9676049 BLAKE2B d628d2cf7d2cae5cfd1f69c72de06529ee3df0192bcb0973916110cc795fd408c9e297d1161e8685cdd62d0c09a985f41d4b2f72ca69ae2cd74488174e392a31 SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee -DIST opendx-4.4.4_p20160917-fix-c++14.patch.bz2 3162 BLAKE2B 7998a0099f197ea35543559e69a30b564521cbb0d504e90a64adde2492da2920b2ca4a96fca296ff88ef19f51ea3e0dd40337f205b8fa54133b7f9669d2086c0 SHA512 0d671e5a085b446969fbe57eb9d08e4dd103bc29058ce8c6167c3cad18f14b816a3f2cae329b194ef9827ff6590d31da95fc04176e0824f95bdf89761007bc6f diff --git a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch b/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch deleted file mode 100644 index 93bf18efb38c.. --- a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -aurN dx-4.3.2-orig/configure.ac dx-4.3.2/configure.ac dx-4.3.2-orig/configure.ac 2007-07-19 00:59:55.0 -0500 -+++ dx-4.3.2/configure.ac 2007-07-19 01:02:34.0 -0500 -@@ -1004,7 +1004,7 @@ - Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \ - Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \ - gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \ -- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ -+ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ - os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \ - sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \ - sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \ -diff -aurN dx-4.3.2-orig/src/exec/libdx/memory.c dx-4.3.2/src/exec/libdx/memory.c dx-4.3.2-orig/src/exec/libdx/memory.c 2007-07-19 00:59:54.0 -0500 -+++ dx-4.3.2/src/exec/libdx/memory.c 2007-07-19 01:01:57.0 -0500 -@@ -66,7 +66,6 @@ - - #if linux - #include --#include - #include - #endif - diff --git a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch deleted file mode 100644 index ba2c9c8c43c4.. --- a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/local.mk dx-4.4.4-orig/src/exec/dxmods/local.mk 2008-09
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx-samples/, profiles/, ...
commit: ced60bcca307dbed19f84a1ec9774cb3d47f35eb Author: Jakov Smolić gentoo org> AuthorDate: Tue Aug 16 08:07:12 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Aug 16 08:07:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced60bcc sci-visualization/opendx-samples: treeclean Signed-off-by: Jakov Smolić gentoo.org> profiles/package.mask | 1 - sci-visualization/opendx-samples/Manifest | 2 - .../files/opendx-samples-4.4.0-nojava.patch| 50 -- sci-visualization/opendx-samples/metadata.xml | 13 -- .../opendx-samples/opendx-samples-4.4.0-r2.ebuild | 33 -- 5 files changed, 99 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 337c562e4207..1b85e0c91aa8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -518,7 +518,6 @@ net-misc/csync # abysmal, build system has major issues, tons of patches, EAPI 6, # no other revdeps in tree. Bug #822762, #831874, removal on 2022-08-13. sci-visualization/opendx -sci-visualization/opendx-samples # Marek Szuba (2022-07-13) # Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them), diff --git a/sci-visualization/opendx-samples/Manifest b/sci-visualization/opendx-samples/Manifest deleted file mode 100644 index f9a4b3cd1542.. --- a/sci-visualization/opendx-samples/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dxsamples-4.4.0.tar.gz 7791659 BLAKE2B f3fb5ac4990ed13718390229debd8f72f84f1b751dae6e6497388e31e0e8f3869d9c30cc7e2e2b5a58fc0e32aab3127751451c616c0081606f28dd41250d9924 SHA512 ae740be888728750de2cf21e94094a4aa01adec8ea0cfe937f03a67803ad7cb0d92968c8d4325e22022c698f871d4af45df02d3b8e8639434a1001dd46e0b311 -DIST opendx-samples-4.4.0-install.patch.bz2 4195 BLAKE2B eb520ac16311e4252f36b7911ebff11f21cf16fa3d3b31a8e1209c28d66e78ae66b57c3b3edd4db66f26e82a25f3675c9a5e0ad146bb1b4ed74d1196007cc836 SHA512 3c276355d0796b2713d42ea11ce34d02c72e5b679aff4feb9792ec58c8a3c6aed1d79981d09a93b842d6d47fdc6cacd5fca4fc96f88cc764a90a5adf10797fc6 diff --git a/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch deleted file mode 100644 index 984f84a10336.. --- a/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch +++ /dev/null @@ -1,50 +0,0 @@ dxsamples-4.4.0/Makefile.am.nojava 2002-01-28 21:53:08.0 +0100 -+++ dxsamples-4.4.0/Makefile.am2006-09-03 01:40:26.0 +0200 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = callmodule data dxlink java macros \ -+SUBDIRS = callmodule data dxlink macros \ - outboard program_guide programs scripts \ - supervise tutorial user util stereo - dxsamples-4.4.0/configure.ac-orig 2009-05-03 14:30:59.0 +1200 -+++ dxsamples-4.4.0/configure.ac 2009-05-03 14:31:44.0 +1200 -@@ -25,11 +25,6 @@ AC_SUBST(RTL_LIBS) - - SHELL=/bin/sh - --AC_ARG_WITH(javadx, -- [ --with-javadx enable JAVADX (default is yes)], -- [with_javadx=$withval], -- [with_javadx='yes']) -- - AC_PROG_INSTALL - if test -z "$LN_S" ; then - AC_PROG_LN_S -@@ -40,25 +35,8 @@ DX_GET_PREFIX - DX_GET_ARCH - DX_ARCH_SPECIFIC - --MAKE_JAVADX_SAMPLES="" --if test "with_javadx" != 'no' ; then -- failed=0; -- passed=0; -- DX_PROG_JAVAC(passed=`expr $passed + 1`,failed=`expr $failed + 1`) -- DX_PROG_JAR(passed=`expr $passed + 1`,failed=`expr $failed + 1`) -- -- if test $failed -eq 0 ; then -- DX_JAVADX_SETUP(passed=`expr $passed + 1`,failed=`expr $failed + 1`) -- if test $failed -eq 0 ; then -- MAKE_JAVADX_SAMPLES=samples -- fi -- fi --fi -- - AC_OUTPUT( Makefile callmodule/Makefile callmodule/localmk \ - data/Makefile dxlink/Makefile dxlink/dxlink_make \ -- java/samples/Makefile java/Makefile java/userdata/Makefile \ -- java/usermacros/Makefile java/nets/Makefile java/makes/Makefile \ - macros/Makefile outboard/Makefile \ - program_guide/Makefile program_guide/localmk program_guide/guidemake \ - programs/2D_DATA/Makefile programs/3D_DATA/Makefile \ diff --git a/sci-visualization/opendx-samples/metadata.xml b/sci-visualization/opendx-samples/metadata.xml deleted file mode 100644 index dbbed6257330.. --- a/sci-visualization/opendx-samples/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - -https://www.gentoo.org/dtd/metadata.dtd";> - - - s...@gentoo.org - Gentoo Science Project - - - This package contains examples of scripts and networks for the - OpenDX Data Explorer. They are referenced in the OpenDX tutorial, - but can also be used stand-alone to browse and investigate. - - diff --git a/sci-visualization/opendx-samples/op
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: c369d129adf672546813d4bdc1e6908592f58c44
Author: Sam James gentoo org>
AuthorDate: Tue Dec 28 22:00:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 28 22:00:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c369d129
sci-visualization/opendx: depend on netcdf subslot
need to be rebuilt when its subslot changes
Signed-off-by: Sam James gentoo.org>
.../opendx/{opendx-4.4.4-r7.ebuild => opendx-4.4.4-r8.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r8.ebuild
similarity index 98%
rename from sci-visualization/opendx/opendx-4.4.4-r7.ebuild
rename to sci-visualization/opendx/opendx-4.4.4-r8.ebuild
index 1184182477b3..26a6f0de70fe 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r8.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
szip? ( virtual/szip )
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
- netcdf? ( sci-libs/netcdf )
+ netcdf? ( sci-libs/netcdf:= )
tiff? ( media-libs/tiff:0 )
imagemagick? ( virtual/imagemagick-tools )"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 10566be78d0c93191a0c35c6c748472bae9a8f6d
Author: Sam James gentoo org>
AuthorDate: Wed Sep 8 04:42:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Sep 8 05:06:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10566be7
sci-visualization/opendx: eutils->desktop inherit
Signed-off-by: Sam James gentoo.org>
sci-visualization/opendx/opendx-4.4.4-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index f0a448c98e8..1184182477b 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=6
MYP=dx-${PV}
-inherit autotools eutils flag-o-matic
+inherit autotools desktop flag-o-matic
DESCRIPTION="3D data visualization tool"
HOMEPAGE="http://www.opendx.org/";
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/files/, sci-visualization/opendx/
commit: 60c4e1235300e9bba9f1d86512a09257f60fe640
Author: Sam James gentoo org>
AuthorDate: Wed Sep 8 04:39:02 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Sep 8 04:41:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c4e123
sci-visualization/opendx: fix build with slibtool, gcc 11
Closes: https://bugs.gentoo.org/786627
Closes: https://bugs.gentoo.org/779160
Thanks-to: orbea riseup.net>
Signed-off-by: Sam James gentoo.org>
.../opendx/files/opendx-4.4.4-slibtool.patch | 40 ++
sci-visualization/opendx/opendx-4.4.4-r7.ebuild| 6 +++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch
b/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch
new file mode 100644
index 000..964322aab9c
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/779160
+
+commit 980149800b1bc9310c404dcc822d35bd725e8b3c
+Author: orbea
+Date: Wed Apr 7 11:42:21 2021 -0700
+
+build: Fix undefined references with slibtool.
+
+diff --git a/src/exec/dpexec/Makefile.am b/src/exec/dpexec/Makefile.am
+index 9f37d05..bd8aefe 100644
+--- a/src/exec/dpexec/Makefile.am
b/src/exec/dpexec/Makefile.am
+@@ -33,6 +33,8 @@ libDPEXECclm_la_SOURCES = \
+ crc.c d.c exobject.c function.c license.c loader.c macro.c \
+ dpparse.c userinter.c utils.c optarg.c sfile.c ddx.c
+
++libDPEXEC_la_LIBADD = ../dxmods/libuser.la
++
+ EXTRA_DIST = local.mk dxThreadMain.cpp dxThreadMain.h tmainUtil.cpp
tmainUtil.h
+
+ $(OBJECTS): yuiif.c yuiif.h
+diff --git a/src/exec/dxexec/Makefile.am b/src/exec/dxexec/Makefile.am
+index 9bc4260..1971965 100644
+--- a/src/exec/dxexec/Makefile.am
b/src/exec/dxexec/Makefile.am
+@@ -12,10 +12,10 @@ libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
+ bindir = $(libdir)/dx/bin_@ARCH@
+ bin_PROGRAMS = dxexec
+
+-dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la
../dxmods/user.lo \
+- ../dxmods/libDXMODSN.la ../libdx/libLIBDX.la ../libdx/mem.lo \
+- ../libdx/memory.lo ../hwrender/libHW.la ../hwrender/opengl/libOPENGL.la
+-dxexec_LDFLAGS = @DXEXEC_EXP@
++dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la \
++ ../dxmods/libDXMODSN.la ../libdx/libLIBDX.la ../libdx/libmem.la \
++ ../hwrender/libHW.la ../hwrender/opengl/libOPENGL.la
++dxexec_LDFLAGS = @DXEXEC_EXP@ -no-undefined
+ dxexec_SOURCES = main.c
+
+ EXTRA_DIST = tmain.cpp
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index 024c2706ae3..f0a448c98e8 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/${P}-szip.patch"
"${FILESDIR}/${P}-null.patch"
"${FILESDIR}/${P}-invalid-conversion.patch"
+ "${FILESDIR}/${P}-slibtool.patch"
"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
)
@@ -61,6 +62,9 @@ src_configure() {
# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
append-flags -fno-strength-reduce
+ # bug #786627
+ append-cppflags -std=c++14
+
# (#82672)
filter-flags -finline-functions
replace-flags -O3 -O2
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx-samples/
commit: 6a8aca5677a9673d7222707203edc4d7ba32a2e8
Author: Sam James gentoo org>
AuthorDate: Thu Apr 29 01:39:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 29 01:51:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8aca56
sci-visualization/opendx-samples: fix variable reference style
Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James gentoo.org>
.../opendx-samples/opendx-samples-4.4.0-r2.ebuild| 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
index 2dbd69320cc..8ee6e71d294 100644
--- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,16 +12,14 @@ DESCRIPTION="Samples for IBM Data Explorer"
HOMEPAGE="http://www.opendx.org/";
SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz
mirror://gentoo/${P}-install.patch.bz2"
-LICENSE="IBM"
-SLOT="0"
-
S="${WORKDIR}/${MY_P}"
+LICENSE="IBM"
+SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
-DEPEND="$RDEPEND"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-nojava.patch"
@@ -29,7 +27,7 @@ PATCHES=(
)
src_prepare() {
- #absolutely no javadx for now
+ # absolutely no javadx for now
default
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/files/
commit: 5fa711a649e31bf27778c24ac6653f075c818aab
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Apr 8 17:04:23 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Apr 9 00:08:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa711a6
sci-visualization/opendx: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/7879
.../opendx/files/opendx-4.4.4-magick.patch | 90 --
1 file changed, 90 deletions(-)
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
deleted file mode 100644
index 5b50470970c..000
--- a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-newer magick libraries, use pkg-config, add possibility to link with
-graphicsmagick, fix for as-needed
-
dx-4.4.4.orig/src/exec/dxmods/_im_image.c
-+++ dx-4.4.4/src/exec/dxmods/_im_image.c
-@@ -329,7 +329,7 @@
- DestroyImageInfo(new_frame_info);
- DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--DestroyConstitute();
-+ConstituteComponentTerminus();
- #endif
- DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
- image->exception.reason,
-@@ -346,7 +346,7 @@
- DestroyImageInfo(new_frame_info);
- DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--DestroyConstitute();
-+ConstituteComponentTerminus();
- #endif
- DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer
_im_image.c");
- }
-@@ -375,7 +375,7 @@
- DestroyImageInfo(image_info);
- DestroyImageInfo(new_frame_info);
- #if MagickLibVersion > 0x0537
--DestroyConstitute();
-+ConstituteComponentTerminus();
- #endif
-
- DEBUGMESSAGE("back from DestroyImage");
-@@ -491,7 +491,7 @@
- DestroyImage(image);
- DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--DestroyConstitute();
-+ConstituteComponentTerminus();
- #endif
- }
- return (OK);
dx-4.4.4.orig/configure.ac
-+++ dx-4.4.4/configure.ac
-@@ -799,7 +799,29 @@
- LIB_MAGICK=''
- if test "$with_magick" != 'no'
- then
--AS_MESSAGE([checking for ImageMagick support ..])
-+found=0
-+static_lib="libGraphicsMagick.a"
-+PKG_CHECK_MODULES(GraphicsMagick, GraphicsMagick, [found=1], [found=0])
-+MAGICK_CFLAGS="$GraphicsMagick_CFLAGS"
-+MAGICK_LIBS="$GraphicsMagick_LIBS"
-+if test $found -eq 0
-+then
-+static_lib="libMagick.a"
-+PKG_CHECK_MODULES(ImageMagick, ImageMagick, [found=1], [found=0])
-+MAGICK_CFLAGS="$ImageMagick_CFLAGS"
-+MAGICK_LIBS="$ImageMagick_LIBS"
-+fi
-+if test $found -eq 1
-+then
-+ CFLAGS="$CFLAGS $MAGICK_CFLAGS"
-+dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
-+ AC_UTILS_UNIQUIFY([$LIBS $MAGICK_LIBS], LIBS)
-+ FMT_LIBS="$FMT_LIBS $static_lib"
-+ AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick
libraries])
-+have_magick='yes'
-+dnl legacy checks installations without pkg-config
-+else
-+AS_MESSAGE([checking for ImageMagick support (no pkg-config) ..])
- AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no)
-
- failed=0;
-@@ -866,6 +888,7 @@
- fi
- fi
- fi
-+fi
-
- AC_LANG([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],
dx-4.4.4.orig/src/exec/dxmods/Makefile.am
-+++ dx-4.4.4/src/exec/dxmods/Makefile.am
-@@ -113,4 +113,5 @@
- $(SOURCES6) \
- $(SOURCES7)
-
-+libDXMODS_la_LIBADD = @MAGICK_LIBS@
- @LOCALMAKE@
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: e7537410c31c7f488b448c40b20d24ed58b24e2e
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:55:54 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:55:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7537410
sci-visualization/opendx-4.4.4-r7: amd64 stable, bug 649084
sci-visualization/opendx/opendx-4.4.4-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index cd3cdbeefa9..00a59b54851 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
LICENSE="IBM"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 5b75f72a3f12da74ca821bc2ebdb579f206b41be
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:56:24 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:56:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b75f72a
sci-visualization/opendx: Drop old
Closes: https://bugs.gentoo.org/649084
sci-visualization/opendx/opendx-4.4.4-r5.ebuild | 82 -
1 file changed, 82 deletions(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
deleted file mode 100644
index 54c6da6296e..000
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYP=dx-${PV}
-inherit eutils flag-o-matic autotools multilib
-
-DESCRIPTION="3D data visualization tool"
-HOMEPAGE="http://www.opendx.org/";
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz";
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="hdf cdf netcdf tiff imagemagick szip smp"
-
-RDEPEND="x11-libs/libXmu
- x11-libs/libXi
- x11-libs/libXp
- x11-libs/libXpm
- >=x11-libs/motif-2.3:0
- virtual/opengl
- virtual/glu
- szip? ( virtual/szip )
- hdf? ( sci-libs/hdf )
- cdf? ( sci-libs/cdf )
- netcdf? ( sci-libs/netcdf )
- tiff? ( media-libs/tiff )
- imagemagick? ( virtual/imagemagick-tools )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
- epatch "${FILESDIR}/${P}-installpaths.patch"
- epatch "${FILESDIR}/${P}-xdg.patch"
- epatch "${FILESDIR}/${P}-gcc43.patch"
- epatch "${FILESDIR}/${P}-dx-errno.patch"
- epatch "${FILESDIR}/${P}-libtool.patch"
- epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
- epatch "${FILESDIR}/${P}-open.patch"
- epatch "${FILESDIR}/${P}-szip.patch"
- epatch "${FILESDIR}/${P}-null.patch"
- epatch "${FILESDIR}/${P}-magick.patch"
- eautoreconf
-}
-
-src_configure() {
- # check flag filtering
- # with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
- append-flags -fno-strength-reduce
-
- # (#82672)
- filter-flags -finline-functions
- replace-flags -O3 -O2
-
- # opendx uses this variable
- unset ARCH
-
- # javadx is currently broken. we may try to fix it someday.
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --with-x \
- --without-javadx \
- $(use_with szip szlib) \
- $(use_with cdf) \
- $(use_with netcdf) \
- $(use_with hdf) \
- $(use_with tiff) \
- $(use_with imagemagick magick) \
- $(use_enable smp smp-linux)
-}
-
-src_install() {
- default
- newicon src/uipp/ui/icon50.xpm ${PN}.xpm
- make_desktop_entry dx "Open Data Explorer"
-}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 52889f0295dedaf33b4ebcbcdb9d2780de16aebf
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:55:54 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:55:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52889f02
sci-visualization/opendx-4.4.4-r7: x86 stable, bug 649084
sci-visualization/opendx/opendx-4.4.4-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index 00a59b54851..024c2706ae3 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
LICENSE="IBM"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 2733c9f6150d9cb0fa3762513bbefab3f7f3926a
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:54:31 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:54:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2733c9f6
sci-visualization/opendx: Drop ppc keywords
sci-visualization/opendx/opendx-4.4.4-r5.ebuild | 2 +-
sci-visualization/opendx/opendx-4.4.4-r7.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
index cd523aace72..54c6da6296e 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz";
LICENSE="IBM"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
RDEPEND="x11-libs/libXmu
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index 7307105626d..cd3cdbeefa9 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
LICENSE="IBM"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx-samples/
commit: 6a5acb83b74db200ccc447768a7be0c755c9c34d
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:54:06 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:54:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5acb83
sci-visualization/opendx-samples: Drop ppc keywords
sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
index 2efa4c437c0..2dbd69320cc 100644
--- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
S="${WORKDIR}/${MY_P}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/, sci-visualization/opendx/files/
commit: 152407387340dd08c853e9a0ca97a1d36e2b889f
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:17:30 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:24:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15240738
sci-visualization/opendx: Add patch to fix invalid conversion
Closes: https://bugs.gentoo.org/638610
.../opendx/files/opendx-4.4.4-invalid-conversion.patch | 13 +
sci-visualization/opendx/opendx-4.4.4-r6.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git
a/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch
b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch
new file mode 100644
index 000..579cceb9684
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch
@@ -0,0 +1,13 @@
+diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C
+index c406cc1..d6c0765 100644
+--- a/src/uipp/dxuilib/EditorWindow.C
b/src/uipp/dxuilib/EditorWindow.C
+@@ -5997,7 +5997,7 @@ char msg[128];
+ //
+ const char *tmpdir = theDXApplication->getTmpDirectory();
+ int tmpdirlen = STRLEN(tmpdir);
+-if (!tmpdirlen) return FALSE;
++if (!tmpdirlen) return (char*)FALSE;
+ if (tmpdir[tmpdirlen-1] == '/') {
+ sprintf(netfilename, "%sdx%d.net", tmpdir, getpid());
+ sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid());
diff --git a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
index 2aae53cbc9d..4f7453fdd62 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}/${P}-open.patch"
"${FILESDIR}/${P}-szip.patch"
"${FILESDIR}/${P}-null.patch"
+ "${FILESDIR}/${P}-invalid-conversion.patch"
"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
)
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 161845d4be61b043231bf07b008e3208a6bf8e97
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 1 23:24:07 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 1 23:24:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161845d4
sci-visualization/opendx: Fix X11 dependencies
I elected not to touch the lack of Xinerama dependency. It looks to be
automagic currently.
Bug: https://bugs.gentoo.org/649084
.../opendx/{opendx-4.4.4-r6.ebuild => opendx-4.4.4-r7.ebuild}| 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
similarity index 95%
rename from sci-visualization/opendx/opendx-4.4.4-r6.ebuild
rename to sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index 4f7453fdd62..7307105626d 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,10 +17,11 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
-RDEPEND="x11-libs/libXmu
- x11-libs/libXi
- x11-libs/libXp
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXmu
x11-libs/libXpm
+ x11-libs/libXt
>=x11-libs/motif-2.3:0
virtual/opengl
virtual/glu
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx-samples/
commit: 3e14690071fc05ea3f990f800476a3e5d131d956 Author: David Seifert gentoo org> AuthorDate: Sat Nov 25 16:53:34 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Nov 25 17:41:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e146900 sci-visualization/opendx-samples: [QA] Consistent whitespace in metadata.xml sci-visualization/opendx-samples/metadata.xml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sci-visualization/opendx-samples/metadata.xml b/sci-visualization/opendx-samples/metadata.xml index e1939802f94..07c8ea7f6e9 100644 --- a/sci-visualization/opendx-samples/metadata.xml +++ b/sci-visualization/opendx-samples/metadata.xml @@ -1,13 +1,13 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - s...@gentoo.org - Gentoo Science Project - - - This package contains examples of scripts and networks for the - OpenDX Data Explorer. They are referenced in the OpenDX tutorial, - but can also be used stand-alone to browse and investigate. - + + s...@gentoo.org + Gentoo Science Project + + + This package contains examples of scripts and networks for the + OpenDX Data Explorer. They are referenced in the OpenDX tutorial, + but can also be used stand-alone to browse and investigate. +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 2fa7b1781ad366af2e74d2fae9a4510d21471ce1
Author: David Seifert gentoo org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 11 19:45:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa7b178
sci-visualization/opendx: Depend on virtual/imagemagick-tools
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907
sci-visualization/opendx/opendx-4.4.4-r5.ebuild| 42 ++
...endx-4.4.4-r4.ebuild => opendx-4.4.4-r6.ebuild} | 42 --
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
index 5c02453d73..6cff41fe1a 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=6
+EAPI=4
MYP=dx-${PV}
-
-inherit autotools eutils flag-o-matic
+inherit eutils flag-o-matic autotools multilib
DESCRIPTION="3D data visualization tool"
HOMEPAGE="http://www.opendx.org/";
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
-
https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2";
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz";
LICENSE="IBM"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
RDEPEND="x11-libs/libXmu
@@ -29,29 +27,26 @@ RDEPEND="x11-libs/libXmu
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
netcdf? ( sci-libs/netcdf )
- tiff? ( media-libs/tiff:0 )
- imagemagick? ( media-gfx/imagemagick )"
+ tiff? ( media-libs/tiff )
+ imagemagick? ( virtual/imagemagick-tools )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MYP}"
-PATCHES=(
- "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
- "${FILESDIR}/${P}-installpaths.patch"
- "${FILESDIR}/${P}-xdg.patch"
- "${FILESDIR}/${P}-gcc43.patch"
- "${FILESDIR}/${P}-dx-errno.patch"
- "${FILESDIR}/${P}-libtool.patch"
- "${FILESDIR}/${P}-concurrent-make-fix.patch"
- "${FILESDIR}/${P}-open.patch"
- "${FILESDIR}/${P}-szip.patch"
- "${FILESDIR}/${P}-null.patch"
- "${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
-)
src_prepare() {
- default
+ epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+ epatch "${FILESDIR}/${P}-installpaths.patch"
+ epatch "${FILESDIR}/${P}-xdg.patch"
+ epatch "${FILESDIR}/${P}-gcc43.patch"
+ epatch "${FILESDIR}/${P}-dx-errno.patch"
+ epatch "${FILESDIR}/${P}-libtool.patch"
+ epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
+ epatch "${FILESDIR}/${P}-open.patch"
+ epatch "${FILESDIR}/${P}-szip.patch"
+ epatch "${FILESDIR}/${P}-null.patch"
+ epatch "${FILESDIR}/${P}-magick.patch"
eautoreconf
}
@@ -69,6 +64,7 @@ src_configure() {
# javadx is currently broken. we may try to fix it someday.
econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
--with-x \
--without-javadx \
$(use_with szip szlib) \
diff --git a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
similarity index 60%
rename from sci-visualization/opendx/opendx-4.4.4-r4.ebuild
rename to sci-visualization/opendx/opendx-4.4.4-r6.ebuild
index 67d504fe1d..a1bfc06af9 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
MYP=dx-${PV}
-inherit eutils flag-o-matic autotools multilib
+
+inherit autotools eutils flag-o-matic
DESCRIPTION="3D data visualization tool"
HOMEPAGE="http://www.opendx.org/";
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz";
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
+
https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2";
LICENSE="IBM"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="hdf cdf netcdf tiff imagemagick szip smp"
RDEPEND="x11-libs/libXmu
@@ -27,26 +29,29 @@ RDEPEND="x11-libs/libXmu
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
netcdf? ( sci-libs/netcdf )
- tiff? ( media-libs/tiff )
- imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )"
+ tiff? ( media-libs/tiff:0 )
+ imagemagick? ( virtual/imagemagick-tools )"
DEP
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx-samples/
commit: 36015463f24c971391b227cb19ab8afd04c21430
Author: Gerhard Bräunlich gmx net>
AuthorDate: Sat Jan 14 16:16:39 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 15 10:13:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36015463
sci-visualization/opendx-samples: Removing EAPI 4 ebuild
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3479
.../opendx-samples/opendx-samples-4.4.0-r1.ebuild | 32 --
1 file changed, 32 deletions(-)
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild
b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild
deleted file mode 100644
index 14a24a5..
--- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools multilib
-
-MY_PN="dxsamples"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Samples for IBM Data Explorer"
-HOMEPAGE="http://www.opendx.org/";
-SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz
- mirror://gentoo/${P}-install.patch.bz2"
-LICENSE="IBM"
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- #absolutely no javadx for now
- epatch "${FILESDIR}/${P}-nojava.patch"
- epatch "${WORKDIR}/${P}-install.patch"
- eautoreconf
-}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx-samples/
commit: 699e19aaa1f8844d4ef3619808991b72b700696f
Author: Gerhard Bräunlich gmx net>
AuthorDate: Sat Jan 14 16:16:08 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 15 10:13:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699e19aa
sci-visualization/opendx-samples: EAPI bump 4 -> 6
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3479
.../opendx-samples/opendx-samples-4.4.0-r2.ebuild | 36 ++
1 file changed, 36 insertions(+)
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
new file mode 100644
index ..6fc2d10
--- /dev/null
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+MY_PN="dxsamples"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Samples for IBM Data Explorer"
+HOMEPAGE="http://www.opendx.org/";
+SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz
+ mirror://gentoo/${P}-install.patch.bz2"
+LICENSE="IBM"
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
+DEPEND="$RDEPEND"
+
+PATCHES=(
+ "${FILESDIR}/${P}-nojava.patch"
+ "${WORKDIR}/${P}-install.patch"
+)
+
+src_prepare() {
+ #absolutely no javadx for now
+ default
+ eautoreconf
+}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/, sci-visualization/opendx/files/
commit: cce130dabaa4e0c7acef43994faa909010b0f6c2
Author: David Seifert gentoo org>
AuthorDate: Sat Sep 17 17:43:29 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Sep 17 17:43:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce130da
sci-visualization/opendx: Allow for compiling with GCC 6
Gentoo-bug: 593932
* EAPI=6
Package-Manager: portage-2.3.0
sci-visualization/opendx/Manifest | 1 +
.../opendx/files/opendx-4.4.4-szip.patch | 4 +--
.../opendx/files/opendx-4.4.4-xdg.patch| 4 +--
sci-visualization/opendx/opendx-4.4.4-r5.ebuild| 33 +-
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/sci-visualization/opendx/Manifest
b/sci-visualization/opendx/Manifest
index 5b25fc6..c943734 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -1 +1,2 @@
DIST dx-4.4.4.tar.gz 9676049 SHA256
a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff SHA512
e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee
WHIRLPOOL
6d6931fabfb054ff06464649b2b2ce5f094aa6d0c28f0f2e6ee22176ef4749d78f102ed9d0c27cf3c84ea10038d4502d908ec7a95a597d32f21574b277a54fa0
+DIST opendx-4.4.4_p20160917-fix-c++14.patch.bz2 3162 SHA256
306a3dcedee38dc61f27ce184a88018b78d541d168eb1b85f04a5964b527e02a SHA512
0d671e5a085b446969fbe57eb9d08e4dd103bc29058ce8c6167c3cad18f14b816a3f2cae329b194ef9827ff6590d31da95fc04176e0824f95bdf89761007bc6f
WHIRLPOOL
b8eecf3955acaa58c94d63a8781691bc4eb2ea62a82077052a1cf221e811cae586a691aff311e08633c70d80d9f15a3d162ad4bd4c4f5b8362fcbfc582a1bf9f
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
index 5e63d4e..488379b 100644
--- a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
@@ -1,5 +1,5 @@
configure.ac.orig 2009-06-14 22:10:24.0 +1200
-+++ configure.ac 2009-06-14 22:26:29.0 +1200
+--- a/configure.ac
b/configure.ac
@@ -148,6 +148,12 @@ AC_ARG_WITH(netcdf,
[with_netcdf=$withval],
[with_netcdf='yes'])
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
index c5b38f2..018dcd6 100644
--- a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
@@ -1,6 +1,6 @@
diff -up bin/url_handler.sh.orig bin/url_handler.sh
bin/url_handler.sh.orig2009-05-02 23:21:08.0 +1200
-+++ bin/url_handler.sh 2009-05-02 23:24:25.0 +1200
+--- a/bin/url_handler.sh
b/bin/url_handler.sh
@@ -27,21 +27,7 @@ case $method in
mailto) mutt `echo "$url" | sed 's;^[^:]*:\(.*\);\1;'`
;;
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
index 2261c30..5c02453 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
@@ -2,14 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
MYP=dx-${PV}
-inherit eutils flag-o-matic autotools multilib
+
+inherit autotools eutils flag-o-matic
DESCRIPTION="3D data visualization tool"
HOMEPAGE="http://www.opendx.org/";
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz";
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
+
https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2";
LICENSE="IBM"
SLOT="0"
@@ -34,18 +36,22 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MYP}"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+ "${FILESDIR}/${P}-installpaths.patch"
+ "${FILESDIR}/${P}-xdg.patch"
+ "${FILESDIR}/${P}-gcc43.patch"
+ "${FILESDIR}/${P}-dx-errno.patch"
+ "${FILESDIR}/${P}-libtool.patch"
+ "${FILESDIR}/${P}-concurrent-make-fix.patch"
+ "${FILESDIR}/${P}-open.patch"
+ "${FILESDIR}/${P}-szip.patch"
+ "${FILESDIR}/${P}-null.patch"
+ "${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
+)
src_prepare() {
- epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
- epatch "${FILESDIR}/${P}-installpaths.patch"
- epatch "${FILESDIR}/${P}-xdg.patch"
- epatch "${FILESDIR}/${P}-gcc43.patch"
- epatch "${FILESDIR}/${P}-dx-errno.patch"
- epatch "${FILESDIR}/${P}-libtool.patch"
- epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
- epatch "${FILESDIR}/${P}-open.patch"
- epatch "${FILESDIR}/${P}-szip.patch"
- epatch "${FILESDIR}/${P}-null.patch"
+ default
eautoreconf
}
@@ -63,7 +69,6 @@ src_configure() {
# javadx is currently broken. we may try to fix it someday.
econf \
- --libdir="${EPREFIX}"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/
commit: 5646a48dbbd8390c1700a709cfb2a81d7d3decfb
Author: Sébastien Fabbro gentoo org>
AuthorDate: Wed Mar 16 22:40:25 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Fri Mar 18 20:10:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5646a48d
sci-visualization/opendx: switch to virtual/szip
Package-Manager: portage-2.2.27
sci-visualization/opendx/opendx-4.4.4-r4.ebuild | 4 ++--
sci-visualization/opendx/opendx-4.4.4-r5.ebuild | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
index f77e7e6..67d504f 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ RDEPEND="x11-libs/libXmu
>=x11-libs/motif-2.3:0
virtual/opengl
virtual/glu
- szip? ( sci-libs/szip )
+ szip? ( virtual/szip )
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
netcdf? ( sci-libs/netcdf )
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
index f8655bc..2261c30 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,11 +23,11 @@ RDEPEND="x11-libs/libXmu
>=x11-libs/motif-2.3:0
virtual/opengl
virtual/glu
- szip? ( sci-libs/szip )
+ szip? ( virtual/szip )
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
netcdf? ( sci-libs/netcdf )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
imagemagick? ( media-gfx/imagemagick )"
DEPEND="${RDEPEND}
