From 738e6c6d93b4c7118e49b38c610abed8b7f7d55a Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Jan 2012 23:14:55 +0000 Subject: Sat Jan 28 23:14:55 UTC 2012 --- extra/alsa-lib/PKGBUILD | 6 ++-- extra/alsa-oss/PKGBUILD | 8 ++--- extra/alsa-plugins/PKGBUILD | 8 ++--- extra/alsa-utils/PKGBUILD | 10 +++--- extra/bluez/PKGBUILD | 12 ++++--- extra/bluez/fix-a2dp.patch | 68 +++++++++++++++++++++++++++++++++++++++ extra/ffmpeg/PKGBUILD | 12 +++---- extra/glew/PKGBUILD | 4 +-- extra/hwloc/PKGBUILD | 8 ++--- extra/openmpi/PKGBUILD | 4 +-- extra/transcode/PKGBUILD | 12 ++++--- extra/transcode/ffmpeg-0.10.patch | 14 ++++++++ extra/vlc/PKGBUILD | 4 +-- extra/xine-lib/PKGBUILD | 9 +++--- 14 files changed, 132 insertions(+), 47 deletions(-) create mode 100644 extra/bluez/fix-a2dp.patch create mode 100644 extra/transcode/ffmpeg-0.10.patch (limited to 'extra') diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index b5f7fda08..b04e7ef4e 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110694 2011-02-21 17:46:05Z tpowa $ +# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $ # Maintainer: judd pkgname=alsa-lib -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') +md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD index 2d32793d0..06e0f8cfc 100644 --- a/extra/alsa-oss/PKGBUILD +++ b/extra/alsa-oss/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136976 2011-09-04 11:56:05Z pierre $ +# $Id: PKGBUILD 147698 2012-01-27 07:26:45Z tpowa $ # Contributor: judd pkgname=alsa-oss -pkgver=1.0.17 -pkgrel=2 +pkgver=1.0.25 +pkgrel=1 pkgdesc="OSS compatibility library" arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,6 @@ url="http://www.alsa-project.org" options=('!libtool') depends=('alsa-lib') source=("ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2") -md5sums=('1b1850c2fc91476a73d50f537cbd402f') build() { cd $srcdir/$pkgname-$pkgver @@ -23,3 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } +md5sums=('922ea177db15c72f1b5037181c73f934') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 93478640d..fd5b54072 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $ +# $Id: PKGBUILD 147731 2012-01-27 15:55:17Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Sergej Pupykin # Contributor: Daniel Ehlers pkgname=alsa-plugins -pkgver=1.0.24 -pkgrel=3 +pkgver=1.0.25 +pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" @@ -19,7 +19,7 @@ optdepends=('libpulse: PulseAudio plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") -md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') +md5sums=('038c023eaa51171f018fbf7141255185') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index cb8da4e3d..b45dcba2c 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 135667 2011-08-17 07:46:33Z tpowa $ +# $Id: PKGBUILD 147702 2012-01-27 07:30:51Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils -pkgver=1.0.24.2 -pkgrel=3 +pkgver=1.0.25 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" #can not use >=$pkgver due to use of letters in alsa-lib update versioning -depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc') +depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate') makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 @@ -35,7 +35,7 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' +md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9' '2ba1a1cbf653bf1a69f8a720fd6549da' '7521bf20f5b3501a510ec4462ae4a934' '4c8ae9f976c7df5e271a4cb91ccc7767' diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index be653c012..1de5cc7e1 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146600 2012-01-13 22:26:31Z andrea $ +# $Id: PKGBUILD 147730 2012-01-27 15:54:11Z heftig $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgname=bluez pkgver=4.98 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -26,15 +26,17 @@ options=('!libtool' 'emptydirs') backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' - 'rc.bluetooth') + 'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch') md5sums=('4aca8a0929250212e9a75fb60dd75b05' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') + '8f9498707f809506928b2e480d3b6789' + 'd6a34317e56b7c2bd990791d89d6c3cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-a2dp.patch" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/bluez/fix-a2dp.patch b/extra/bluez/fix-a2dp.patch new file mode 100644 index 000000000..e4bb1372a --- /dev/null +++ b/extra/bluez/fix-a2dp.patch @@ -0,0 +1,68 @@ +From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 26 Jan 2012 23:39:02 +0200 +Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket + is disabled + +Local endpoints can only be used when UNIX socket API is available. +--- + audio/a2dp.c | 15 +++++++-------- + 1 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/audio/a2dp.c b/audio/a2dp.c +index 5ca105c..bbb91ce 100644 +--- a/audio/a2dp.c ++++ b/audio/a2dp.c +@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) + + int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + { +- int sbc_srcs = 1, sbc_sinks = 1; ++ int sbc_srcs = 0, sbc_sinks = 0; + int mpeg12_srcs = 0, mpeg12_sinks = 0; +- gboolean source = TRUE, sink = FALSE, socket = TRUE; ++ gboolean source = TRUE, sink = FALSE, socket = FALSE; + gboolean delay_reporting = FALSE; + char *str; + GError *err = NULL; +@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + source = TRUE; + if (strstr(str, "Source")) + sink = TRUE; ++ if (strstr(str, "Socket")) ++ socket = TRUE; + g_free(str); + } + +@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + } + + /* Don't register any local sep if Socket is disabled */ +- if (socket == FALSE) { +- sbc_srcs = 0; +- sbc_sinks = 0; +- mpeg12_srcs = 0; +- mpeg12_sinks = 0; ++ if (socket == FALSE) + goto proceed; +- } + + str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_srcs = 1; + } else { + sbc_srcs = atoi(str); + g_free(str); +@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_sinks = 1; + } else { + sbc_sinks = atoi(str); + g_free(str); +-- +1.7.6.5 + diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index c8c5e77c8..62b506d67 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146495 2012-01-11 22:55:38Z ibiru $ +# $Id: PKGBUILD 147716 2012-01-27 11:08:09Z ibiru $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=20120111 +pkgver=20120127 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -13,16 +13,12 @@ license=('GPL') depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) makedepends=('yasm' 'git' 'libvdpau') #git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz - revert-enabling-threads.patch) -md5sums=('7a54b2b1af86a746696d1c0b2a79979c' - '79cc22bc2ac3e67d96c340cb7061e64d') +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) +md5sums=('dc706cdb31801b4746f37459b0c38b7e') build() { cd "$srcdir/$pkgname" - patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch" - ./configure \ --prefix=/usr \ --enable-libmp3lame \ diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index eb08d7441..f72d47777 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138482 2011-09-24 16:46:38Z stephane $ +# $Id: PKGBUILD 147734 2012-01-27 15:57:44Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: SleepyDog pkgname=glew pkgver=1.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index fba4aecc2..fb16f141b 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145717 2011-12-28 15:42:53Z stephane $ +# $Id: PKGBUILD 147724 2012-01-27 15:42:58Z stephane $ # Maintainer : Stéphane Gaudreault # Contributor: Sylvain HENRY # Contributor: Hervé YVIQUEL pkgname=hwloc -pkgver=1.3.1 +pkgver=1.4 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ depends=('sh' 'pciutils') makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1051c937c3d2a4c98922903f313a1fa021bb35ba') +source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 4673b26a6..990899c83 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143088 2011-11-22 17:32:55Z stephane $ +# $Id: PKGBUILD 147726 2012-01-27 15:43:19Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=openmpi pkgver=1.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 73566a33f..a74dbfd64 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144420 2011-12-05 18:18:14Z jgc $ +# $Id: PKGBUILD 147746 2012-01-27 20:01:33Z ibiru $ # Maintainer: # Contributor: Sarah Hay # Contributor: roberto @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" @@ -17,14 +17,18 @@ makedepends=('nasm') options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch) + subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch + ffmpeg-0.10.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae') + '591943a33235342a66c3df0625a164a1479c09ae' + '3c03111cfae88db918afff3837cec7db32ace3cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch" ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch new file mode 100644 index 000000000..5965c180c --- /dev/null +++ b/extra/transcode/ffmpeg-0.10.patch @@ -0,0 +1,14 @@ +diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c +--- transcode-1.1.7.orig/filter/filter_pp.c 2012-01-27 19:55:13.706613234 +0000 ++++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +0000 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 257798d85..09a939f80 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $ +# $Id: PKGBUILD 147739 2012-01-27 19:27:41Z ibiru $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.13 -pkgrel=1 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 7447852b0..add03d4a7 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146428 2012-01-10 23:37:52Z eric $ +# $Id: PKGBUILD 147743 2012-01-27 19:57:13Z eric $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -11,7 +11,7 @@ license=('LGPL' 'GPL') depends=('libxvmc' 'ffmpeg' 'libxinerama') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' - 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs') + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau') optdepends=('imagemagick: for using the imagemagick plugin' \ 'jack: for using the jack plugin' \ 'vcdimager: for using the vcd plugin' \ @@ -27,7 +27,8 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libmpcdec: for using the musepack plugin' \ 'libcaca: for using the caca plugin' \ 'libbluray: for using the bluray plugin' \ - 'gnome-vfs: for using the gnome-vfs 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) sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d') -- cgit v1.2.3-54-g00ecf