Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5974/10.4/stable/main/finkinfo/sci
Modified Files:
dx.info dx.patch
Log Message:
Updates from maintainer.
Index: dx.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/dx.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dx.patch 11 Nov 2011 19:21:14 -0000 1.2
+++ dx.patch 8 Jan 2012 18:10:25 -0000 1.3
@@ -1,6 +1,6 @@
-diff -urN dx-4.4.4/bin/Makefile.am dx-4.4.4-new/bin/Makefile.am
+diff -urN dx-4.4.4/bin/Makefile.am dx-new/bin/Makefile.am
--- dx-4.4.4/bin/Makefile.am 2003-07-11 20:11:37.000000000 -0400
-+++ dx-4.4.4-new/bin/Makefile.am 2008-02-19 23:04:39.000000000 -0500
++++ dx-new/bin/Makefile.am 2011-12-04 22:58:28.000000000 -0500
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
@@ -10,9 +10,9 @@
EXTRA_SCRIPTS = mdf2c dx
EXTRA_DIST = url_handler.sh
-diff -urN dx-4.4.4/bin/dx.in dx-4.4.4-new/bin/dx.in
+diff -urN dx-4.4.4/bin/dx.in dx-new/bin/dx.in
--- dx-4.4.4/bin/dx.in 2004-05-31 12:12:05.000000000 -0400
-+++ dx-4.4.4-new/bin/dx.in 2008-02-19 23:04:39.000000000 -0500
++++ dx-new/bin/dx.in 2011-12-04 22:58:28.000000000 -0500
@@ -60,10 +60,10 @@
#
longhelp() {
@@ -27,9 +27,9 @@
echo "set the DXROOT environment variable to the root of the"
echo "dx installation tree and try again."
fi
-diff -urN dx-4.4.4/configure.ac dx-4.4.4-new/configure.ac
+diff -urN dx-4.4.4/configure.ac dx-new/configure.ac
--- dx-4.4.4/configure.ac 2006-08-21 17:56:08.000000000 -0400
-+++ dx-4.4.4-new/configure.ac 2008-05-10 15:46:45.000000000 -0400
++++ dx-new/configure.ac 2011-12-04 22:58:28.000000000 -0500
@@ -218,6 +218,7 @@
dnl End of command line options configuration
@@ -38,7 +38,7 @@
AC_LANG([C++])
AC_CHECK_HEADERS(stdlib.h)
AC_LANG([C])
-@@ -505,6 +505,11 @@
+@@ -505,6 +506,11 @@
LIBS="-L$xm_libraries $LIBS"
fi
@@ -50,7 +50,7 @@
AC_CHECK_LIB(GL, glXGetConfig)
AC_CHECK_LIB(GLU, gluBuild2DMipmaps)
-@@ -677,7 +682,7 @@
+@@ -677,7 +683,7 @@
fi
dnl -- check for unix
else
@@ -59,7 +59,7 @@
AC_MSG_CHECKING(if HDF package is complete)
if test $passed -gt 0
then
-@@ -686,7 +691,7 @@
+@@ -686,7 +692,7 @@
AC_MSG_RESULT(no -- some components failed test)
have_hdf='no (failed tests)'
else
@@ -68,7 +68,7 @@
LIBS="$LIB_HDF $LIBS"
FMT_LIBS="$FMT_LIBS libdf.a"
AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
-@@ -801,7 +806,12 @@
+@@ -801,7 +807,12 @@
failed=0;
passed=0;
@@ -81,7 +81,7 @@
if test "$ARCH" = "intelnt" ; then
AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr
$failed + 1`,)
AC_MSG_CHECKING(if ImageMagick package is complete)
-@@ -836,7 +846,7 @@
+@@ -836,7 +847,7 @@
if test "$HAVE_MC" = "yes" ; then
LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
@@ -90,18 +90,18 @@
AC_MSG_CHECKING(if ImageMagick package is complete)
if test $passed -gt 0
then
-diff -urN dx-4.4.4/include/Makefile.am dx-4.4.4-new/include/Makefile.am
+diff -urN dx-4.4.4/include/Makefile.am dx-new/include/Makefile.am
--- dx-4.4.4/include/Makefile.am 2006-04-08 23:44:49.000000000 -0400
-+++ dx-4.4.4-new/include/Makefile.am 2008-02-19 23:04:39.000000000 -0500
++++ dx-new/include/Makefile.am 2011-12-04 22:58:28.000000000 -0500
@@ -1,4 +1,4 @@
-dxincdir = $(prefix)/dx/include
+dxincdir = $(exec_prefix)/include
SUBDIRS = dx
dxinc_HEADERS = dxl.h dxstereo.h
nodist_dxinc_HEADERS = dxconfig.h
-diff -urN dx-4.4.4/include/dx/Makefile.am dx-4.4.4-new/include/dx/Makefile.am
+diff -urN dx-4.4.4/include/dx/Makefile.am dx-new/include/dx/Makefile.am
--- dx-4.4.4/include/dx/Makefile.am 1999-05-25 19:35:16.000000000 -0400
-+++ dx-4.4.4-new/include/dx/Makefile.am 2008-02-19 23:04:39.000000000
-0500
++++ dx-new/include/dx/Makefile.am 2011-12-04 22:58:28.000000000 -0500
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -110,9 +110,9 @@
dxinc_HEADERS = \
UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
-diff -urN dx-4.4.4/man/catl/Makefile.am dx-4.4.4-new/man/catl/Makefile.am
+diff -urN dx-4.4.4/man/catl/Makefile.am dx-new/man/catl/Makefile.am
--- dx-4.4.4/man/catl/Makefile.am 1999-04-05 07:56:00.000000000 -0400
-+++ dx-4.4.4-new/man/catl/Makefile.am 2008-02-19 23:04:39.000000000 -0500
++++ dx-new/man/catl/Makefile.am 2011-12-04 22:58:28.000000000 -0500
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -121,9 +121,9 @@
cat_DATA = dx.l
EXTRA_DIST = $(cat_DATA)
-diff -urN dx-4.4.4/man/manl/Makefile.am dx-4.4.4-new/man/manl/Makefile.am
+diff -urN dx-4.4.4/man/manl/Makefile.am dx-new/man/manl/Makefile.am
--- dx-4.4.4/man/manl/Makefile.am 2002-05-20 00:47:06.000000000 -0400
-+++ dx-4.4.4-new/man/manl/Makefile.am 2008-02-19 23:04:39.000000000 -0500
++++ dx-new/man/manl/Makefile.am 2011-12-04 22:58:28.000000000 -0500
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -132,9 +132,21 @@
man_MANS = dx.l
EXTRA_DIST = $(man_MANS)
-diff -urN dx-4.4.4/src/exec/dxmods/_im_image.c
dx-4.4.4-new/src/exec/dxmods/_im_image.c
+diff -urN dx-4.4.4/src/exec/dpexec/packet.c dx-new/src/exec/dpexec/packet.c
+--- dx-4.4.4/src/exec/dpexec/packet.c 2006-04-27 11:34:53.000000000 -0400
++++ dx-new/src/exec/dpexec/packet.c 2011-12-05 00:26:25.000000000 -0500
+@@ -143,6 +143,8 @@
+ {
+ if (sts > 0 && (!tmpbufferused || *tmpbufferused == 0))
+ {
++ //see http://www.opendx.org/bugs/view.php?id=251
++ sts=0; // MHM change in case IOCTL fails
+ if(SFILEIoctl(_dxd_exSockFD, FIONBIO, &one) >= 0)
+ sts = writeToSFILE(_dxd_exSockFD, packet, length);
+ SFILEIoctl(_dxd_exSockFD, FIONBIO, &zero);
+diff -urN dx-4.4.4/src/exec/dxmods/_im_image.c
dx-new/src/exec/dxmods/_im_image.c
--- dx-4.4.4/src/exec/dxmods/_im_image.c 2006-01-05 17:55:43.000000000
-0500
-+++ dx-4.4.4-new/src/exec/dxmods/_im_image.c 2008-05-11 01:09:15.000000000
-0400
++++ dx-new/src/exec/dxmods/_im_image.c 2011-12-04 22:58:28.000000000 -0500
@@ -999,8 +999,11 @@
/* Opacities in colormap is wrong; use direct color map */
if ( image->matte )
@@ -148,9 +160,9 @@
}
} else
DXErrorGoto( ERROR_INTERNAL, "unexpected image field format"
);
-diff -urN dx-4.4.4/src/uipp/base/StartWebBrowser.C
dx-4.4.4-new/src/uipp/base/StartWebBrowser.C
+diff -urN dx-4.4.4/src/uipp/base/StartWebBrowser.C
dx-new/src/uipp/base/StartWebBrowser.C
--- dx-4.4.4/src/uipp/base/StartWebBrowser.C 2005-12-16 16:11:51.000000000
-0500
-+++ dx-4.4.4-new/src/uipp/base/StartWebBrowser.C 2008-02-20
02:41:56.000000000 -0500
++++ dx-new/src/uipp/base/StartWebBrowser.C 2011-12-04 22:58:28.000000000
-0500
@@ -13,6 +13,11 @@
#include <stdio.h>
Index: dx.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/dx.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dx.info 11 Nov 2011 19:21:14 -0000 1.7
+++ dx.info 8 Jan 2012 18:10:25 -0000 1.8
@@ -1,17 +1,43 @@
Package: dx
Version: 4.4.4
-Revision: 1506
-Distribution: 10.5, 10.6
+Revision: 1507
Source: http://opendx.sdsc.edu/source/%n-%v.tar.gz
Source-MD5: 6da0c4cd21d3c08f97b7662e3aee5b7b
PatchFile: %n.patch
-PatchFile-MD5: f43a6028f7ffdbeda9f096faf2625451
-BuildDepends: autoconf2.6, automake1.11, fink-package-precedence,
fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), gcc4.2,
imagemagick1-dev (>= 6.4.0-1011), libjpeg, libtiff (>= 3.7.2-1001), libtool2,
netcdf (>= 3.6.2-6), openmotif3 (>= 2.2.3-11), x11-dev
-Depends: freetype219-shlibs (>= 2.3.12-1), hdf (>= 4.2r1-1001),
imagemagick1-shlibs (>= 6.4.0-1011), libjpeg-shlibs, libtiff-shlibs (>=
3.7.2-1001), netcdf-shlibs (>= 3.6.2-6), openmotif3-shlibs (>= 2.2.3-11), x11
-ConfigureParams: --prefix=%p/share --exec_prefix=%p --with-motif-libs=%p/lib
--with-motif-includes=%p/include --without-javadx --with-large-arenas
--enable-dependency-tracking --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
-SetCXX:g++-4.2
-SetCC:gcc-4.2
-SetLIBS:-lz
+PatchFile-MD5: c96d6e6a6be650d562daafcf05d09d2f
+PatchScript: <<
+%{default_script}
+perl -pi -e 's/unsigned\s(int.*arg)/\1/g' \
+ src/uipp/base/Application.h \
+ src/uipp/base/Application.C \
+ src/uipp/base/IBMApplication.h \
+ src/uipp/base/IBMApplication.C \
+ src/uipp/dxui/Main.C \
+ src/uipp/dxuilib/DXApplication.h \
+ src/uipp/dxuilib/DXApplication.C \
+ src/uipp/mb/MBApplication.h \
+ src/uipp/mb/MBApplication.C \
+ src/uipp/mb/Main.C \
+ src/uipp/prompter/GARApplication.h \
+ src/uipp/prompter/GARApplication.C \
+ src/uipp/prompter/Main.C \
+ src/uipp/startup/Main.C \
+ src/uipp/startup/StartupApplication.h \
+ src/uipp/startup/StartupApplication.C \
+ src/uipp/tutor/Main.C \
+ src/uipp/tutor/TutorApplication.C \
+ src/uipp/tutor/TutorApplication.h
+ perl -pi -e 's/DestroyConstitute/ConstituteComponentTerminus/g' \
+ src/exec/dxmods/_im_image.c
+<<
+BuildDepends: autoconf2.6, automake1.11, fink-package-precedence,
fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), imagemagick2-dev,
libjpeg8, libtiff (>= 3.7.2-1001), libtool2, netcdf7, openmotif4, x11-dev
+Depends: freetype219-shlibs (>= 2.3.12-1), hdf (>= 4.2r1-1001),
imagemagick2-shlibs, libjpeg8-shlibs, libtiff-shlibs (>= 3.7.2-1001),
netcdf7-shlibs, openmotif4-shlibs, x11
+ConfigureParams: --prefix=%p/share --exec_prefix=%p --with-motif-libs=%p/lib
--with-motif-includes=%p/include --without-javadx --with-large-arenas
--enable-dependency-tracking --x-includes=/usr/X11/include
--x-libraries=/usr/X11/lib
+UseMaxBuildJobs: false
+SetLIBS: -lz
+SetCFLAGS: -g -O2
+SetCPPFLAGS: -I%p/opt/netcdf7/include
+SetLDFLAGS: -L%p/opt/netcdf7/lib
GCC:4.0
CompileScript:<<
%p/bin/autoreconf -f -i
@@ -62,6 +88,12 @@
Patch to allow compiling if ImageMagick was built with --enable-hdri
(require positive int for array subscript in _im_image.c). See:
http://www.imagemagick.org/script/high-dynamic-range.php
+
+akh: patch instances of "argc" to be an int rather than
+ unsigned int to keep clang happy.
+ patch _im_image.c to deal with a change in the ImageMagick API (shocker!)
+ cf.:
+ https://bugs.launchpad.net/ubuntu/+source/transcode/+bug/539106
<<
DescPackaging: <<
dmacks: Hack configure to use moderner check for ImageMagick.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
