From 600d5378dadf22b8517d52ac19500594bce4b66d Mon Sep 17 00:00:00 2001 From: root Date: Sun, 13 Nov 2011 23:14:59 +0000 Subject: Sun Nov 13 23:14:59 UTC 2011 --- extra/alsa-plugins/PKGBUILD | 4 +- extra/amarok/PKGBUILD | 4 +- extra/amule/PKGBUILD | 6 +- extra/avidemux/PKGBUILD | 6 +- extra/blender/PKGBUILD | 4 +- extra/cmus/PKGBUILD | 6 +- extra/evince/PKGBUILD | 4 +- extra/ffmpeg/PKGBUILD | 13 +- extra/ffmpegthumbnailer/PKGBUILD | 12 +- extra/gegl/0.1.6-ffmpeg.patch | 33 +++ extra/gegl/PKGBUILD | 14 +- extra/graphite/PKGBUILD | 49 ++-- extra/gstreamer0.10-ugly/PKGBUILD | 4 +- extra/gtk3/PKGBUILD | 16 +- extra/inkscape/PKGBUILD | 4 +- extra/k3b/PKGBUILD | 37 +-- extra/k3b/k3b-2.0.2-ffmpeg.patch | 96 +++++++ extra/k3b/k3b.install | 9 +- extra/kdebindings-smokeqt/PKGBUILD | 4 +- extra/kdemultimedia/PKGBUILD | 4 +- extra/koffice/PKGBUILD | 17 +- extra/koffice/qt48fix.patch | 10 + extra/kradio/PKGBUILD | 24 +- extra/kradio/kradio-ffmpeg.diff | 34 +++ extra/kradio/kradio.install | 11 + extra/libreoffice/PKGBUILD | 99 +++---- extra/live-media/PKGBUILD | 6 +- extra/mediastreamer/PKGBUILD | 9 +- extra/miro/PKGBUILD | 19 +- extra/miro/ffmpeg.patch | 95 +++++++ extra/moc/PKGBUILD | 14 +- extra/moc/moc-ffmpeg.patch | 26 ++ extra/mpd/PKGBUILD | 4 +- extra/nawk/PKGBUILD | 30 +++ extra/nawk/manpage-naming.patch | 46 ++++ extra/opal/PKGBUILD | 4 +- extra/opencv/PKGBUILD | 6 +- extra/poppler/PKGBUILD | 26 +- extra/poppler/git-fixes.patch | 107 ++++++++ extra/qscintilla/PKGBUILD | 19 +- extra/sox/PKGBUILD | 14 +- extra/sox/sox-14.3.2-ffmpeg.patch | 40 +++ extra/tcl/PKGBUILD | 12 +- extra/tk/PKGBUILD | 11 +- extra/tracker/PKGBUILD | 4 +- extra/transcode/PKGBUILD | 16 +- extra/transcode/transcode-1.1.5-ffmpeg.patch | 124 +++++++++ extra/tumbler/PKGBUILD | 6 +- extra/vlc/PKGBUILD | 9 +- extra/vlc/vlc.install | 2 +- extra/vte/PKGBUILD | 25 +- extra/vte3/PKGBUILD | 23 +- extra/x264/PKGBUILD | 6 +- extra/xine-lib/PKGBUILD | 24 +- extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch | 380 +++++++++++++++++++++++++++ 55 files changed, 1344 insertions(+), 287 deletions(-) create mode 100644 extra/gegl/0.1.6-ffmpeg.patch create mode 100644 extra/k3b/k3b-2.0.2-ffmpeg.patch create mode 100644 extra/koffice/qt48fix.patch create mode 100644 extra/kradio/kradio-ffmpeg.diff create mode 100644 extra/kradio/kradio.install create mode 100644 extra/miro/ffmpeg.patch create mode 100644 extra/moc/moc-ffmpeg.patch create mode 100644 extra/nawk/PKGBUILD create mode 100644 extra/nawk/manpage-naming.patch create mode 100644 extra/poppler/git-fixes.patch create mode 100644 extra/sox/sox-14.3.2-ffmpeg.patch create mode 100644 extra/transcode/transcode-1.1.5-ffmpeg.patch create mode 100644 extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch (limited to 'extra') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index b485b65db..93478640d 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122044 2011-05-02 00:18:38Z heftig $ +# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $ # Maintainer: Jan "heftig" Steffens # Contributor: Sergej Pupykin # Contributor: Daniel Ehlers pkgname=alsa-plugins pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index a8183bd63..c3ead5dc1 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134019 2011-08-01 10:23:47Z andrea $ +# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $ # Maintainer: Andrea Scarpino # Contributor: damir pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.4.3 -pkgrel=1 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 8f0ae710d..a86846f68 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141482 2011-10-30 18:13:40Z giovanni $ +# $Id: PKGBUILD 142567 2011-11-12 08:25:22Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Henrik Ronellenfitsch # Contributor: Alessio Sergi # Contributor: Dario 'Dax' Vilardi pkgname=amule -pkgver=10648 +pkgver=10674 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=('dc9d4bbe4b1b2fd263e98d32e71f6284') +md5sums=('3557fb22e7ca7d973414d7eedfbbb79f') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 3bf48567d..cef7b7e78 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140069 2011-10-06 07:33:44Z ibiru $ +# $Id: PKGBUILD 142664 2011-11-12 17:45:03Z ibiru $ # Maintainer: Eric Bélanger pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=4 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -98,7 +98,7 @@ package_avidemux-gtk() { package_avidemux-qt() { pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') + depends=("avidemux-cli=${pkgver}" 'qt') install=avidemux.install cd "${srcdir}/${pkgbase}_${pkgver}" diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 334fbd7fb..4e4bb6b1c 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141279 2011-10-28 02:04:28Z eric $ +# $Id: PKGBUILD 142616 2011-11-12 17:15:07Z ibiru $ # Contributor: John Sowiak # Maintainer: tobias @@ -13,7 +13,7 @@ _svn=false pkgname=blender pkgver=2.60a -pkgrel=1 +pkgrel=2 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index 395192056..b3fe7427e 100644 --- a/extra/cmus/PKGBUILD +++ b/extra/cmus/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 132775 2011-07-26 00:10:12Z eric $ +# $Id: PKGBUILD 142618 2011-11-12 17:15:10Z ibiru $ # Maintainer: Aaron Griffin # Contributor: dorphell pkgname=cmus pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' +makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index b7d0edb29..242d7472b 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140859 2011-10-20 05:42:04Z ibiru $ +# $Id: PKGBUILD 142650 2011-11-12 17:18:26Z ibiru $ # Maintainer: Jan de Groot pkgname=evince pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index b9d49ca06..14fe3d04c 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z ibiru $ +# $Id: PKGBUILD 142620 2011-11-12 17:15:14Z ibiru $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=20111003 +pkgver=20111108 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') +depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm') makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) -md5sums=('38139817bee918a5664c549adb487468') +md5sums=('bad7e47f6974cee62d98ce9de710076c') build() { cd "$srcdir/$pkgname" @@ -27,6 +27,8 @@ build() { --enable-libx264 \ --enable-libvpx \ --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ --enable-postproc \ --enable-shared \ --enable-x11grab \ @@ -38,7 +40,8 @@ build() { --enable-gpl \ --enable-version3 \ --enable-runtime-cpudetect \ - --disable-debug + --disable-debug \ + --disable-static make make tools/qt-faststart diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 82a96c06a..3fed7aae2 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -4,16 +4,16 @@ pkgname=ffmpegthumbnailer pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') arch=('i686' 'x86_64') depends=('ffmpeg' 'libjpeg' 'libpng') optdepends=('gvfs: support for gio uris') -source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz - ffmpegthumbnailer.desktop) -options=(!libtool) +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + 'ffmpegthumbnailer.desktop') +options=('!libtool') sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53') @@ -30,7 +30,5 @@ package() { # FS#24105: Generate thumbnails in nautilus install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \ - ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop + ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop } - - diff --git a/extra/gegl/0.1.6-ffmpeg.patch b/extra/gegl/0.1.6-ffmpeg.patch new file mode 100644 index 000000000..51fb95d28 --- /dev/null +++ b/extra/gegl/0.1.6-ffmpeg.patch @@ -0,0 +1,33 @@ +diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c +--- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 ++++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 +@@ -69,17 +69,17 @@ + { + switch (err) + { +- case AVERROR_NUMEXPECTED: ++ case AVERROR(EDOM): + g_warning ("%s: Incorrect image filename syntax.\n" + "Use '%%d' to specify the image number:\n" + " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" + " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", + filename); + break; +- case AVERROR_INVALIDDATA: ++ case AVERROR(EINVAL): + g_warning ("%s: Error while parsing header\n", filename); + break; +- case AVERROR_NOFMT: ++ case AVERROR(EILSEQ): + g_warning ("%s: Unknown format\n", filename); + break; + default: +@@ -278,7 +278,7 @@ + for (i = 0; i< p->ic->nb_streams; i++) + { + AVCodecContext *c = p->ic->streams[i]->codec; +- if (c->codec_type == CODEC_TYPE_VIDEO) ++ if (c->codec_type == AVMEDIA_TYPE_VIDEO) + { + p->video_st = p->ic->streams[i]; + p->video_stream = i; diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 4a018da9c..64ea9e89c 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 110564 2011-02-20 03:00:42Z eric $ +# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ # Maintainer: Eric Bélanger pkgname=gegl pkgver=0.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" license=('GPL3' 'LGPL3') -depends=('babl' 'libpng' 'libjpeg' 'gtk2') +depends=('babl' 'gtk2') makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') optdepends=('openexr: for using the openexr plugin' \ 'ffmpeg: for using the ffmpeg plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('af5e5a7d3c7ddfaa2b3414de2a7e9113') -sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ + 0.1.6-ffmpeg.patch) +sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' + 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index 9442d5ee0..21b6ae5eb 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,42 +1,39 @@ -# $Id: PKGBUILD 137743 2011-09-10 14:59:36Z pierre $ +# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $ # Maintainer: AndyRTR -pkgbase=graphite -pkgname=('libgraphite' 'pango-graphite') -pkgver=2.3.1 -pkgrel=2 +pkgname=graphite +pkgver=1.0.3 +pkgrel=1 +epoch=1 arch=('i686' 'x86_64') url="http://graphite.sil.org/" -makedepends=('pango' 'gcc-libs') +pkgdesc='reimplementation of the SIL Graphite text processing engine' +license=('custom_SIL Dual license') +depends=('gcc-libs') +makedepends=('cmake' 'freetype2') options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz") -md5sums=('d35724900f6a4105550293686688bbb3') +source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") +md5sums=('3bf481ca95109b14435125c0dd1f2217') build() { - cd "${srcdir}/silgraphite-${pkgver}" - ./configure --prefix=/usr --disable-static + cd "${srcdir}" + mkdir build + cd build + cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr make } -package_libgraphite() { - pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers' - license=('custom_SIL Dual license') - depends=('gcc-libs') +check() { + cd "${srcdir}"/build + ctest +} - cd "${srcdir}/silgraphite-${pkgver}"/engine +package() { + cd "${srcdir}"/build make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} - install -m644 license/*.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ -} - -package_pango-graphite() { - pkgdesc="SILGraphite support for pango" - license=('LGPL') - depends=('pango' 'libgraphite') - install=pango-graphite.install - - cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite - make DESTDIR="$pkgdir/" install + install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/ } diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 368c429f3..9ec05bb6d 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140071 2011-10-06 07:33:46Z ibiru $ +# $Id: PKGBUILD 142666 2011-11-12 17:45:39Z ibiru $ # Maintainer: Jan de Groot pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index a2f2c6e70..9f2dc994e 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140925 2011-10-20 05:43:41Z ibiru $ +# $Id: PKGBUILD 142690 2011-11-12 18:51:16Z ibiru $ # Maintainer: Ionut Biru pkgname=gtk3 -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64') @@ -13,13 +13,13 @@ makedepends=('gobject-introspection') options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3' +sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { - cd "${srcdir}/gtk+-${pkgver}" + cd "$srcdir/gtk+-$pkgver" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -31,8 +31,8 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/gtk+-$pkgver" + make DESTDIR="$pkgdir" install - install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini" + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 19bb5fbef..94615493a 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140573 2011-10-17 08:14:49Z jgc $ +# $Id: PKGBUILD 142652 2011-11-12 17:18:29Z ibiru $ # Contributor: tobias # Contributor: Tobias Kieslich # Maintainer: Gaetan Bisson pkgname=inkscape pkgver=0.48.2 -pkgrel=3 +pkgrel=4 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64') diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index 1b94ed8cd..f1dce1167 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 106655 2011-01-17 20:23:05Z tpowa $ -# Maintainer: Tobias Powalowski -# Contributor: jlvsimoes +# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $ +# Maintainer: Eric Bélanger # Contributor: damir pkgname=k3b pkgver=2.0.2 -pkgrel=1 -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' - 'shared-mime-info' 'libxft') -makedepends=('cmake' 'pkgconfig' 'automoc4' ) +pkgrel=4 pkgdesc="Feature-rich and easy to handle CD burning application" -url="http://k3b.sourceforge.net/" -arch=("i686" "x86_64") +arch=('i686' 'x86_64') +url="http://k3b.org/" license=('GPL') -install="${pkgname}.install" +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') optdepends=('dvd+rw-tools: for dvd burning support' - 'vcdimager: for vcd burning support' - 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support') + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b') build() { cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -33,7 +35,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } -md5sums=('c86113af31a2032e57fd2f302b5f637a') diff --git a/extra/k3b/k3b-2.0.2-ffmpeg.patch b/extra/k3b/k3b-2.0.2-ffmpeg.patch new file mode 100644 index 000000000..2878b1edc --- /dev/null +++ b/extra/k3b/k3b-2.0.2-ffmpeg.patch @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek +Date: Sun Aug 28 20:18:53 2011 +0200 + + Fixed compilation with new FFMPEG + + BUG: 274817 + FIXED-IN: 2.0.3 + +diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +index 0ad59fc..0c5f366 100644 +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif ++ { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } +@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const + QString K3bFFMpegFile::title() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->title[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->title ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const + QString K3bFFMpegFile::author() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->author[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->author ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const + QString K3bFFMpegFile::comment() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->comment[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->comment ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( + #else ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ int len = ::avcodec_decode_audio3( ++ #else + int len = ::avcodec_decode_audio2( ++ #endif + #endif ++ + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else +@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() + #endif + (short*)d->alignedOutputBuffer, + &d->outputBufferSize, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ &d->packet ); ++#else + d->packetData, d->packetSize ); ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); diff --git a/extra/k3b/k3b.install b/extra/k3b/k3b.install index a60d358ce..413ad60f7 100644 --- a/extra/k3b/k3b.install +++ b/extra/k3b/k3b.install @@ -1,12 +1,13 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 6d90df871..a35dd69a6 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141755 2011-11-02 18:12:20Z andrea $ +# $Id: PKGBUILD 142565 2011-11-12 08:14:45Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokeqt pkgver=4.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index 76b4c5c98..bbb6f4d9f 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141867 2011-11-02 18:15:28Z andrea $ +# $Id: PKGBUILD 142628 2011-11-12 17:15:23Z ibiru $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') pkgver=4.7.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 2425f5077..f0be52a61 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $ +# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,25 +37,26 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=9 +pkgrel=11 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons') + 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf') groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch') + 'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch') sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') - + 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739' + 'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa') build() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" patch -p1 -i "${srcdir}"/gcc46.patch + patch -p1 -i "${srcdir}"/qt48fix.patch cd "${srcdir}" mkdir build @@ -71,8 +72,8 @@ build() { package_koffice-filters(){ pkgdesc="Filters for the KDE office suite" - depends=('shared-mime-info') - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + depends=('shared-mime-info' 'libgsf') + optdepends=('libwpd: WordPerfect document importer' 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' 'libkdcraw: support for raw images' 'poppler: support for pdf' 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch new file mode 100644 index 000000000..de72926d5 --- /dev/null +++ b/extra/koffice/qt48fix.patch @@ -0,0 +1,10 @@ +--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-02-17 13:10:38.000000000 +0100 ++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-09-08 15:03:31.932039128 +0200 +@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh + << "visible="< pkgname=kradio pkgver=4.0.2 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL2') -pkgdesc="KRadio is a comfortable KDE radio application" +pkgdesc="A comfortable KDE radio application" url="http://kradio.sourceforge.net/" -depends=('lame' 'kdelibs' 'libsndfile' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('pkgconfig' 'automoc4') -source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2) +depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') +makedepends=('pkg-config' 'automoc4' 'cmake') +install=kradio.install +source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff) options=(!libtool) build() { - cd $srcdir + cd "$srcdir" + (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff") mkdir build cd build cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release @@ -22,7 +24,9 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$startdir/pkg install + cd "$srcdir/build" + make DESTDIR="$pkgdir" install } -md5sums=('18fea3e2bc7100882075187c6a89f7bd') +md5sums=('18fea3e2bc7100882075187c6a89f7bd' + '5f407eb75536f39e79c77a70613e8704' + '7d31a4f54602bc109f39cc0a7a1dc50c') diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff new file mode 100644 index 000000000..27d224fec --- /dev/null +++ b/extra/kradio/kradio-ffmpeg.diff @@ -0,0 +1,34 @@ +X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988 + +diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp +index 4cd6cc0..c74d6e2 100644 +--- a/plugins/internetradio/decoder_thread.cpp ++++ b/plugins/internetradio/decoder_thread.cpp +@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + + //av_log_set_level(255); + m_av_pFormatCtx = avformat_alloc_context(); +- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); + m_av_pFormatCtx->probesize = m_maxProbeSize; + m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; + +@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_pFormatCtx_opened = true; + } + else { +- + // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); + if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { + if (warningsNotErrors) { +@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_audioStream = -1; + for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { + // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { ++#if LIBAVCODEC_VERSION_MAJOR < 53 + if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream ++#else ++ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream ++#endif + m_av_audioStream = i; + break; + } diff --git a/extra/kradio/kradio.install b/extra/kradio/kradio.install new file mode 100644 index 000000000..af52669f5 --- /dev/null +++ b/extra/kradio/kradio.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 15b67b82a..393d6716e 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $ +# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -35,16 +35,16 @@ pkgname=('libreoffice-common' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.3.2 -pkgver=3.4.3 -pkgrel=4 +_LOver=3.4.4.2 +pkgver=3.4.4 +pkgrel=3 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' @@ -52,15 +52,15 @@ makedepends=( # makedepends # the depends from libreoffice main pkg "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script 'ttf-dejavu') # to satisfy regression tests - # translate-toolkit - todo move them to extra to allow --with-system-foo builds + # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -88,10 +88,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt @@ -106,14 +103,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_ct2n.diff vbahelper.visibility.patch scp2-more-reasonable-file-access-rights.diff - java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842 oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 - poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe - pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b - poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b - build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42) + RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -148,28 +140,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) -md5sums=('7c2e73f1197d169519f86efe422e5df9' - '823956297a7e0b7603c585c49bd9fd4e' - '465b3be0e30f88e1139c45d2e2217927' - 'a1d5af5be5eb522c8a24feacbb0161fa' - '8b972e130dfe62eb41d1d71d72de4b76' - 'a6b22494e3a65a3b242ecb896aa7ab48' - 'b7d86f8baee5b31af210cc81785e5676' - 'de6c062d334daab99cf0592aa3568215' - 'df46914d540ef0126cd746d09c68ca2a' - '8f308250c397ddc6fdb1aae13e102927' - '1fd00a0fcfd4a5d1956c3f6a0990d1ce' - '86914ac8bc30ea721b708b2f2faa3111' - '1452229e57ac3c4191e798eac4c0a7e0' - 'bb46bdb682689629d432cdbf5f3f42c2' - 'bec7f633562762debdf810690002e688' - '87061613efece1c253906a90cd4dc01f' - '308284d7d1d1bd6860d128b26e24390b' - 'fa8b36365a2b2fb110c44886d7069774' - 'da8a40cac4bd9d4f6f326e0e3b1b7e2a' + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) +md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' + 'db423cbb1cee416b718138044a5de930' + '31944d2139d6d81ef1131bd513530621' + 'f447fd4ffe54aab9561c6caa262754b3' + '97fe698737a35c8803712d4e08007620' + 'acff44d97a5106d9b53c747dabeb0800' + '620d43a0b9f36388f423e030513864ef' + '4c5b1ed870363eca2602f0cb42a8415a' + '702c6ca31525d7d2c2ded86c77b0bd2e' + 'ac9b3acf78f43c1395d0e2dedc860f30' + 'd8d2c41cb86bc8ba2a07e001a5317abb' + '4d4af2fc06dbe33ec2307df812f7abe1' + '1398a566eb76598bf3005e187fc2386c' + 'dd962d2d57f88b9e07e665adad3cabbc' + 'fff0fc9cd16ef1eb2b2ed5d0a6e77f95' + 'e54d41d39e63d04ac4a88ce79e37af98' + 'dbc71403040f447683bf55d1f0be3cad' + '69ce5b72f44b008d0e78767c5b1dbf39' + '34a2e8ae6b81a042966740263c53e135' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -195,10 +185,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' '18f577b374d60b3c760a3a3350407632' '0ff7d225d087793c8c2c680d77aac3e7' '185d60944ea767075d27247c3162b3bc' - 'b4cae0700aa1c2aef7eb7f345365e6f1' '90401bca927835b6fbae4a707ed187c8' - 'f02578f5218f217a9f20e9c30e119c6a' - '0625a7d661f899a8ce263fc8a9879108' '451ccf439a36a568653b024534669971' '7e7efc5d4a03126bb9ae3ae9aa2c4e87' '41c9b65ad60af4b3255bbecdfef11736' @@ -213,17 +200,13 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' '37638431e7e40baf2e47966ebb9bc0e9' - 'ca6032e86229ae798f3744ae244f5bfe' '3c6c62e77c30649a3dfe73512947cc9a' - '64497be966802e62ffe3282d3facf7b7' - '89ff871e77e10357a976fe9d1ab3a65a' - 'c4cb0d7f2602396a3f4cac55b8a4e308' - 'b8f1fb7f3902d22aeaa2575c6b08a62c') + 'eb35d4c715e0dfc23bbc706996033829') build() { unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh @@ -244,16 +227,12 @@ build() { cd ${srcdir}/build # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_boost.diff + #patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff - patch -Np1 -i ${srcdir}/java-detection.diff patch -Np1 -i ${srcdir}/oracle-recognition.diff - patch -Np1 -i ${srcdir}/poppler-check.diff - patch -Np1 -i ${srcdir}/pdfimport.diff - patch -Np1 -i ${srcdir}/poppler-buildfix.diff - patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff + patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -282,7 +261,7 @@ build() { # fi # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -v -f + autoconf -f # non-SMP test build # export MAKEFLAGS="-j1" @@ -299,7 +278,6 @@ build() { --enable-crashdump \ --enable-dbus \ --enable-evolution2\ - --enable-graphite --without-system-graphite \ --enable-gio\ --disable-gnome-vfs\ --disable-kde\ @@ -342,6 +320,7 @@ build() { --with-external-hyph-dir=/usr/share/hyphen \ --with-external-thes-dir=/usr/share/mythes \ --with-system-cppunit\ + --with-system-graphite\ --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ @@ -350,7 +329,7 @@ build() { --with-external-libtextcat-data \ --with-openldap\ --with-ant-home="/usr/share/java/apache-ant"\ - --without-system-boost\ + --with-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mozilla\ @@ -393,7 +372,7 @@ package_libreoffice-common() { install=${pkgbase}.install depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" - 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script #'java-runtime' #'saxon' diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 47754d09a..1ce809241 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141480 2011-10-30 17:14:30Z giovanni $ +# $Id: PKGBUILD 142561 2011-11-12 07:58:37Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2011.10.27 +pkgver=2011.11.08 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('fe776efc25fbb98c6279b97cb9c48006') +md5sums=('962ff6b036247e2abac091a6047eb822') build() { cd ${srcdir}/live diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 1a97bc8aa..3c3b7637a 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 129367 2011-06-27 05:48:53Z andrea $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 142632 2011-11-12 17:15:28Z ibiru $ +# Maintainer: +# Contributor: Andrea Scarpino # Contributor: Sergej Pupykin # Contributor: Adrià Arrufat pkgname=mediastreamer pkgver=2.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') -url="http://www.linphone.org" +url="http://www.linphone.org/" license=('GPL') depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') makedepends=('cmake' 'automoc4') diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 8d518a86f..e6df06f4e 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136884 2011-09-02 16:14:24Z ronald $ +# $Id: PKGBUILD 142634 2011-11-12 17:15:30Z ibiru $ # Maintainer: Ronald van Haren pkgname=miro pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') url="http://www.getmiro.com" @@ -12,15 +12,20 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') makedepends=('pkg-config') install=miro.install -source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840') +options=('!makeflags') +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840' + 'f0c851d51318c0e0be8b91463ef901625d2587a9') build() { - cd "${srcdir}/${pkgname}-${pkgver}/linux" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/ffmpeg.patch" + cd linux python2 setup.py install --root="${pkgdir}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch new file mode 100644 index 000000000..edf378459 --- /dev/null +++ b/extra/miro/ffmpeg.patch @@ -0,0 +1,95 @@ +diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c +--- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200 ++++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200 +@@ -60,7 +60,7 @@ + } + + switch (input_codec_context->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + output_codec_context->channel_layout = input_codec_context->channel_layout; + output_codec_context->sample_rate = input_codec_context->sample_rate; + output_codec_context->channels = input_codec_context->channels; +@@ -72,7 +72,7 @@ + output_codec_context->block_align = input_codec_context->block_align; + } + break; +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + output_codec_context->pix_fmt = input_codec_context->pix_fmt; + output_codec_context->width = input_codec_context->width; + output_codec_context->height = input_codec_context->height; +@@ -154,7 +154,7 @@ + exit(1); + } + +- ofmt = guess_format("mpegts", NULL, NULL); ++ ofmt = av_guess_format("mpegts", NULL, NULL); + if (!ofmt) { + fprintf(stderr, "Could not find MPEG-TS muxer\n"); + exit(1); +@@ -174,12 +174,12 @@ + + for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) { + switch (ic->streams[i]->codec->codec_type) { +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + video_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + video_st = add_output_stream(oc, ic->streams[i]); + break; +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + audio_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + audio_st = add_output_stream(oc, ic->streams[i]); +@@ -195,7 +195,7 @@ + exit(1); + } + +- dump_format(oc, 0, input, 1); ++ av_dump_format(oc, 0, input, 1); + + if (video_st) { + codec = avcodec_find_decoder(video_st->codec->codec_id); +@@ -208,7 +208,7 @@ + } + } + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + exit(1); + } +@@ -234,7 +234,7 @@ + break; + } + +- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) { ++ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) { + segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den; + } + else if (video_index < 0) { +@@ -245,10 +245,10 @@ + } + + if (segment_time - prev_segment_time >= segment_duration) { +- put_flush_packet(oc->pb); +- url_fclose(oc->pb); ++ avio_flush(oc->pb); ++ avio_close(oc->pb); + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + break; + } +@@ -278,7 +278,7 @@ + av_freep(&oc->streams[i]); + } + +- url_fclose(oc->pb); ++ avio_close(oc->pb); + av_free(oc); + + return 0; diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index d782e1b0f..24465bb6e 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $ +# $Id: PKGBUILD 142636 2011-11-12 17:15:33Z ibiru $ # Maintainer: Eric Bélanger pkgname=moc pkgver=20110528 -pkgrel=3 +pkgrel=4 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64') url="http://moc.daper.net/" license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' @@ -18,15 +18,15 @@ optdepends=('speex: for using the speex plugin' 'libmodplug: for using the modplug plugin') options=('!libtool') source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ - gcc-undefined-symbols.diff) -md5sums=('003fd01af2165264eb666040e4f586cd' - 'efacb8559e9145e15b0c25f8fa2a9d79') + gcc-undefined-symbols.diff moc-ffmpeg.patch) sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' - 'a811a4ac7e049914aab528d3f06a6be6634c2720') + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') build() { cd "${srcdir}/${pkgname}" patch -p0 -i ../gcc-undefined-symbols.diff + patch -p0 -i ../moc-ffmpeg.patch # Disabling aac to use the external ffmpeg to play them (FS#13164) ./autogen.sh diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/extra/moc/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index a2aced8ca..77b1cecc4 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141091 2011-10-23 16:35:52Z dreisner $ +# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $ # Maintainer: Angel Velasquez # Contributor: Andrea Scarpino # Contributor: Damir Perisa @@ -6,7 +6,7 @@ pkgname=mpd pkgver=0.16.5 -pkgrel=1 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD new file mode 100644 index 000000000..f930b1800 --- /dev/null +++ b/extra/nawk/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 142698 2011-11-13 02:24:31Z dreisner $ +# Maintainer: Dave Reisner + +pkgname=nawk +pkgver=20110810 +pkgrel=2 +pkgdesc="The one, true implementation of the AWK" +url="http://cm.bell-labs.com/who/bwk/" +license=('MIT') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('glibc') +provides=('awk') +source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz" + 'manpage-naming.patch') +md5sums=('a7062ecade93dc4cb39190e48db9a51d' + '8486d387a51fe3b3c9875c4151ad92b4') + +build() { + patch -Np1 < manpage-naming.patch + sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE + + make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS" +} + +package() { + install -Dm755 a.out "$pkgdir/usr/bin/nawk" + install -Dm644 awk.1 "$pkgdir/usr/share/man/man1/nawk.1" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/nawk/LICENSE" +} diff --git a/extra/nawk/manpage-naming.patch b/extra/nawk/manpage-naming.patch new file mode 100644 index 000000000..782f5e427 --- /dev/null +++ b/extra/nawk/manpage-naming.patch @@ -0,0 +1,46 @@ +diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1 +--- ./nawk-20100523.orig/awk.1 2007-03-31 16:56:19.000000000 -0400 ++++ nawk-20100523/awk.1 2010-09-20 21:49:16.840069318 -0400 +@@ -7,13 +7,11 @@ + .fi + .ft 1 + .. +-awk +-.TH AWK 1 +-.CT 1 files prog_other ++.TH NAWK 1 + .SH NAME +-awk \- pattern-directed scanning and processing language ++nawk \- pattern-directed scanning and processing language + .SH SYNOPSIS +-.B awk ++.B nawk + [ + .BI \-F + .I fs +@@ -32,7 +30,7 @@ + .I file ... + ] + .SH DESCRIPTION +-.I Awk ++.I Nawk + scans each input + .I file + for lines that match any of a set of patterns specified literally in +@@ -198,7 +196,6 @@ + .BR atan2 + are built in. + Other built-in functions: +-.TF length + .TP + .B length + the length of its argument +@@ -407,7 +404,6 @@ + do not combine with other patterns. + .PP + Variable names with special meanings: +-.TF FILENAME + .TP + .B CONVFMT + conversion format used when converting numbers + diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 4e45a5a34..3ae5df87d 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140067 2011-10-06 07:33:41Z ibiru $ +# $Id: PKGBUILD 142672 2011-11-12 17:47:17Z ibiru $ # Maintainer: Jan de Groot # Contributor: Tom K pkgname=opal pkgver=3.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.ekiga.org" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index f2bf421bf..505e5abb5 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $ +# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski @@ -6,12 +6,12 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' +depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030' 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') optdepends=('python2-numpy: Python 2.x interface' diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index afc3662bf..1a3a0aafa 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 141011 2011-10-21 10:45:03Z ibiru $ +# $Id: PKGBUILD 142670 2011-11-12 17:46:43Z ibiru $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.0 -pkgrel=2 +pkgver=0.18.1 +pkgrel=1 arch=(i686 x86_64) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" +_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e) -md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77' - '8f4a296fdd98446858d5ea74d7c496ab') + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 + git-fixes.patch) +md5sums=('d30e883a27423c936ef338ce1d967e2d' + '9dc64c254a31e570507bdd4ad4ba629a' + 'a73ba6515aa73cb20c480692da52c79e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac - autoreconf + patch -Np1 -i "${srcdir}/git-fixes.patch" - patch -Np1 -i "${srcdir}/fix_cairo.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ @@ -32,6 +35,13 @@ build() { make } +check() { + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} + make check +} + package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch new file mode 100644 index 000000000..a18a31aec --- /dev/null +++ b/extra/poppler/git-fixes.patch @@ -0,0 +1,107 @@ +From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Sun, 30 Oct 2011 15:02:19 +0000 +Subject: pdftocairo: Make sure beginDocument() is always called + +This fixes a crash when rendering only odd/even pages in a printing +format. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index e458ee5..1b67c90 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) { + lastPage = firstPage; + } + ++ // Make sure firstPage is always used so that beginDocument() is called ++ if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ firstPage++; ++ + cairoOut = new CairoOutputDev(); + cairoOut->startDoc(doc->getXRef(), doc->getCatalog()); + if (sz != 0) +-- +cgit v0.9.0.2-2-gbebe +From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Sun, 30 Oct 2011 15:08:46 +0000 +Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable + +This fixes an error in my previous commit. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index 1b67c90..d0d1ec6 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) { + } + + // Make sure firstPage is always used so that beginDocument() is called +- if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1)) + firstPage++; + + cairoOut = new CairoOutputDev(); +-- +cgit v0.9.0.2-2-gbebe +From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Tue, 01 Nov 2011 08:40:53 +0000 +Subject: Fix pkg-config files + +We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ +--- +diff --git a/configure.ac b/configure.ac +index 3a120ca..c4f5b92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then + POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" + + GLIB_REQUIRED=2.18 ++ AC_SUBST(GLIB_REQUIRED) + AC_ARG_ENABLE(poppler-glib, + AC_HELP_STRING([--disable-poppler-glib], + [Don't compile poppler glib wrapper.]), +diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in +index 55a2278..5fcb6f2 100644 +--- a/poppler-glib-uninstalled.pc.in ++++ b/poppler-glib-uninstalled.pc.in +@@ -1,7 +1,7 @@ + Name: poppler-glib + Description: GLib wrapper for poppler - uninstalled + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + + Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/glib +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 3264ed6..e15e669 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -6,7 +6,7 @@ includedir=${prefix}/include + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @POPPLER_VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in +index 04d9bb9..9ba8978 100644 +--- a/poppler-glib.pc.in ++++ b/poppler-glib.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 466140ede..5572ae8fa 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 123072 2011-05-07 23:41:27Z andrea $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5.1 -pkgrel=2 +pkgver=2.6 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt') +makedepends=('python2-pyqt' 'chrpath') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('dd7edef5ff674d307057a3c12dbd8fce' +md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' '8cf9c06252e2f11ab00e62848e322fd3') @@ -57,6 +58,9 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -65,4 +69,7 @@ package_python2-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index d9f3730c9..774654feb 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $ +# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $ # Maintainer: Eric Bélanger pkgname=sox pkgver=14.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') -depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' @@ -17,12 +17,14 @@ optdepends=('libao: for ao plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee') -sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + sox-14.3.2-ffmpeg.patch) +sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' + '86caa6aa86a0bf7a048522114d4efd11acbbda70') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch new file mode 100644 index 000000000..5289b9b47 --- /dev/null +++ b/extra/sox/sox-14.3.2-ffmpeg.patch @@ -0,0 +1,40 @@ +Index: sox-14.3.2/src/ffmpeg.c +=================================================================== +--- sox-14.3.2.orig/src/ffmpeg.c ++++ sox-14.3.2/src/ffmpeg.c +@@ -91,7 +91,7 @@ static int stream_component_open(priv_t + + if (!codec || avcodec_open(enc, codec) < 0) + return -1; +- if (enc->codec_type != CODEC_TYPE_AUDIO) { ++ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); + return -1; + } +@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) + /* Find audio stream (FIXME: allow different stream to be selected) */ + for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { + AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; +- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { ++ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { + ffmpeg->audio_index = i; + break; + } +@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo + + c = st->codec; + c->codec_id = codec_id; +- c->codec_type = CODEC_TYPE_AUDIO; ++ c->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + c->bit_rate = 256000; /* FIXME: allow specification */ +@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t + av_init_packet(&pkt); + pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); + pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ffmpeg->audio_st->index; + pkt.data = ffmpeg->audio_buf_aligned; + diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index 49a3581d8..73f1461fc 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 128924 2011-06-25 14:08:35Z allan $ +# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $ # Maintainer: Allan McRae # Committer: Judd Vinet pkgname=tcl -pkgver=8.5.10 +pkgver=8.5.11 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') -depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('a08eaf8467c0631937067c1948dd326b') +md5sums=('b01a9691c83990b3db0ce62d1012ca67') build() { cd ${srcdir}/tcl${pkgver}/unix @@ -25,6 +24,11 @@ build() { make } +#check() { +# cd ${srcdir}/tcl${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tcl${pkgver}/unix diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index cb89106d8..f1d6d4677 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128929 2011-06-25 14:10:32Z allan $ +# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $ # Maintainer: Allan McRae # Contributor: Judd Vinet pkgname=tk -pkgver=8.5.10 +pkgver=8.5.11 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('adfdaca46cc95fec8557df8ecdb0715c') +md5sums=('b61b72f0aad230091b100746f078b8f1') build() { cd ${srcdir}/tk${pkgver}/unix @@ -25,6 +25,11 @@ build() { make } +#check() { +# cd ${srcdir}/tk${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tk${pkgver}/unix diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 93565f739..19ad1b223 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141260 2011-10-27 15:31:43Z heftig $ +# $Id: PKGBUILD 142660 2011-11-12 17:18:45Z ibiru $ # Maintainer: Jan "heftig" Steffens # Contributor: Sergej Pupykin # Contributor: Alexander Fehr @@ -7,7 +7,7 @@ pkgbase=tracker pkgname=(tracker libtracker-sparql) pkgver=0.12.7 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index a7e6a6530..9ba6c94ad 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137997 2011-09-13 21:30:20Z eric $ +# $Id: PKGBUILD 142644 2011-11-12 17:15:42Z ibiru $ # Maintainer: # Contributor: Sarah Hay # Contributor: roberto @@ -6,31 +6,29 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.5 -pkgrel=6 +pkgrel=7 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" license=('GPL') -depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' +depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') makedepends=('nasm') options=('!libtool' '!makeflags') source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch) -md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' - 'c0bd49a88f667c68c4430ad25bbed510' - 'af4056b7530a6f147594f676849e7c7b' - 'c299cfc6c4be6a5512d1a129f04e5450') + transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch) sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' - '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2' + '2d3bb4486394ee55540e772f134e193874e5c2b4') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 < ../transcode-1.1.5-jpeg-7.patch patch -p1 < ../transcode-1.1.5-mpa.patch + patch -p1 < ../transcode-1.1.5-ffmpeg.patch # building from here ./configure --prefix=/usr \ diff --git a/extra/transcode/transcode-1.1.5-ffmpeg.patch b/extra/transcode/transcode-1.1.5-ffmpeg.patch new file mode 100644 index 000000000..86e8272e9 --- /dev/null +++ b/extra/transcode/transcode-1.1.5-ffmpeg.patch @@ -0,0 +1,124 @@ +Index: transcode-1.1.5/encode/encode_lavc.c +=================================================================== +--- transcode-1.1.5.orig/encode/encode_lavc.c ++++ transcode-1.1.5/encode/encode_lavc.c +@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa + /* + * context *transcode* (not libavcodec) defaults + */ +- pd->ff_vcontext.mb_qmin = 2; +- pd->ff_vcontext.mb_qmax = 31; + pd->ff_vcontext.max_qdiff = 3; + pd->ff_vcontext.max_b_frames = 0; + pd->ff_vcontext.me_range = 0; +@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri + // handled by transcode core + // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + // handled by transcode core +- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, +- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +Index: transcode-1.1.5/export/aud_aux.c +=================================================================== +--- transcode-1.1.5.orig/export/aud_aux.c ++++ transcode-1.1.5/export/aud_aux.c +@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- + memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all +- mpa_ctx.codec_type = CODEC_TYPE_AUDIO; ++ mpa_ctx.codec_type = AVMEDIA_TYPE_AUDIO; + mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. + mpa_ctx.channels = vob->dm_chan; // channels + mpa_ctx.sample_rate = vob->a_rate; +Index: transcode-1.1.5/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.5.orig/export/export_ffmpeg.c ++++ transcode-1.1.5/export/export_ffmpeg.c +@@ -643,8 +643,6 @@ MOD_init + + lavc_venc_context->bit_rate = vob->divxbitrate * 1000; + lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; +- lavc_venc_context->mb_qmin = lavc_param_mb_qmin; +- lavc_venc_context->mb_qmax = lavc_param_mb_qmax; + lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); + lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); + lavc_venc_context->max_qdiff = lavc_param_vqdiff; +Index: transcode-1.1.5/import/decode_lavc.c +=================================================================== +--- transcode-1.1.5.orig/import/decode_lavc.c ++++ transcode-1.1.5/import/decode_lavc.c +@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode) + + //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read); + do { +- len = avcodec_decode_video(lavc_dec_context, &picture, +- &got_picture, buffer+buf_len, mp4_size-buf_len); ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = buffer+buf_len; ++ pkt.size = mp4_size-buf_len; ++ len = avcodec_decode_video2(lavc_dec_context, &picture, ++ &got_picture, &pkt); + + if (len < 0) { + tc_log_error(__FILE__, "frame decoding failed"); +Index: transcode-1.1.5/import/probe_ffmpeg.c +=================================================================== +--- transcode-1.1.5.orig/import/probe_ffmpeg.c ++++ transcode-1.1.5/import/probe_ffmpeg.c +@@ -47,7 +47,7 @@ static void translate_info(const AVForma + for (i = 0; i < ctx->nb_streams; i++) { + st = ctx->streams[i]; + +- if (st->codec->codec_type == CODEC_TYPE_VIDEO) { ++ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + info->bitrate = st->codec->bit_rate / 1000; + info->width = st->codec->width; + info->height = st->codec->height; +@@ -65,7 +65,7 @@ static void translate_info(const AVForma + for (i = 0; i < ctx->nb_streams; i++) { + st = ctx->streams[i]; + +- if (st->codec->codec_type == CODEC_TYPE_AUDIO ++ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO + && j < TC_MAX_AUD_TRACKS) { + info->track[j].format = 0x1; /* known wrong */ + info->track[j].chan = st->codec->channels; +Index: transcode-1.1.5/export/ffmpeg_cfg.c +=================================================================== +--- transcode-1.1.5.orig/export/ffmpeg_cfg.c ++++ transcode-1.1.5/export/ffmpeg_cfg.c +@@ -34,8 +34,6 @@ int lavc_param_vme = 4; + //int lavc_param_vqscale = 0; + //int lavc_param_vqmin = 2; + //int lavc_param_vqmax = 31; +-int lavc_param_mb_qmin = 2; +-int lavc_param_mb_qmax = 31; + int lavc_param_lmin = 2; + int lavc_param_lmax = 31; + int lavc_param_vqdiff = 3; +@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={ + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +Index: transcode-1.1.5/export/ffmpeg_cfg.h +=================================================================== +--- transcode-1.1.5.orig/export/ffmpeg_cfg.h ++++ transcode-1.1.5/export/ffmpeg_cfg.h +@@ -13,8 +13,6 @@ extern int lavc_param_vme; + //extern int lavc_param_vqscale; + //extern int lavc_param_vqmin; + //extern int lavc_param_vqmax; +-extern int lavc_param_mb_qmin; +-extern int lavc_param_mb_qmax; + extern int lavc_param_lmin; + extern int lavc_param_lmax; + extern int lavc_param_vqdiff; diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index b18e5e01d..b7d69b4be 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140583 2011-10-17 08:15:09Z jgc $ +# $Id: PKGBUILD 142662 2011-11-12 17:18:47Z ibiru $ # Maintainer: Andreas Radke # Contributor: Jan Jezek pkgname=tumbler pkgver=0.1.22 -pkgrel=3 +pkgrel=4 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') @@ -15,7 +15,7 @@ makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') optdepends=('ffmpegthumbnailer: for video thumbnails' 'gstreamer0.10: for video thumbnails') options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2 +source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 fix-video-image.patch) md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' 'be9b0f1c3a4b0be102774c84d5ac29e6') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 621ad8918..9b14f6a80 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140130 2011-10-07 15:51:39Z giovanni $ +# $Id: PKGBUILD 142646 2011-11-12 17:15:45Z ibiru $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.12 -pkgrel=1 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -28,8 +28,9 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/http/.hosts' diff --git a/extra/vlc/vlc.install b/extra/vlc/vlc.install index 4a1091bc5..dc4961cae 100644 --- a/extra/vlc/vlc.install +++ b/extra/vlc/vlc.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins update-desktop-database -q } diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 5cd10f758..d35c20c63 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,35 +1,38 @@ -# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $ +# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $ # Maintainer: Jan de Groot pkgname=vte pkgver=0.28.2 -pkgrel=2 +pkgrel=3 pkgdesc="Virtual Terminal Emulator widget for use with GTK2" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') depends=('gtk2' 'vte-common') -makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc') +makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz) -sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ - --enable-introspection --with-gtk=2.0 \ - --enable-gtk-doc + --enable-introspection --with-gtk=2.0 make } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir/usr/lib/vte/gnome-pty-helper" } diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 87ae483fc..8b2f70aed 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 140961 2011-10-20 05:44:24Z ibiru $ +# $Id: PKGBUILD 142687 2011-11-12 18:46:20Z ibiru $ # Maintainer: Ionut Biru pkgbase=vte3 pkgname=(vte3 vte-common) pkgver=0.30.1 -pkgrel=1 +pkgrel=2 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz) -sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "${srcdir}/vte-${pkgver}" + cd "$srcdir/vte-$pkgver" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ @@ -28,15 +31,15 @@ build() { package_vte3(){ depends=('gtk3' 'vte-common') - cd "${srcdir}/vte-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/vte-$pkgver" + make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir"/usr/lib/vte/gnome-pty-helper } package_vte-common() { pkgdesc="Common files used by vte and vte3" - cd "${srcdir}/vte-${pkgver}" + cd "$srcdir/vte-$pkgver" - make -C gnome-pty-helper DESTDIR="${pkgdir}" install + make -C gnome-pty-helper DESTDIR="$pkgdir" install } diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 0e847a587..dc8f17316 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140061 2011-10-06 07:33:34Z ibiru $ +# $Id: PKGBUILD 142608 2011-11-12 17:14:58Z ibiru $ # Maintainer : Ionut Biru # Contributor: damir # Contributor: Paul Mattal pkgname=x264 -pkgver=20111001 +pkgver=20111030 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('dd67dca96ac79e7cb963bfcbf68e017b') +md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 86dda60c1..2f7159754 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 137999 2011-09-13 21:30:22Z eric $ +# $Id: PKGBUILD 142648 2011-11-12 17:15:49Z ibiru $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.1.19 -pkgrel=5 +pkgrel=6 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" license=('LGPL' 'GPL') -depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') optdepends=('imagemagick: for using the imagemagick plugin' \ @@ -25,19 +25,19 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libmng: for using the mng plugin' \ 'aalib: for using the aalib plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2 - xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch) -md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' - '9776df4eb54d2f1f68d8268adbc3b5c2' - '8662fb124870b1dd7effe4ff5e2a2e3d') -sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz + xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch + xine-lib-1.1.19-ffmpeg.patch) +sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d' '121a8358d7919b2e51067412373f52848290338a' - '920bf27e6e3523dfe4cc9c802ff713e9688a3f34') + '920bf27e6e3523dfe4cc9c802ff713e9688a3f34' + 'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch - patch -p0 < ../xine-lib-1.1.19-xvmc.patch + patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch" + patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch" + patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch" sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h diff --git a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch new file mode 100644 index 000000000..6817aa989 --- /dev/null +++ b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch @@ -0,0 +1,380 @@ +diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c +--- a/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 19:46:49 2011 -0400 +@@ -46,6 +46,12 @@ + + #define AUDIOBUFSIZE (64 * 1024) + ++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++# define AVAUDIO 3 ++#else ++# define AVAUDIO 2 ++#endif ++ + typedef struct { + audio_decoder_class_t decoder_class; + } ff_audio_class_t; +@@ -255,6 +261,9 @@ + buf->decoder_info[2]); + + } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { ++#if AVAUDIO > 2 ++ AVPacket avpkt; ++#endif + + if( !this->decoder_ok ) { + if ( ! this->context || ! this->codec ) { +@@ -286,11 +295,21 @@ + if (!this->output_open) { + if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++#if AVAUDIO > 2 ++ av_init_packet (&avpkt); ++ avpkt.data = (uint8_t *)&this->buf[0]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ avcodec_decode_audio3 (this->context, ++ (int16_t *)this->decode_buffer, ++ &decode_buffer_size, &avpkt); ++#else + avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[0], + this->size); ++#endif + this->audio_bits = this->context->bits_per_sample; + this->audio_sample_rate = this->context->sample_rate; + this->audio_channels = this->context->channels; +@@ -311,12 +330,21 @@ + offset = 0; + while (this->size>0) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++#if AVAUDIO > 2 ++ av_init_packet (&avpkt); ++ avpkt.data = (uint8_t *)&this->buf[offset]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ bytes_consumed = avcodec_decode_audio3 (this->context, ++ (int16_t *)this->decode_buffer, ++ &decode_buffer_size, &avpkt); ++#else + bytes_consumed = avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[offset], + this->size); +- ++#endif + if (bytes_consumed<0) { + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "ffmpeg_audio_dec: error decompressing audio frame\n"); +diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c +--- a/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 19:46:49 2011 -0400 +@@ -58,6 +58,14 @@ + + #define ENABLE_DIRECT_RENDERING + ++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++# define AVVIDEO 2 ++#else ++# define AVVIDEO 1 ++# define pp_context pp_context_t ++# define pp_mode pp_mode_t ++#endif ++ + /* reordered_opaque appeared in libavcodec 51.68.0 */ + #define AVCODEC_HAS_REORDERED_OPAQUE + #if LIBAVCODEC_VERSION_INT < 0x334400 +@@ -116,8 +124,8 @@ + + int pp_quality; + int pp_flags; +- pp_context_t *pp_context; +- pp_mode_t *pp_mode; ++ pp_context *our_context; ++ pp_mode *our_mode; + + /* mpeg-es parsing */ + mpeg_parser_t *mpeg_parser; +@@ -444,23 +452,23 @@ + this->pp_quality = this->class->pp_quality; + + if(this->pp_available && this->pp_quality) { +- if(!this->pp_context && this->context) +- this->pp_context = pp_get_context(this->context->width, this->context->height, ++ if(!this->our_context && this->context) ++ this->our_context = pp_get_context(this->context->width, this->context->height, + this->pp_flags); +- if(this->pp_mode) +- pp_free_mode(this->pp_mode); ++ if(this->our_mode) ++ pp_free_mode(this->our_mode); + +- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", ++ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", + this->pp_quality); + } else { +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } + +- if(this->pp_context) { +- pp_free_context(this->pp_context); +- this->pp_context = NULL; ++ if(this->our_context) { ++ pp_free_context(this->our_context); ++ this->our_context = NULL; + } + } + } +@@ -1055,12 +1063,26 @@ + } + + /* skip decoding b frames if too late */ ++#if AVVIDEO > 1 ++ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; ++#else + this->context->hurry_up = (this->skipframes > 0); ++#endif + + lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); ++#if AVVIDEO > 1 ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; ++ avpkt.size = this->mpeg_parser->buffer_size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ len = avcodec_decode_video2 (this->context, this->av_frame, ++ &got_picture, &avpkt); ++#else + len = avcodec_decode_video (this->context, this->av_frame, + &got_picture, this->mpeg_parser->chunk_buffer, + this->mpeg_parser->buffer_size); ++#endif + lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", + len, got_picture); + len = current - buf->content - offset; +@@ -1112,7 +1134,13 @@ + + } else { + +- if (this->context->hurry_up) { ++ if ( ++#if AVVIDEO > 1 ++ this->context->skip_frame != AVDISCARD_DEFAULT ++#else ++ this->context->hurry_up ++#endif ++ ) { + /* skipped frame, output a bad frame */ + img = this->stream->video_out->get_frame (this->stream->video_out, + this->bih.biWidth, +@@ -1304,13 +1332,25 @@ + got_picture = 0; + } else { + /* skip decoding b frames if too late */ ++#if AVVIDEO > 1 ++ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; ++#else + this->context->hurry_up = (this->skipframes > 0); +- ++#endif + lprintf("buffer size: %d\n", this->size); ++#if AVVIDEO > 1 ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = (uint8_t *)&chunk_buf[offset]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ len = avcodec_decode_video2 (this->context, this->av_frame, ++ &got_picture, &avpkt); ++#else + len = avcodec_decode_video (this->context, this->av_frame, + &got_picture, &chunk_buf[offset], + this->size); +- ++#endif + #ifdef AVCODEC_HAS_REORDERED_OPAQUE + /* reset consumed pts value */ + this->context->reordered_opaque = ff_tag_pts(this, 0); +@@ -1432,7 +1472,7 @@ + img->base, img->pitches, + img->width, img->height, + this->av_frame->qscale_table, this->av_frame->qstride, +- this->pp_mode, this->pp_context, ++ this->our_mode, this->our_context, + this->av_frame->pict_type); + + } else if (!this->av_frame->opaque) { +@@ -1676,11 +1716,11 @@ + free(this->buf); + this->buf = NULL; + +- if(this->pp_context) +- pp_free_context(this->pp_context); ++ if(this->our_context) ++ pp_free_context(this->our_context); + +- if(this->pp_mode) +- pp_free_mode(this->pp_mode); ++ if(this->our_mode) ++ pp_free_mode(this->our_mode); + + mpeg_parser_dispose(this->mpeg_parser); + +@@ -1721,8 +1761,8 @@ + this->aspect_ratio = 0; + + this->pp_quality = 0; +- this->pp_context = NULL; +- this->pp_mode = NULL; ++ this->our_context = NULL; ++ this->our_mode = NULL; + + this->mpeg_parser = NULL; + +diff -r 717450d734f7 src/post/planar/pp.c +--- a/src/post/planar/pp.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/post/planar/pp.c Mon May 16 19:46:49 2011 -0400 +@@ -35,6 +35,12 @@ + # include + #endif + ++#if LIBPOSTPROC_VERSION_MAJOR < 52 ++# define pp_context pp_context_t ++# define pp_mode pp_mode_t ++# define PP_PARAMETERS_T ++#endif ++ + #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ + + /* plugin class initialization function */ +@@ -76,14 +82,15 @@ + + /* libpostproc specific stuff */ + int pp_flags; +- pp_context_t *pp_context; +- pp_mode_t *pp_mode; ++ pp_context *our_context; ++ pp_mode *our_mode; + + pthread_mutex_t lock; + }; + + + static int set_parameters (xine_post_t *this_gen, void *param_gen) { ++#ifdef PP_PARAMETERS_T + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + pp_parameters_t *param = (pp_parameters_t *)param_gen; + +@@ -92,17 +99,18 @@ + memcpy( &this->params, param, sizeof(pp_parameters_t) ); + + pthread_mutex_unlock (&this->lock); +- ++#endif + return 1; + } + + static int get_parameters (xine_post_t *this_gen, void *param_gen) { ++#ifdef PP_PARAMETERS_T + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + pp_parameters_t *param = (pp_parameters_t *)param_gen; + + + memcpy( param, &this->params, sizeof(pp_parameters_t) ); +- ++#endif + return 1; + } + +@@ -202,8 +210,8 @@ + if(cpu_caps & MM_ACCEL_X86_3DNOW) + this->pp_flags |= PP_CPU_CAPS_3DNOW; + +- this->pp_mode = NULL; +- this->pp_context = NULL; ++ this->our_mode = NULL; ++ this->our_context = NULL; + + pthread_mutex_init (&this->lock, NULL); + +@@ -248,13 +256,13 @@ + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + + if (_x_post_dispose(this_gen)) { +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } +- if(this->pp_context) { +- pp_free_context(this->pp_context); +- this->pp_context = NULL; ++ if(this->our_context) { ++ pp_free_context(this->our_context); ++ this->our_context = NULL; + } + free(this); + } +@@ -304,7 +312,7 @@ + + pthread_mutex_lock (&this->lock); + +- if( !this->pp_context || ++ if( !this->our_context || + this->frame_width != yv12_frame->width || + this->frame_height != yv12_frame->height ) { + +@@ -312,32 +320,32 @@ + this->frame_height = yv12_frame->height; + pp_flags = this->pp_flags; + +- if(this->pp_context) +- pp_free_context(this->pp_context); ++ if(this->our_context) ++ pp_free_context(this->our_context); + +- this->pp_context = pp_get_context(frame->width, frame->height, pp_flags); ++ this->our_context = pp_get_context(frame->width, frame->height, pp_flags); + +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } + } + +- if(!this->pp_mode) +- this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode, ++ if(!this->our_mode) ++ this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode, + this->params.quality); + +- if(this->pp_mode) ++ if(this->our_mode) + pp_postprocess(yv12_frame->base, yv12_frame->pitches, + out_frame->base, out_frame->pitches, + (frame->width+7)&(~7), frame->height, + NULL, 0, +- this->pp_mode, this->pp_context, ++ this->our_mode, this->our_context, + 0 /*this->av_frame->pict_type*/); + + pthread_mutex_unlock (&this->lock); + +- if(this->pp_mode) { ++ if(this->our_mode) { + skip = out_frame->draw(out_frame, stream); + _x_post_frame_copy_up(frame, out_frame); + } else { -- cgit v1.2.3-54-g00ecf