From 94a3b302f520438e919ef8706ce9cf42ad7c2e11 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 May 2013 01:57:14 -0700 Subject: Fri May 31 01:56:04 PDT 2013 --- extra/bitlbee/PKGBUILD | 5 +- extra/calligra/PKGBUILD | 8 +- extra/clutter/PKGBUILD | 8 +- extra/cogl/PKGBUILD | 8 +- extra/dosfstools/PKGBUILD | 10 +- extra/gnome-shell/PKGBUILD | 8 +- extra/gupnp-av/PKGBUILD | 6 +- extra/gupnp-dlna/PKGBUILD | 6 +- extra/gupnp/PKGBUILD | 6 +- extra/kdevelop-php/PKGBUILD | 10 +- extra/kdevelop/PKGBUILD | 6 +- extra/kdevplatform/PKGBUILD | 8 +- extra/kwebkitpart/PKGBUILD | 9 +- extra/libmbim/PKGBUILD | 38 +++ extra/libmbim/format.patch | 14 ++ extra/libxcb/PKGBUILD | 10 +- extra/libxcursor/PKGBUILD | 7 +- extra/mutter/PKGBUILD | 8 +- extra/nettle/PKGBUILD | 10 +- extra/totem/PKGBUILD | 8 +- extra/xine-lib/PKGBUILD | 26 +- extra/xine-lib/accel_vaapi.h | 135 ++++++++++ ...udio_decoder-support-new-av_decode_audio4.patch | 277 --------------------- 23 files changed, 282 insertions(+), 349 deletions(-) create mode 100644 extra/libmbim/PKGBUILD create mode 100644 extra/libmbim/format.patch create mode 100644 extra/xine-lib/accel_vaapi.h delete mode 100644 extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch (limited to 'extra') diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index e293ebcdf..dbda4f18f 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $ +# $Id: PKGBUILD 186657 2013-05-30 12:20:27Z dreisner $ # Contributor: FUBAR # Contributor: simo @@ -9,7 +9,7 @@ pkgname=bitlbee pkgver=3.2 -pkgrel=2 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -36,6 +36,7 @@ build() { ./configure \ --prefix=/usr \ --etcdir=/etc/bitlbee \ + --sbindir=/usr/bin \ --pidfile=/run/bitlbee/bitlbee.pid \ --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 547607a90..abad8e3ea 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186337 2013-05-25 02:56:27Z foutrelis $ +# $Id: PKGBUILD 186633 2013-05-30 10:57:28Z andrea $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -17,8 +17,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.6.3 -pkgrel=5 +pkgver=2.6.4 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -28,7 +28,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('90d6bb619191abbcc94094379d47e225') +md5sums=('a38fdc882888469ea8b0dea949c05dda') build() { mkdir build diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 885c94ccc..9116dcb8d 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185561 2013-05-15 07:16:35Z heftig $ +# $Id: PKGBUILD 186662 2013-05-30 12:24:29Z heftig $ # Maintainer: Jan de Groot # Contributor: Sergej Pupykin # Contributor: William Rea pkgname=clutter pkgver=1.14.4 -pkgrel=1 +pkgrel=2 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -20,6 +20,10 @@ build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index ce0b3dacb..289dcaf83 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $ +# $Id: PKGBUILD 186660 2013-05-30 12:23:15Z heftig $ # Maintainer: Ionut Biru pkgname=cogl pkgver=1.14.0 -pkgrel=2 +pkgrel=3 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" @@ -18,6 +18,10 @@ build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --enable-wayland-egl-{platform,server} --enable-gles{1,2} + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index ef6e457d2..63834267f 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186197 2013-05-22 00:02:48Z eric $ +# $Id: PKGBUILD 186622 2013-05-30 05:56:36Z tpowa $ # Maintainer: dorphell # Committer: Judd Vinet pkgname=dosfstools -pkgver=3.0.16 -pkgrel=2 +pkgver=3.0.17 +pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) depends=('glibc') @@ -20,5 +20,5 @@ package () { cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e' - 'e8b460ab9c27279e652ddbd1ce7fa4b2') +md5sums=('468b953ddc8baf66e9881d1a5eae03e2' + 'SKIP') diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 94c7894e3..49bc85f1a 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186358 2013-05-25 15:54:34Z heftig $ +# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $ # Maintainer: Ionut Biru # Contributor: Flamelab # Contributor: Thijs Vermeir # Contributor: Denis Zawada pkgname=gupnp-av -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=(gupnp) makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4') +sha256sums=('43597bdfb1c352338e706962ff7fcdbcb544c5a36f27c9c2aaa5a550b6990270') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD index 0e4a1cb98..666a8ecc8 100644 --- a/extra/gupnp-dlna/PKGBUILD +++ b/extra/gupnp-dlna/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $ +# $Id: PKGBUILD 186714 2013-05-30 17:41:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Balló György pkgname=gupnp-dlna -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="Library to ease DLNA-related bits for applications using gupnp" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=(gst-plugins-base-libs) makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b') +sha256sums=('158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 12b2897c2..cea16d012 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $ +# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: György Balló pkgname=gupnp -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812') +sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0') build() { cd $pkgname-$pkgver diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index cb0ad4d34..3b44c970c 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183678 2013-04-26 13:20:21Z andrea $ +# $Id: PKGBUILD 186676 2013-05-30 12:44:27Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdevelop-php -pkgver=1.5.0 -_pkgver=4.5.0 +pkgver=1.5.1 +_pkgver=4.5.1 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('778a1711c15458952e1e4765722a0839390f636c' - 'fa282f0ace43d36a785e608c421c91437596fc79') +sha1sums=('c047724c255417b361d3ce1898555c2b9183f5b2' + '9bdb654373970f46d01359fdcae6d879c405760a') build() { mkdir build diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index 411995acc..4d2209343 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183676 2013-04-26 13:20:05Z andrea $ +# $Id: PKGBUILD 186674 2013-05-30 12:43:58Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Giovanni Scafora pkgname=kdevelop -pkgver=4.5.0 +pkgver=4.5.1 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('kdesdk-okteta: hex editor' 'qt-doc: qt documentation integration') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('21cdff814b5840d4b62b105b53c0b128e35c3c9f') +sha1sums=('e27b77bca0b4c466f66b24167ec416f20b353f6f') build() { mkdir build diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 20a00eaf8..840084833 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183674 2013-04-26 13:19:47Z andrea $ +# $Id: PKGBUILD 186672 2013-05-30 12:43:39Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Giovanni Scafora pkgname=kdevplatform -pkgver=1.5.0 -_pkgver=4.5.0 +pkgver=1.5.1 +_pkgver=4.5.1 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5b887fdd9fe065ff8be5641859c80c020ba625e') +sha1sums=('af3e78b55c4aec97e271bc06c59186cdf77fe3d1') build() { mkdir build diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index b726f455d..aeae8d6c2 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186557 2013-05-28 23:46:47Z andrea $ +# $Id: PKGBUILD 186710 2013-05-30 17:03:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kwebkitpart pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A WebKit browser component for KDE" url="https://projects.kde.org/projects/extragear/base/kwebkitpart/" arch=('i686' 'x86_64') @@ -11,8 +11,9 @@ license=('LGPL') depends=('kdelibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('0c90cc05b4f9b6cba9e62941ae4d3ba0') +# Generate using kde releaseme scripts +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('82640f97f23ce72bed1da6527909bb5d') build() { sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD new file mode 100644 index 000000000..901429d4c --- /dev/null +++ b/extra/libmbim/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libmbim +pkgver=1.0.0 +pkgrel=1 +pkgdesc="MBIM modem protocol helper library" +arch=(i686 x86_64) +url="http://cgit.freedesktop.org/libmbim/libmbim" +license=(GPL2) +depends=(glib2 bash systemd) +makedepends=(gtk-doc python) +options=('!libtool') +source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch) +sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c' + 'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../format.patch +} + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-tests + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch new file mode 100644 index 000000000..4bd4c0eea --- /dev/null +++ b/extra/libmbim/format.patch @@ -0,0 +1,14 @@ +diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c +--- libmbim-1.0.0/cli/mbimcli-basic-connect.c 2013-05-22 16:20:29.000000000 +0200 ++++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c 2013-05-30 05:53:49.269777442 +0200 +@@ -909,8 +909,8 @@ + "\t Network error: '%s'\n" + "\t Packet service state: '%s'\n" + "\tAvailable data classes: '%s'\n" +- "\t Uplink speed: '%lu bps'\n" +- "\t Downlink speed: '%lu bps'\n", ++ "\t Uplink speed: '%" G_GUINT64_FORMAT " bps'\n" ++ "\t Downlink speed: '%" G_GUINT64_FORMAT " bps'\n", + mbim_device_get_path_display (device), + VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)), + VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)), diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 01d3b10cf..a1ae6f35f 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177994 2013-02-12 20:05:14Z andyrtr $ +# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxcb -pkgver=1.9 -pkgrel=3 +pkgver=1.9.1 +pkgrel=1 pkgdesc="X11 client-side library" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org/" @@ -14,8 +14,8 @@ options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') +sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f' + '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD index 16d6470f0..27c35ea5c 100644 --- a/extra/libxcursor/PKGBUILD +++ b/extra/libxcursor/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $ +# $Id: PKGBUILD 186698 2013-05-30 14:35:12Z andyrtr $ +# Maintainer: Andreas Radke # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxcursor -pkgver=1.1.13 +pkgver=1.1.14 pkgrel=1 pkgdesc="X cursor management library" arch=(i686 x86_64) @@ -13,7 +14,7 @@ depends=('libxfixes' 'libxrender') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47') +sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df') build() { cd "${srcdir}/libXcursor-${pkgver}" diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 5f7dec8b9..5ef2f83d3 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185488 2013-05-14 11:23:26Z heftig $ +# $Id: PKGBUILD 186664 2013-05-30 12:25:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Ionut Biru # Contributor: Michael Kanis pkgname=mutter pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') @@ -24,6 +24,10 @@ build() { --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static \ --disable-schemas-compile --enable-compile-warnings=minimum + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index f169b6bc8..cdeec201d 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183668 2013-04-26 12:45:09Z andyrtr $ +# $Id: PKGBUILD 186700 2013-05-30 14:40:21Z andyrtr $ # Maintainer: Andreas Radke # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64') @@ -11,8 +11,10 @@ url="http://www.lysator.liu.se/~nisse/nettle/" license=('GPL2') install=$pkgname.install depends=('gmp') -source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2caa1bd667c35db71becb93c5d89737f') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('003d5147911317931dd453520eb234a5' + 'SKIP') + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 2f9b1ca40..a06bb53b7 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185508 2013-05-14 12:12:44Z heftig $ +# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=(i686 x86_64) @@ -39,6 +39,10 @@ build() { --disable-static \ --enable-python \ --enable-nautilus + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index e6666456e..db3b37892 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180316 2013-03-20 02:35:37Z eric $ +# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $ # Maintainer: Eric Bélanger pkgname=xine-lib -pkgver=1.2.2 -pkgrel=8 +pkgver=1.2.3 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -30,23 +30,21 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'gnome-vfs: for using the gnome-vfs plugin' \ 'libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz - xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch) -sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c' - '45500eca2aa40c133e1a6e8b23dbadc4b921b11f') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h) +sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57' + '08ed9947ef919c71c87151baa8fc0ce7d8f72050') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix audio decoding with newest FFmpeg - # https://bugs.archlinux.org/task/33818 - patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch" +prepare() { + cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/ +} +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h new file mode 100644 index 000000000..666b23fd6 --- /dev/null +++ b/extra/xine-lib/accel_vaapi.h @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2008 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * + * + * Common acceleration definitions for vdpau + * + * + */ + +#ifndef HAVE_XINE_ACCEL_VAAPI_H +#define HAVE_XINE_ACCEL_VAAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#ifdef HAVE_FFMPEG_AVUTIL_H +# include +#else +# include +#endif + +#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 + +#define NUM_OUTPUT_SURFACES 22 + +#define SURFACE_FREE 0 +#define SURFACE_ALOC 1 +#define SURFACE_RELEASE 2 +#define SURFACE_RENDER 3 +#define SURFACE_RENDER_RELEASE 5 + +struct vaapi_equalizer { + VADisplayAttribute brightness; + VADisplayAttribute contrast; + VADisplayAttribute hue; + VADisplayAttribute saturation; +}; + +typedef struct ff_vaapi_context_s ff_vaapi_context_t; + +struct ff_vaapi_context_s { + VADisplay va_display; + VAContextID va_context_id; + VAConfigID va_config_id; + int width; + int height; + int sw_width; + int sw_height; + int va_profile; + unsigned int va_colorspace; + VAImage va_subpic_image; + VASubpictureID va_subpic_id; + int va_subpic_width; + int va_subpic_height; + int is_bound; + void *gl_surface; + unsigned int soft_head; + unsigned int valid_context; + unsigned int va_head; + unsigned int va_soft_head; + vo_driver_t *driver; + unsigned int last_sub_image_fmt; + VASurfaceID last_sub_surface_id; + struct vaapi_equalizer va_equalizer; + VAImageFormat *va_image_formats; + int va_num_image_formats; + VAImageFormat *va_subpic_formats; + int va_num_subpic_formats; +}; + +typedef struct ff_vaapi_surface_s ff_vaapi_surface_t; +typedef struct vaapi_accel_s vaapi_accel_t; + +struct ff_vaapi_surface_s { + unsigned int index; + vaapi_accel_t *accel; + VASurfaceID va_surface_id; + unsigned int status; +}; + +struct vaapi_accel_s { + unsigned int index; + vo_frame_t *vo_frame; + +#if AVVIDEO > 1 + int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, AVPacket *avpkt); +#else + int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, uint8_t *buf, int buf_size); +#endif + VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender); + int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec); + ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen); + int (*guarded_render)(vo_frame_t *frame_gen); + ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen); + void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); + void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); +}; + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch deleted file mode 100644 index 255f56d0d..000000000 --- a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001 -From: Torsten Jager -Date: Thu, 21 Feb 2013 22:35:00 +0200 -Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 () - ---- - src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------ - src/combined/ffmpeg/ffmpeg_compat.h | 4 +- - 2 files changed, 131 insertions(+), 26 deletions(-) - -diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c -index 4e64378..34a7a9e 100644 ---- a/src/combined/ffmpeg/ff_audio_decoder.c -+++ b/src/combined/ffmpeg/ff_audio_decoder.c -@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s { - int decoder_ok; - - AVCodecParserContext *parser_context; -- -+#if AVAUDIO > 3 -+ AVFrame *av_frame; -+#endif - } ff_audio_decoder_t; - - -@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ - return; - } - -+ /* Try to make the following true */ -+ this->context->request_sample_fmt = AV_SAMPLE_FMT_S16; -+ - /* Current ffmpeg audio decoders usually use 16 bits/sample - * buf->decoder_info[2] can't be used as it doesn't refer to the output - * bits/sample for some codecs (e.g. MS ADPCM) */ -@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this) - this->audio_channels = 0; - } - --static int ff_audio_decode(xine_t *xine, -- AVCodecContext *ctx, -- AVCodecParserContext *parser_ctx, -- int16_t *decode_buffer, int *decode_buffer_size, -- uint8_t *buf, int size) --{ -+static int ff_audio_decode (ff_audio_decoder_t *this, -+ int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) { - int consumed; - int parser_consumed = 0; - - #if AVPARSE > 1 -- if (parser_ctx) { -+ if (this->parser_context) { - uint8_t *outbuf; - int outsize; - - do { -- int ret = av_parser_parse2(parser_ctx, ctx, -- &outbuf, &outsize, -- buf, size, -- 0, 0, 0); -+ int ret = av_parser_parse2 (this->parser_context, this->context, -+ &outbuf, &outsize, buf, size, 0, 0, 0); - parser_consumed += ret; - buf += ret; - size -= ret; -@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine, - /* nothing to decode ? */ - if (outsize <= 0) { - *decode_buffer_size = 0; -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: not enough data to decode\n"); - return parser_consumed; - } -@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine, - avpkt.data = buf; - avpkt.size = size; - avpkt.flags = AV_PKT_FLAG_KEY; -- consumed = avcodec_decode_audio3 (ctx, -- decode_buffer, decode_buffer_size, -- &avpkt); -+# if AVAUDIO > 3 -+ int got_frame; -+ if (!this->av_frame) -+ this->av_frame = avcodec_alloc_frame (); -+ -+ consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); -+ if ((consumed >= 0) && got_frame) { -+ int16_t *q = decode_buffer; -+ int samples = this->av_frame->nb_samples; -+ int channels = this->context->channels; -+ int bytes, i, j; -+ /* limit buffer */ -+ if (channels > 12) -+ channels = 12; -+ if (*decode_buffer_size < samples * channels * 2) -+ samples = *decode_buffer_size / (channels * 2); -+ bytes = samples * channels * 2; -+ *decode_buffer_size = bytes; -+ /* convert to packed int16_t. I guess there is something -+ in libavfilter but also another dependency... */ -+ switch (this->context->sample_fmt) { -+ case AV_SAMPLE_FMT_U8P: -+ if (channels > 1) { -+ uint8_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (uint8_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_U8: -+ { -+ uint8_t *p = (uint8_t *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) -+ *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000; -+ } -+ break; -+ case AV_SAMPLE_FMT_S16P: -+ if (channels > 1) { -+ int16_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (int16_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = *p[j]++; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_S16: -+ xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes); -+ break; -+ case AV_SAMPLE_FMT_S32P: -+ if (channels > 1) { -+ int32_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (int32_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = *p[j]++ >> 16; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_S32: -+ { -+ int32_t *p = (int32_t *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) -+ *q++ = *p++ >> 16; -+ } -+ break; -+ case AV_SAMPLE_FMT_FLTP: /* the most popular one */ -+ if (channels > 1) { -+ float *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (float *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) { -+ int v = *p[j]++ * (float)0x7fff; -+ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; -+ } -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_FLT: -+ { -+ float *p = (float *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) { -+ int v = *p++ * (float)0x7fff; -+ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; -+ } -+ } -+ break; -+ default: ; -+ } -+ } else *decode_buffer_size = 0; -+# else -+ consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt); -+# endif - #else -- consumed = avcodec_decode_audio2 (ctx, -- decode_buffer, decode_buffer_size, -- buf, size); -+ consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size); - #endif - - if (consumed < 0) { -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed); - } else if (parser_consumed && consumed != size) { - -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: decoder didn't consume all data\n"); - } - -@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; - - bytes_consumed = -- ff_audio_decode(this->stream->xine, this->context, -- this->parser_context, -+ ff_audio_decode(this, - (int16_t *)this->decode_buffer, &decode_buffer_size, - &this->buf[offset], this->size); - -@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - } - - /* fill up this buffer */ -+#if AVAUDIO < 4 - if (codec_type == BUF_AUDIO_WMAPRO) { - /* the above codecs output float samples, not 16-bit integers */ - int bytes_per_sample = sizeof(float); -@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - bytes_to_send = bytes_to_send * 2 / bytes_per_sample; - xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send); - free(int_buffer); -- } else { -+ } else -+#endif -+ { - if ((decode_buffer_size - out) > audio_buffer->mem_size) - bytes_to_send = audio_buffer->mem_size; - else -@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) { - - /* try to reset the wma decoder */ - if( this->decoder_ok ) { -+#if AVAUDIO > 3 -+ avcodec_free_frame (&this->av_frame); -+#endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); - if (avcodec_open (this->context, this->codec) < 0) -@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) { - } - - if( this->context && this->decoder_ok ) { -+#if AVAUDIO > 3 -+ avcodec_free_frame (&this->av_frame); -+#endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); - pthread_mutex_unlock (&ffmpeg_lock); -@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, - - this->context = avcodec_alloc_context(); - this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE); -- -+#if AVAUDIO > 3 -+ this->av_frame = NULL; -+#endif - return &this->audio_decoder; - } - -diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h -index 0acead8..b567dc1 100644 ---- a/src/combined/ffmpeg/ffmpeg_compat.h -+++ b/src/combined/ffmpeg/ffmpeg_compat.h -@@ -94,7 +94,9 @@ - #endif - - /* avcodec_decode_audio() */ --#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+#if LIBAVCODEC_VERSION_MAJOR >= 54 -+# define AVAUDIO 4 -+#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) - # define AVAUDIO 3 - #else - # define AVAUDIO 2 --- -1.8.1.5 - -- cgit v1.2.3-54-g00ecf