diff options
43 files changed, 525 insertions, 177 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index da196a7eb..6dc54a8db 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56935 2011-10-17 07:29:09Z bisson $ +# $Id: PKGBUILD 61911 2012-01-10 16:09:29Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64') url='http://collectd.org/' @@ -45,7 +45,7 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' 'rc.d') sha1sums=('ec1bf97d21a27d9b53b20f7dc4fb61441b4e42e0' - 'b221352447b2d42cade4a65ced322bcff8a40366' + 'b17793f0e7e2c94079257349a1bac7ba8d94e4a3' '0f441718d5519cb043b1130e5a1d0379078adbcc') install=install diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch index d6184f29d..7a9ad9fc0 100644 --- a/community/collectd/libperl.patch +++ b/community/collectd/libperl.patch @@ -11,7 +11,7 @@ diff -aur old/configure.in new/configure.in PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` CFLAGS="$CFLAGS $PERL_CFLAGS" LDFLAGS="$LDFLAGS $PERL_LDFLAGS" -+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" ++ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS" AC_CACHE_CHECK([for libperl], [c_cv_have_libperl], diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 42a73d657..5a6bb97ae 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61028 2011-12-20 17:34:12Z foutrelis $ +# $Id: PKGBUILD 61899 2012-01-10 12:57:08Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris -pkgver=11.12 +pkgver=12.01 pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('gnucap: for computer simulation within the electricity activity' makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') options=('!libtool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('ab57e7c96df66114f7298947f6725364f4a8b811f1bb1e9470cbd63eea9e6d81') +sha256sums=('77e5a4901550dfcad632277437b6895a65a553225224c8a78f2bd5b7b459aa91') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index b90a3f8f8..b12b6959c 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60238 2011-12-08 10:43:13Z spupykin $ +# $Id: PKGBUILD 61917 2012-01-10 23:41:37Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=gogglesmm -pkgver=0.12.5 +pkgver=0.12.6 pkgrel=1 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'glproto' 'dri2proto') replaces=('musicmanager') conflicts=('musicmanager') source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('07e92bcf2daf39d6b380590816edd013') +md5sums=('19505ee514690fe3372621685666db4c') build() { cd $srcdir/gogglesmm-$pkgver diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index f77c7dcbb..4b0695154 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59445 2011-11-24 21:56:56Z ebelanger $ +# $Id: PKGBUILD 61926 2012-01-11 02:52:12Z ebelanger $ # Contributor: Johannes Martin <honzor@gmx.net> # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gputils -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=1 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://gputils.sourceforge.net/" license=('GPL') depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('04780834e30fc50f0bd92cc4c91cf11b') +md5sums=('d896de172a10afb77156a4fb8f393942') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index 4873f704e..ddcd0322a 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57039 2011-10-18 23:59:43Z ebelanger $ +# $Id: PKGBUILD 61928 2012-01-11 03:15:10Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák <hvizdakr at gmail dot com> pkgname=ibus-hangul -pkgver=1.3.2 +pkgver=1.4.0 pkgrel=1 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64') @@ -11,13 +11,11 @@ url='http://ibus.googlecode.com' license=('GPL') depends=('ibus' 'libhangul') makedepends=('intltool') -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1.4.0.patch) -md5sums=('b8132e8b11afadd803b2602c63294da5' - 'edf93824ab2eead1307088d3edc24dbc') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +sha1sums=('421d7164a27eeedfea49d54b61e2a5edd4f7d3a7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/ibus-1.4.0.patch" PYTHON=python2 ./configure --prefix=/usr --libexecdir=/usr/lib/ibus make } diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD index c410dc245..132499abe 100644 --- a/community/ibus-pinyin/PKGBUILD +++ b/community/ibus-pinyin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56127 2011-10-02 07:12:20Z ebelanger $ +# $Id: PKGBUILD 61930 2012-01-11 03:50:39Z ebelanger $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.maRS<leemars at gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-pinyin -pkgver=1.3.99.20110706 +pkgver=1.4.0 pkgrel=1 pkgdesc='The PinYin Engine for IBus Input Framework.' arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ makedepends=('intltool') install=ibus-pinyin.install source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2") -md5sums=('0d9d5d78106c2d36c28a00b74aa9a6c3' - 'd0951b8daa7f56a2cbd3b6b4e42532e0') +sha1sums=('499ceb4d3bec5614f88322b8e7695c04586b63e9' + 'e38a148a772e9909facda66b2d579e17b94cccbe') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ibus-table-extraphrase/PKGBUILD b/community/ibus-table-extraphrase/PKGBUILD index 53d7e079d..04016b0c7 100644 --- a/community/ibus-table-extraphrase/PKGBUILD +++ b/community/ibus-table-extraphrase/PKGBUILD @@ -1,24 +1,21 @@ +# $Id: PKGBUILD 61932 2012-01-11 04:09:08Z ebelanger $ # Contributor: Lee.MaRS<leemars at gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-table-extraphrase -pkgver=1.2.0.20100305 -pkgrel=2 -pkgdesc="The extra phrases of tables engines for IBus." +pkgver=1.3.9.20110826 +pkgrel=1 +pkgdesc="The extra phrases of tables engines for IBus" arch=('i686' 'x86_64') url="http://code.google.com/p/ibus/" license=('LGPL') -depends=('ibus-table>=1.2.0') -provides=('ibus-table-extraphrase=1.2.0') -conflicts=('ibus-table-extraphrase-git') +depends=('ibus-table') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('ab3a0bd3b443ad4df9ad5554e155550d') +sha1sums=('b2f69cfedc230988d7b8693dd8fd3c250a376246') build() { cd ${pkgname}-${pkgver} - ./autogen.sh - ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/ibus @@ -29,5 +26,5 @@ build() { package() { cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 81a8afa71..015396c72 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 57420 2011-10-27 12:32:11Z foutrelis $ +# $Id: PKGBUILD 61907 2012-01-10 16:07:55Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') url="http://libmemcached.org/" license=('GPL') -depends=('glibc') +depends=('glibc' 'libsasl') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('d992845fe71210e2e93147ba8f29df1fca14e716') +sha256sums=('936cc1b5f36fae45a1069cbd889effa2ecf12e05ce09b45c14a992a35d3c0dbc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index 1814501e5..4a97fb410 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=me-tv pkgver=2.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" arch=('i686' 'x86_64') url="https://launchpad.net/me-tv" diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index f8cb26dd4..3284a7811 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61765 2012-01-07 13:49:52Z svenstaro $ +# $Id: PKGBUILD 61915 2012-01-10 22:08:30Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 478f40a0e..ecd116a82 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -6,8 +6,8 @@ post_install() { getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - chown -R 86:86 /var/lib/murmur - chown -R 86:86 /var/log/murmur + chown -R murmur:murmur /var/lib/murmur + chown -R murmur:murmur /var/log/murmur echo echo '==> Set the SuperUser password with (as root):' diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 731058d5d..7b5cce6c0 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58415 2011-11-12 17:18:19Z ibiru $ +# $Id: PKGBUILD 61921 2012-01-10 23:41:50Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') @@ -16,14 +16,17 @@ makedepends=('cmake' 'libvncserver') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip + osg-xine-1.2.patch) #source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956') +md5sums=('c43a25d023e635c3566b2083d8e6d956' + 'b05a486fdc2aaf06b29efb5e0714672e') build() { cd OpenSceneGraph-$pkgver [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + patch -p1 <$srcdir/osg-xine-1.2.patch make } diff --git a/community/openscenegraph/osg-xine-1.2.patch b/community/openscenegraph/osg-xine-1.2.patch new file mode 100644 index 000000000..c73b588dc --- /dev/null +++ b/community/openscenegraph/osg-xine-1.2.patch @@ -0,0 +1,14 @@ +diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c +--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 ++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 +@@ -2769,8 +2769,8 @@ + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; +- rgb_class->driver_class.get_identifier = get_identifier; +- rgb_class->driver_class.get_description = get_description; ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); diff --git a/community/paraview/12859-VisItBrige-external-tiff-support.diff b/community/paraview/12859-VisItBrige-external-tiff-support.diff new file mode 100644 index 000000000..1901d0146 --- /dev/null +++ b/community/paraview/12859-VisItBrige-external-tiff-support.diff @@ -0,0 +1,32 @@ +commit c69690edb180b96081f3e75d0c23bbd5abcb3d65 +Author: Robert Maynard <robert.maynard@kitware.com> +Date: Mon Jan 9 12:50:32 2012 -0500 + + Corrected build issues when using system tiff library. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b2ee9e..a83beb7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -216,6 +216,9 @@ VISIT_VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include) + #setup png + VISIT_VTK_THIRD_PARTY_INCLUDE(PNG vtkpng) + ++#setup tiff ++VISIT_VTK_THIRD_PARTY_INCLUDE(TIFF vtktiff) ++ + + #----------------------------------------------------------------------------- + # Detect packages here. We could probably write macros that we can include from +diff --git a/visit_vtk/full/CMakeLists.txt b/visit_vtk/full/CMakeLists.txt +index e83e041..532dc62 100644 +--- a/visit_vtk/full/CMakeLists.txt ++++ b/visit_vtk/full/CMakeLists.txt +@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}") + + VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) +-TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff) ++TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES}) + + VISIT_INSTALL_TARGETS(visit_vtk) diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index a596884ae..cf71d6d81 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -4,27 +4,34 @@ pkgname=paraview pkgver=3.12.0 -pkgrel=1 +pkgrel=2 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns') +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff') makedepends=('cmake' 'desktop-file-utils' 'boost') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' 'paraview.desktop' - 'fix-boost-graph-api-changes.diff') + 'fix-boost-graph-api-changes.diff' + '12859-VisItBrige-external-tiff-support.diff') md5sums=('8feabc6261e2060648eaac593d85b1de' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5' - '2aa5b98288cadd201ffbd057f18929b0') + '2aa5b98288cadd201ffbd057f18929b0' + '9321279c8fc6f289a7cf228648edcb5f') build() { cd ParaView-${pkgver}/VTK # fix http://www.vtk.org/Bug/view.php?id=12772 remove on next pkgver bump patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff + + cd ${srcdir}/ParaView-${pkgver}/Utilities/VisItBridge + # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump + patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff + mkdir ${srcdir}/build cd ${srcdir}/build diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD index 7d1c5063d..c66b6ec3f 100644 --- a/community/php-memcached/PKGBUILD +++ b/community/php-memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49774 2011-06-21 04:55:35Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 61909 2012-01-10 16:08:51Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcached pkgver=1.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="PHP extension for interfacing with memcached via libmemcached library" arch=('i686' 'x86_64') url="http://pecl.php.net/package/memcached" @@ -11,7 +11,7 @@ license=('PHP') depends=('php' 'libmemcached') backup=('etc/php/conf.d/memcached.ini') source=(http://pecl.php.net/get/memcached-$pkgver.tgz) -md5sums=('b91f815ad59086d0c3564cce022b5c4f') +sha256sums=('16de77317e43b0a5bfd802c0bd2ef575adbad2093e8632d58738974e6cb14129') build() { cd "$srcdir/memcached-$pkgver" diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 0e05e0aca..cc4126ef1 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56081 2011-09-30 14:47:59Z stativ $ +# $Id: PKGBUILD 61903 2012-01-10 14:41:19Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.3 +pkgver=4.0.6 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD index 4401e1a9b..2d2176b93 100644 --- a/community/xfmedia/PKGBUILD +++ b/community/xfmedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58605 2011-11-16 15:28:21Z spupykin $ +# $Id: PKGBUILD 61923 2012-01-10 23:42:04Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Tom Killian <tomk@runbox.com> @@ -6,7 +6,7 @@ pkgname=xfmedia pkgver=0.9.2 -pkgrel=9 +pkgrel=10 pkgdesc="xfce media player" arch=('i686' 'x86_64') license=('GPL') @@ -17,18 +17,21 @@ install=xfmedia.install source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 xfmedia-dbus-0.6-support.patch xfmedia-empty-prev-next-fix.patch - xfmedia-exo-0.6.patch) + xfmedia-exo-0.6.patch + xfmedia-xine-1.2.0.patch) md5sums=('6eb8bd1f67201f829e0f45e733c02bd5' '8f2aa12eea584de65d8ed28179e56b51' '650f8cb9e2ddd9a8a2a03748b8757110' - 'f5e17fcdf2056dcc8ca8aae8600c0132') + 'f5e17fcdf2056dcc8ca8aae8600c0132' + '934603c7d3a1a0a66edb847bcb930df1') build() { cd ${srcdir}/$pkgname-$pkgver patch -Np1 -i ../xfmedia-dbus-0.6-support.patch patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch patch -Np1 -i ../xfmedia-exo-0.6.patch - ./configure --prefix=/usr + patch -Np1 -i ../xfmedia-xine-1.2.0.patch + LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr make } diff --git a/community/xfmedia/xfmedia-xine-1.2.0.patch b/community/xfmedia/xfmedia-xine-1.2.0.patch new file mode 100644 index 000000000..2e04ac80a --- /dev/null +++ b/community/xfmedia/xfmedia-xine-1.2.0.patch @@ -0,0 +1,34 @@ +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c +--- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 +@@ -1450,17 +1450,6 @@ + } + + gboolean +-xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) +-{ +- +- g_return_val_if_fail(xfx != NULL, 0); +- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); +- g_return_val_if_fail(xfx->priv->stream != NULL, 0); +- +- return xine_trick_mode(xfx->priv->stream, mode, value); +-} +- +-gboolean + xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, + gint *pos_time, gint *length_time) + { +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h +--- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 +@@ -87,9 +87,6 @@ + gboolean xfmedia_xine_play (XfmediaXine *xfx, + gint pos, + gint start_time); +-gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, +- gint mode, +- gint value); + gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, + gint info); + G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 00971c5f7..dac07e317 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142294 2011-11-08 00:38:03Z dreisner $ +# $Id: PKGBUILD 146434 2012-01-11 04:50:27Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed -pkgver=1.5 -pkgrel=4 +pkgver=1.6 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') @@ -12,10 +12,10 @@ url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) -md5sums=('e66c03d7e4c67b025d5b6093ec678267') +md5sums=('9a78593decccaa889523aa4bb555ed4b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/ \ --mandir=/usr/share/man \ @@ -27,15 +27,11 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" - - make check + make -C "$pkgname-$pkgver" check } package() { - cd "$srcdir/$pkgname-$pkgver" - - make "DESTDIR=$pkgdir" install + make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install # nuke info pages rm -r "$pkgdir/usr/share/info" diff --git a/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch new file mode 100644 index 000000000..993650b2c --- /dev/null +++ b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch @@ -0,0 +1,77 @@ +From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Sun, 11 Dec 2011 13:58:05 -0500 +Subject: [PATCH] findmnt: support alternative location of fstab + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + misc-utils/findmnt.8 | 6 ++++-- + misc-utils/findmnt.c | 9 +++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8 +index 24e3a52..7f3dc6c 100644 +--- a/misc-utils/findmnt.8 ++++ b/misc-utils/findmnt.8 +@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default. + .SH OPTIONS + .IP "\fB\-h, \-\-help\fP" + Print help and exit. +-.IP "\fB\-s, \-\-fstab\fP" ++.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP" + Search in + .IR /etc/fstab + and + .IR /etc/fstab.d . +-The output is in the list format (see --list). ++The output is in the list format (see --list). Optionally, search the file ++specified by ++.IR fstab . + .IP "\fB\-m, \-\-mtab\fP" + Search in + .IR /etc/mtab . +diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c +index 4577dc6..5502a87 100644 +--- a/misc-utils/findmnt.c ++++ b/misc-utils/findmnt.c +@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) + + fprintf(out, _( + "\nOptions:\n" +- " -s, --fstab search in static table of filesystems\n" ++ " -s, --fstab[=<fstab>] search in static table of filesystems\n" + " -m, --mtab search in table of mounted filesystems\n" + " -k, --kernel search in kernel table of mounted\n" + " filesystems (default)\n\n")); +@@ -839,7 +839,7 @@ int main(int argc, char *argv[]) + { "direction", 1, 0, 'd' }, + { "evaluate", 0, 0, 'e' }, + { "first-only", 0, 0, 'f' }, +- { "fstab", 0, 0, 's' }, ++ { "fstab", 2, 0, 's' }, + { "help", 0, 0, 'h' }, + { "invert", 0, 0, 'i' }, + { "kernel", 0, 0, 'k' }, +@@ -872,7 +872,8 @@ int main(int argc, char *argv[]) + tt_flags |= TT_FL_TREE; + + while ((c = getopt_long(argc, argv, +- "acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) { ++ "acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:", ++ longopts, NULL)) != -1) { + switch(c) { + case 'a': + tt_flags |= TT_FL_ASCII; +@@ -938,7 +939,7 @@ int main(int argc, char *argv[]) + case 's': /* fstab */ + if (tabfile) + errx_mutually_exclusive("--{fstab,mtab,kernel}"); +- tabfile = _PATH_MNTTAB; ++ tabfile = optarg ? optarg : _PATH_MNTTAB; + tt_flags &= ~TT_FL_TREE; + break; + case 'k': /* kernel (mountinfo) */ +-- +1.7.8.1 + diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 002fa77fb..26faab001 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141022 2011-10-21 21:39:17Z tomegun $ +# $Id: PKGBUILD 146393 2012-01-10 11:39:59Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64') @@ -16,7 +16,8 @@ provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') #source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2 + 0001-findmnt-support-alternative-location-of-fstab.patch) optdepends=('perl: for chkdupexe support') build() { @@ -25,6 +26,9 @@ build() { # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h + # backport patch needed for usr support in initramfs + patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch + ./configure --enable-arch\ --enable-write\ --enable-raw\ @@ -42,4 +46,5 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('079b37517fd4e002a2e6e992e8b4e361') +md5sums=('079b37517fd4e002a2e6e992e8b4e361' + '823e2d87885b81f245b8c368e28f8cab') diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD index 29a5da889..529b49642 100644 --- a/extra/bluez-hcidump/PKGBUILD +++ b/extra/bluez-hcidump/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 127665 2011-06-17 17:18:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 146410 2012-01-10 21:40:52Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy carrier <geoffroy@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=bluez-hcidump -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc="Bluetooth HCI package analyzer" url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') -depends=('glibc' 'bluez') +depends=('bluez') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz") -md5sums=('b160f0672276398344eebe9df1b37a2c') +md5sums=('3c298a8be67099fe227f3e4d9de539d5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 920c6437a..3d3f31c46 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 146412 2012-01-10 21:47:26Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez -pkgver=4.96 -pkgrel=3 +pkgver=4.97 +pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -24,17 +25,21 @@ replaces=('bluez-libs' 'bluez-utils') 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" -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' - 'rc.bluetooth') -md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f' + 'rc.bluetooth' + 'make-libcheck-optional.patch') +md5sums=('b302cee7f9b9527d29775449d7e1dfe6' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') + '8f9498707f809506928b2e480d3b6789' + 'f112fc5bcaeecc7b6ea994f14786e235') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}"/make-libcheck-optional.patch + autoreconf -i -f + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -50,7 +55,8 @@ build() { --enable-pand \ --enable-dund \ --enable-cups \ - --enable-wiimote + --enable-wiimote \ + --disable-test make } diff --git a/extra/bluez/make-libcheck-optional.patch b/extra/bluez/make-libcheck-optional.patch new file mode 100644 index 000000000..a315a3898 --- /dev/null +++ b/extra/bluez/make-libcheck-optional.patch @@ -0,0 +1,79 @@ +From: Marcel Holtmann <marcel@holtmann.org> +Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800) +Subject: build: Move libcheck under TEST conditional +X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a + +build: Move libcheck under TEST conditional +--- + +diff --git a/Makefile.am b/Makefile.am +index 9112483..5cf287c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -449,6 +449,7 @@ endif + + unit_objects = + ++if TEST + unit_tests = unit/test-eir + + noinst_PROGRAMS += $(unit_tests) +@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests) + unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c + unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@ + unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ +-unit_test_eir_SHORTNAME = unit + unit_objects += $(unit_test_eir_OBJECTS) ++else ++unit_tests = ++endif + + TESTS = $(unit_tests) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 2097d77..753b994 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [ + []) + ]) + ++AC_DEFUN([AC_PATH_CHECK], [ ++ PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no) ++ AC_SUBST(CHECK_CFLAGS) ++ AC_SUBST(CHECK_LIBS) ++]) ++ + AC_DEFUN([AC_PATH_OUI], [ + AC_ARG_WITH(ouifile, + AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]), +@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") + AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes") + AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") +- AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") ++ AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes") + AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes") + AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes") + AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes") +diff --git a/configure.ac b/configure.ac +index 3a5dfde..a7670da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,8 +24,6 @@ AC_PROG_YACC + AM_PROG_LEX + AM_PROG_MKDIR_P + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) +- + m4_define([_LT_AC_TAGCONFIG], []) + m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) + +@@ -50,6 +48,7 @@ AC_PATH_UDEV + AC_PATH_SNDFILE + AC_PATH_OUI + AC_PATH_READLINE ++AC_PATH_CHECK + + AC_ARG_BLUEZ + diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index 942c64b29..67107f3bc 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141206 2011-10-26 08:04:28Z eric $ +# $Id: PKGBUILD 146432 2012-01-11 00:54:52Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.11 +pkgver=9.12 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('lcms' 'jasper') source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) -sha1sums=('79dc403d6b629df6dac3218ad33dc89c4a86c234' +sha1sums=('b0110f83692b14940a8e43759d7ccefa77103cc6' '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 6d15fa99e..24489add5 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 144952 2011-12-11 23:12:10Z ibiru $ +# $Id: PKGBUILD 146396 2012-01-10 13:06:16Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20111211 +pkgver=20120110 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=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvdpau libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) -makedepends=('yasm' 'git') +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) -md5sums=('75d512bf5137d0b055e54313702ef5fc') +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) +md5sums=('a8121ae2fbe83044ac27501e3f58780d') build() { cd "$srcdir/$pkgname" diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD index dc547f447..de2d2944c 100644 --- a/extra/k9copy/PKGBUILD +++ b/extra/k9copy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145676 2011-12-26 22:21:16Z giovanni $ +# $Id: PKGBUILD 146416 2012-01-10 23:37:32Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=k9copy pkgver=2.3.8 -pkgrel=1 +pkgrel=2 pkgdesc="A small utility which allows the copy of DVD under Linux" arch=('i686' 'x86_64') url="http://k9copy.sourceforge.net" diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD index 84a710827..cad29ec16 100644 --- a/extra/kaffeine/PKGBUILD +++ b/extra/kaffeine/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 122312 2011-05-03 18:56:11Z tpowa $ +# $Id: PKGBUILD 146418 2012-01-10 23:37:34Z eric $ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kaffeine pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc='KDE media player' license=('GPL') arch=('i686' 'x86_64') url="http://kaffeine.kde.org" depends=('kdelibs' 'kdebase-runtime' 'xine-lib') -makedepends=('pkgconfig' 'cmake' 'automoc4') +makedepends=('pkg-config' 'cmake' 'automoc4') +install=kaffeine.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('690e48d2e5fe123887109aa9b1bc1c31') build() { - cd $srcdir + cd "$srcdir" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,7 +26,6 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$pkgdir install + cd "$srcdir/build" + make DESTDIR="$pkgdir" install } -md5sums=('690e48d2e5fe123887109aa9b1bc1c31') diff --git a/extra/kaffeine/kaffeine.install b/extra/kaffeine/kaffeine.install new file mode 100644 index 000000000..5c501dc49 --- /dev/null +++ b/extra/kaffeine/kaffeine.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 3828fa1d7..fed053273 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145651 2011-12-26 11:44:37Z andrea $ +# $Id: PKGBUILD 146420 2012-01-10 23:37:38Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime pkgver=4.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index cba95a38d..019a971bf 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdelibs pkgver=4.7.4 -pkgrel=4 +pkgrel=5 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,11 +19,12 @@ replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'fix-knotify-filepath.patch') + 'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch') sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '3312f6005aa56a9b992c74008fe5b314f1c8ffba') + '3312f6005aa56a9b992c74008fe5b314f1c8ffba' + '9cb83cb7f6394549354c6837977f9e9529127041') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -36,6 +37,8 @@ build() { # https://bugs.kde.org/show_bug.cgi?id=285028 patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch + patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch new file mode 100644 index 000000000..bdcd39a6c --- /dev/null +++ b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch @@ -0,0 +1,32 @@ +From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 +From: Johannes Huber <johu@gentoo.org> +Date: Thu, 5 Jan 2012 10:06:05 +0100 +Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. + +--- + cmake/modules/FindXine.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 37c58c6..d71969a 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine + ${PC_LIBXINE_LIBRARY_DIRS} + ) + +-find_program(XINECONFIG_EXECUTABLE NAMES xine-config ++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config + HINTS + ${PC_LIBXINE_PREFIX}/bin + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) +-- +1.7.8.2 + diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index fc7af1d72..962bf7591 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 131909 2011-07-17 09:27:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 146408 2012-01-10 21:28:35Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=obexd pkgname=('obexd-client' 'obexd-server') -pkgver=0.42 +pkgver=0.43 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') -makedepends=('openobex' 'libical') +makedepends=('glib2' 'openobex' 'libical') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('39a85d219dba37d83f5a07a74d1fa563') +md5sums=('7490dc8536d8ac56afb884c87f24bd08') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index c18cbde3b..b4265766c 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145287 2011-12-21 06:58:54Z schiv $ +# $Id: PKGBUILD 146424 2012-01-10 23:37:44Z eric $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.3.1_a _realver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -94,6 +94,10 @@ package_opencv-docs() { mkdir -p "$pkgdir/usr/share/doc" cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_opencv-samples() { @@ -106,6 +110,10 @@ package_opencv-samples() { mkdir -p "$pkgdir/usr/share/opencv" cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD index e3dc227bc..4736fcceb 100644 --- a/extra/oxine/PKGBUILD +++ b/extra/oxine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137856 2011-09-12 03:56:43Z eric $ +# $Id: PKGBUILD 146426 2012-01-10 23:37:48Z eric $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> # Contributor: dorphell <dorphell@archlinux.org> pkgname=oxine pkgver=0.7.1 -pkgrel=4 +pkgrel=5 pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems" arch=('i686' 'x86_64') url="http://oxine.sourceforge.net/" diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index 07f51ce8b..b839f0b83 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 129462 2011-06-28 03:34:32Z heftig $ +# $Id: PKGBUILD 146436 2012-01-11 05:01:01Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop -pkgver=1.7.0 -pkgrel=2 -depends=('libx11' 'openssl' 'libao' 'libsamplerate') +pkgver=1.7.1 +pkgrel=1 pkgdesc="An open source client for Windows Remote Desktop Services" -url="http://www.rdesktop.org/" -license=('GPL') arch=('i686' 'x86_64') +url="http://www.rdesktop.org/" +license=('GPL3') +depends=('libx11' 'openssl' 'libao' 'libsamplerate') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch') -md5sums=('77fa93b21aa38837a85e81c00e757228' +md5sums=('c4b39115951c4a6d74f511c99b18fcf9' '880d3aeac67b901e6bf44d1323374768' 'bd2c9bc68bddcc2652c668753d787df7') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # FS#15113 - patch -i ${srcdir}/rdesktop-send_physical_buttons.diff + patch -i "${srcdir}/rdesktop-send_physical_buttons.diff" # Fix libao segfault, from Fedora - patch -i ${srcdir}/rdesktop-libao.patch + patch -i "${srcdir}/rdesktop-libao.patch" ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD index 031234da6..aaca30008 100644 --- a/extra/tidyhtml/PKGBUILD +++ b/extra/tidyhtml/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 69561 2010-02-21 04:47:38Z allan $ -# Maintainer: eric <eric@archlinux.org> -# Contributor : Markus Meissner <markus@meissna.de> +# $Id: PKGBUILD 146404 2012-01-10 21:14:26Z andrea $ +# Maintainer: +# Contributor: eric <eric@archlinux.org> +# Contributor: Markus Meissner <markus@meissna.de> pkgname=tidyhtml # obtain pkgver from http://tidy.cvs.sourceforge.net/tidy/tidy/src/version.h?view=markup pkgver=1.46 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to tidy down your HTML code to a clean style" arch=('i686' 'x86_64') url="http://tidy.sourceforge.net/" license=('custom') +depends=('glibc') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/tidyhtml/${pkgname}-${pkgver}.tar.bz2) +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('3d970d54be83c5ec985687e9976a2832') mksource() { - mkdir tidyhtml-${pkgver} - cd tidyhtml-${pkgver} + mkdir ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} cvs -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy login #hit enter for password cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy co -P tidy cd .. - tar -cvjf tidyhtml-${pkgver}.tar.bz2 tidyhtml-${pkgver}/* + tar -cvjf ${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}/* } build(){ @@ -28,9 +30,13 @@ build(){ source build/gnuauto/setup.sh ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/${pkgname}-${pkgver}/tidy make DESTDIR=$pkgdir install install -Dm644 htmldoc/license.html \ - ${pkgdir}/usr/share/licenses/${pkgname}/license.txt + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD index 389bd0721..c27e4dccb 100644 --- a/extra/wavpack/PKGBUILD +++ b/extra/wavpack/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 69147 2010-02-18 00:38:05Z dgriffiths $ -# Maintainer: François Charette <firmicus ατ gmx δοτ net> +# $Id: PKGBUILD 146400 2012-01-10 20:33:06Z andrea $ +# Maintainer: +# Contributor: François Charette <firmicus ατ gmx δοτ net> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Michal Hybner <dta081@gmail.com> + pkgname=wavpack pkgver=4.60.1 -pkgrel=1 +pkgrel=2 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" arch=('i686' 'x86_64') url="http://www.wavpack.com/" license=('custom') depends=('glibc') options=('!libtool') -source=(http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2) +source=("http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2") md5sums=('7bb1528f910e4d0003426c02db856063') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-mmx --disable-static || return 1 - make || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-mmx \ + --disable-static + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 - rm -f ${pkgdir}/usr/lib/*.a + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm644 license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 50c250b72..7447852b0 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,39 +1,40 @@ -# $Id: PKGBUILD 142780 2011-11-15 05:34:03Z eric $ +# $Id: PKGBUILD 146428 2012-01-10 23:37:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.1.20 +pkgver=1.2.0 pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" license=('LGPL' 'GPL') -depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') -makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' - 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') +depends=('libxvmc' 'ffmpeg' 'libxinerama') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' + 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs') optdepends=('imagemagick: for using the imagemagick plugin' \ - 'smbclient: for using the smb plugin' \ 'jack: for using the jack plugin' \ 'vcdimager: for using the vcd plugin' \ - 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \ 'mesa: for using the opengl plugin' \ - 'libpulse: for using the pulseaudio plugin' \ - 'speex: for using the speex plugin' \ - 'v4l-utils: for using the v4l plugin' \ 'wavpack: for using the wavpack plugin' \ 'faad2: for using the faad plugin' \ 'libmng: for using the mng plugin' \ - 'aalib: for using the aalib plugin') + 'aalib: for using the aalib plugin' \ + 'libmodplug: for using the modplug plugin' \ + 'libdca: for using the dca plugin' \ + 'a52dec: for using the a52 plugin' \ + 'libmad: for using the mp3 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') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) -sha1sums=('1dbd48e14113739101429391d45f65ebbf6519fc') +sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ - configure src/input/input_v4l.c src/video_out/video_out_syncfb.h - ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad \ - --disable-optimizations + ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations make } diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index f0563b8b3..d5ca4e7ee 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 144037 2011-12-02 17:33:46Z eric $ +# $Id: PKGBUILD 146430 2012-01-10 23:37:56Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui pkgver=0.99.6 -pkgrel=3 +pkgrel=4 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" -depends=('xine-lib' 'curl' 'libxtst' 'libpng' 'libxft' 'libxxf86vm' +depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils') makedepends=('libxt') diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD new file mode 100644 index 000000000..17bf249d7 --- /dev/null +++ b/testing/btrfs-progs/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 146398 2012-01-10 16:04:17Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +pkgname=btrfs-progs +pkgver=0.19.20120110 +pkgrel=1 +pkgdesc="btrfs filesystem utilities" +arch=(i686 x86_64) +depends=('glibc' 'e2fsprogs') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) +url="http://btrfs.wiki.kernel.org/" +replaces=('btrfs-progs-unstable') +conflicts=('btrfs-progs-unstable') +provides=('btrfs-progs-unstable') +license=('GPL2') + +build() { + cd $srcdir/$pkgname + make CFLAGS="$CFLAGS" all convert +} + +package() { + cd $srcdir/$pkgname + make prefix=$pkgdir/usr install + # fix manpage + mkdir -p $pkgdir/usr/share/ + mv $pkgdir/usr/man $pkgdir/usr/share/man +} +md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2') |