Commit 61a5700b authored by David Schleef's avatar David Schleef Committed by Joao Eriberto Mota Filho

Imported Debian patch 0.2.0.dfsg.1-1

parent 5034838f
......@@ -115,8 +115,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -180,6 +178,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -6066,63 +6066,137 @@ SED=$lt_cv_path_SED
AC_MSG_RESULT([$SED])
])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN(PKG_CHECK_MODULES, [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
#
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
# this or PKG_CHECK_MODULES is called, or make sure to call
# PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
if test $pkg_failed = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
[Package requirements ($2) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
to avoid the need to call pkg-config. See the pkg-config man page for
more details.])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
to avoid the need to call pkg-config. See the pkg-config man page for
more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
# -*- Autoconf -*-
# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
......
This diff is collapsed.
......@@ -430,24 +430,6 @@ else
AC_MSG_RESULT([no])
fi
AC_ARG_ENABLE([gforce],
AC_HELP_STRING([--disable-gforce],
[Do not build gforce plugin @<:@default=enabled@:>@]),
[gforce=$enableval],
[gforce=yes])
AC_MSG_CHECKING([whether to build bumpscope plugin])
if test x$gforce = xyes; then
AC_MSG_RESULT([yes])
build_actor="$build_actor G-Force"
AC_SUBST([GFORCE], ['actor_gforce.la'])
# Special flags for G-Force, make this only for G-Force FIXME FIXME!!!
GFORCE_CFLAGS="-DUNIX_X -D_REENTRANT"
AC_SUBST(GFORCE_FLAGS, "${GFORCE_CFLAGS}")
else
AC_MSG_RESULT([no])
fi
AC_ARG_ENABLE([alphablend],
AC_HELP_STRING([--disable-alphablend],
[Do not build alphablend morph plugin @<:@default=enabled@:>@]),
......@@ -611,28 +593,6 @@ AC_CONFIG_FILES([
plugins/actor/corona/Makefile
plugins/actor/goom2/Makefile
plugins/actor/gdkpixbuf/Makefile
plugins/actor/G-Force/Makefile
plugins/actor/G-Force/docs/Makefile
plugins/actor/G-Force/Common/Makefile
plugins/actor/G-Force/Common/GeneralTools/Makefile
plugins/actor/G-Force/Common/GeneralTools/Headers/Makefile
plugins/actor/G-Force/Common/io/Makefile
plugins/actor/G-Force/Common/io/Headers/Makefile
plugins/actor/G-Force/Common/math/Makefile
plugins/actor/G-Force/Common/math/Headers/Makefile
plugins/actor/G-Force/Common/UI/Makefile
plugins/actor/G-Force/Common/UI/Headers/Makefile
plugins/actor/G-Force/GForceCommon/Makefile
plugins/actor/G-Force/GForceCommon/Headers/Makefile
plugins/actor/G-Force/unix/Makefile
plugins/actor/G-Force/unix/Headers/Makefile
plugins/actor/G-Force/unix/libmfl/Makefile
plugins/actor/G-Force/unix/libvisual/Makefile
plugins/actor/G-Force/GForceColorMaps/Makefile
plugins/actor/G-Force/GForceDeltaFields/Makefile
plugins/actor/G-Force/GForceParticles/Makefile
plugins/actor/G-Force/GForceWaveShapes/Makefile
plugins/actor/G-Force/NotWorkingWaveShapes/Makefile
plugins/input/Makefile
plugins/input/esd/Makefile
plugins/input/alsa/Makefile
......
libvisual-plugins (0.2.0.dfsg.1-1) unstable; urgency=low
* New package
- removed plugins/actor/G-Force directory because it contains
code that is not DFSG-free.
- This package does not compile with gcc-4.0, thus the need to
force an older compiler. There is C++ code in here, although
the interface is completely C-based. Since these are plugins,
they don't export anything that depends on the C++ ABI, but
there could theoretically be problems if an application that
uses a different C++ ABI loads these plugins, thus causing two
libstdc++ .so's to be loaded simultaneously.
-- David Schleef <ds@schleef.org> Thu, 08 Sep 2005 19:25:56 -0700
Source: libvisual-plugins
Section: sound
Priority: optional
Maintainer: David Schleef <ds@schleef.org>
Build-Depends: cdbs, debhelper, libvisual0.2-dev, gcc-3.4, g++-3.4, chrpath, libesd0-dev, libjack0.100.0-dev, libgdk-pixbuf-dev, libgtk2.0-dev, xutils, x-dev, libx11-dev, xlibmesa-gl-dev, libxxf86vm-dev, xlibmesa-glu-dev, libasound2-dev
Standards-Version: 3.5.6
Package: libvisual0.2-plugins
Section: sound
Architecture: any
Depends: ${shlibs:Depends}
Description: Audio visualization framework plugins
Plugins for the libvisual audio visualization framework.
This package was debianized by David Schleef <ds@schleef.org> on
Wed, 22 Jun 2005 16:07:50 -0700.
It was downloaded from http://libvisual.sourceforge.net/
The upstream tarball was modified to remove the non-free G-Force
plugin.
Upstream Author: Dennis Smit <synap@users.sourceforge.net>
/* Libvisual-plugins - Standard plugins for libvisual
*
* Copyright (C) 2004, 2005 Dennis Smit <ds@nerds-incorporated.org>
*
* Authors: Dennis Smit <ds@nerds-incorporated.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
A copy of the GPL can be found in /usr/share/common-licenses/GPL-2
debian/tmp/usr/lib/lib*.so.*
shlibs:Depends=libasound2 (>> 1.0.9), libaudiofile0 (>= 0.2.3-4), libc6 (>= 2.3.4-1), libcairo2 (>= 1.0.0), libesd0 (>= 0.2.35) | libesd-alsa0 (>= 0.2.35), libfontconfig1 (>= 2.3.0), libfreetype6 (>= 2.1.5-1), libgcc1 (>= 1:4.0.1), libgl1-mesa | libgl1, libglib2.0-0 (>= 2.8.0), libglu1-mesa | libglu1, libgtk2.0-0 (>= 2.8.0), libjack0.80.0-0 (>= 0.99.0), libpango1.0-0 (>= 1.10.0), libstdc++6 (>= 4.0.1), libvisual0.2 (>= 0.2.0), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, zlib1g (>= 1:1.2.1)
# Automatically added by dh_makeshlibs
if [ "$1" = "configure" ]; then
ldconfig
fi
# End automatically added section
# Automatically added by dh_makeshlibs
if [ "$1" = "remove" ]; then
ldconfig
fi
# End automatically added section
#!/usr/bin/make -f
CC=gcc-3.4
CXX=g++-3.4
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
install/libvisual0.2-plugins::
find debian/libvisual0.2-plugins -name '*.la' | xargs rm -f
find debian/libvisual0.2-plugins -name '*.a' | xargs rm -f
find debian/libvisual0.2-plugins -name '*.so' | xargs chrpath --delete
......@@ -99,8 +99,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -164,6 +162,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -119,8 +119,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -184,6 +182,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -2,5 +2,5 @@
SUBDIRS = goom2 gdkpixbuf lv_gltest madspin \
infinite JESS lv_analyzer lv_scope oinksie \
jakdaw plazma bumpscope corona nebulus \
G-Force dancingparticles pseudotoad_flower
dancingparticles pseudotoad_flower
......@@ -99,8 +99,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -164,6 +162,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......@@ -203,7 +202,7 @@ target_alias = @target_alias@
SUBDIRS = goom2 gdkpixbuf lv_gltest madspin \
infinite JESS lv_analyzer lv_scope oinksie \
jakdaw plazma bumpscope corona nebulus \
G-Force dancingparticles pseudotoad_flower
dancingparticles pseudotoad_flower
all: all-recursive
......
......@@ -114,8 +114,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -179,6 +177,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -122,8 +122,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -187,6 +185,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -126,8 +126,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -191,6 +189,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -178,6 +176,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -178,6 +176,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -117,8 +117,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -182,6 +180,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -71,7 +71,7 @@ void _inf_compute_surface(InfinitePrivate *priv, t_interpol* vector_field)
if (cpucaps->hasMMX == 100) {
#ifdef VISUAL_ARCH_X86
int add_src2[2];
//int add_src2[2];
uint8_t *ptr_pix2[2];
int plugwidth = priv->plugwidth;
uint8_t *ptr_surf = priv->surface1;
......@@ -95,7 +95,7 @@ void _inf_compute_surface(InfinitePrivate *priv, t_interpol* vector_field)
"\n\t pxor %%mm4, %%mm4"
:: [plugw] "m" (plugwidth)
, [aflag] "m" (aflag)
: "mm4", "mm5", "mm6", "mm7");
);
for (j = 0; j < priv->plugheight; j++) {
for (i = 0; i < priv->plugwidth; i += 2) {
......@@ -129,10 +129,10 @@ void _inf_compute_surface(InfinitePrivate *priv, t_interpol* vector_field)
"\n\t movq %%mm0, %[pix]"
:: [interpol] "m" (*(coords))
, [addsrc2] "m" (add_src2)
//, [addsrc2] "m" (add_src2)
, [surf1] "m" (ptr_surf)
, [pix] "m" (*ptr_pix2)
: "mm0", "mm1", "mm2", "mm3", "mm4");
);
// printf ("%x %x\n", ptr_pix2[0], ptr_pix2[1]);
// printf ("%p %p\n", ptr_pix2[0], ptr_pix2[1]);
int color1 = 0, color2 = 0;
......
......@@ -114,8 +114,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -179,6 +177,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -178,6 +176,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -178,6 +176,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -178,6 +176,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -116,8 +116,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -181,6 +179,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -125,8 +125,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -190,6 +188,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -124,8 +124,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -189,6 +187,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -114,8 +114,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -179,6 +177,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -114,8 +114,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -179,6 +177,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -99,8 +99,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -164,6 +162,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@
GDKPIXBUF = @GDKPIXBUF@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
GFORCE = @GFORCE@
GFORCE_FLAGS = @GFORCE_FLAGS@
GLTEST = @GLTEST@
GOOM2 = @GOOM2@
HAVE_LIB_GL_FALSE = @HAVE_LIB_GL_FALSE@
......@@ -178,6 +176,7 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
......
......@@ -113,8 +113,6 @@ FLOWER = @FLOWER@