[med-svn] [mialmpick] 01/05: Imported Upstream version 0.2.12
Gert Wollny
gert-guest at moszumanska.debian.org
Fri May 6 14:39:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository mialmpick.
commit d21fd2a1e6181a8f9178da125c1adfa04b3e66c7
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Thu May 5 16:50:43 2016 +0000
Imported Upstream version 0.2.12
---
ChangeLog | 5 +++++
config.guess | 13 +++++++++++--
config.sub | 14 +++++++-------
configure | 22 +++++++++++-----------
configure.ac | 2 +-
po/de.gmo | Bin 4374 -> 4374 bytes
po/de.po | 2 +-
po/mialmpick.pot | 4 ++--
src/glvolume.c | 10 +++++-----
src/main.c | 2 +-
10 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6cc3f62..20905ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-26 Gert Wollny <gw.fossdev at gmail.com>
+
+ * Version bump to 0.2.12
+ * Correct Correct shaders to work with FLOSS radeon drivers
+
2016-01-05 Gert Wollny <gw.fossdev at gmail.com>
* Version bump to 0.2.11
diff --git a/config.guess b/config.guess
index 17a4f70..6f790d6 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-07-03'
+timestamp='2015-12-14'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -249,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -962,6 +965,9 @@ EOF
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ k1om:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1128,7 +1134,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1398,6 +1404,9 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
+ exit ;;
esac
cat >&2 <<EOF
diff --git a/config.sub b/config.sub
index afdef26..a16cc4d 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-07-28'
+timestamp='2015-12-14'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -53,8 +53,7 @@ timestamp='2015-07-28'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
@@ -306,7 +305,7 @@ case $basic_machine in
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -521,7 +520,7 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
- asmjs)
+ asmjs)
basic_machine=asmjs-unknown
;;
aux)
@@ -1397,7 +1396,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1417,7 +1416,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+ | -onefs* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/configure b/configure
index 5f03d98..a41efad 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mialmpick 0.2.11.
+# Generated by GNU Autoconf 2.69 for mialmpick 0.2.12.
#
# Report bugs to <gw.fossdev at gmail.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mialmpick'
PACKAGE_TARNAME='mialmpick'
-PACKAGE_VERSION='0.2.11'
-PACKAGE_STRING='mialmpick 0.2.11'
+PACKAGE_VERSION='0.2.12'
+PACKAGE_STRING='mialmpick 0.2.12'
PACKAGE_BUGREPORT='gw.fossdev at gmail.com'
PACKAGE_URL=''
@@ -1317,7 +1317,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mialmpick 0.2.11 to adapt to many kinds of systems.
+\`configure' configures mialmpick 0.2.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1387,7 +1387,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mialmpick 0.2.11:";;
+ short | recursive ) echo "Configuration of mialmpick 0.2.12:";;
esac
cat <<\_ACEOF
@@ -1495,7 +1495,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mialmpick configure 0.2.11
+mialmpick configure 0.2.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1797,7 +1797,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mialmpick $as_me 0.2.11, which was
+It was created by mialmpick $as_me 0.2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2613,7 +2613,7 @@ fi
# Define the identity of the package.
PACKAGE='mialmpick'
- VERSION='0.2.11'
+ VERSION='0.2.12'
cat >>confdefs.h <<_ACEOF
@@ -5605,7 +5605,7 @@ fi
#AM_PROG_LIBTOOL
-MIALMPICK_VERSION=0.2.11
+MIALMPICK_VERSION=0.2.12
@@ -8716,7 +8716,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mialmpick $as_me 0.2.11, which was
+This file was extended by mialmpick $as_me 0.2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8782,7 +8782,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mialmpick config.status 0.2.11
+mialmpick config.status 0.2.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index cc14f25..5355ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
m4_define([mialmpick_major_version], [0])
m4_define([mialmpick_minor_version], [2])
-m4_define([mialmpick_micro_version], [11])
+m4_define([mialmpick_micro_version], [12])
m4_define([mialmpick_version],
[mialmpick_major_version.mialmpick_minor_version.mialmpick_micro_version])
diff --git a/po/de.gmo b/po/de.gmo
index 5d70dbe..351df9f 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index e143731..ba9fd1f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: gw.fossdev at gmail.com\n"
-"POT-Creation-Date: 2016-01-08 15:10+0100\n"
+"POT-Creation-Date: 2016-04-26 13:39+0200\n"
"PO-Revision-Date: 2004-02-04 18:24+0100\n"
"Last-Translator: Gert Wollny <wollny at cbs.mpg.de>\n"
"Language-Team: German <de at li.org>\n"
diff --git a/po/mialmpick.pot b/po/mialmpick.pot
index c3aaa9f..14b2dd3 100644
--- a/po/mialmpick.pot
+++ b/po/mialmpick.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: mialmpick 0.2.11\n"
+"Project-Id-Version: mialmpick 0.2.12\n"
"Report-Msgid-Bugs-To: gw.fossdev at gmail.com\n"
-"POT-Creation-Date: 2016-01-08 15:10+0100\n"
+"POT-Creation-Date: 2016-04-26 13:39+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/src/glvolume.c b/src/glvolume.c
index abfc286..b532ea2 100644
--- a/src/glvolume.c
+++ b/src/glvolume.c
@@ -408,15 +408,15 @@ static const char *__fragment_program[] = {
"uniform float alpha_discard_min;\n"
"void main(void)\n",
"{\n",
- " float alpha = texture3D(VolumeTexture, gl_TexCoord[0]).a;\n", //getting the Normal/Value Values,
+ " float alpha = texture3D(VolumeTexture, gl_TexCoord[0].xyz).a;\n", //getting the Normal/Value Values,
" if (alpha > alpha_discard_max || alpha < alpha_discard_min) discard;\n",
//computing SurfaceNormal
- " float nx = GradientScale.x * (texture3D(VolumeTexture, gl_TexCoord[1]).a - alpha);\n",
- " float ny = GradientScale.y * (texture3D(VolumeTexture, gl_TexCoord[2]).a - alpha);\n",
- " float nz = GradientScale.z * (texture3D(VolumeTexture, gl_TexCoord[3]).a - alpha);\n",
+ " float nx = GradientScale.x * (texture3D(VolumeTexture, gl_TexCoord[1].xyz).a - alpha);\n",
+ " float ny = GradientScale.y * (texture3D(VolumeTexture, gl_TexCoord[2].xyz).a - alpha);\n",
+ " float nz = GradientScale.z * (texture3D(VolumeTexture, gl_TexCoord[3].xyz).a - alpha);\n",
" vec3 Norm = normalize(vec3(nx, ny, nz));",
" float LightIntens = max(dot(LightDirection, Norm),0.0);", //computing Light Intensity
- " gl_FragColor = vec4(LightIntens.xxx, alpha);", //setting Fragmentcolor
+ " gl_FragColor = vec4(LightIntens, LightIntens, LightIntens, alpha);", //setting Fragmentcolor
"}\n"
};
diff --git a/src/main.c b/src/main.c
index d0438cb..b6d579c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -74,7 +74,7 @@ int main (int argc, char *argv[])
{ "volume", 'v', POPT_ARG_STRING, &in_filename, 0,
"volume image (only unsigned short and unsigned byte are supported)", "volume" },
{ "glade-file", 0, POPT_ARG_STRING, &glade_filename, 0,
- "use specified glade interface file (only usefull when run from source tree)", "glade" },
+ "use specified glade interface file (only useful when run from source tree)", "glade" },
POPT_AUTOHELP
{ NULL, 0, 0, NULL, 0, 0, 0 }
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mialmpick.git
More information about the debian-med-commit
mailing list