Commit 5dfc60af authored by Steve Langasek's avatar Steve Langasek Committed by Joao Eriberto Mota Filho

Imported Debian patch 0.4.0.dfsg.1-4

parent 05682292
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 <vorlon@debian.org> 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.
......
......@@ -2,7 +2,7 @@ Source: libvisual-plugins
Section: sound
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends: cdbs, debhelper, libvisual-0.4-dev, chrpath, libesd0-dev, libjack-dev, libgtk2.0-dev, x11proto-core-dev, libx11-dev, libgl1-mesa-dev, libxxf86vm-dev, libglu1-mesa-dev, libasound2-dev [linux-any], bison
Build-Depends: debhelper (>= 8.9.4~), libvisual-0.4-dev, chrpath, 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
......
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -28,7 +28,7 @@ gettextsrcdir = $(datadir)/gettext/po
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
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = mkinstalldirs
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
GMSGFMT = @GMSGFMT@
--- /dev/null
+++ b/po/mkinstalldirs
@@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage" 1>&2
+ exit 0
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+done
+
+for file
+do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+ 0) exit 0 ;;
+esac
+
+case $dirmode in
+ '')
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ fi
+ ;;
+esac
+
+for file
+do
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+ACLOCAL_AMFLAGS = -I m4
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
+
+ pathcomp="$pathcomp/"
+ done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here
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])
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"),
This diff is collapsed.
......@@ -3,4 +3,4 @@
03_build_against_gl_fixes.patch
04_lv_analyzer_build_fix.patch
05_fix_po.patch
90_autoreconf.patch
60_no-const-vispluginfo-in-nastyfft.patch
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
export DEB_CPPFLAGS_MAINT_APPEND := -D_GNU_SOURCE
DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --disable-gdkpixbuf-plugin --enable-debug
%:
dh $@ --with autoreconf
install/libvisual-0.4-plugins::
find debian/libvisual-0.4-plugins -name '*.la' | xargs rm -f
find debian/libvisual-0.4-plugins -name '*.a' | xargs rm -f
find debian/libvisual-0.4-plugins -name '*.so' | xargs chrpath --delete
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment