diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-20 11:40:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-20 11:40:04 +0100 |
| commit | fa1021504c53eb066826883dab3918e432b93444 (patch) | |
| tree | 312e7333a30cb09f648a85ec1a78bfb151ade116 /extra/libvisual-plugins | |
| parent | 65de768385d6ee97a2b45c807ab9955c642da7c0 (diff) | |
| parent | 99136e3a2e9f6f07a7ff08d5721bce354b853c8b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/freeimage/PKGBUILD
community/gummi/PKGBUILD
community/mfs/PKGBUILD
community/nzbget/PKGBUILD
community/openntpd/PKGBUILD
community/proj/PKGBUILD
community/yaws/PKGBUILD
gnome-unstable/totem-plparser/PKGBUILD
gnome-unstable/totem/PKGBUILD
multilib/lib32-libice/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcomposite/PKGBUILD
multilib/lib32-libxdmcp/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxinerama/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-libxss/PKGBUILD
multilib/lib32-libxtst/PKGBUILD
multilib/lib32-libxxf86vm/PKGBUILD
testing/bash/PKGBUILD
testing/bash/system.bashrc
Diffstat (limited to 'extra/libvisual-plugins')
| -rw-r--r-- | extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch | 18 | ||||
| -rw-r--r-- | extra/libvisual-plugins/PKGBUILD | 11 |
2 files changed, 25 insertions, 4 deletions
diff --git a/extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch new file mode 100644 index 000000000..8e54e02cb --- /dev/null +++ b/extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch @@ -0,0 +1,18 @@ +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"), diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD index 7c0010b8e..a929bdc64 100644 --- a/extra/libvisual-plugins/PKGBUILD +++ b/extra/libvisual-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148842 2012-02-05 11:52:32Z ibiru $ +# $Id: PKGBUILD 153728 2012-03-18 21:20:45Z jgc $ # Maintainer: damir <damir@archlinux.org> pkgname=libvisual-plugins pkgver=0.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="plugins for libvisual" arch=("i686" "x86_64" 'mips64el') license=('GPL') @@ -16,13 +16,15 @@ source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins 03_build_against_gl_fixes.patch 04_lv_analyzer_build_fix.patch 05_fix_po.patch - 050_all_automagic.patch) + 050_all_automagic.patch + 60_no-const-vispluginfo-in-nastyfft.patch) md5sums=('4330e9287f9d6fae02f482f428a1e77b' 'f9cfb607bfcbfef60830fae4e7dc6963' '116701408747dbb87dc134434478ebe2' '01678a8f1584c76a44e59d81003a1109' '6189b7427c4e11c8b8d6c6266d6a1629' - 'b50ae94c424a5f0af235deffa8451eb6') + 'b50ae94c424a5f0af235deffa8451eb6' + '7012518727cb072a7e90a826a5577cc6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,6 +32,7 @@ build() { patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch" patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch" patch -Np0 -i "${srcdir}/050_all_automagic.patch" + patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch" autoreconf -fi # Apply later as autoreconf overwrites po/Makefile.in.in |