[tachyon] 01/01: Imported Debian patch 0.99~b6+dsx-2
Jerome Benoit
calculus-guest at moszumanska.debian.org
Thu Jun 25 14:24:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository tachyon.
commit e5ed6d0c90d1e7b8e3466c01ab9ac503658ecdfb
Author: Jerome Benoit <calculus at rezozer.net>
Date: Thu Jun 25 16:14:30 2015 +0200
Imported Debian patch 0.99~b6+dsx-2
---
debian/changelog | 13 +
debian/control | 2 +-
debian/copyright | 10 +-
.../upstream-rationalization-autotools.patch | 262 ++++++++++++++++++++-
debian/rules | 11 +-
5 files changed, 286 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae5f67a..e3da9c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tachyon (0.99~b6+dsx-2) unstable; urgency=medium
+
+ * Debianization:
+ - debian/control, update;
+ - debian/copyright, correct and refresh;
+ - debian/rules, harden;
+ - debian/patches/:
+ - autotools chain:
+ - libjpeg find and check, harden;
+ - kfreebsd and hurd surpports, harden.
+
+ -- Jerome Benoit <calculus at rezozer.net> Thu, 25 Jun 2015 14:22:32 +0000
+
tachyon (0.99~b6+dsx-1) unstable; urgency=medium
* New upstrean release.
diff --git a/debian/control b/debian/control
index 070021c..5b48765 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
- autotools-dev, autoconf-archive, autoconf-gl-macros, dh-autoreconf, libtool, pkg-config, help2man,
+ autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
mpi-default-dev,
libmpich-dev,
libjpeg-dev (>=1:1.3.1-10),
diff --git a/debian/copyright b/debian/copyright
index 8f76f77..cceede4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://jedi.ks.uiuc.edu/~johns/raytracer/
Files: *
Copyright:
- 1994-2014 John E. Stone <johns at ks.uiuc.edu>
+ 1994-2015 John E. Stone <johns at ks.uiuc.edu>
License: BSD-3-clause
Files: demosrc/trackball.*
@@ -22,7 +22,7 @@ License: LPPL-1.0+
Files: pkgextra/virtual-reality/*
Copyright:
1994 Avalon
-License: public-domain
+License: public-domain-vr
These files are public domain and come with NO WARRANTY of any kind.
Comment:
These data files belong to the Avalon 3D Graphics Collection, a collection of public
@@ -33,7 +33,7 @@ Comment:
Files: pkgextra/volpack/*
Copyright:
1994 Phil Lacrout <volpack at graphics.stanford.edu>
-License: public-domain
+License: public-domain-vp
These files are public domain and come with NO WARRANTY of any kind.
Comment:
These data files are part of the official VolPack rendering library distribution,
@@ -44,7 +44,7 @@ Comment:
Files: pkgextra/volpack/data/brain/*.den.Z
Copyright:
1994 Phil Lacrout <volpack at graphics.stanford.edu>
-License: public-domain
+License: public-domain-vp-chvrtd
These data files constains volume data derived from an MR scan of a human head;
the data are in .den format and has been been compressed.
.
@@ -60,7 +60,7 @@ License: public-domain
Files: debian/*
Copyright:
- 2014 Jerome Benoit <calculus at rezozer.net>
+ 2014-2015 Jerome Benoit <calculus at rezozer.net>
2008 Tim Abbott <tabbott at mit.edu>
License: GPL-3+
Comment:
diff --git a/debian/patches/upstream-rationalization-autotools.patch b/debian/patches/upstream-rationalization-autotools.patch
index 8308412..d51118c 100644
--- a/debian/patches/upstream-rationalization-autotools.patch
+++ b/debian/patches/upstream-rationalization-autotools.patch
@@ -4,11 +4,11 @@ Description: rationalization -- autotools machinery
This patch is meant to be submitted to the upstream maintainer.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-10-20
+Last-Update: 2015-06-25
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,88 @@
+dnl -*- Autoconf -*-
+dnl Process this file with autoconf to produce a configure script.
+
@@ -37,7 +37,11 @@ Last-Update: 2014-10-20
+
+dnl Checks for system features.
+AC_CANONICAL_HOST
-+AS_IF([test "x$host_os" != "xlinux-gnu"],[],[CPPFLAGS="$CPPFLAGS -DLinux"])
++case "$host_os" in
++ linux*) CPPFLAGS="$CPPFLAGS -DLinux" ;;
++ k*bsd-gnu*) CPPFLAGS="$CPPFLAGS -DBsd" ;;
++ gnu*) CPPFLAGS="$CPPFLAGS -DGnu" ;;
++esac
+
+dnl libtool:
+LT_INIT
@@ -61,7 +65,7 @@ Last-Update: 2014-10-20
+## math library
+LT_LIB_M
+## JPEG library
-+PKG_CHECK_MODULES([LIBJPEG],[libjpeg],[CPPFLAGS="$CPPFLAGS -DUSEJPEG"],[AC_MSG_ERROR([unable to find libjpeg])])
++AM_PATH_LIBJPEG([62],[CPPFLAGS="$CPPFLAGS -DUSEJPEG"],[AC_MSG_ERROR([unable to find libjpeg])])
+## PNG library
+PKG_CHECK_MODULES([LIBPNG],[libpng],[CPPFLAGS="$CPPFLAGS -DUSEPNG"],[AC_MSG_ERROR([unable to find libpng])])
+## OpenGL
@@ -415,3 +419,253 @@ Last-Update: 2014-10-20
+
+EXTRA_DIST =
+
+--- /dev/null
++++ b/m4/adhoc_libjpeg.m4
+@@ -0,0 +1,236 @@
++# adhoc_libjpeg.m4 serial 1
++dnl m4/adhoc_libjpeg.m4 -- M4 macro processor include script
++dnl
++dnl Copyright (C) 2015 Jerome Benoit <jgmbenoit at rezozer.net>
++dnl
++dnl Based on macros for the GNU GMP library by Owen Taylor, modified by:
++dnl Hans Petter Jansson, 2001-04-09;
++dnl Allin Cottrell, April 2003;
++dnl and certainly others.
++dnl
++dnl Copying and distribution of this file, with or without modification, are
++dnl permitted in any medium without royalty provided the copyright notice and
++dnl this notice are preserved. This file is offered as-is, without any warranty.
++dnl
++dnl
++dnl NOTE:
++dnl The trick used to extract the library version number of the JPEG library
++dnl itself was adapted from a comment by user2834915 user at stackoverflow.com,
++dnl https://stackoverflow.com/questions/10332908/find-out-libjpeg-version-at-runtime-or-other-ways-to-prevent-aborts
++dnl
++
++dnl _adhoc_AC_PROG_PATH_LIBJPEG_CC_ARG_WITH
++AC_DEFUN_ONCE([_adhoc_AC_PROG_PATH_LIBJPEG_CC_ARG_WITH],[dnl
++AC_ARG_WITH([libjpeg-prefix],
++ [AS_HELP_STRING([--with-libjpeg-prefix=PREFIX],
++ [specify prefix for the installed JPEG library [standard search prefixes]])],
++ [libjpeg_config_prefix="$withval"],[libjpeg_config_prefix=""])
++AC_ARG_WITH([libjpeg-include],
++ [AS_HELP_STRING([--with-libjpeg-include=PATH],
++ [specify directory for the installed JPEG library header file [standard search paths]])],
++ [libjpeg_config_include_prefix="$withval"],[libjpeg_config_include_prefix=""])
++AC_ARG_WITH([libjpeg-lib],
++ [AS_HELP_STRING([--with-libjpeg-lib=PATH],
++ [specify directory for the installed JPEG library [standard search paths]])],
++ [libjpeg_config_lib_prefix="$withval"],[libjpeg_config_lib_prefix=""])
++
++ if test "x$libjpeg_config_include_prefix" = "x" ; then
++ if test "x$libjpeg_config_prefix" != "x" ; then
++ libjpeg_config_include_prefix="$libjpeg_config_prefix/include"
++ fi
++ fi
++ if test "x$libjpeg_config_lib_prefix" = "x" ; then
++ if test "x$libjpeg_config_prefix" != "x" ; then
++ libjpeg_config_lib_prefix="$libjpeg_config_prefix/lib"
++ fi
++ fi
++
++ LIBJPEG_CPPFLAGS=
++ if test "x$libjpeg_config_include_prefix" != "x" ; then
++ LIBJPEG_CPPFLAGS="-I$libjpeg_config_include_prefix"
++ fi
++
++ LIBJPEG_LDFLAGS=
++ if test "x$libjpeg_config_lib_prefix" != "x" ; then
++ LIBJPEG_LDFLAGS="-L$libjpeg_config_lib_prefix"
++ fi
++
++AC_SUBST(LIBJPEG_CPPFLAGS)
++AC_SUBST(LIBJPEG_LDFLAGS)
++])
++
++dnl adhoc_AM_PATH_LIBJPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++AC_DEFUN([adhoc_AM_PATH_LIBJPEG],[dnl
++AC_REQUIRE([AC_PROG_SED])dnl
++AC_REQUIRE([_adhoc_AC_PROG_PATH_LIBJPEG_CC_ARG_WITH])dnl
++
++ min_libjpeg_version=m4_default([$1],[60])
++ min_libjpeg_version_0="$min_libjpeg_version.0"
++
++ min_libjpeg_version_number=`echo $min_libjpeg_version_0 | $SED 's/\([[0-9]]*\).\(.*\)/\1/'`
++
++ min_libjpeg_dotted_version="$min_libjpeg_version_number"
++
++ LIBJPEG_LIBS="-ljpeg"
++
++ AC_MSG_CHECKING([for JPEG library - version >= $min_libjpeg_version ])
++
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LDFLAGS="$LDFLAGS"
++ ac_save_LIBS="$LIBS"
++
++ CPPFLAGS="$CPPFLAGS $LIBJPEG_CPPFLAGS"
++ CFLAGS="$CFLAGS $LIBJPEG_CFLAGS"
++ LDFLAGS="$LDFLAGS $LIBJPEG_LDFLAGS"
++ LIBS="$LIBS $LIBJPEG_LIBS"
++
++ rm -f conf.libjpegtest
++ AC_RUN_IFELSE([AC_LANG_SOURCE(
++[[
++#include <stdio.h>
++#include <jpeglib.h>
++
++#define PRINTF_MSG_ERROR_MISMATCH_HEADER_LIBRARY \
++ printf("*** This likely indicates either a bad configuration or some\n"); \
++ printf("*** other inconsistency in the development environment. If the\n"); \
++ printf("*** expected JPEG library cannot be found, it may be sufficient\n"); \
++ printf("*** either to set properly the LD_LIBRARY_PATH environment variable\n"); \
++ printf("*** or to configure ldconfig(8) to consider the installed location.\n"); \
++ printf("*** Otherwise a bad configuration or an inconsistency in the\n"); \
++ printf("*** include/library search paths may be investigated; adjustments\n"); \
++ printf("*** through the use of --with-libjpeg-(include|lib) configure option\n"); \
++ printf("*** may help.\n"); \
++ printf("***\n"); \
++ printf("*** If an old version is installed, it may be best to remove it and to\n"); \
++ printf("*** reinstall a more recent one; although modifying LD_LIBRARY_PATH\n"); \
++ printf("*** may also get things to work. Latest information on JPEG may be\n"); \
++ printf("*** available from <http://jpegclub.org/>.\n"); \
++ printf("***\n");
++
++int adhoc_libjpeg_version(void);
++
++int main ()
++{
++ int libjpeg_hdr_version_number = 0;
++ int libjpeg_lib_version_number = 0;
++
++ fclose (fopen ("conf.libjpegtest", "w"));
++
++#ifdef JPEG_LIB_VERSION
++ libjpeg_hdr_version_number = JPEG_LIB_VERSION;
++#else
++ error JPEG_LIB_VERSION not defined
++#endif
++
++ libjpeg_lib_version_number = adhoc_libjpeg_version();
++
++ if (libjpeg_lib_version_number != libjpeg_hdr_version_number) {
++ printf("\n***\n");
++ printf("*** JPEG header version number (%d) and\n",libjpeg_hdr_version_number);
++ printf("*** JPEG library version number (%d)\n",libjpeg_lib_version_number);
++ printf("*** do not match.\n");
++ printf("***\n");
++ PRINTF_MSG_ERROR_MISMATCH_HEADER_LIBRARY
++ }
++ else if ($min_libjpeg_version_number <= libjpeg_hdr_version_number) {
++ return (0);
++ }
++ else {
++ printf("\n***\n");
++ printf("*** JPEG version $min_libjpeg_dotted_version or higher is required:\n");
++ printf("*** an older version of JPEG (%d) was found.\n",libjpeg_hdr_version_number);
++ printf("*** Latest information on JPEG may be available from <http://jpegclub.org/>.\n");
++ printf("***\n");
++ }
++
++ return (1);
++}
++
++static
++int ADHOC_LIBRARY_JPEG_LIB_VERSION=-1;
++
++static
++void adhoc_libjpeg_version_error_exit(j_common_ptr cinfo) {
++ ADHOC_LIBRARY_JPEG_LIB_VERSION=cinfo->err->msg_parm.i[0];
++ return ; }
++
++int adhoc_libjpeg_version(void) {
++ if (ADHOC_LIBRARY_JPEG_LIB_VERSION < 0) {
++ struct jpeg_decompress_struct cinfo;
++ struct jpeg_error_mgr error_mgr;
++ error_mgr.error_exit=&adhoc_libjpeg_version_error_exit;
++ cinfo.err=&error_mgr;
++#undef JPEG_LIB_VERSION
++#define JPEG_LIB_VERSION -1
++ jpeg_create_decompress(&cinfo);
++#undef JPEG_LIB_VERSION
++ }
++ return (ADHOC_LIBRARY_JPEG_LIB_VERSION); }
++
++]]
++)],[],[no_libjpeg=yes],[AC_MSG_WARN([$ac_n "cross compiling; assumed OK... $ac_c])])
++
++ CPPFLAGS="$ac_save_CPPFLAGS"
++ CFLAGS="$ac_save_CFLAGS"
++ LDFLAGS="$ac_save_LDFLAGS"
++ LIBS="$ac_save_LIBS"
++
++ if test "x$no_libjpeg" = "x" ; then
++ AC_MSG_RESULT([yes])
++ $2
++ else
++ AC_MSG_RESULT([no])
++ if test -f conf.libjpegtest ; then
++ :
++ else
++ echo "***"
++ echo "*** Could not run JPEG test program, checking why..."
++ CPPFLAGS="$CPPFLAGS $LIBJPEG_CPPFLAGS"
++ CFLAGS="$CFLAGS $LIBJPEG_CFLAGS"
++ LDFLAGS="$CFLAGS $LIBJPEG_LDFLAGS"
++ LIBS="$LIBS $LIBJPEG_LIBS"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM(
++[[
++#include <stdio.h>
++#include <jpeg.h>
++]],
++[[ return (1); ]]
++)],
++[
++echo "***"
++echo "*** The test program compiled, but did not run. This usually means"
++echo "*** that the run-time linker is not finding JPEG library or finding the wrong"
++echo "*** version of JPEG. If it is not finding JPEG, you'll need to set your"
++echo "*** LD_LIBRARY_PATH environment variable, or configure ldconfig(8) to consider"
++echo "*** the installed location."
++echo "***"
++echo "*** If you have an old version installed, it is best to remove it; although"
++echo "*** modifying LD_LIBRARY_PATH may also get things to work. Latest information"
++echo "*** on JPEG may be available from <http://jpegclub.org/>."
++echo "***"
++],
++[
++echo "***"
++echo "*** The test program failed to compile or link. See the file config.log for the"
++echo "*** exact error that occured. This usually means JPEG was incorrectly installed"
++echo "*** or that you have moved JPEG since it was installed."
++echo "***"
++])
++ CPPFLAGS="$ac_save_CPPFLAGS"
++ CFLAGS="$ac_save_CFLAGS"
++ LDFLAGS="$ac_save_LDFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ rm -f conf.libjpegtest
++ m4_default([$3],[AC_MSG_ERROR([no suitable JPEG library found])])
++ fi
++ rm -f conf.libjpegtest
++
++AC_SUBST(LIBJPEG_LIBS)
++])
++
++dnl alias
++AU_ALIAS([AM_PATH_LIBJPEG],[adhoc_AM_PATH_LIBJPEG])
++
++dnl eof
+--- a/src/util.c
++++ b/src/util.c
+@@ -51,7 +51,7 @@
+ void rt_finalize(void); /* UGLY! tachyon.h needs more cleanup before it can */
+ /* be properly included without risk of bogosity */
+
+-#if defined(__linux) || defined(Bsd) || defined(AIX) || defined(__APPLE__) || defined(__sun) || defined(__hpux) || defined(_CRAYT3E) || defined(_CRAY) || defined(_CRAYC) || defined(__osf__) || defined(__BEOS__)
++#if defined(__linux) || defined(Bsd) || defined(Gnu) || defined(AIX) || defined(__APPLE__) || defined(__sun) || defined(__hpux) || defined(_CRAYT3E) || defined(_CRAY) || defined(_CRAYC) || defined(__osf__) || defined(__BEOS__)
+ #include <sys/time.h>
+ #endif
+
diff --git a/debian/rules b/debian/rules
index fbb1e11..87b0650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,15 @@ else
DEB_ARCH_DEFAULT_MPI_IMPL = mpich
endif
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O3
+## inspired from mpfr material
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else ifeq ($(DEB_HOST_ARCH),alpha)
+ CFLAGS += -mieee
+else ifeq ($(DEB_HOST_ARCH),sha4)
+ CFLAGS += -mieee
+else
+ CFLAGS := $(subst -O2,-O3,$(CFLAGS))
endif
CC_mt = gcc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tachyon.git
More information about the debian-science-commits
mailing list