From 853acffdfdaafc5b2982cbac2a0e5adda28e6d6e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 11 Aug 2011 23:14:30 +0000 Subject: Thu Aug 11 23:14:30 UTC 2011 --- extra/amule/PKGBUILD | 7 +- extra/ardour/PKGBUILD | 9 +- extra/ghex/PKGBUILD | 32 +- extra/gstreamer0.10-base/PKGBUILD | 20 +- ...am-fix-crashes-with-0-byte-vorbis-packets.patch | 22 ++ ...lt-on-0-byte-ogg_packet-in-_chain_reverse.patch | 21 ++ extra/gstreamer0.10-good/PKGBUILD | 11 +- extra/hylafax/PKGBUILD | 6 +- extra/imagemagick/PKGBUILD | 8 +- extra/libburn/PKGBUILD | 10 +- extra/libisoburn/PKGBUILD | 8 +- extra/libisofs/PKGBUILD | 6 +- extra/libvisual-plugins/02_64-bit_JESS_fix.patch | 58 ++++ .../03_build_against_gl_fixes.patch | 372 +++++++++++++++++++++ .../04_lv_analyzer_build_fix.patch | 12 + extra/libvisual-plugins/050_all_automagic.patch | 50 +++ extra/libvisual-plugins/05_fix_po.patch | 127 +++++++ extra/libvisual-plugins/PKGBUILD | 40 ++- 18 files changed, 760 insertions(+), 59 deletions(-) create mode 100644 extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch create mode 100644 extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch create mode 100644 extra/libvisual-plugins/02_64-bit_JESS_fix.patch create mode 100644 extra/libvisual-plugins/03_build_against_gl_fixes.patch create mode 100644 extra/libvisual-plugins/04_lv_analyzer_build_fix.patch create mode 100644 extra/libvisual-plugins/050_all_automagic.patch create mode 100644 extra/libvisual-plugins/05_fix_po.patch (limited to 'extra') diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 91ad6c41f..a85e67cc7 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129995 2011-06-30 18:10:17Z giovanni $ +# $Id: PKGBUILD 135112 2011-08-10 10:56:40Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Henrik Ronellenfitsch # Contributor: Alessio Sergi # Contributor: Dario 'Dax' Vilardi pkgname=amule -pkgver=10587 +pkgver=10598 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('94228cf3fa58178a84c24658a06022bd') +md5sums=('3ba206bd0c43c6fb3247e76141fcf148') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" @@ -39,5 +39,6 @@ build() { package() { cd "${srcdir}/aMule-SVN-r${pkgver}" + make DESTDIR=${pkgdir}/ install } diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 5780fa159..0add64a1f 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 131778 2011-07-14 23:39:36Z schiv $ +# $Id: PKGBUILD 135177 2011-08-10 20:28:08Z schiv $ # Maintainer: tobias # Maintainer: Ray Rashif # Contributor: Giovanni Scafora @@ -9,7 +9,7 @@ pkgname=ardour pkgver=2.8.11 -pkgrel=5 +pkgrel=6 pkgdesc="A multichannel hard disk recorder and digital audio workstation" arch=('i686' 'x86_64') url="http://ardour.org/" @@ -20,7 +20,8 @@ depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat' # +soundtouch (these +/- changes are for SYSLIBS) # liblrdf versioned for https://bugs.archlinux.org/task/25005 # slv2 versioned for https://bugs.archlinux.org/task/25060 -makedepends=('scons' 'boost' 'pkg-config') +makedepends=('scons' 'boost' 'pkg-config' 'cwiid') +optdepends=('cwiid: Wiimote support') changelog=${pkgname}.changelog source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.desktop @@ -52,6 +53,7 @@ build() { DIST_LIBDIR="lib" \ FREEDESKTOP=0 \ FREESOUND=1 \ + WIIMOTE=1 \ SYSLIBS=1 \ DESTDIR="${pkgdir}" } @@ -62,6 +64,7 @@ package() { scons PREFIX="/usr" \ FREEDESKTOP=0 \ FREESOUND=1 \ + WIIMOTE=1 \ SYSLIBS=1 \ DESTDIR="${pkgdir}" install diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index 700075f98..62d794963 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 56292 2009-10-21 10:30:09Z jgc $ +# $Id: PKGBUILD 135083 2011-08-10 07:36:19Z ibiru $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=ghex -pkgver=2.24.0 +pkgver=2.90.0 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/Ghex" -depends=('libgnomeui>=2.24.2' 'libgnomeprintui>=2.18.4' 'hicolor-icon-theme') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.18.0') +depends=('gtk3' 'gconf' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=ghex.install -source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.24/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('6fd8e0df1cb6fb9fcf60cfa2bc88877713e4366c') +source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.90/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2edeedcf1973c221d2f5ea1397099fbfc054b60cf2ebff5cb1ca9e83fd6c4974') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -d -m755 ${startdir}/pkg/usr/share/gconf/schemas - gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas --domain ghex-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1 - rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas + install -d -m755 "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain ghex-3.0 "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index f1bb35503..ad59c539c 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 124029 2011-05-16 08:07:30Z jgc $ +# $Id: PKGBUILD 135097 2011-08-10 09:35:11Z jgc $ # Maintainer: Jan de Groot pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') -pkgver=0.10.34 +pkgver=0.10.35 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.34' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2) -sha256sums=('7f347a60cd4317c7ea44c23e52d6e6233d2fa278b3fe3df7cbefe2bc2e253989') +source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2 + oggstream-fix-crashes-with-0-byte-vorbis-packets.patch + theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch) +sha256sums=('cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103' + '2e9d001dbe0ed598c8e86b0081c6ecdf28a1a6b45ffafc639f5cf52fdf0d467f' + '8da16aed8c098251903208cc7ac233b7a9df3f024f78c6970e71f3c2e2bdaa17') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" + + patch -Np1 -i "${srcdir}/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch" + patch -Np1 -i "${srcdir}/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch" + sed -i '/AC_PATH_XTRA/d' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -28,7 +36,7 @@ build() { package_gstreamer0.10-base() { pkgdesc="GStreamer Multimedia Framework Base plugin libraries" - depends=('gstreamer0.10>=0.10.34' 'orc' 'libxv') + depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') cd "${srcdir}/gst-plugins-base-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch b/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch new file mode 100644 index 000000000..8ba4c8ed3 --- /dev/null +++ b/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch @@ -0,0 +1,22 @@ +From 8bd3bdaf3768b3fb6adc85b3bc681fdce07b786e Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Wed, 03 Aug 2011 08:18:29 +0000 +Subject: oggstream: Fix crashes with 0-byte vorbis packets + +Fixes bug #655574. +--- +diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c +index e843f48..77f39d4 100644 +--- a/ext/ogg/gstoggstream.c ++++ b/ext/ogg/gstoggstream.c +@@ -792,7 +792,7 @@ packet_duration_vorbis (GstOggStream * pad, ogg_packet * packet) + int size; + int duration; + +- if (packet->packet[0] & 1) ++ if (packet->bytes == 0 || packet->packet[0] & 1) + return 0; + + mode = (packet->packet[0] >> 1) & ((1 << pad->vorbis_log2_num_modes) - 1); +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch b/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch new file mode 100644 index 000000000..b9883d407 --- /dev/null +++ b/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch @@ -0,0 +1,21 @@ +From 7d22d91fca6b9f24ca205eef98031f1ed6a44d33 Mon Sep 17 00:00:00 2001 +From: Philip Jägenstedt +Date: Tue, 26 Jul 2011 14:10:17 +0000 +Subject: theoradec: segfault on 0-byte ogg_packet in _chain_reverse + +--- +diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c +index 96e12ee..25d68db 100644 +--- a/ext/theora/gsttheoradec.c ++++ b/ext/theora/gsttheoradec.c +@@ -1440,7 +1440,7 @@ theora_dec_chain_reverse (GstTheoraDec * dec, gboolean discont, GstBuffer * buf) + + /* if we copied a keyframe, flush and decode the decode queue */ + data = GST_BUFFER_DATA (gbuf); +- if ((data[0] & 0x40) == 0) { ++ if (data && (data[0] & 0x40) == 0) { + GST_DEBUG_OBJECT (dec, "copied keyframe"); + res = theora_dec_flush_decode (dec); + } +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index 98528c8c1..cacb2e3b0 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 124034 2011-05-16 08:41:06Z jgc $ +# $Id: PKGBUILD 135102 2011-08-10 09:44:06Z jgc $ # Maintainer: Jan de Groot pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.29 +pkgver=0.10.30 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) -sha256sums=('466a64dcb580d4feef701abfc90656abb3558a2e3fc1e40e43977034bebc354c') +sha256sums=('b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6') build() { cd "${srcdir}/gst-plugins-good-${pkgver}" @@ -21,6 +21,7 @@ build() { --disable-static --enable-experimental \ --disable-schemas-install \ --disable-hal \ + --disable-esd \ --with-package-name="GStreamer Good Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" @@ -38,7 +39,7 @@ package_gstreamer0.10-good() { } package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index d0e7ab028..ed87911d6 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 134870 2011-08-08 08:29:49Z tpowa $ +# $Id: PKGBUILD 135136 2011-08-10 12:54:02Z tpowa $ # Maintainer: Paul Mattal pkgname=hylafax pkgver=6.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -52,7 +52,7 @@ package () { fi # add missing awk file for notify-4.1 script install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \ - $spkgdir/var/spool/hylafax/bin/notify.awk + $pkgdir/var/spool/hylafax/bin/notify.awk # fix permission on /var/lock chmod 1777 $pkgdir/var/lock diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index edbf8dc94..73e94729a 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131116 2011-07-10 21:02:00Z eric $ +# $Id: PKGBUILD 135188 2011-08-10 23:52:51Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.1.0 +pkgver=6.7.1.3 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,9 +12,9 @@ depends=('libtool' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('2c420f9316e15624490efac7ce6eb4ae' +md5sums=('092784fb731a162d3ad44ae59b7af888' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('6570b9f994ae58e047d3a3ad84b1bfdf2e749159' +sha1sums=('fb74e861126582135013007dd6a0afb9fe264ab7' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index 9123c4a32..d48f1c5a0 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128028 2011-06-20 21:30:26Z andyrtr $ +# $Id: PKGBUILD 135153 2011-08-10 16:27:10Z andyrtr $ # Maintainer: Andreas Radke # Contributor: William Rea pkgname=libburn -pkgver=1.1.0.pl01 +pkgver=1.1.4 #.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64') @@ -12,16 +12,16 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool' '!emptydirs') -md5sums=('641d8923007453674ffeb4acce3eded4') +md5sums=('a337cf8bf044a1bbc367ff35b9bc6a8b') build() { - cd ${srcdir}/${pkgname}-${pkgver/.pl??/} + cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver/.pl??/} + cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} make DESTDIR=${pkgdir} install } diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index e0cad9930..75361f813 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 131111 2011-07-10 16:14:08Z andyrtr $ +# $Id: PKGBUILD 135163 2011-08-10 16:43:11Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Gour pkgname=libisoburn -pkgver=1.1.2 +pkgver=1.1.4 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64') license=('GPL2') -depends=('libburn>=1.1.0' 'libisofs>=1.1.2' 'readline>=6.2') +depends=('libburn' 'libisofs' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('07a8531e8693b8ad4093b12184da6d1c') +md5sums=('db79a0f0622077bb1a901f57cc1e2b67') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index ca76e08e4..7bbee2367 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131106 2011-07-10 16:11:07Z andyrtr $ +# $Id: PKGBUILD 135158 2011-08-10 16:31:59Z andyrtr $ # Maintainer: AndyRTR # Contributor: Hugo Doria # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.1.2 +pkgver=1.1.4 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('6d504f2ab57046cb3e95b7d17fe00068') +md5sums=('2bdfda5f47fc986230efe8d05c463d52') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libvisual-plugins/02_64-bit_JESS_fix.patch b/extra/libvisual-plugins/02_64-bit_JESS_fix.patch new file mode 100644 index 000000000..1d7f99e56 --- /dev/null +++ b/extra/libvisual-plugins/02_64-bit_JESS_fix.patch @@ -0,0 +1,58 @@ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c +--- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c 2006-02-06 05:47:26.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c 2007-07-04 18:12:58.000000000 +1000 +@@ -282,7 +282,7 @@ + + 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 @@ + 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 @@ + } + 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 @@ + /* 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 @@ + 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 @@ + 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) diff --git a/extra/libvisual-plugins/03_build_against_gl_fixes.patch b/extra/libvisual-plugins/03_build_against_gl_fixes.patch new file mode 100644 index 000000000..b21558232 --- /dev/null +++ b/extra/libvisual-plugins/03_build_against_gl_fixes.patch @@ -0,0 +1,372 @@ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am 2006-02-23 20:03:24.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am 2006-02-23 20:03:24.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am 2006-02-24 00:34:48.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am 2006-02-23 20:03:27.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am 2006-02-23 20:03:27.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am 2006-02-23 20:03:28.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am 2006-02-23 20:03:24.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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\ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am 2006-02-23 20:03:28.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am 2006-02-24 22:24:49.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -4,5 +4,5 @@ + + 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 +diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am 2006-02-23 20:03:29.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am 2006-02-24 22:24:49.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -10,5 +10,5 @@ + + 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 +diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am 2006-02-24 22:24:50.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -4,5 +4,5 @@ + + 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 +diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am 2006-02-23 20:03:31.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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\ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am 2006-03-09 00:06:58.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -4,7 +4,7 @@ + + 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 \ +diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am 2006-02-23 20:03:35.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 +diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am 2006-02-23 20:03:36.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 +diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am 2006-02-23 20:03:37.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 +diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am 2006-02-23 20:03:37.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 + +diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am 2006-02-23 20:03:38.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 + +diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am 2006-02-23 20:03:38.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 +diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am 2006-02-23 20:03:39.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 +diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am 2006-02-23 20:03:39.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 +diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am 2006-02-23 20:03:39.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -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 diff --git a/extra/libvisual-plugins/04_lv_analyzer_build_fix.patch b/extra/libvisual-plugins/04_lv_analyzer_build_fix.patch new file mode 100644 index 000000000..1fc5f7fc7 --- /dev/null +++ b/extra/libvisual-plugins/04_lv_analyzer_build_fix.patch @@ -0,0 +1,12 @@ +diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac +--- libvisual-plugins-0.4.0/configure.ac 2006-03-17 03:50:41.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/configure.ac 2007-07-04 18:22:38.000000000 +1000 +@@ -361,7 +361,7 @@ + [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 + diff --git a/extra/libvisual-plugins/050_all_automagic.patch b/extra/libvisual-plugins/050_all_automagic.patch new file mode 100644 index 000000000..9c25fac72 --- /dev/null +++ b/extra/libvisual-plugins/050_all_automagic.patch @@ -0,0 +1,50 @@ +--- configure.ac.old 2007-02-24 23:09:08.000000000 +0100 ++++ configure.ac 2007-02-24 23:13:15.000000000 +0100 +@@ -89,7 +89,18 @@ + + dnl Libraries + ++dnl List of plugins to build ++build_input_plugins="" ++build_actor_plugins="" ++build_morph_plugins="" ++ + dnl EsounD ++AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd], ++ [Do not build esound input plugin @<:@default=enabled@:>@]), ++ [ENABLE_INPUT_ESD=$enableval], ++ [ENABLE_INPUT_ESD=yes]) ++ ++if test "$ENABLE_INPUT_ESD" = "yes"; then + PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version], + [HAVE_ESD="yes"], [HAVE_ESD="no"]) + +@@ -98,8 +109,15 @@ + else + AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built]) + fi ++fi + + dnl JACK ++AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack], ++ [Do not build jack input plugin @<:@default=enabled@:>@]), ++ [ENABLE_INPUT_JACK=$enableval], ++ [ENABLE_INPUT_JACK=yes]) ++ ++if test "$ENABLE_INPUT_JACK" = "yes"; then + PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"]) + if test "$HAVE_JACK" = "yes"; then + build_input_plugins="$build_input_plugins jack" +@@ -107,11 +125,7 @@ + AC_MSG_WARN([*** libjack is too old. You can download a newer version at + http://jackit.sf.net/. The jackit input plugin won't be built]) + fi +- +-dnl List of plugins to build +-build_input_plugins="" +-build_actor_plugins="" +-build_morph_plugins="" ++fi + + dnl GdkPixbuf + AC_ARG_ENABLE([gdkpixbuf-plugin], diff --git a/extra/libvisual-plugins/05_fix_po.patch b/extra/libvisual-plugins/05_fix_po.patch new file mode 100644 index 000000000..a5413ef1b --- /dev/null +++ b/extra/libvisual-plugins/05_fix_po.patch @@ -0,0 +1,127 @@ +diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in +--- libvisual-plugins-0.4.0/po/Makefile.in.in 2006-03-21 05:48:28.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/po/Makefile.in.in 2007-07-09 21:50:13.000000000 +1000 +@@ -28,7 +28,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKINSTALLDIRS = mkinstalldirs + mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ +diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs +--- libvisual-plugins-0.4.0/po/mkinstalldirs 1970-01-01 10:00:00.000000000 +1000 ++++ libvisual-plugins-0.4.0.new/po/mkinstalldirs 2006-03-21 05:48:42.000000000 +1100 +@@ -0,0 +1,111 @@ ++#! /bin/sh ++# mkinstalldirs --- make directory hierarchy ++# Author: Noah Friedman ++# 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 ++ ++ 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 diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD index e6b7eeea0..604b8788e 100644 --- a/extra/libvisual-plugins/PKGBUILD +++ b/extra/libvisual-plugins/PKGBUILD @@ -1,22 +1,44 @@ -# $Id: PKGBUILD 63448 2010-01-17 14:53:27Z jgc $ +# $Id: PKGBUILD 135107 2011-08-10 10:33:28Z jgc $ # Maintainer: damir pkgname=libvisual-plugins pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="plugins for libvisual" arch=("i686" "x86_64") license=('GPL') url="http://www.localhost.nl/~synap/libvisual/" -depends=('libvisual>=0.4.0' 'gtk2>=2.18.6' 'mesa>=7.7' 'alsa-lib' 'esound' 'jack-audio-connection-kit') -makedepends=(pkgconfig) -source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz") -md5sums=('4330e9287f9d6fae02f482f428a1e77b') +depends=('libvisual' 'gtk2' 'mesa' 'alsa-lib' 'jack') +makedepends=('pkgconfig' 'namcap') options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz + 02_64-bit_JESS_fix.patch + 03_build_against_gl_fixes.patch + 04_lv_analyzer_build_fix.patch + 05_fix_po.patch + 050_all_automagic.patch) +md5sums=('4330e9287f9d6fae02f482f428a1e77b' + 'f9cfb607bfcbfef60830fae4e7dc6963' + '116701408747dbb87dc134434478ebe2' + '01678a8f1584c76a44e59d81003a1109' + '6189b7427c4e11c8b8d6c6266d6a1629' + 'b50ae94c424a5f0af235deffa8451eb6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-alsa --disable-gstreamer-plugin || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch" + 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" + + autoreconf -fi + # Apply later as autoreconf overwrites po/Makefile.in.in + patch -Np1 -i "${srcdir}/05_fix_po.patch" + + ./configure --prefix=/usr \ + --disable-gstreamer-plugin \ + --disable-gforce \ + --disable-esd + make + make DESTDIR="${pkgdir}" install } -- cgit v1.2.3-54-g00ecf