debian/0000755000000000000000000000000012033526016007164 5ustar debian/copyright0000644000000000000000000000236111726503107011125 0ustar This package was debianized by David Schleef 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 /* Libvisual-plugins - Standard plugins for libvisual * * Copyright (C) 2004, 2005 Dennis Smit * * Authors: Dennis Smit * * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ A copy of the GPL can be found in /usr/share/common-licenses/GPL-2 debian/source/0000755000000000000000000000000011726506650010476 5ustar debian/source/format0000644000000000000000000000001411726503107011676 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000001523312033526016011042 0ustar libvisual-plugins (0.4.0.dfsg.1-7build1) quantal; urgency=low * Rebuild for new armel compiler default of ARMv5t. -- Colin Watson Fri, 05 Oct 2012 10:44:46 +0100 libvisual-plugins (0.4.0.dfsg.1-7) unstable; urgency=low * QA upload. * Mark libvisual-0.4-plugins Multi-Arch: same, since it already ships its files in the right place. This lets the libvisual Recommends be satisfied correctly when installing for a foreign arch. LP: #947639. -- Steve Langasek Fri, 09 Mar 2012 22:52:04 +0000 libvisual-plugins (0.4.0.dfsg.1-6) unstable; urgency=low * QA upload. * Ship the alsa.m4 macro in the package since libasound2-dev is linux-only and autoreconf will fail on non-linux plattforms otherwise. Closes: #647231 -- Michael Biebl Wed, 25 Jan 2012 11:46:09 +0100 libvisual-plugins (0.4.0.dfsg.1-5) unstable; urgency=low * QA upload. * Build-depend on libvisual-0.4-dev (>= 0.4.0-4) to ensure we install to the multiarch path on all architectures. * Drop unused build-dependency on chrpath. -- Steve Langasek Wed, 26 Oct 2011 01:38:28 +0000 libvisual-plugins (0.4.0.dfsg.1-4) unstable; urgency=low * QA upload. * Various fixes from Ubuntu: - Drop build-dependencies on libesd and libjack, neither of which are used at runtime. Closes: #503013. - Drop build-dependency on x11proto-core-dev, not used at build time. - Build-dep on mesa-common-dev explicitely for GL/glx.h. - Add -D_GNU_SOURCE to CFLAGS to pick up mremap prototype. LP: #766045. - 60_no-const-vispluginfo-in-nastyfft: the static VisPluginInfo in nastyfft was declared as const, but libvisual write to its refcount when it visual_object_unref()s it (nasty!). This is broken at various levels: libvisual shouldn't be writing to this static plugin which is allocated by a dlopen()ed plugin, and it should also honor the "const VisPluginInfo" API... Anyway, nastyfft was the only occurrence and this fixes the crash for now; LP: #287448. * Switch from cdbs to dh(1). * Switch to debhelper compat 9 for hardening. * Use dh_autoreconf to get up-to-date config.guess/config.sub at build time, and drop debian/patches/90_autoreconf.patch. Closes: #503017. * Also build-depend on autopoint, not pulled in by dh-autoreconf but needed for this package. * Update debian/patches/05_fix_po.patch to actually be safe in the face of autoreconfing. -- Steve Langasek Tue, 25 Oct 2011 23:02:36 +0000 libvisual-plugins (0.4.0.dfsg.1-3) unstable; urgency=low * QA upload, orphaning package see #641060. * Update build depend on x-dev to x11proto-core-dev. (Closes: #515381) * Update build depend on libjack0.100.0-dev to libjack-dev. (Closes: #527419) * Remove obsolete build depend on xutils. * Use linux-any instead of hardcoded list of non-Linux architectures. (Closes: #634479) * Switch to format source 3.0: adapt patches and remove the include in simple-patchsys.mk * Clean patch 90_autoreconf.patch and remove useless cache directory autom4te.cache. (Closes: #503015) * Add watch file, thanks to Loïc Minier. (Closes: #503018) * Bump to dh compatibility 8. * Drop libvisual-0.4-plugins.install file. * Add ${misc:Depends} in the Depends line. * Update to Standards-Version 3.9.2, no changes required. * Add duplicate Section line. -- Ana Beatriz Guerrero Lopez Sat, 10 Sep 2011 15:18:54 +0200 libvisual-plugins (0.4.0.dfsg.1-2) unstable; urgency=low * Merged Ubuntu Changes * Remove libasound-dev from build dep on KFreeBSD-amd64 and hurd-i386 (Closes: #451112) * debian/patches/02_64-bit_JESS_fix.patch (Closes: #400810) applied from -1ubuntu3 merge * Changed Maintainer (Closes: #451213) -- Brandon Holtsclaw Fri, 23 Nov 2007 07:31:40 +0000 libvisual-plugins (0.4.0.dfsg.1-1ubuntu3) gutsy; urgency=low [ Richard James Edmands ] [Patches by David Leverton] * debian/patches/02_64-bit_JESS_fix.patch: - Fix a crasher with JESS on 64-bit (LP: #103393, LP: #109409, LP: #85163) * debian/patches/03_build_against_gl_fixes.patch: - Fixes the makefiles to make sure GL visualizations get built against libGL (LP: #115502) * debian/patches/04_lv_analyzer_build_fix.patch: - Fixes configure so that lv_analyzer actually gets built [Richard Edmands] * debian/patches/01_disable-gforce-dfsg.patch: - Converted the old g-force disable change to a patch * debian/patches/05_fix_po.patch: - Fixed so translations work properly * debian/rules: - Disabling gdkpixbuf plugin as it is just a blank visualization - Enable Debugging (LP: #150781) * debian/control: - Bumped Standards version to 3.7.2 - Remove build-dep on libgdk-pixbuf-dev as it is no longer needed [ Christopher James Halse Rogers ] * debian/90_autoreconf: - Run autoreconf to activate the build-system fixes. - Move all of Debian's auto* changes from the .diff.gz to this patch. * By combined power of above, close (LP: #123934). Thanks very much for your work! -- Christopher James Halse Rogers Wed, 10 Oct 2007 22:00:24 +1000 libvisual-plugins (0.4.0.dfsg.1-1ubuntu2) gutsy; urgency=low * debian/control: Update maintainer fields according to debian- maintainer-field spec. -- Martin Pitt Wed, 15 Aug 2007 08:07:55 +0000 libvisual-plugins (0.4.0.dfsg.1-1ubuntu1) edgy; urgency=low * Sync with Debian * debian/control: + Change x11proto-gl-dev Build-Depends to libgl1-mesa-dev and libglu1-mesa-dev + Add Replaces/Conflicts on libvisual0.4-plugins -- Sebastian Dröge Sat, 29 Jul 2006 15:26:31 +0200 libvisual-plugins (0.4.0.dfsg.1-1) unstable; urgency=low * New upstream release. - builds with gcc-4.x (Closes: #343006) * Remove libasound-dev from build dep on KFreeBSD-i386 (Closes: #336855) -- David Schleef Fri, 19 May 2006 16:43:11 -0700 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 Thu, 08 Sep 2005 19:25:56 -0700 debian/watch0000644000000000000000000000015211726503107010217 0ustar version=3 opts=dversionmangle=s/\.dfsg\.\d+$// \ http://sf.net/libvisual/libvisual-plugins-(.+)\.tar.gz debian/patches/0000755000000000000000000000000011726506650010625 5ustar debian/patches/06_alsa_m4_macro.patch0000644000000000000000000001122211726503107014644 0ustar Index: libvisual-plugins-0.4.0.dfsg.1/m4/alsa.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ libvisual-plugins-0.4.0.dfsg.1/m4/alsa.m4 2012-01-25 11:45:41.320529192 +0100 @@ -0,0 +1,141 @@ +dnl Configure Paths for Alsa +dnl Some modifications by Richard Boulton +dnl Christopher Lansdown +dnl Jaroslav Kysela +dnl Last modification: $Id: alsa.m4,v 1.24 2004/09/15 18:48:07 tiwai Exp $ +dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. +dnl enables arguments --with-alsa-prefix= +dnl --with-alsa-enc-prefix= +dnl --disable-alsatest +dnl +dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, +dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. +dnl +AC_DEFUN([AM_PATH_ALSA], +[dnl Save the original CFLAGS, LDFLAGS, and LIBS +alsa_save_CFLAGS="$CFLAGS" +alsa_save_LDFLAGS="$LDFLAGS" +alsa_save_LIBS="$LIBS" +alsa_found=yes + +dnl +dnl Get the cflags and libraries for alsa +dnl +AC_ARG_WITH(alsa-prefix, +[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], +[alsa_prefix="$withval"], [alsa_prefix=""]) + +AC_ARG_WITH(alsa-inc-prefix, +[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], +[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) + +dnl FIXME: this is not yet implemented +AC_ARG_ENABLE(alsatest, +[ --disable-alsatest Do not try to compile and run a test Alsa program], +[enable_alsatest="$enableval"], +[enable_alsatest=yes]) + +dnl Add any special include directories +AC_MSG_CHECKING(for ALSA CFLAGS) +if test "$alsa_inc_prefix" != "" ; then + ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" + CFLAGS="$CFLAGS -I$alsa_inc_prefix" +fi +AC_MSG_RESULT($ALSA_CFLAGS) + +dnl add any special lib dirs +AC_MSG_CHECKING(for ALSA LDFLAGS) +if test "$alsa_prefix" != "" ; then + ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" + LDFLAGS="$LDFLAGS $ALSA_LIBS" +fi + +dnl add the alsa library +ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" +LIBS="$ALSA_LIBS $LIBS" +AC_MSG_RESULT($ALSA_LIBS) + +dnl Check for a working version of libasound that is of the right version. +min_alsa_version=ifelse([$1], ,0.1.1,$1) +AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) +no_alsa="" + alsa_min_major_version=`echo $min_alsa_version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + alsa_min_minor_version=`echo $min_alsa_version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + alsa_min_micro_version=`echo $min_alsa_version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + +AC_LANG_SAVE +AC_LANG_C +AC_TRY_COMPILE([ +#include +], [ +/* ensure backward compatibility */ +#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) +#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR +#endif +#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) +#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR +#endif +#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) +#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR +#endif + +# if(SND_LIB_MAJOR > $alsa_min_major_version) + exit(0); +# else +# if(SND_LIB_MAJOR < $alsa_min_major_version) +# error not present +# endif + +# if(SND_LIB_MINOR > $alsa_min_minor_version) + exit(0); +# else +# if(SND_LIB_MINOR < $alsa_min_minor_version) +# error not present +# endif + +# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) +# error not present +# endif +# endif +# endif +exit(0); +], + [AC_MSG_RESULT(found.)], + [AC_MSG_RESULT(not present.) + ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) + alsa_found=no] +) +AC_LANG_RESTORE + +dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. +if test "x$enable_alsatest" = "xyes"; then +AC_CHECK_LIB([asound], [snd_ctl_open],, + [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) + alsa_found=no] +) +fi + +if test "x$alsa_found" = "xyes" ; then + ifelse([$2], , :, [$2]) + LIBS=`echo $LIBS | sed 's/-lasound//g'` + LIBS=`echo $LIBS | sed 's/ //'` + LIBS="-lasound $LIBS" +fi +if test "x$alsa_found" = "xno" ; then + ifelse([$3], , :, [$3]) + CFLAGS="$alsa_save_CFLAGS" + LDFLAGS="$alsa_save_LDFLAGS" + LIBS="$alsa_save_LIBS" + ALSA_CFLAGS="" + ALSA_LIBS="" +fi + +dnl That should be it. Now just export out symbols: +AC_SUBST(ALSA_CFLAGS) +AC_SUBST(ALSA_LIBS) +]) + debian/patches/series0000644000000000000000000000030611726503107012033 0ustar 01_disable-gforce-dfsg.patch 02_64-bit_JESS_fix.patch 03_build_against_gl_fixes.patch 04_lv_analyzer_build_fix.patch 05_fix_po.patch 60_no-const-vispluginfo-in-nastyfft.patch 06_alsa_m4_macro.patch debian/patches/01_disable-gforce-dfsg.patch0000644000000000000000000000347611726503107015741 0ustar --- a/configure.ac +++ b/configure.ac @@ -414,7 +414,7 @@ AC_ARG_ENABLE([gforce], AS_HELP_STRING([--disable-gforce], [Do not build the G-Force plugin @<:@default=enabled@:>@]), [ENABLE_GFORCE=$enableval], - [ENABLE_GFORCE=yes]) + [ENABLE_GFORCE=no]) if test "$ENABLE_GFORCE" = "yes"; then build_actor_plugins="$build_actor_plugins G-Force" @@ -558,28 +558,6 @@ AC_CONFIG_FILES([ plugins/actor/nastyfft/Makefile plugins/actor/oinksie/Makefile plugins/actor/pseudotoad_flower/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 --- a/plugins/actor/Makefile.am +++ b/plugins/actor/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS = $(build_actor_plugins) DIST_SUBDIRS = \ bumpscope \ corona \ - G-Force \ gdkpixbuf \ gstreamer \ infinite \ debian/patches/03_build_against_gl_fixes.patch0000644000000000000000000002321311726503107016630 0ustar --- a/plugins/actor/bumpscope/Makefile.am +++ b/plugins/actor/bumpscope/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_bumpscope.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_bumpscope_la_LDFLAGS = -module -avoid-version +actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS) actor_bumpscope_la_SOURCES = actor_bumpscope.c \ actor_bumpscope.h \ --- a/plugins/actor/corona/Makefile.am +++ b/plugins/actor/corona/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_corona.la -LIBS += $(LIBVISUAL_LIBS) - AM_CXXFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_corona_la_LDFLAGS = -module -avoid-version +actor_corona_la_LIBADD = $(LIBVISUAL_LIBS) actor_corona_la_SOURCES = actor_corona.cpp \ autopal.h \ --- a/plugins/actor/gdkpixbuf/Makefile.am +++ b/plugins/actor/gdkpixbuf/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la -LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version +actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS) actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c --- a/plugins/actor/gstreamer/Makefile.am +++ b/plugins/actor/gstreamer/Makefile.am @@ -2,14 +2,13 @@ actor_plugin_LTLIBRARIES = actor_gstreamer.la -LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS) INCLUDES = $(all_includes) \ -I$(top_srcdir) actor_gstreamer_la_LDFLAGS = -module -avoid-version +actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) actor_gstreamer_la_SOURCES = actor_gstreamer.c --- a/plugins/actor/infinite/Makefile.am +++ b/plugins/actor/infinite/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_infinite.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_infinite_la_LDFLAGS = -module -avoid-version +actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS) actor_infinite_la_SOURCES = compute.c compute.h \ display.c display.h \ --- a/plugins/actor/jakdaw/Makefile.am +++ b/plugins/actor/jakdaw/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_jakdaw.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_jakdaw_la_LDFLAGS = -module -avoid-version +actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS) actor_jakdaw_la_SOURCES = actor_jakdaw.c \ actor_jakdaw.h \ --- a/plugins/actor/JESS/Makefile.am +++ b/plugins/actor/JESS/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_JESS.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_JESS_la_LDFLAGS = -module -avoid-version +actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS) actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\ distorsion.c distorsion.h\ --- a/plugins/actor/lv_analyzer/Makefile.am +++ b/plugins/actor/lv_analyzer/Makefile.am @@ -2,14 +2,13 @@ actor_plugin_LTLIBRARIES = actor_lv_analyzer.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) \ -I$(top_srcdir) actor_lv_analyzer_la_LDFLAGS = -module -avoid-version +actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS) actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c --- a/plugins/actor/lv_gltest/Makefile.am +++ b/plugins/actor/lv_gltest/Makefile.am @@ -4,5 +4,5 @@ actor_plugin_LTLIBRARIES = actor_lv_glte actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) actor_lv_gltest_la_LDFLAGS = -module -avoid-version -actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU +actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU actor_lv_gltest_la_SOURCES = actor_lv_gltest.c --- a/plugins/actor/lv_scope/Makefile.am +++ b/plugins/actor/lv_scope/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_lv_scope.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_lv_scope_la_LDFLAGS = -module -avoid-version +actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS) actor_lv_scope_la_SOURCES = actor_lv_scope.c --- a/plugins/actor/madspin/Makefile.am +++ b/plugins/actor/madspin/Makefile.am @@ -10,5 +10,5 @@ actor_plugin_LTLIBRARIES = actor_madspin actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\" actor_madspin_la_LDFLAGS = -module -avoid-version -actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL +actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL actor_madspin_la_SOURCES = madspin.c --- a/plugins/actor/nastyfft/Makefile.am +++ b/plugins/actor/nastyfft/Makefile.am @@ -4,5 +4,5 @@ actor_plugin_LTLIBRARIES = actor_nastyff actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) actor_nastyfft_la_LDFLAGS = -module -avoid-version -actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU +actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU actor_nastyfft_la_SOURCES = actor_nastyfft.c --- a/plugins/actor/oinksie/Makefile.am +++ b/plugins/actor/oinksie/Makefile.am @@ -2,13 +2,12 @@ actor_plugin_LTLIBRARIES = actor_oinksie.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) actor_oinksie_la_LDFLAGS = -module -avoid-version +actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS) actor_oinksie_la_SOURCES = actor_oinksie.c\ oinksie.c oinksie.h\ --- a/plugins/actor/pseudotoad_flower/Makefile.am +++ b/plugins/actor/pseudotoad_flower/Makefile.am @@ -4,7 +4,7 @@ actor_plugin_LTLIBRARIES = actor_flower. actor_flower_la_LDFLAGS = -module -avoid-version actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) -actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU +actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU actor_flower_la_SOURCES = \ actor_flower.c \ --- a/plugins/input/alsa/Makefile.am +++ b/plugins/input/alsa/Makefile.am @@ -2,12 +2,11 @@ input_plugin_LTLIBRARIES = input_alsa.la -LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS) - AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) input_alsa_la_LDFLAGS = -module -avoid-version +input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS) input_alsa_la_SOURCES = input_alsa.c --- a/plugins/input/debug/Makefile.am +++ b/plugins/input/debug/Makefile.am @@ -2,11 +2,10 @@ input_plugin_LTLIBRARIES = input_debug.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) input_debug_la_LDFLAGS = -module -avoid-version +input_debug_la_LIBADD = $(LIBVISUAL_LIBS) input_debug_la_SOURCES = input_debug.c --- a/plugins/input/esd/Makefile.am +++ b/plugins/input/esd/Makefile.am @@ -2,11 +2,10 @@ input_plugin_LTLIBRARIES = input_esd.la -LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) input_esd_la_LDFLAGS = -module -avoid-version +input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS) input_esd_la_SOURCES = input_esd.c --- a/plugins/input/jack/Makefile.am +++ b/plugins/input/jack/Makefile.am @@ -2,13 +2,12 @@ input_plugin_LTLIBRARIES = input_jack.la -LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) input_jack_la_LDFLAGS = -module -avoid-version +input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) input_jack_la_SOURCES = input_jack.c --- a/plugins/input/mplayer/Makefile.am +++ b/plugins/input/mplayer/Makefile.am @@ -2,12 +2,11 @@ input_plugin_LTLIBRARIES = input_mplayer.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) input_mplayer_la_LDFLAGS = -module -avoid-version +input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS) input_mplayer_la_SOURCES = input_mplayer.c --- a/plugins/morph/alphablend/Makefile.am +++ b/plugins/morph/alphablend/Makefile.am @@ -2,11 +2,10 @@ morph_plugin_LTLIBRARIES = morph_alphablend.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) morph_alphablend_la_LDFLAGS = -module -avoid-version +morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS) morph_alphablend_la_SOURCES = morph_alphablend.c --- a/plugins/morph/flash/Makefile.am +++ b/plugins/morph/flash/Makefile.am @@ -2,11 +2,10 @@ morph_plugin_LTLIBRARIES = morph_flash.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) morph_flash_la_LDFLAGS = -module -avoid-version +morph_flash_la_LIBADD = $(LIBVISUAL_LIBS) morph_flash_la_SOURCES = morph_flash.c --- a/plugins/morph/slide/Makefile.am +++ b/plugins/morph/slide/Makefile.am @@ -2,11 +2,10 @@ morph_plugin_LTLIBRARIES = morph_slide.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) morph_slide_la_LDFLAGS = -module -avoid-version +morph_slide_la_LIBADD = $(LIBVISUAL_LIBS) morph_slide_la_SOURCES = morph_slide.c --- a/plugins/morph/tentacle/Makefile.am +++ b/plugins/morph/tentacle/Makefile.am @@ -2,11 +2,10 @@ morph_plugin_LTLIBRARIES = morph_tentacle.la -LIBS += $(LIBVISUAL_LIBS) - AM_CFLAGS = $(LIBVISUAL_CFLAGS) INCLUDES = $(all_includes) -I$(top_srcdir) morph_tentacle_la_LDFLAGS = -module -avoid-version +morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS) morph_tentacle_la_SOURCES = morph_tentacle.c debian/patches/04_lv_analyzer_build_fix.patch0000644000000000000000000000044411726503107016520 0ustar --- a/configure.ac +++ b/configure.ac @@ -361,7 +361,7 @@ AC_ARG_ENABLE([analyzer], [ENABLE_ANALYZER=$enableval], [ENABLE_ANALYZER=yes]) -if test "$ENABLE_ANALYZER" = xyes; then +if test "$ENABLE_ANALYZER" = "yes"; then build_actor_plugins="$build_actor_plugins lv_analyzer" fi debian/patches/05_fix_po.patch0000644000000000000000000000130511726503107013427 0ustar Index: debian/Makefile.am =================================================================== --- debian.orig/Makefile.am +++ debian/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to generate a Makefile.in +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = plugins po EXTRA_DIST = libvisual-plugins.spec gettext.h po/Makevars.in Index: debian/configure.ac =================================================================== --- debian.orig/configure.ac +++ debian/configure.ac @@ -13,6 +13,7 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) m4_define([libvisual_required_version], [lv_plugins_version]) m4_define([esound_required_version], [0.2.28]) debian/patches/02_64-bit_JESS_fix.patch0000644000000000000000000000352511726503107014645 0ustar --- a/plugins/actor/JESS/renderer.c +++ b/plugins/actor/JESS/renderer.c @@ -282,7 +282,7 @@ void fade(float variable, uint8_t * dim) void render_deformation(JessPrivate *priv, int defmode) { - uint32_t bmax; + intptr_t bmax; uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i; uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux; @@ -294,7 +294,7 @@ void render_deformation(JessPrivate *pri tab2 = priv->table2; tab3 = priv->table3; tab4 = priv->table4; - bmax = priv->resx * priv->resy + (uint32_t) priv->pixel; + bmax = priv->resx * priv->resy + (intptr_t) priv->pixel; switch(defmode) { @@ -352,7 +352,7 @@ void render_deformation(JessPrivate *pri } for (i = 0; i < priv->resy * priv->resx; i++) { - aux = (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer); + aux = (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer); *(pix++) = *(aux++) ; *(pix++) = *(aux++); *(pix++) = *(aux); @@ -373,7 +373,8 @@ void render_blur(JessPrivate *priv, int /* j'ai mis pixel par defaut... */ uint8_t *pix = priv->pixel; - uint32_t bmax,pitch_4; + intptr_t bmax; + uint32_t pitch_4; pix = priv->pixel; if (priv->pixel == NULL) @@ -387,7 +388,7 @@ void render_blur(JessPrivate *priv, int if (priv->video == 8) { if (visual_cpu_get_mmx ()) { - bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel; + bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel; #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) __asm __volatile ("\n\t pxor %%mm6, %%mm6" @@ -423,7 +424,7 @@ void render_blur(JessPrivate *priv, int else { pitch_4 = priv->pitch+4; - bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel; + bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel; if (visual_cpu_get_mmx ()) { #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) debian/patches/60_no-const-vispluginfo-in-nastyfft.patch0000644000000000000000000000142711726503107020514 0ustar The static VisPluginInfo in nastyfft was declared as const, but libvisual write to its refcount when it visual_object_unref()s it (nasty!). This is broken at various levels: libvisual shouldn't be writing to this static plugin which is allocated by a dlopen()ed plugin, and it should also honor the "const VisPluginInfo" API... Anyway, nastyfft was the only occurrence and this fixes the crash for now; LP: #287448. --- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c +++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c @@ -80,7 +80,7 @@ .vidoptions.depth = VISUAL_VIDEO_DEPTH_GL }}; - static const VisPluginInfo info[] = {{ + static VisPluginInfo info[] = {{ .type = VISUAL_PLUGIN_TYPE_ACTOR, .plugname = N_("nastyfft"), debian/control0000644000000000000000000000120711726506635010604 0ustar Source: libvisual-plugins Section: sound Priority: optional Maintainer: Debian QA Group Build-Depends: debhelper (>= 8.9.4~), libvisual-0.4-dev (>= 0.4.0-4), libgtk2.0-dev, libx11-dev, libgl1-mesa-dev, mesa-common-dev, libxxf86vm-dev, libglu1-mesa-dev, libasound2-dev [linux-any], bison, dh-autoreconf, autopoint Standards-Version: 3.9.2 Package: libvisual-0.4-plugins Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libvisual0.4-plugins Replaces: libvisual0.4-plugins Description: Audio visualization framework plugins Plugins for the libvisual audio visualization framework. debian/rules0000755000000000000000000000045211726503107010251 0ustar #!/usr/bin/make -f export DEB_CPPFLAGS_MAINT_APPEND := -D_GNU_SOURCE %: dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- --disable-gdkpixbuf-plugin --enable-debug override_dh_auto_install: dh_auto_install find debian/libvisual-0.4-plugins -name '*.la' | xargs rm -f debian/compat0000644000000000000000000000000211726503107010366 0ustar 9