diff options
222 files changed, 4523 insertions, 810 deletions
diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD index f6429515e..7a1ce02fc 100644 --- a/community/acetoneiso2/PKGBUILD +++ b/community/acetoneiso2/PKGBUILD @@ -1,6 +1,7 @@ +# $Id: PKGBUILD 58519 2011-11-13 15:33:17Z andrea $ +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Wes Brewer <brewerw@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=acetoneiso2 pkgver=2.3 @@ -9,7 +10,7 @@ pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" arch=('i686' 'x86_64' 'mips64el') url="http://www.acetoneteam.org" license=('GPL3') -depends=('qt>=4' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') +depends=('qt' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') optdepends=("p7zip: for ISO compress/decompress support") conflicts=('acetoneiso') install=${pkgname}.install @@ -20,6 +21,7 @@ build() { cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso qmake + # needed for phonon sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile make } diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD index 95c0534e9..acd8be747 100644 --- a/community/acpitool/PKGBUILD +++ b/community/acpitool/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $ +# $Id: PKGBUILD 58302 2011-11-10 17:58:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> # Contributor: Milosz Piglas <archeofuture@gmail.com> pkgname=acpitool pkgver=0.5.1 -pkgrel=3 +pkgrel=5 pkgdesc="ACPI client - replacement for apm tool" url="http://sourceforge.net/projects/acpitool/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gcc-libs') source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2 - linux-3.0.patch) + linux-3.0.patch + sysfs-battery.patch) md5sums=('9e4ec55201be0be71ffbc56d38b42b57' - 'eb149edb32be6cdf20a7d16beb3e9f70') + 'eb149edb32be6cdf20a7d16beb3e9f70' + '969fc4929cc215756db27168646c2b7a') build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/linux-3.0.patch + patch -p1 <$srcdir/sysfs-battery.patch ./configure --prefix=/usr make } diff --git a/community/acpitool/sysfs-battery.patch b/community/acpitool/sysfs-battery.patch new file mode 100644 index 000000000..4f6898a78 --- /dev/null +++ b/community/acpitool/sysfs-battery.patch @@ -0,0 +1,52 @@ +diff -wbBur acpitool-0.5.1/src/acpitool.h acpitool-0.5.1.my/src/acpitool.h +--- acpitool-0.5.1/src/acpitool.h 2008-10-16 19:38:12.000000000 +0400 ++++ acpitool-0.5.1.my/src/acpitool.h 2011-11-10 21:55:23.000000000 +0400 +@@ -29,11 +29,11 @@ + + struct Battery_Info { + int Battery_Present; +- char Charging_State[12]; +- char Remaining_Cap[10]; +- char Design_Cap[10]; +- char LastFull_Cap[10]; +- char Present_Rate[10]; ++ char Charging_State[13]; ++ char Remaining_Cap[13]; ++ char Design_Cap[13]; ++ char LastFull_Cap[13]; ++ char Present_Rate[13]; + char Technology[13]; + char Model[13]; + char Serial[13]; +diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp +--- acpitool-0.5.1/src/battery.cpp 2009-08-13 23:42:43.000000000 +0400 ++++ acpitool-0.5.1.my/src/battery.cpp 2011-11-10 21:48:22.000000000 +0400 +@@ -614,7 +614,7 @@ + } + + memset(str, '\0', 100); +- for(int t=0; t<5; t++) ++ for(int t=0; t<1; t++) + fgets(str, 100, power_fp); /* skip first 5 lines */ + + /* get battery status (full, charging, ...) */ +@@ -664,8 +664,8 @@ + + + +- fgets(str, 100, power_fp); /* skip 1 line */ +- ++ fgets(str, 100, power_fp); /* cycle count - skip 1 line */ ++ fgets(str, 100, power_fp); /* voltage_min - skip 1 line */ + + /* get voltage_now */ + memset(str, '\0', 100); +@@ -756,7 +756,7 @@ + else + strncpy(batt_info->Model, "unknown", 7); + +- fgets(str, 100, power_fp); ++ fgets(str, 100, power_fp); /* manufacturer - skip 1 line */ + + /* get serial */ + memset(str, '\0', 100); diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 51ede6de9..6c537d876 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58055 2011-11-06 09:27:03Z giovanni $ +# $Id: PKGBUILD 58435 2011-11-12 17:24:25Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.25 -pkgrel=1 +pkgver=0.8.26 +pkgrel=3 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('b7b141db18912925be08ff79fd2ead3f' +md5sums=('269662b0af1aac2dea8add6b8d6055dc' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index ecb74afd1..3e509e4bc 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57044 2011-10-19 09:24:20Z foutrelis $ +# $Id: PKGBUILD 58385 2011-11-12 17:16:09Z ibiru $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee pkgver=1.2.101 -pkgrel=1 +pkgrel=2 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -27,10 +27,10 @@ source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.ta cherokee.rc cherokee.logrotate fix-ctk-path-handler-match.patch) -sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136' - '85e24ccc94e6e97858226222ac62cca79c17bc80' - '266064ab6d3ebd206d7207e1d97b003d2021b2e4' - '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc') +sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8' + '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86' + '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e' + '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 6886b088e..c9272ed0e 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55804 2011-09-21 11:27:26Z lfleischer $ +# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.1 -pkgrel=2 +pkgrel=3 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -32,11 +32,11 @@ optdepends=('libsamplerate: for Resampler plugin' 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('be8359d1bd9cf7679cf2ca748996e726') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch") build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/ffmpeg.patch ./configure --prefix=/usr make @@ -47,3 +47,5 @@ package () { make prefix="${pkgdir}/usr" install } +md5sums=('be8359d1bd9cf7679cf2ca748996e726' + '6cc7623734af310095534c361c9f64e8') diff --git a/community/deadbeef/ffmpeg.patch b/community/deadbeef/ffmpeg.patch new file mode 100644 index 000000000..925b84408 --- /dev/null +++ b/community/deadbeef/ffmpeg.patch @@ -0,0 +1,45 @@ +diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c +--- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c 2011-05-22 13:58:53.000000000 +0000 ++++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c 2011-11-01 10:38:11.447669741 +0000 +@@ -140,7 +140,12 @@ + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -490,7 +495,12 @@ + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -745,7 +755,12 @@ + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD index 63bb86166..51a15b0a2 100644 --- a/community/dvdstyler/PKGBUILD +++ b/community/dvdstyler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57524 2011-10-30 04:00:55Z ebelanger $ +# $Id: PKGBUILD 58391 2011-11-12 17:16:44Z ibiru $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=dvdstyler pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform DVD authoring application" arch=('i686' 'x86_64' 'mips64el') url="http://www.dvdstyler.de/" @@ -19,6 +19,7 @@ sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6') build() { cd "${srcdir}/DVDStyler-${pkgver}" sed -i 's/rmdir "$$t"//' docs/Makefile.in + sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp ./configure --prefix=/usr make } diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index f76f336b0..41402f4b6 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49560 2011-06-18 07:28:14Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b12 -pkgrel=3 +pkgrel=4 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64' 'mips64el') url="http://community.electricsheep.org/" @@ -11,13 +11,14 @@ license=('GPL') depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') makedepends=('xscreensaver') optdepends=('xscreensaver: to use electricsheep with xscreensaver') -changelog=ChangeLog -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9c66691538941593ca9442e087b183d1') -sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + electricsheep-ffmpeg.patch) +sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32' + 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch" ./configure --prefix=/usr make } diff --git a/community/electricsheep/electricsheep-ffmpeg.patch b/community/electricsheep/electricsheep-ffmpeg.patch new file mode 100644 index 000000000..b04cf41b0 --- /dev/null +++ b/community/electricsheep/electricsheep-ffmpeg.patch @@ -0,0 +1,36 @@ +diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c +--- electricsheep-2.7b12.orig/electricsheep.c 2011-10-31 22:36:30.000000000 -0400 ++++ electricsheep-2.7b12/electricsheep.c 2011-10-31 22:40:04.000000000 -0400 +@@ -662,7 +662,7 @@ + input_stream_index = -1; + for (j = 0; j < ictx->nb_streams; j++) { + AVCodecContext *enc = ictx->streams[j]->codec; +- if (CODEC_TYPE_VIDEO == enc->codec_type) { ++ if (AVMEDIA_TYPE_VIDEO == enc->codec_type) { + input_stream_index = j; + break; + } +@@ -730,7 +730,7 @@ + av_init_packet(&opkt); + if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec, + &opkt.data, &opkt.size, ipkt.data, ipkt.size, +- ipkt.flags & PKT_FLAG_KEY)) ++ ipkt.flags & AV_PKT_FLAG_KEY)) + opkt.destruct= av_destruct_packet; + + if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) { +diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c +--- electricsheep-2.7b12.orig/electricsheep.c 2011-11-01 00:21:51.000000000 -0400 ++++ electricsheep-2.7b12/electricsheep.c 2011-11-01 00:25:10.000000000 -0400 +@@ -686,9 +686,9 @@ + } + } + +- output_ctx = av_alloc_format_context(); ++ output_ctx = avformat_alloc_context(); + +- ofmt = guess_format(NULL, fname, NULL); ++ ofmt = av_guess_format(NULL, fname, NULL); + if (!ofmt) { + fprintf(logout, "could not determine format from %s.\n", fname); + exit(1); diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 5eeeb3155..d41524bf7 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 52540 2011-07-26 04:27:53Z svenstaro $ +# $Id: PKGBUILD 58520 2011-11-13 15:38:01Z andrea $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> + pkgname=fatrat -pkgver=1.1.3 -pkgrel=5 +pkgver=1.2.0_beta1 +pkgrel=1 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" license=('GPL') -depends=('gloox' 'curl' 'qt' 'libtorrent-rasterbar') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net') optdepends=('geoip: GeoIP support') -makedepends=('asio' 'cmake') +makedepends=('boost' 'cmake' 'java-environment') source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) -md5sums=('6d4a00cdd0b59a05b1521184508d4637') +md5sums=('7ce4d5e6318361f36ba5ac86a5755da9') build() { cd $pkgname-$pkgver diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index c9516ffb6..049eb0cda 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56650 2011-10-09 12:33:26Z jlichtblau $ +# $Id: PKGBUILD 58395 2011-11-12 17:16:59Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=ffmpeg2theora pkgver=0.28 -pkgrel=1 +pkgrel=2 pkgdesc="A simple converter to create Ogg Theora files" arch=('i686' 'x86_64' 'mips64el') url="http://www.v2v.cc/~j/ffmpeg2theora/" diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index b8b323ff3..c6307d3a5 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51749 2011-07-14 06:47:41Z spupykin $ +# $Id: PKGBUILD 58316 2011-11-11 09:18:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius -pkgver=2.1.11 +pkgver=2.1.12 pkgrel=1 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=$pkgname.install source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 radiusd krb5-build-fix.patch) -md5sums=('96b21a95117d8ebde689c4c13c028d30' +md5sums=('862d3a2c11011e61890ba84fa636ed8c' 'f1a6530b1b69d2fa793aa45b2de379bb' 'c6a61de7576933f59154a53bfc12a2d2') diff --git a/community/freeradius/freeradius.install b/community/freeradius/freeradius.install index e50aa403d..c3b9f9415 100644 --- a/community/freeradius/freeradius.install +++ b/community/freeradius/freeradius.install @@ -1,6 +1,6 @@ post_install() { - groupadd radiusd - useradd -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd + groupadd -r radiusd + useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd touch /var/log/radius/radius.log chown -R radiusd.radiusd /var/log/radius/radius.log diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index ee0bb4f9f..5f2172495 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58131 2011-11-06 19:03:02Z lcarlier $ +# $Id: PKGBUILD 58354 2011-11-12 10:52:35Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 28a1bf9c9..32d39f84b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57730 2011-11-01 19:01:23Z lcarlier $ +# $Id: PKGBUILD 58437 2011-11-12 17:24:37Z ibiru $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -13,14 +13,14 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=2.99.6 -pkgrel=1 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" license=('GPL') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'qt' + 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') @@ -860,7 +860,7 @@ package_gambas3-gb-qt4-opengl() { } package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4') # qt-webkit + depends=('gambas3-gb-qt4') pkgdesc="Qt4 toolkit webkit component" ## workaround for splitting diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index 594ecc9d2..a35c6bf2b 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -2,9 +2,9 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac -pkgver=1.6.1 -pkgrel=2 -pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' +pkgver=1.6.2 +pkgrel=1 +pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64' 'mips64el') url='http://www.ginac.de' license=('GPL') @@ -12,7 +12,7 @@ depends=('cln') makedepends=('transfig' 'doxygen' 'texlive-bin') options=('!libtool') source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") -md5sums=('d383f3ee50f88ffa1b3966fdb11d0f12') +md5sums=('4cfdd286ab0c32981ec1c9c779e87eb9') build() { cd ginac-${pkgver} diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 509f37798..a78103e6d 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/gnash/" license=(GPL3) @@ -14,14 +14,17 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils pkgconfig boost) options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2) -md5sums=('5b2be6b04a1bcc5fb404cc377034499e') +source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 + gentoo-ffmpeg-0.8.patch) +md5sums=('5b2be6b04a1bcc5fb404cc377034499e' + '98dec9a5c1b1084245a3f46b4022a6e2') build() { cd "$srcdir/gnash-$pkgver" - # Version is now in version.h - sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 + # Consolidated gentoo patches for ffmpeg compatibility + # as of 2011-10-31 + patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" ./autogen.sh ./configure \ diff --git a/community/gnash/gentoo-ffmpeg-0.8.patch b/community/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community/gnash/gentoo-ffmpeg-0.8.patch @@ -0,0 +1,204 @@ +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 +@@ -29,7 +29,7 @@ + + //#define GNASH_DEBUG_AUDIO_DECODING + +-#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 ++#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 + + namespace gnash { + namespace media { +@@ -549,8 +549,12 @@ + #endif + + // older ffmpeg versions didn't accept a const input.. ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = inputSize; + int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, +- input, inputSize); ++ &pkt); + + #ifdef GNASH_DEBUG_AUDIO_DECODING + log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " +@@ -658,13 +662,13 @@ + { + if ( _needsParsing ) + { +- return av_parser_parse(_parser, _audioCodecCtx, ++ return av_parser_parse2(_parser, _audioCodecCtx, + // as of 2008-10-28 SVN, ffmpeg doesn't + // accept a pointer to pointer to const.. + const_cast<boost::uint8_t**>(outFrame), + outFrameSize, + input, inputSize, +- 0, 0); // pts & dts ++ 0, 0, AV_NOPTS_VALUE); // pts & dts + } + else + { +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 +@@ -46,8 +46,10 @@ + { + if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { + if ( ! _context ) { +- _context = audio_resample_init( +- 2, ctx->channels, 44100, ctx->sample_rate ++ _context = av_audio_resample_init( ++ 2, ctx->channels, 44100, ctx->sample_rate, ++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, ++ 16, 10, 0, 0.8 + ); + } + +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 +@@ -387,7 +387,7 @@ + + log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", + _inputFmt->name, _formatCtx->nb_streams); +- ++ /* + if ( _formatCtx->title[0] ) + log_debug(_(" Title:'%s'"), _formatCtx->title); + if ( _formatCtx->author[0] ) +@@ -398,7 +398,7 @@ + log_debug(_(" Comment:'%s'"), _formatCtx->comment); + if ( _formatCtx->album[0] ) + log_debug(_(" Album:'%s'"), _formatCtx->album); +- ++ */ + // Find first audio and video stream + for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++) + { +@@ -415,7 +415,7 @@ + } + + switch (enc->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + if (_audioStreamIndex < 0) { + _audioStreamIndex = i; + _audioStream = _formatCtx->streams[i]; +@@ -425,7 +425,7 @@ + } + break; + +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + if (_videoStreamIndex < 0) { + _videoStreamIndex = i; + _videoStream = _formatCtx->streams[i]; +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 +@@ -356,8 +356,12 @@ + + int bytes = 0; + // no idea why avcodec_decode_video wants a non-const input... +- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, +- input, input_size); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = input_size; ++ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, ++ &pkt); + + if (!bytes) { + log_error("Decoding of a video frame failed"); +diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 +--- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 +@@ -22,6 +22,7 @@ + backupLIBS="$LIBS" + backupCFLAGS="$CFLAGS" + avcodec_h="" ++ avcodec_version_h="" + ffmpeg_top_incl="" + + dnl If the user specify an path to include headers from, we assume it's the full +@@ -46,6 +47,9 @@ + else + AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) + fi ++ if test -f ${with_ffmpeg_incl}/version.h; then ++ avcodec_version_h=${with_ffmpeg_incl}/version.h ++ fi + fi + ]) + +@@ -66,6 +70,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" + avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -83,6 +90,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" + avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -182,14 +192,24 @@ + dnl a modified form of grepping may be better, making sure all old kinds of + dnl version numbering fail gracefully. + ++ versionfile="" ++ + dnl Check avcodec version number, if it was found +- if test x"${avcodec_h}" != x; then ++ if test x"${avcodec_version_h}" != x; then ++ versionfile=${avcodec_version_h} ++ else ++ if test x"${avcodec_h}" != x; then ++ versionfile=${avcodec_h} ++ fi ++ fi ++ ++ if test x"${versionfile}" != x; then + + AC_MSG_CHECKING([ffmpeg version]) + +- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` + + if test x"${ffmpeg_major_version}" != x ; then + +@@ -198,15 +218,15 @@ + else + + dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` + + if test x"${ffmpeg_version}" = x ; then + + dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` + + if test x"${ffmpeg_version}" = x ; then +- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` + fi + fi + diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index 677f7fd80..e0b00efca 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $ +# $Id: PKGBUILD 58379 2011-11-12 16:02:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=('LGPL') -depends=(gnustep-base libungif aspell gcc-libs libcups audiofile libsndfile giflib libao) -makedepends=(gcc-objc) +depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') +makedepends=('gcc-objc') conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') @@ -22,6 +22,7 @@ build() { cd $srcdir/$pkgname-$pkgver . /etc/profile.d/GNUstep.sh ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h make make DESTDIR=$pkgdir install } diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index a352891a3..7ea5954a4 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52155 2011-07-20 20:14:39Z jlichtblau $ +# $Id: PKGBUILD 58521 2011-11-13 15:39:18Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: m0rph <m0rph.mailbox@gmail.com> @@ -9,11 +9,10 @@ pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64' 'mips64el') url="http://goldendict.berlios.de/" license=('GPL3') -depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'openssl' 'phonon') -makedepends=('patch') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'phonon') provides=('stardict') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 $pkgname-paths.diff) sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') @@ -33,6 +32,6 @@ package() { make INSTALL_ROOT=${pkgdir} install -#removing unneeded + #removing unneeded rm -rf ${pkgdir}/usr/share/app-install } diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index fbe77e1be..d4e346228 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44556 2011-04-08 21:04:15Z spupykin $ +# $Id: PKGBUILD 58523 2011-11-13 15:42:30Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgbase=google-gadgets diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index d5c09a1f6..080c51871 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,47 +1,35 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: niQo -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 58399 2011-11-12 17:17:21Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=0.4.5 -pkgrel=8 +pkgrel=9 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad' - 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') -# 'js' +depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut') license=('LGPL') -options=('!makeflags') # Multiple build jobs aren't handled correctly +options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz libpng14-infopp-null.patch openjpeg14.patch) -md5sums=('755e8c438a48ebdb13525dd491f5b0d1' - '14d6483c9eb84434aea68596f243e0ca' - '1605fc11bd49b9c8220820bb38912021') +sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8' + '00ba08808ec46ef6b8301ede26e500b3449253c1' + '95747ca98cdf0efc33ec776764401f5a83818ab5') build() { - cd ${srcdir}/${pkgname} - chmod +x configure - sed -i 's|--warn-common||' configure - sed -i 's#osmozilla##g' applications/Makefile - sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile - sed -i 's#ldconfig || true##g' Makefile + cd "${srcdir}/${pkgname}" + chmod +x configure + sed -i 's|--warn-common||' configure + sed -i 's#lib64#lib#g' configure + patch -p1 -i "${srcdir}/libpng14-infopp-null.patch" + patch -p1 -i "${srcdir}/openjpeg14.patch" - #FS#14506 - sed -i 's#lib64#lib#g' configure - patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch - patch -Np1 -i ${srcdir}/openjpeg14.patch - - # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined - # symbol: XvQueryExtension" with our LDFLAGS :\ - export LDFLAGS=${LDFLAGS/,--as-needed/} - - ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make + export LDFLAGS=${LDFLAGS/,--as-needed/} + ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no + make } package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install install-lib + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install install-lib } diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index 8aca0d76b..592191d4a 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 57048 2011-10-19 10:30:50Z spupykin $ +# $Id: PKGBUILD 58522 2011-11-13 15:40:29Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2') optdepends=('qt') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index 03abb8db0..01f064d67 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: soeren <nonick@posteo.de> pkgname=gummi -pkgver=0.5.8 -pkgrel=4 +pkgver=0.6.0 +pkgrel=1 pkgdesc='Simple LaTex editor for GTK users' arch=('i686' 'x86_64' 'mips64el') url='http://gummi.midnightcoding.org/' license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') -source=("http://dev.midnightcoding.org/redmine/attachments/download/141/gummi-0.5.8-2.tar.gz") -md5sums=('79cd1360779125ad85a0f0b459951b27') +source=("http://dev.midnightcoding.org/redmine/attachments/download/212/gummi-0.6.0.tar.gz") +md5sums=('45c727b815460e108a4442db27edd385') build() { cd ${pkgname}-${pkgver} diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index e2b24d6e0..3dd8401a0 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,37 +1,44 @@ +# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=tar pkgname=haskell-tar pkgver=0.3.1.0 -pkgrel=4.2 +pkgrel=5 pkgdesc="Reading, writing and manipulating \".tar\" archive files." url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') depends=('ghc=7.0.3-2' sh) options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") +install=haskell-tar.install md5sums=('10b54856495f9ef0a42aa270085c7d5e') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/tar-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$srcdir/tar-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/tar" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } +# vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install index e8c2f6293..7e0383621 100644 --- a/community/haskell-tar/haskell-tar.install +++ b/community/haskell-tar/haskell-tar.install @@ -1,18 +1,24 @@ HS_DIR=usr/share/haskell/haskell-tar + post_install() { ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + post_remove } + pre_upgrade() { ${HS_DIR}/unregister.sh } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + post_install } + pre_remove() { - ${HS_DIR}/unregister.sh + pre_upgrade } + post_remove() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +# vim:set ts=2 sw=2 et: diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 634b58750..cd6af53d8 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54951 2011-08-28 19:13:33Z ttopper $ +# $Id: PKGBUILD 58366 2011-11-12 13:28:03Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.0.2 +pkgver=4.1 pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') @@ -11,18 +11,22 @@ url="http://i3wm.org/" license=('BSD') replaces=("i3" "i3bar") groups=("i3") -depends=('libxcursor' 'xcb-util' 'libev' 'yajl') +depends=('libxcursor' 'libev' 'yajl' 'startup-notification' 'pcre') makedepends=('bison' 'flex') optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'dmenu: As menu.' + 'i3lock: For locking your screen.' + 'i3status: To display systeminformation with a bar.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2) -md5sums=('8b173504824d312a954ccb32b092b068') +md5sums=('1a05d605624506c2b4b9f1272fd84a5a') build() { cd "$srcdir/$_pkgsourcename-$pkgver" + # To avoid problems with bison use only a single process + MAKEFLAGS="-j1" make } diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 753552694..806f00e61 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,7 +6,7 @@ pkgname=john pkgver=1.7.8 -pkgrel=6 +pkgrel=7 _jumbover=8 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64' 'mips64el') @@ -65,7 +65,7 @@ package() { # install password list and charset files install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \ ${pkgdir}/usr/share/john/ - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32}.conf \ + install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \ ${pkgdir}/usr/share/john/ # install binaries diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 8ae36bfbb..ce6efc4cb 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57067 2011-10-20 15:00:52Z bpiotrowski $ +# $Id: PKGBUILD 58524 2011-11-13 15:44:01Z andrea $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> @@ -15,13 +15,16 @@ source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) md5sums=('6211a9a9e02d645268cbf055892601a0') build() { - cd $srcdir/kadu-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX=/usr + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd $srcdir/kadu-$pkgver + cd $srcdir/build make DESTDIR=$pkgdir install rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 27b2c395c..c08d91af7 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $ +# $Id: PKGBUILD 58466 2011-11-12 20:42:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.8svn20110722 +pkgver=0.8.2 pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,21 @@ url="http://www.kdenlive.org/" license=('GPL') depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' 'libqzeitgeist') -makedepends=('automoc4' 'cmake' 'gettext') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa') install=kdenlive.install options=('docs') -#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2") -md5sums=('390fcbce02274ee99b2a6d6a234bef0c') +source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz" + glu.patch) +md5sums=('0836842f489f6142cee101842ac76c54' + 'fd6c5fe46419ee505c562363d41f6e9f') build() { export LDFLAGS="$LDFLAGS -lX11" - cd "${srcdir}" - mkdir build || true + mkdir -p build cd build - cmake ../${pkgname}-${pkgver} \ + (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch) + cmake ../kdenlive-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ diff --git a/community/kdenlive/glu.patch b/community/kdenlive/glu.patch new file mode 100644 index 000000000..a4c2f21fb --- /dev/null +++ b/community/kdenlive/glu.patch @@ -0,0 +1,11 @@ +diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp +--- kdenlive-0.8.2/src/videoglwidget.cpp 2011-10-31 22:46:21.000000000 +0400 ++++ kdenlive-0.8.2.my/src/videoglwidget.cpp 2011-11-02 14:54:10.000000000 +0400 +@@ -2,6 +2,7 @@ + #include <QtGui> + #include <QtOpenGL> + #include "videoglwidget.h" ++#include <GL/glu.h> + + #ifndef GL_TEXTURE_RECTANGLE_EXT + #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 094d64b9c..e711e233e 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 53306 2011-08-02 18:26:59Z spupykin $ +# $Id: PKGBUILD 58525 2011-11-13 15:45:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 @@ -13,12 +12,22 @@ makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2) +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) md5sums=('26fd24979ae4a29bac9309b3b0c98788') build() { - cd $srcdir/kvirc-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr . + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DWANT_KDE4=OFF \ + -DWANT_PERL=ON \ + -DWANT_PHONON=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr . make +} + +package() { + cd ${srcdir}/build make DESTDIR=$pkgdir install } diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index a5d6be8f5..57c0ec859 100644 --- a/community/libdlna/PKGBUILD +++ b/community/libdlna/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 7626 2010-01-08 23:34:07Z dgriffiths $ +# $Id: PKGBUILD 58401 2011-11-12 17:17:29Z ibiru $ # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libdlna pkgver=0.2.3 -pkgrel=8 +pkgrel=9 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards " url="http://libdlna.geexbox.org" license=("LGPL") arch=('i686' 'x86_64' 'mips64el') -options=('!libtool') +options=('!libtool' '!makeflags') # not parallel safe, error find -ldlna makedepends=('ctags') depends=('glibc' 'ffmpeg') -source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2c974f95b711e5fd07f78fc4ebfcca66') +source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch") build() { cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c || return 1 - sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c || return 1 - ./configure --prefix=/usr --includedir=/usr/include/libavformat || return 1 - make || return 1 + patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch +# sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c +# sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c + ./configure --prefix=/usr --includedir=/usr/include/libavformat + make -j1 # not parallel safe, error find -ldlna +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} make INSTALL=/bin/install DESTDIR=${pkgdir} install } +md5sums=('2c974f95b711e5fd07f78fc4ebfcca66' + '937f1aebf930571127856056bd1d3959' + 'a5c9f58233fc7fc79b5fe550b297273b') diff --git a/community/libdlna/ffmpeg-0.8.patch b/community/libdlna/ffmpeg-0.8.patch new file mode 100644 index 000000000..63b33a451 --- /dev/null +++ b/community/libdlna/ffmpeg-0.8.patch @@ -0,0 +1,19 @@ +diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c +--- libdlna-0.2.3/src/profiles.c 2007-11-26 21:47:43.000000000 +0100 ++++ libdlna-0.2.3.new/src/profiles.c 2011-10-31 16:06:34.000000000 +0100 +@@ -205,13 +205,13 @@ + for (i = 0; i < ctx->nb_streams; i++) + { + if (audio_stream == -1 && +- ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + { + audio_stream = i; + continue; + } + else if (video_stream == -1 && +- ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) + { + video_stream = i; + continue; diff --git a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch new file mode 100644 index 000000000..8620ab2eb --- /dev/null +++ b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch @@ -0,0 +1,89 @@ +https://bugs.gentoo.org/show_bug.cgi?id=297872 +http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca + +From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001 +From: Jeremy Olexa <darkside@gentoo.org> +Date: Tue, 22 Dec 2009 00:22:42 -0600 +Subject: [PATCH] Update reference to ffmpeg header files + +--- + configure | 4 ++-- + src/av_mpeg4_part10.c | 2 +- + src/av_mpeg4_part2.c | 2 +- + src/containers.c | 2 +- + src/profiles.h | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure b/configure +index 8acbd9d..85c1091 100755 +--- a/configure ++++ b/configure +@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then + fi + + echolog "Checking for libavformat ..." +-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" ++check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" + echolog "Checking for libavcodec ..." +-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" ++check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" + + ################################################# + # version +diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c +index bd17022..f9c8ee5 100644 +--- a/src/av_mpeg4_part10.c ++++ b/src/av_mpeg4_part10.c +@@ -26,7 +26,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + #include "dlna_internals.h" + #include "profiles.h" +diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c +index 0148384..823e1b6 100644 +--- a/src/av_mpeg4_part2.c ++++ b/src/av_mpeg4_part2.c +@@ -26,7 +26,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + #include "dlna_internals.h" + #include "profiles.h" +diff --git a/src/containers.c b/src/containers.c +index 71b51f7..ca0819b 100644 +--- a/src/containers.c ++++ b/src/containers.c +@@ -4,7 +4,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avformat.h> ++#include <libavformat/avformat.h> + + #include "containers.h" + #include "profiles.h" +diff --git a/src/profiles.h b/src/profiles.h +index 7b86d33..a7fc0fd 100644 +--- a/src/profiles.h ++++ b/src/profiles.h +@@ -22,8 +22,8 @@ + #ifndef _PROFILES_H_ + #define _PROFILES_H_ + +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> + + #include "dlna_internals.h" + #include "containers.h" +-- +1.6.4.4 + diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 14018852b..339bf28da 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56341 2011-10-05 19:08:14Z andrea $ +# $Id: PKGBUILD 58358 2011-11-12 10:52:51Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.2 -pkgrel=4 +pkgrel=5 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index b062d41ec..860042a5a 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56302 2011-10-05 13:53:49Z spupykin $ +# $Id: PKGBUILD 58331 2011-11-11 18:59:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.50 +pkgver=0.7.51 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('d637d7f1e20b30c1dd1926ad134ee639' +md5sums=('eb377eebb40d64bf980c857f36cc5b51' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index b741f675b..688f8d85a 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57461 2011-10-28 07:54:07Z lcarlier $ +# $Id: PKGBUILD 58470 2011-11-12 22:05:09Z lcarlier $ # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw _pkgbasename=LibRaw -pkgver=0.13.8 -pkgrel=1 +pkgver=0.14.3 +pkgrel=2 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64' 'mips64el') url="http://www.libraw.org/" @@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom') depends=('lcms') options=('!makeflags') source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('62cd5fee94915add0c43a97ec6909bbb') +md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} @@ -28,4 +28,3 @@ package() { make DESTDIR=${pkgdir} install } - diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 0ef5e80cc..8a1ee0723 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56229 2011-10-03 15:41:17Z spupykin $ +# $Id: PKGBUILD 58333 2011-11-11 19:01:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.22 +pkgver=0.4.23 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f44a39e783ceafe71cd3e7dde8a81e22') +md5sums=('00e622cf33eeb134a785463fbf49d227') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 3de965a51..dcb1b6cf7 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lightspark pkgver=0.5.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' @@ -15,7 +15,8 @@ optdepends=('gnash-gtk: fallback support') install="lightspark.install" source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" 'llvm29.diff') -md5sums=('ac2233a83e8bf0b305563bbce322cd76') +md5sums=('ac2233a83e8bf0b305563bbce322cd76' + '5f717d1d9ead478184ca68f6ac068099') build() { cd lightspark-${pkgver} @@ -41,5 +42,3 @@ package() { make DESTDIR=${pkgdir} install } -md5sums=('ac2233a83e8bf0b305563bbce322cd76' - '5f717d1d9ead478184ca68f6ac068099') diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD new file mode 100644 index 000000000..21bfddf37 --- /dev/null +++ b/community/log4cpp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 58314 2011-11-11 08:13:40Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor : Geraud Le Falher <daureg@gmail.com> + +pkgname=log4cpp +pkgver=1.0 +pkgrel=6 +pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." +arch=('i686' 'x86_64') +url="http://log4cpp.hora-obscura.de/" +license=('LGPL') +depends=('gcc-libs') +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc43.patch) +md5sums=('1face50ead0790d1297dfb04bacf273c' + '09a6fd8ab6527a417c97c4db5215e558') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir"/gcc43.patch + ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/community/log4cpp/gcc43.patch b/community/log4cpp/gcc43.patch new file mode 100644 index 000000000..a60f986e9 --- /dev/null +++ b/community/log4cpp/gcc43.patch @@ -0,0 +1,26 @@ +Index: log4cpp-1.0/src/BasicLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400 ++++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400 +@@ -15,6 +15,8 @@ + #include <sstream> + #endif + ++#include <memory> ++ + namespace log4cpp { + + BasicLayout::BasicLayout() { +Index: log4cpp-1.0/src/PatternLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400 ++++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400 +@@ -370,7 +370,7 @@ + literal = ""; + } + if ((minWidth != 0) || (maxWidth != 0)) { +- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); ++ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); + minWidth = maxWidth = 0; + } + _components.push_back(component); diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 37b12dd23..b60640e55 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 56345 2011-10-05 19:08:27Z andrea $ +# $Id: PKGBUILD 58474 2011-11-12 22:05:38Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.1.0 -pkgrel=2 +pkgrel=5 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt') +depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz) -sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac') +source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz + luminance-hdr-2.1.0-libraw.patch) +sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac' + 'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c') build() { cd "${srcdir}/luminance-hdr-${pkgver}" + # stolen from gentoo + patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch + if [ ${CARCH} = i686 ]; then sed -i 's/ -msse2//' project.pro fi diff --git a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch new file mode 100644 index 000000000..8472a7422 --- /dev/null +++ b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch @@ -0,0 +1,10 @@ +--- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig ++++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp +@@ -94,7 +94,6 @@ + RawProcessor.set_progress_handler(cb, callback_data); + int ret; + +- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC; + OUT.output_bps = 16; + + //OUT.gamm[0] = 1/2.4; //sRGB diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 824cb1a71..425dada88 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56306 2011-10-05 13:55:59Z spupykin $ +# $Id: PKGBUILD 58337 2011-11-11 19:02:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.50 +pkgver=0.7.51 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo>=0.7.35' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('1c647544dde097c5730959515a18481a') +md5sums=('b06dc34481ce2971c28e517b146888e8') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 2379a0329..e954b259e 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56304 2011-10-05 13:54:48Z spupykin $ +# $Id: PKGBUILD 58335 2011-11-11 19:02:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.50 +pkgver=0.7.51 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo>=0.7.35') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('1c647544dde097c5730959515a18481a') +md5sums=('b06dc34481ce2971c28e517b146888e8') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 540960168..dffb76d45 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54993 2011-08-29 20:53:40Z spupykin $ +# $Id: PKGBUILD 58407 2011-11-12 17:17:53Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,7 +6,7 @@ pkgname=minidlna pkgver=1.0.22 -pkgrel=3 +pkgrel=4 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index eab793997..6e1663b31 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51875 2011-07-17 19:10:00Z spupykin $ +# $Id: PKGBUILD 58409 2011-11-12 17:17:58Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,8 +7,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.7.4 -pkgrel=1.1 +pkgver=0.7.6 +pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -16,7 +16,7 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d5d1ff686f51131a02b0f6fca0f073da') +md5sums=('105969a63339da2f8ce4ddce1652c9e7') build() { # mlt diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index c6f5fa422..e12f7ee0c 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 85176 2010-07-09 22:50:45Z eric $ +# $Id: PKGBUILD 58411 2011-11-12 17:18:08Z ibiru $ # Maintainer: pkgname=motion pkgver=3.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -depends=('ffmpeg' 'libjpeg') +depends=('ffmpeg' 'libjpeg' 'v4l-utils') backup=('etc/motion/motion.conf') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f') sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/ffmpeg-0.8.patch + patch -Np1 -i $srcdir/linux-headers.patch ./configure --prefix=/usr \ --without-pgsql \ --without-mysql \ @@ -31,3 +33,29 @@ package(){ install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" } +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + '2f422c268337dce583b9dac344005e93') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '7b41c8c273980c147694d82af7c9cb9e51302dd9') +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + '5db295d7c2e4c38f36e861a3c4dfdd8d') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '2b12df6d9053d17f6ac1969e3510dd50c6fe6667') +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + 'd36687710837d69fbce4608b1345fa34') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '6912448db0711f85322505ee6f8052f8f98ae634') +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + 'd36687710837d69fbce4608b1345fa34' + 'd8c3c4fdded5cfbd729710475559a21d') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '6912448db0711f85322505ee6f8052f8f98ae634' + '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e') diff --git a/community/motion/ffmpeg-0.8.patch b/community/motion/ffmpeg-0.8.patch new file mode 100644 index 000000000..5dcc6e686 --- /dev/null +++ b/community/motion/ffmpeg-0.8.patch @@ -0,0 +1,112 @@ +diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c +--- motion-3.2.12/ffmpeg.c 2010-06-01 08:48:23.000000000 +0200 ++++ motion-3.2.12.new/ffmpeg.c 2011-10-31 17:25:03.000000000 +0100 +@@ -14,7 +14,7 @@ + + #include "ffmpeg.h" + #include "motion.h" +- ++#include <libavformat/avformat.h> + #if LIBAVCODEC_BUILD > 4680 + /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with + * non-standard framerates. Previous builds contained a broken hack +@@ -228,10 +228,12 @@ + mpeg1_file_protocol.url_close = file_protocol.url_close; + + /* Register the append file protocol. */ +-#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8) +- av_register_protocol(&mpeg1_file_protocol); ++#ifdef have_av_register_protocol2 ++ av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol)); ++#elif defined have_av_register_protocol ++ av_register_protocol(&mpeg1_file_protocol); + #else +- register_protocol(&mpeg1_file_protocol); ++# warning av_register_protocolXXX missing + #endif + } + +@@ -244,7 +246,7 @@ + const char *ext; + AVOutputFormat *of = NULL; + +- /* Here, we use guess_format to automatically setup the codec information. ++ /* Here, we use av_guess_format to automatically setup the codec information. + * If we are using msmpeg4, manually set that codec here. + * We also dynamically add the file extension to the filename here. This was + * done to support both mpeg1 and mpeg4 codecs since they have different extensions. +@@ -258,7 +260,7 @@ + /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would + * result in a muxed output file, which isn't appropriate here. + */ +- of = guess_format("mpeg1video", NULL, NULL); ++ of = av_guess_format("mpeg1video", NULL, NULL); + if (of) { + /* But we want the trailer to be correctly written. */ + of->write_trailer = mpeg1_write_trailer; +@@ -270,24 +272,24 @@ + #endif + } else if (strcmp(codec, "mpeg4") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + } else if (strcmp(codec, "msmpeg4") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + if (of) { + /* Manually override the codec id. */ + of->video_codec = CODEC_ID_MSMPEG4V2; + } + } else if (strcmp(codec, "swf") == 0) { + ext = ".swf"; +- of = guess_format("swf", NULL, NULL); ++ of = av_guess_format("swf", NULL, NULL); + } else if (strcmp(codec, "flv") == 0) { + ext = ".flv"; +- of = guess_format("flv", NULL, NULL); ++ of = av_guess_format("flv", NULL, NULL); + of->video_codec = CODEC_ID_FLV1; + } else if (strcmp(codec, "ffv1") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + if (of) { + /* Use the FFMPEG Lossless Video codec (experimental!). + Requires strict_std_compliance to be <= -2 */ +@@ -295,7 +297,7 @@ + } + } else if (strcmp(codec, "mov") == 0) { + ext = ".mov"; +- of = guess_format("mov", NULL, NULL); ++ of = av_guess_format("mov", NULL, NULL); + } else { + motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec); + return NULL; +@@ -377,7 +379,7 @@ + + ffmpeg->c = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st); + c->codec_id = ffmpeg->oc->oformat->video_codec; +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + is_mpeg1 = c->codec_id == CODEC_ID_MPEG1VIDEO; + + if (strcmp(ffmpeg_video_codec, "ffv1") == 0) +@@ -646,7 +648,7 @@ + if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) { + /* raw video case. The API will change slightly in the near future for that */ + #ifdef FFMPEG_AVWRITEFRAME_NEWAPI +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.data = (uint8_t *)pic; + pkt.size = sizeof(AVPicture); + ret = av_write_frame(ffmpeg->oc, &pkt); +@@ -667,7 +669,7 @@ + #ifdef FFMPEG_AVWRITEFRAME_NEWAPI + pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts; + if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.data = ffmpeg->video_outbuf; + pkt.size = out_size; diff --git a/community/motion/linux-headers.patch b/community/motion/linux-headers.patch new file mode 100644 index 000000000..795c8aec5 --- /dev/null +++ b/community/motion/linux-headers.patch @@ -0,0 +1,35 @@ +diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h +--- motion-3.2.12-OLD/motion.h 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/motion.h 2011-08-30 02:11:08.000000000 -0700 +@@ -40,7 +40,7 @@ + + #define _LINUX_TIME_H 1 + #if !defined(WITHOUT_V4L) && !defined(BSD) +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #endif + + #include <pthread.h> +diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c +--- motion-3.2.12-OLD/track.c 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/track.c 2011-08-30 23:05:09.000000000 -0700 +@@ -11,6 +11,7 @@ + #include "motion.h" + + #ifndef WITHOUT_V4L ++#include <linux/videodev2.h> + #include "pwc-ioctl.h" + #endif + +diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h +--- motion-3.2.12-OLD/video.h 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/video.h 2011-08-30 02:11:12.000000000 -0700 +@@ -12,7 +12,7 @@ + + #define _LINUX_TIME_H 1 + #ifndef WITHOUT_V4L +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <sys/mman.h> + #include "pwc-ioctl.h" + #endif diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 98d3e431f..f8caed272 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $ +# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 -pkgver=2.0 -pkgrel=15.1 +pkgver=2.0.20111101 +pkgrel=1 pkgdesc="A movie player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,26 +25,28 @@ fi backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') -source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz - mplayer2-remove-mp3lib.patch - mplayer2-SAMI-subs.patch) -sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' - 'c55128a99406a5e01ab077555b7b24aa7b54110c' - '4059d5d0564004feb55d25b5f62f7f4672e40fb1') +#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d') options=('!emptydirs') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +# source PKGBUILD && mksource +mksource() { + _gitroot="git://git.mplayer2.org/mplayer2.git" + _gitname="${pkgname}-${pkgver}" + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + else + git clone "$_gitroot" "$_gitname" + fi - # Drop internal mp3lib (FS#24149) - # Default decoder for mp3 will be mpg123 - rm -fr mp3lib - patch -Np1 -i ../mplayer2-remove-mp3lib.patch + tar -cJvf ${_gitname}.tar.xz ${_gitname} + rm -fr ${_gitname} +} - # SAMI subtitle parsing buffer overflow - # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html - # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf - patch -Np1 -i ../mplayer2-SAMI-subs.patch +build() { + cd "${srcdir}/${pkgname}-${pkgver}" if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ @@ -71,7 +73,6 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ - --enable-xvmc \ --language=all \ --enable-translation \ --confdir=/etc/mplayer diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD index 6c79bed54..e55a31ca9 100644 --- a/community/musescore/PKGBUILD +++ b/community/musescore/PKGBUILD @@ -1,21 +1,23 @@ -# Contributor: Cristian Maureira <saint [at] archlinux.cl> -# Previous Contributor: Dr.Egg <rwhite @ archlinux . us> +# $Id: PKGBUILD 58526 2011-11-13 15:57:02Z andrea $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de +# Contributor: Cristian Maureira <saint [at] archlinux.cl> +# Contributor: Dr.Egg <rwhite @ archlinux . us> pkgname=musescore pkgver=1.1 pkgrel=2 -pkgdesc="A music score editor written in Qt4" +pkgdesc="A music score editor written in Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.musescore.org/en/" license=('GPL') -depends=('qt>=4.5.0' 'libsndfile' 'qtscriptgenerator') +depends=('qt' 'libsndfile' 'qtscriptgenerator') makedepends=('cmake' 'doxygen') optdepends=('portaudio' 'jack') -source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch') +install=musescore.install +source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2" + 'paths.patch') md5sums=('68b43af92093a16f7f074c0eb560a867' 'e5011154d217f633f21b4bb70e589510') -install=musescore.install build() { cd $srcdir/mscore-${pkgver} diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install index 6d2e3727f..d6abb5470 100644 --- a/community/musescore/musescore.install +++ b/community/musescore/musescore.install @@ -3,9 +3,9 @@ post_install() { } post_upgrade() { - update-desktop-database -q + post_install } post_remove() { - update-desktop-database -q + post_install } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 11e52b97e..207484ee1 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57172 2011-10-23 02:27:54Z jconder $ +# $Id: PKGBUILD 58529 2011-11-13 16:01:47Z andrea $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.24.1 -pkgrel=3 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' - 'qtwebkit' 'wget') + 'wget') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 434e82574..338c5de24 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('c05f2dadd4d82c0d72dbc116e82cfc0e') +md5sums=('92b8085967110b0125c192634f127a2b') build() { cd node-v${pkgver} diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index dbe670633..b940f264b 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 58261 2011-11-09 14:59:24Z spupykin $ +# $Id: PKGBUILD 58321 2011-11-11 11:56:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules pkgver=2011.10.26 _pkgsubver=514583 -pkgrel=1 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" +pkgrel=2 +pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" license=('GPL') makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') depends=("linux") install=$pkgname.install +options=('!strip') source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") md5sums=('06f299375a91fbcba9d16b5007490023') @@ -35,7 +36,8 @@ package() { cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ for MOD in `find -type f -name '*.ko'`; do - install -D -m644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ + install -Dm644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ done sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install + gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko } diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install index 801d2c5b3..cdd13e929 100644 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community/open-vm-tools-modules/open-vm-tools-modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION='2.6.38-ARCH' +KERNEL_VERSION='3.1.0-4-ARCH' post_install() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 3a8626c63..b8bdab9c5 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58259 2011-11-09 14:58:37Z spupykin $ +# $Id: PKGBUILD 58319 2011-11-11 11:55:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2011.10.26 _pkgsubver=514583 -pkgrel=1 +pkgrel=2 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -29,7 +29,7 @@ md5sums=('06f299375a91fbcba9d16b5007490023' '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' - '67cb83a9e5a4dd016c1a1da2863ca36d' + '136ff53d0d3a303d09266a407fd2d215' 'b55d15e2c4be396aad709aeca91033d3' '73cc1a2665b0dd62427733d62ead8b9a' '75a25d83417e683957321f97a00f8465') diff --git a/community/open-vm-tools/open-vm-tools.rc.d b/community/open-vm-tools/open-vm-tools.rc.d index 0c9221489..555fa1535 100644 --- a/community/open-vm-tools/open-vm-tools.rc.d +++ b/community/open-vm-tools/open-vm-tools.rc.d @@ -13,7 +13,7 @@ case "$1" in if [ "$VM_DRAG_AND_DROP" == "yes" ]; then VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe vmblock + [ -z "$VMBLOCK" ] && modprobe -f vmblock if [ $? -gt 0 ]; then stat_fail exit 1 @@ -36,7 +36,7 @@ case "$1" in for m in vmhgfs vmsync; do VMMOD=`grep -w $m /proc/modules` [ -z "$VMMOD" ] && \ - { modprobe $m + { modprobe -f $m if [ $? -gt 0 ]; then stat_fail exit 1 diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index e00c59ba9..dedf985b9 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54658 2011-08-22 14:51:35Z spupykin $ +# $Id: PKGBUILD 58415 2011-11-12 17:18:19Z ibiru $ # 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=1 +pkgrel=2 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64' 'mips64el') license=('custom:OSGPL') diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 9e2e6106c..da943848f 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58527 2011-11-13 15:58:19Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Michele Mocciola <mickele> # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> @@ -5,11 +6,11 @@ pkgname=paraview pkgver=3.10.1 pkgrel=4 -pkgdesc='Parallel Visualization Application using VTK.' +pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' makedepends=('cmake' 'desktop-file-utils') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 9d4db9737..7e30d453c 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56949 2011-10-17 08:21:01Z ibiru $ +# $Id: PKGBUILD 58479 2011-11-13 13:51:40Z jelle $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.11 -pkgrel=1 +pkgrel=3 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 721cd0098..c4c9e2f5c 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55893 2011-09-24 16:49:07Z stephane $ +# $Id: PKGBUILD 58417 2011-11-12 17:18:28Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=9 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -13,19 +13,26 @@ depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'l 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47') optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2) -md5sums=('451a759de77984b5a699e91107fe52e2') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 + boost-filesystem-v3.patch + ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a") +md5sums=('451a759de77984b5a699e91107fe52e2' + '42a8c825d80b0de16bd5752d2a80e585' + 'ff0ffa681dfaa09c4f42133a65309bf0') build() { cd ${srcdir}/Performous-${pkgver}-Source + # fix to built against boost 1.46 and later, upstream (git) now support v3 + patch -Np1 -i ../boost-filesystem-v3.patch + # fix with ffmpeg-0.8 + patch -Np1 -i ../ffmpeg-0.8.patch + mkdir -p build cd build # fix config loading with libxml++ export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - # fix to built against boost 1.46, upstream (git) now support v3 - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr .. diff --git a/community/performous/boost-filesystem-v3.patch b/community/performous/boost-filesystem-v3.patch new file mode 100644 index 000000000..22dd07213 --- /dev/null +++ b/community/performous/boost-filesystem-v3.patch @@ -0,0 +1,135 @@ +diff --git a/game/backgrounds.cc b/game/backgrounds.cc +index 7fd3cd0..cdedefb 100644 +--- a/game/backgrounds.cc ++++ b/game/backgrounds.cc +@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + { +diff --git a/game/cache.cc b/game/cache.cc +index 69974e2..0f1edd0 100644 +--- a/game/cache.cc ++++ b/game/cache.cc +@@ -9,7 +9,11 @@ namespace cache { + fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ + fs::path cache_filename; + std::string const lod = (boost::format("%.2f") % factor).str(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; ++#else ++ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; ++#endif + + if (isThemeResource(svgfilename)) { + std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); +diff --git a/game/filemagic.hh b/game/filemagic.hh +index bf87ded..29e81fe 100644 +--- a/game/filemagic.hh ++++ b/game/filemagic.hh +@@ -71,7 +71,11 @@ namespace filemagic { + // For now, just check the extension an assume it's not lying. + + // Get file extension in lower case ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string ext = filename.extension(); ++#else ++ std::string ext = filename.extension().string(); ++#endif + // somehow this does not convert the extension to lower case: + //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); + std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); +diff --git a/game/fs.cc b/game/fs.cc +index e34a784..767a7ab 100644 +--- a/game/fs.cc ++++ b/game/fs.cc +@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) { + + bool isThemeResource(fs::path filename){ + try { ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string themefile = getThemePath(filename.filename()); ++#else ++ std::string themefile = getThemePath(filename.filename().string()); ++#endif + return themefile == filename; + } catch (...) { return false; } + } +diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc +index 38e163b..db15d79 100644 +--- a/game/songparser-ini.cc ++++ b/game/songparser-ini.cc +@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() { + // Search the dir for the music files + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++#endif + if (regex_match(name.c_str(), match, midifile)) { + s.midifilename = name; + } else if (regex_match(name.c_str(), match, audiofile_background)) { +diff --git a/game/songparser.cc b/game/songparser.cc +index 2b7b9b4..ac9f3f6 100644 +--- a/game/songparser.cc ++++ b/game/songparser.cc +@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s): + + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename ++#else ++ std::string name = p.filename().string(); // File basename ++#endif + if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { + m_song.cover = name; + } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { +diff --git a/game/songs.cc b/game/songs.cc +index 62ab26d..afab383 100644 +--- a/game/songs.cc ++++ b/game/songs.cc +@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + try { +diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh +index 58e19dc..8895d94 100644 +--- a/tools/ss_helpers.hh ++++ b/tools/ss_helpers.hh +@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st + void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); } + void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); } + ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string filename(boost::filesystem::path const& p) { return *--p.end(); } ++#else ++std::string filename(boost::filesystem::path const& p) { return p.filename().string(); } ++#endif + + /** Fix Singstar's b0rked XML **/ + std::string xmlFix(std::vector<char> const& data) { +-- +1.7.4.1 + diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index bd8ef5f87..dcc8aba90 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 57200 2011-10-23 22:18:46Z bisson $ +# $Id: PKGBUILD 58419 2011-11-12 17:18:36Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard pkgver=0.16 -pkgrel=1 +pkgrel=3 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg') +depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') optdepends=('libdiscid: CD-Lookup feature') source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") sha1sums=('274071410550ee29051bb0137d72602921a015f9') diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD new file mode 100644 index 000000000..b359ca4f0 --- /dev/null +++ b/community/pion-net/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 58325 2011-11-11 13:52:07Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: David Watzke <david@watzke.cz> + +pkgname=pion-net +pkgver=4.0.5 +pkgrel=3 +pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" +url="http://www.pion.org/projects/pion-network-library" +arch=('i686' 'x86_64') +license=('custom:Boost') +depends=('boost-libs' 'openssl' 'log4cpp') +makedepends=('boost') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" + "$pkgname-$pkgver-build.patch") +md5sums=('1030fcce124621de705bdab40a1d977c' + 'd75ea2af90163a81d2bc71fda00f0c00') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i "$srcdir/$pkgname-$pkgver-build.patch" + + # override configure bug (forces debug even when nobody asked for it) + sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure + + ./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp + + find -name Makefile -print0 | xargs -0 \ + sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile + + # override Makefile bug + sed -i "/docs:/ s/doxygen-doc//" Makefile + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # install license + install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost" +} diff --git a/community/pion-net/pion-net-4.0.5-build.patch b/community/pion-net/pion-net-4.0.5-build.patch new file mode 100644 index 000000000..25fdca20b --- /dev/null +++ b/community/pion-net/pion-net-4.0.5-build.patch @@ -0,0 +1,12 @@ +diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp +--- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp 2010-12-21 03:07:13.000000000 +0100 ++++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp 2011-07-31 09:01:38.445559768 +0200 +@@ -639,7 +639,7 @@ + + /// returns reference to the io_service used for async operations + inline boost::asio::io_service& getIOService(void) { +- return m_ssl_socket.lowest_layer().io_service(); ++ return m_ssl_socket.lowest_layer().get_io_service(); + } + + /// returns non-const reference to underlying TCP socket object diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index f1e47b9bf..f172fb294 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55279 2011-09-08 15:03:04Z ttopper $ +# $Id: PKGBUILD 58369 2011-11-12 14:16:49Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.99.0 +pkgver=0.99.1 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,12 @@ license=('GPL3') depends=('libnotify' 'libcdio' 'curl' 'taglib' 'gstreamer0.10' 'hicolor-icon-theme' 'gtk2' 'dbus-glib' 'dbus-core' - 'sqlite3' 'glib2') + 'sqlite3' 'glib2' 'desktop-file-utils') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('0791335c29121e6288962f4a7fbe074e4db73c9d') +sha1sums=('bd3e965da2f602bb7d9c731eccbb4d67e8c70d6c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 243f47de6..d9ac969d6 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -1,50 +1,38 @@ -# $Id: PKGBUILD 57764 2011-11-02 14:37:24Z tdziedzic $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Ray Rashif <schiv@archlinux.org> +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> # Contributor: Andrzej Giniewicz <gginiu@gmail.com> -pkgbase=python-scipy -_app=scipy pkgname=('python-scipy' 'python2-scipy') -pkgver=0.9.0 -_theapp=$_app-$pkgver -pkgrel=3 +pkgver=0.10.0 +pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" license=('BSD') -depends=('python-numpy') -makedepends=('gcc-fortran' 'python2-numpy') -source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") -md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') +makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") +md5sums=('e357c08425fd031dce63bc4905789088') build() { unset LDFLAGS unset FFLAGS - # Compatibility symlinks for current stable numpy - # - no need to patch numpy just for this - # see http://projects.scipy.org/numpy/ticket/1749 - ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so - ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so - export LAPACK="$srcdir" - export BLAS="$srcdir" - # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ - $_theapp/$_app/special/cephes/mconf.h + scipy-${pkgver}/scipy/special/cephes/mconf.h # 2 builds - cp -r $_theapp $_theapp-py2 + cp -r scipy-${pkgver} scipy-${pkgver}-py2 # build for python3 - cd $_theapp + cd scipy-${pkgver} python setup.py config_fc --fcompiler=gnu95 build # build for python2 - cd ../$_theapp-py2 + cd ../scipy-${pkgver}-py2 for file in $(find . -name '*.py' -print); do sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file @@ -55,28 +43,29 @@ build() { } package_python-scipy() { + depends=('python-numpy') provides=('python3-scipy' 'scipy') - cd "$srcdir/$_theapp" + cd scipy-${pkgver} python setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root="$pkgdir" --optimize=1 + --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + "${pkgdir}/usr/share/licenses/python-scipy/LICENSE" } package_python2-scipy() { depends=('python2-numpy') conflicts=('python-scipy<0.9.0') - cd "$srcdir/$_theapp-py2" + cd scipy-${pkgver}-py2 python2 setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root="$pkgdir" --optimize=1 + --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD index 4d33bd215..5a7e907d7 100644 --- a/community/python2-poppler/PKGBUILD +++ b/community/python2-poppler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56953 2011-10-17 08:21:15Z ibiru $ +# $Id: PKGBUILD 58362 2011-11-12 10:53:03Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: György Balló <ballogy@freestart.hu> pkgname=python2-poppler _realname=pypoppler pkgver=0.12.1 -pkgrel=5 +pkgrel=7 pkgdesc="Python 2.x bindings for Poppler" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/poppler-python" @@ -15,15 +15,20 @@ provides=('pypoppler' 'python-poppler') conflicts=('python-poppler') replaces=('python-poppler') options=(!libtool) -source=(http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz - pypoppler-0.12.1-poppler-0.16.0.patch) +source=("http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz" + 'pypoppler-0.12.1-poppler-0.16.0.patch') md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a' '683c5b67866d56adc2494120cc329dc8') build() { cd "$srcdir/$_realname-$pkgver" - patch -Np0 -i "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch" + # poppler 0.16 compat + patch -Np0 -i \ + "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch" + + # poppler 0.18 compat + sed -i "/pixbuf/,/^)/d" poppler.defs ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -36,5 +41,7 @@ build() { package() { cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index d75aa0ff8..b846555a9 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -1,5 +1,6 @@ +# $Id: PKGBUILD 58528 2011-11-13 15:59:35Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index c43e11098..35e45b332 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56621 2011-10-09 07:51:45Z jlichtblau $ +# $Id: PKGBUILD 58530 2011-11-13 16:03:22Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> @@ -16,25 +16,32 @@ optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml) + $pkgname-mimetypes.xml + 'fix-glu-header.patch') sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + '8e8c6440e1674a87d5a221c978f2be832457fb43980894725044837581625618') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - install -d ${srcdir}/$pkgname-$pkgver/build - cd ${srcdir}/$pkgname-$pkgver/build + patch -R -p2 -i "${srcdir}"/fix-glu-header.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd "${srcdir}" + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package(){ - cd ${srcdir}/$pkgname-$pkgver/build + cd "${srcdir}/build" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \ - ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml + install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ + "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } diff --git a/community/qlandkartegt/fix-glu-header.patch b/community/qlandkartegt/fix-glu-header.patch new file mode 100644 index 000000000..214ad395d --- /dev/null +++ b/community/qlandkartegt/fix-glu-header.patch @@ -0,0 +1,12 @@ +--- QLandkarteGT/trunk/src/CMap3D.cpp 2011/08/23 16:34:50 2943 ++++ QLandkarteGT/trunk/src/CMap3D.cpp 2011/09/03 07:58:02 2961 +@@ -31,8 +31,8 @@ + #include "CWptDB.h" + #include "WptIcons.h" + +-#include <GL/glu.h> + #include <QtGui> ++#include <QtOpenGL> + #include <math.h> + + #ifndef GL_CLAMP_TO_EDGE diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 1358b0445..2ffb00768 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50714 2011-06-29 20:28:47Z spupykin $ +# $Id: PKGBUILD 58531 2011-11-13 16:04:18Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> +# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 pkgver=0.2.b20 pkgrel=1 -pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME." +pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" license=("GPL") arch=('i686' 'x86_64' 'mips64el') @@ -23,6 +23,6 @@ build() { package() { cd "$srcdir/$pkgname" make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install - mkdir -p $pkgdir/usr/share/{applications,pixmaps} + install -d $pkgdir/usr/share/{applications,pixmaps} install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" } diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index d366771fc..e594e316c 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 56625 2011-10-09 08:59:56Z jlichtblau $ +#$Id: PKGBUILD 58421 2011-11-12 17:18:45Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.5.2 -pkgrel=1 +pkgrel=3 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') url="http://qmmp.ylsoftware.com/" diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 31050d69e..379f85cbe 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,7 @@ +2011-11-12 Andrea Scarpino <andrea@archlinux.org> + * qmmp 0.5.2-3 + * rebuild with qt 4.7 + 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.2-1 diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD index 7822b704a..b98775d66 100644 --- a/community/qmpdclient/PKGBUILD +++ b/community/qmpdclient/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57154 2011-10-22 15:37:23Z andrea $ +# $Id: PKGBUILD 58444 2011-11-12 18:54:25Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=qmpdclient pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt4 client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://bitcheese.net/wiki/QMPDClient" @@ -29,6 +29,5 @@ build() { package() { cd ${srcdir}/build - make DESTDIR=${pkgdir} install } diff --git a/community/qmpdclient/qmpdclient.changelog b/community/qmpdclient/qmpdclient.changelog index 1e43c6a15..788ad2d68 100644 --- a/community/qmpdclient/qmpdclient.changelog +++ b/community/qmpdclient/qmpdclient.changelog @@ -1,3 +1,7 @@ +2011-11-12 Andrea Scarpino <andrea@archlinux.org> + * qmpdclient 1.2.2-2 + * Qt 4.8 downgrade + 2011-10-22 Andrea Scarpino <andrea@archlinux.org> * qmpdclient 1.2.2-1 diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 3d99a92f1..23b606691 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56042 2011-09-29 16:07:37Z svenstaro $ +# $Id: PKGBUILD 58532 2011-11-13 16:04:52Z andrea $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> diff --git a/community/raw-thumbnailer/PKGBUILD b/community/raw-thumbnailer/PKGBUILD index 8d4b3422f..275a110ee 100644 --- a/community/raw-thumbnailer/PKGBUILD +++ b/community/raw-thumbnailer/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 22594 2010-07-23 08:17:42Z lcarlier $ -# Maintainer: pressh <pressh at gmail dot com> +# $Id: PKGBUILD 58310 2011-11-10 20:50:33Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=raw-thumbnailer -pkgver=0.2 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="A lightweight and fast raw image thumbnailer that can be used by file managers." url="http://code.google.com/p/raw-thumbnailer/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('libopenraw') source=(http://raw-thumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('f107575aa32a0d53802cf5beead18bf8') +sha1sums=('f34012062c0b1eaa10525722c36bd027b11ade2e') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD index bca611d90..428c44b09 100644 --- a/community/rsnapshot/PKGBUILD +++ b/community/rsnapshot/PKGBUILD @@ -1,23 +1,35 @@ -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> +# $Id: PKGBUILD 58364 2011-11-12 11:47:00Z andrea $ +# Maintainer: +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Thorsten Tasch <tht@thorstentasch.de> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + pkgname=rsnapshot pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A remote filesystem snapshot utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.rsnapshot.org" license=('GPL') depends=('perl' 'rsync' 'openssh') backup=('etc/rsnapshot.conf') -source=(http://www.rsnapshot.org/downloads/$pkgname-$pkgver.tar.gz rsnapshot) +source=("http://www.rsnapshot.org/downloads/${pkgname}-${pkgver}.tar.gz" + 'rsnapshot') +md5sums=('588f92995dcf60a6ea6df8d94a017e7e' + '4cd16eaa51d58a652cffde945985e91c') + build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1 - sed -i 's:/usr/bin/pod2man:/usr/bin/perlbin/core/pod2man:' Makefile - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - mv "$pkgdir"/etc/rsnapshot.conf.default "$pkgdir"/etc/rsnapshot.conf + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man + sed -i 's:/usr/bin/pod2man:/usr/bin/core_perl/pod2man:' Makefile + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + mv ${pkgdir}/etc/rsnapshot.conf.default ${pkgdir}/etc/rsnapshot.conf install -Dm644 ${srcdir}/rsnapshot ${pkgdir}/etc/logrotate.d/rsnapshot } -md5sums=('588f92995dcf60a6ea6df8d94a017e7e' '4cd16eaa51d58a652cffde945985e91c') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index e7c3039e2..6d3bb3f4c 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56119 2011-10-02 02:52:32Z ebelanger $ +# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.5 -pkgrel=2 +pkgver=5.8.6 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('a73cb577cb4bc5b9c8f0d217eb054ad2' +md5sums=('c46db0496066b82faf735bd4222208d7' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 13f6fe947..0e965efba 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 56880 2011-10-15 22:25:22Z spupykin $ +# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.4 -pkgrel=2 +pkgver=0.11.6 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') -makedepends=('intltool' 'vala') +makedepends=('intltool') +# 'vala' install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" - "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2") -md5sums=('150899574f8fd96b6a5b87173a6ef3e0' - 'bf35262cc611de447147d01cbac33767') + "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2" + "fix-with-libraw-0.4.patch") +md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf' + 'bf35262cc611de447147d01cbac33767' + '488787b6d2cbc7348bc88348b78b6005') build() { cd "${srcdir}/vala-0.12.1" @@ -27,11 +30,15 @@ build() { export PATH=$srcdir/vala/bin:$PATH cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ../fix-with-libraw-0.4.patch + ./configure --prefix=/usr \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-schemas-install \ --disable-desktop-update \ --disable-icon-update + make } diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch new file mode 100644 index 000000000..f6f021b61 --- /dev/null +++ b/community/shotwell/fix-with-libraw-0.4.patch @@ -0,0 +1,50 @@ +Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled +diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala +--- shotwell-0.11.5/src/photos/GRaw.vala 2011-09-24 00:52:27.000000000 +0200 ++++ shotwell-0.11.5-fixed/src/photos/GRaw.vala 2011-11-01 00:25:05.976289495 +0100 +@@ -163,9 +163,9 @@ + proc = new LibRaw.Processor(options); + } + +- public void add_masked_borders_to_bitmap() { +- proc.add_masked_borders_to_bitmap(); +- } ++// public void add_masked_borders_to_bitmap() { ++// proc.add_masked_borders_to_bitmap(); ++// } + + public void adjust_sizes_info_only() throws Exception { + throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); +@@ -215,9 +215,9 @@ + throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename)); + } + +- public void rotate_fuji_raw() throws Exception { +- throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); +- } ++// public void rotate_fuji_raw() throws Exception { ++// throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); ++// } + + public void thumb_writer(string filename) throws Exception { + throw_exception("thumb_writer", proc.thumb_writer(filename)); +@@ -262,7 +262,7 @@ + // camera_profile + // bad_pixels + // dark_frame +- output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; ++ // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; + output_params->output_bps = 8; + // output_tiff + output_params->user_flip = GRaw.Flip.FROM_SOURCE; +@@ -303,8 +303,8 @@ + case LibRaw.Result.UNSUPPORTED_THUMBNAIL: + throw new Exception.UNSUPPORTED_THUMBNAIL(msg); + +- case LibRaw.Result.CANNOT_ADDMASK: +- throw new Exception.CANNOT_ADDMASK(msg); ++// case LibRaw.Result.CANNOT_ADDMASK: ++// throw new Exception.CANNOT_ADDMASK(msg); + + case LibRaw.Result.UNSUFFICIENT_MEMORY: + throw new Exception.OUT_OF_MEMORY(msg); diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 8cfabf947..f4af9acf3 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55126 2011-09-02 23:39:52Z giovanni $ +# $Id: PKGBUILD 58533 2011-11-13 16:05:39Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> @@ -18,6 +18,7 @@ md5sums=('ce27976254236f8b11b787fd05be9acb' 'fef6aa492af487ccccd6b133635cee5a') build() { + cd "${srcdir}" mkdir build cd build cmake -G "Unix Makefiles" \ @@ -31,7 +32,7 @@ build() { } package() { - cd build + cd "${srcdir}"/build make install DESTDIR="${pkgdir}" install -d -m 0755 "${pkgdir}"/usr/share/applications diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index da7b195f1..f1c053ce3 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') install=simple-scan.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('175a852f132f85e861ded99d546137fb4299ad9ce2836eaac9d645fbfcbefbac') +sha256sums=('10fba94b60cd5159d54d3491f228ac9fe83ac0ab02b983d7cd8390aa26cf2ecc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD index 04cd74807..83ca34614 100644 --- a/community/sqliteman/PKGBUILD +++ b/community/sqliteman/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 44071 2011-04-01 22:02:53Z spupykin $ +# $Id: PKGBUILD 58342 2011-11-12 08:23:16Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Porizka <artee@beer.cz> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=sqliteman pkgver=1.2.2 -pkgrel=4 +pkgrel=5 pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world" arch=('i686' 'x86_64' 'mips64el') url="http://sqliteman.sf.net" license=('GPL') -depends=('qt' 'qscintilla') +depends=('qscintilla') makedepends=('cmake') +install=sqliteman.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('5ecdf710e23606e1b924f740ea69306d') build() { - cd ${srcdir}/${pkgname}-${pkgver} - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/sqliteman/sqliteman.install b/community/sqliteman/sqliteman.install new file mode 100644 index 000000000..ce8f7514f --- /dev/null +++ b/community/sqliteman/sqliteman.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/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index f6fe18c2e..f47e2bbd7 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56131 2011-10-02 08:08:49Z spupykin $ +# $Id: PKGBUILD 58423 2011-11-12 17:18:54Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.63.02 -pkgrel=1 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -16,7 +16,7 @@ conflicts=('synfig-core') replaces=('synfig-core') options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz - build-fix.patch) + build-fix.patch ffmpeg-0.8.patch) md5sums=('4286d5e1887275107d760d1b678aec24' '2de5e74159a38e4b1788c20d4c4b6f68') @@ -24,7 +24,8 @@ build() { cd $srcdir/$pkgname-$pkgver [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv - patch -p1 <$srcdir/build-fix.patch + patch -p1 -i $srcdir/build-fix.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch make } @@ -32,3 +33,9 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68' + 'f1f22b1ce2c13e25d5eb51a664a9551f') +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68' + 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfig/ffmpeg-0.8.patch b/community/synfig/ffmpeg-0.8.patch new file mode 100644 index 000000000..4ba40fff2 --- /dev/null +++ b/community/synfig/ffmpeg-0.8.patch @@ -0,0 +1,60 @@ +diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp +--- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp 2011-09-29 10:51:41.000000000 +0200 ++++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp 2011-10-31 16:39:03.000000000 +0100 +@@ -441,7 +441,7 @@ + if( context->coded_frame ) + pkt.pts = context->coded_frame->pts; + if( context->coded_frame && context->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + //kluge for raw picture format (they said they'd fix) + if (formatc->oformat->flags & AVFMT_RAWPICTURE) +@@ -463,7 +463,7 @@ + if( context->coded_frame ) + pkt.pts = context->coded_frame->pts; + if( context->coded_frame && context->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + ret = av_write_frame(formatc, &pkt); + +@@ -567,17 +567,17 @@ + if (typestring) + { + //formatptr guess_format(type, filename, MIME type) +- format = guess_format(typestring,NULL,NULL); ++ format = av_guess_format(typestring,NULL,NULL); + } + else + { +- format = guess_format(NULL, filename, NULL); ++ format = av_guess_format(NULL, filename, NULL); + } + + if(!format) + { + synfig::warning("Unable to Guess the output, defaulting to mpeg"); +- format = guess_format("mpeg", NULL, NULL); ++ format = av_guess_format("mpeg", NULL, NULL); + } + + if(!format) +@@ -753,7 +753,7 @@ + + context = st->codec; + context->codec_id = (CodecID)codec_id; +- context->codec_type = CODEC_TYPE_VIDEO; ++ context->codec_type = AVMEDIA_TYPE_VIDEO; + + //PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???) + +@@ -800,7 +800,7 @@ + + context = stream->codec; + context->codec_id = (CodecID)codec_id; +- context->codec_type = CODEC_TYPE_AUDIO; ++ context->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + context->bit_rate = 64000; diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 66729ef29..4baa0b4c3 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58537 2011-11-13 16:08:37Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: furester <xfurester@hotmail.com> diff --git a/community/tora/PKGBUILD b/community/tora/PKGBUILD index 0bbdada6b..324e4d48c 100644 --- a/community/tora/PKGBUILD +++ b/community/tora/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 44359 2011-04-06 09:51:56Z jelle $ +# $Id: PKGBUILD 58339 2011-11-12 08:18:18Z andrea $ # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> + pkgname=tora pkgver=2.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Toolkit for databases with support for MySQL and PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://tora.sourceforge.net" @@ -13,15 +14,20 @@ license=('GPL') depends=('qscintilla') makedepends=('cmake') options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('ea4a75a9daeaf58492413e3f7fe40293') build() { - cd $srcdir/$pkgname-$pkgver - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/ + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/tora/tora.install b/community/tora/tora.install index 260f3960f..161b21e2b 100644 --- a/community/tora/tora.install +++ b/community/tora/tora.install @@ -1,5 +1,5 @@ # Thanks to: Serge Gielkens (Teld) for this bugfix -infodir=/usr/share/info +infodir=usr/share/info filelist=(tora.info) post_install() { @@ -17,4 +17,3 @@ pre_remove() { install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index e445fa1d8..697bd84b7 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 54970 2011-08-29 09:48:35Z spupykin $ +# $Id: PKGBUILD 58295 2011-11-10 13:02:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.8.1 -pkgrel=8 +pkgver=3.2.9 +pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" license=('GPL2') -depends=(openssl curl) -conflicts=(ircd) -provides=(ircd) +depends=('openssl' 'curl') +makedepends=('c-ares') +conflicts=('ircd') +provides=('ircd') backup=(etc/unrealircd/unrealircd.conf) source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc arch-fixes.patch) -md5sums=('7b741e94e867c0a7370553fd01506c66' +md5sums=('bde023695347969f545ce5f2a9ac9aed' '0d728240132a97a2cef61be9558750b1' '77807313c4578f2c30286b9f9e3fb21c') @@ -37,7 +38,8 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ - --enable-libcurl=/usr + --enable-libcurl=/usr \ + --with-system-cares make make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 371bf4a83..6f896a7c9 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> @@ -8,7 +9,7 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=2 +pkgrel=6 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64' 'mips64el') url='http://www.vtk.org' @@ -22,10 +23,12 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" - 'fixkernelversioncheck.diff') + 'fixkernelversioncheck.diff' + 'ffmpeg-0.8.diff') md5sums=('37b7297d02d647cc6ca95b38174cb41f' 'a05295b81930e894fc0e31866f399151' - '9e137af23701f76fc727222ebac23389') + '9e137af23701f76fc727222ebac23389' + 'e992321c9d1def6034d0fa6607b40c5a') build() { cd VTK @@ -34,6 +37,10 @@ build() { # remove next pkgver bump patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + # fix compilation error: + # remove next pkgver bump + patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff + cd ${srcdir} rm -rf build diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff new file mode 100644 index 000000000..523919d6f --- /dev/null +++ b/community/vtk/ffmpeg-0.8.diff @@ -0,0 +1,66 @@ +Description: Upstream changes introduced in version 5.6.1-6.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + vtk (5.6.1-6.1) unstable; urgency=low + . + [ Michael Schutte ] + * Non-maintainer upload. + * Remove absolute paths to required libraries from + /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: + #506992. Due to the multiarch transition, the original behavior + frequently causes reverse build-deps to FTBFS. This change should + probably be reverted once all required libraries are multiarched. + . + [ Steve M. Robbins ] + * Override lintian diagnostic about embedded libraries ftgl and sqlite. + * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav + 0.7. + . + The person named in the Author field signed this changelog entry. +Author: Steve M. Robbins <smr@debian.org> +Bug-Debian: http://bugs.debian.org/506992 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx ++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx +@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() + } + + //choose avi media file format +- this->avOutputFormat = guess_format("avi", NULL, NULL); ++ this->avOutputFormat = av_guess_format("avi", NULL, NULL); + if (!this->avOutputFormat) + { + vtkGenericWarningMacro (<< "Could not open the avi media file format."); +@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() + //Set up the codec. + AVCodecContext *c = this->avStream->codec; + c->codec_id = (CodecID)this->avOutputFormat->video_codec; +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; + c->pix_fmt = PIX_FMT_YUVJ420P; +@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm + pkt.stream_index = this->avStream->index; + if (cc->coded_frame->key_frame) //treat keyframes well + { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.duration = 0; //presentation duration in time_base units or 0 if NA + pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/community/wkhtmltopdf/PKGBUILD b/community/wkhtmltopdf/PKGBUILD index 94fa7ee98..79b021c93 100644 --- a/community/wkhtmltopdf/PKGBUILD +++ b/community/wkhtmltopdf/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 19347 2010-06-22 14:11:07Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 58535 2011-11-13 16:06:48Z andrea $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=wkhtmltopdf pkgver=0.9.9 @@ -17,12 +17,14 @@ build() { cd "$srcdir/$pkgname-$pkgver" qmake wkhtmltopdf.pro - make || return 1 - make INSTALL_ROOT="$pkgdir/usr" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir/usr" install # Generate and install man page install -d "$pkgdir/usr/share/man/man1" ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1" } - -# vim:set ts=2 sw=2 et: diff --git a/community/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD index aa9d379e1..078cba68e 100644 --- a/community/wxsvg/PKGBUILD +++ b/community/wxsvg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55754 2011-09-19 05:09:05Z ebelanger $ +# $Id: PKGBUILD 58427 2011-11-12 17:19:10Z ibiru $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=wxsvg pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="C++ library to create, manipulate and render SVG files" arch=('i686' 'x86_64' 'mips64el') url="http://wxsvg.sourceforge.net/" diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 9ec816419..b2d59a5e6 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57288 2011-10-25 10:02:07Z spupykin $ +# $Id: PKGBUILD 58429 2011-11-12 17:19:30Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=1 +pkgrel=2 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" diff --git a/community/xvidcap/PKGBUILD b/community/xvidcap/PKGBUILD index f2ed215bb..52f8f4622 100644 --- a/community/xvidcap/PKGBUILD +++ b/community/xvidcap/PKGBUILD @@ -6,7 +6,7 @@ pkgname=xvidcap pkgver=1.1.7 -pkgrel=3 +pkgrel=4 pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video" arch=("i686" "x86_64" 'mips64el') license=('GPL') @@ -15,7 +15,8 @@ depends=('dbus-glib' 'lame' 'libxmu' 'libglade' 'ffmpeg' 'dbus') makedepends=('perlxml' 'rarian') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'xextproto-7.1.1.patch' - 'xvidcap-ffmpeg.patch') + 'xvidcap-ffmpeg.patch' + 'ffmpeg-0.8.patch') md5sums=('b39a682d3ef9fcbf424af771936780e2' 'fbde2b076c5ea05723883b87f3ef2a65' 'f18817da1c0dada05fa791ae53193b2c') @@ -24,14 +25,26 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch - patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch || return 1 + patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch + patch -Np1 -i ${srcdir}/ffmpeg-0.8.patch ./configure --prefix=/usr \ --with-x \ --with-gtk2 \ --enable-libmp3lame \ --without-forced-embedded-ffmpeg - make || return 1 - make prefix=${pkgdir}/usr install || return 1 + make } +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir}/usr install +} +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c' + '36ead5f0345ae776601d49c1c90cb101') +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c' + '6e4dfab56b877362757092f55ad6b337') diff --git a/community/xvidcap/ffmpeg-0.8.patch b/community/xvidcap/ffmpeg-0.8.patch new file mode 100644 index 000000000..511333a0f --- /dev/null +++ b/community/xvidcap/ffmpeg-0.8.patch @@ -0,0 +1,82 @@ +diff -aur xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7.new/src/xtoffmpeg.c +--- xvidcap-1.1.7/src/xtoffmpeg.c 2008-05-25 22:01:54.000000000 +0000 ++++ xvidcap-1.1.7.new/src/xtoffmpeg.c 2011-10-31 20:41:08.259171263 +0000 +@@ -361,7 +361,7 @@ + } + // put sample parameters + au_c->codec_id = xvc_audio_codecs[job->au_targetCodec].ffmpeg_id; +- au_c->codec_type = CODEC_TYPE_AUDIO; ++ au_c->codec_type = AVMEDIA_TYPE_AUDIO; + au_c->bit_rate = target->sndsize; + au_c->sample_rate = target->sndrate; + au_c->channels = target->sndchannels; +@@ -567,7 +567,7 @@ + av_rescale_q (enc->coded_frame->pts, enc->time_base, + ost->st->time_base); + } +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ost->st->index; + + pkt.data = audio_out; +@@ -627,7 +627,7 @@ + pkt.pts = + av_rescale_q (enc->coded_frame->pts, enc->time_base, + ost->st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + av_interleaved_write_frame (s, &pkt); + } + +@@ -681,7 +681,7 @@ + if (ret <= 0) { + ret = avcodec_encode_audio (enc, bit_buffer, bit_buffer_size, NULL); + } +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + if (samples) { + av_free (samples); +@@ -905,7 +905,7 @@ + ost->time_base); + } + if (enc->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + + pkt.stream_index = ost->index; +@@ -1157,7 +1157,7 @@ + } + + st->codec->codec_id = codec_id; +- st->codec->codec_type = CODEC_TYPE_VIDEO; ++ st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + + // find the video encoder + codec = avcodec_find_encoder (st->codec->codec_id); +@@ -1439,13 +1439,13 @@ + // guess AVOutputFormat + if (job->target >= CAP_MF) + file_oformat = +- guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); ++ av_guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); + else { + char tmp_fn[30]; + + snprintf (tmp_fn, 29, "test-%%d.%s", + xvc_formats[job->target].extensions[0]); +- file_oformat = guess_format (NULL, tmp_fn, NULL); ++ file_oformat = av_guess_format (NULL, tmp_fn, NULL); + } + if (!file_oformat) { + fprintf (stderr, +@@ -1466,7 +1466,7 @@ + #endif // DEBUG + + // prepare AVFormatContext +- output_file = av_alloc_format_context (); ++ output_file = avformat_alloc_context(); + if (!output_file) { + fprintf (stderr, + _ diff --git a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch new file mode 100644 index 000000000..4420d0b63 --- /dev/null +++ b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Sun, 19 Jun 2011 16:04:25 -0500 +Subject: [PATCH] Set hostname via /proc if file is available + +On Linux, the hostname can be set via this file if available, precluding +the need for a `hostname` binary. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + dhcpcd-hooks/30-hostname | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname +index 65d1a13..af94262 100644 +--- a/dhcpcd-hooks/30-hostname ++++ b/dhcpcd-hooks/30-hostname +@@ -21,7 +21,11 @@ need_hostname() + try_hostname() + { + if valid_domainname "$1"; then +- hostname "$1" ++ if [ -w /proc/sys/kernel/hostname ]; then ++ echo "$1" > /proc/sys/kernel/hostname ++ else ++ hostname "$1" ++ fi + else + syslog err "Invalid hostname: $1" + fi +-- +1.7.5.4 + diff --git a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch new file mode 100644 index 000000000..7e78ecd0d --- /dev/null +++ b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Tue, 21 Jun 2011 09:32:47 -0400 +Subject: [PATCH] set MTU via sysfs if file is available + +On Linux, a network interface's MTU can be set by writing to +/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. + +Signed-off-by: Dave Reisner <d@falconindy.com> +--- + dhcpcd-hooks/10-mtu | 4 ++-- + dhcpcd-run-hooks.in | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu +index 639697c..8763930 100644 +--- a/dhcpcd-hooks/10-mtu ++++ b/dhcpcd-hooks/10-mtu +@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if set_mtu "$interface" "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ set_mtu "$interface" "$mtu" + rm "$mtu_dir/$interface" + fi + fi +diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in +index 0e60338..843f3ca 100644 +--- a/dhcpcd-run-hooks.in ++++ b/dhcpcd-run-hooks.in +@@ -215,6 +215,17 @@ service_condcommand() + service_exists $1 && service_status $1 && service_cmd $1 $2 + } + ++# Set MTU for an interface ++set_mtu() { ++ local interface=$1 mtu=$2 ++ ++ if [ -e /sys/class/net/$interface/mtu ]; then ++ echo "$mtu" > /sys/class/net/$interface/mtu ++ else ++ ifconfig "$interface" mtu "$mtu" ++ fi ++} ++ + # We source each script into this one so that scripts run earlier can + # remove variables from the environment so later scripts don't see them. + # Thus, the user can create their dhcpcd.enter/exit-hook script to configure +-- +1.7.5.4 + diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ab53755ab..75477bfeb 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 118799 2011-04-07 19:53:44Z ronald $ +# $Id: PKGBUILD 142553 2011-11-12 07:19:26Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd pkgver=5.2.12 -pkgrel=1 +pkgrel=4 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" arch=('i686' 'x86_64' 'mips64el') @@ -15,13 +15,20 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') + 'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \ + '0001-set-MTU-via-sysfs-if-file-is-available.patch') sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + 'ee85adac972a8172a9d9b3a1bdd46e0430301582' + 'afbed18dc5544f7d0b81e2266b322ca12becf9a4') build() { cd ${srcdir}/${pkgname}-${pkgver} + # remove net-tools dep + patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch + patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch + # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd diff --git a/core/dhcpcd/remove_ifconfig.patch b/core/dhcpcd/remove_ifconfig.patch new file mode 100644 index 000000000..5bcc4a68f --- /dev/null +++ b/core/dhcpcd/remove_ifconfig.patch @@ -0,0 +1,20 @@ +--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 ++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 +@@ -7,7 +7,7 @@ + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if ip link set "$interface" mtu "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ ip link set "$interface" mtu "$new_interface_mtu" + rm "$mtu_dir/$interface" + fi + fi diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index fd861bd2f..075b45073 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140832 2011-10-20 05:41:08Z ibiru $ +# $Id: PKGBUILD 142720 2011-11-13 20:52:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.30.1 +pkgver=2.30.2 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9' +sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD index bc305d6cc..662e6e13b 100644 --- a/core/hdparm/PKGBUILD +++ b/core/hdparm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111559 2011-02-27 18:01:17Z tpowa $ +# $Id: PKGBUILD 142539 2011-11-11 21:16:42Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm pkgver=9.37 -pkgrel=1 +pkgrel=2 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64 'mips64el') depends=('glibc') diff --git a/core/idnkit/PKGBUILD b/core/idnkit/PKGBUILD index ad97b1283..74b1cb6b5 100644 --- a/core/idnkit/PKGBUILD +++ b/core/idnkit/PKGBUILD @@ -1,13 +1,15 @@ +# $Id: PKGBUILD 142702 2011-11-13 10:10:08Z bisson $ # Contributor: Igor Nemilentsev <trezorg@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=idnkit pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Provides functionalities about Internationalized Domain Name processing' -arch=('i686' 'x86_64' 'mips64el') url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') +depends=('glibc') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') @@ -27,8 +29,14 @@ build() { make } +check() { + cd "${srcdir}/idnkit-${pkgver}-src" + make check +} + package() { cd "${srcdir}/idnkit-${pkgver}-src" make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm "${pkgdir}"/etc/*.sample } diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD index 767fddecf..ac25efcb1 100644 --- a/core/ifenslave/PKGBUILD +++ b/core/ifenslave/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 108480 2011-01-31 14:27:02Z dan $ +# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $ # Maintainer: # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ifenslave pkgver=1.1.0 -pkgrel=6 -pkgdesc="Utility for bonding ethernet interfaces" +pkgrel=7 +pkgdesc='Utility for bonding ethernet interfaces' arch=('i686' 'x86_64' 'mips64el') -url="http://www.linuxfoundation.org/en/Net:Bonding" +url='http://www.linuxfoundation.org/en/Net:Bonding' license=('GPL2') depends=('glibc') makedepends=('linux-api-headers') backup=('etc/conf.d/bonding') -source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=2bac96' - bonding.conf.d) -md5sums=('41a23dc9ac3522ac2af23396ba70bcc4' - '397fccbf574d5082c7a3c8d3793dc000') +source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf' + 'bonding.conf.d') +sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73' + '6843971c0254768868b556af33289d7d32d6208d') build() { - cd $srcdir - gcc -Wall -Wstrict-prototypes $CFLAGS $LDFLAGS ifenslave.c -o ifenslave + cd "${srcdir}" + gcc -Wall -Wstrict-prototypes ${CFLAGS} ${LDFLAGS} ifenslave.c -o ifenslave } package() { - cd $srcdir - install -Dm755 ifenslave $pkgdir/sbin/ifenslave - install -Dm644 bonding.conf.d $pkgdir/etc/conf.d/bonding + cd "${srcdir}" + install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave + install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding } diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD index e459b8bf5..792ecf9c2 100644 --- a/core/run-parts/PKGBUILD +++ b/core/run-parts/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 136455 2011-08-29 16:51:36Z pierre $ +# $Id: PKGBUILD 142725 2011-11-13 21:03:15Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.0.2 +pkgver=4.0.4 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64' 'mips64el') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") -sha256sums=('c2fca92e93437ea5f0904f12847779d67b13d4b9d6ca85b8213e678a03ed76dc') +source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('9a14722c7422c6d16f30c80b74201d9c803beeef2bb4c004964d0979eaa1232f') build() { cd $srcdir/debianutils-$pkgver diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD index d33e59680..0d725bfb3 100644 --- a/core/sysfsutils/PKGBUILD +++ b/core/sysfsutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108847 2011-02-04 11:49:39Z stephane $ +# $Id: PKGBUILD 142543 2011-11-11 21:17:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=sysfsutils pkgver=2.1.0 -pkgrel=6 +pkgrel=7 pkgdesc="System Utilities Based on Sysfs" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') @@ -20,6 +20,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 552b96cf9..8401ed2a9 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131821 2011-07-15 23:50:00Z dan $ +# $Id: PKGBUILD 142541 2011-11-11 21:16:44Z tpowa $ # Maintainer: # Contributor: Judd <jvinet@zeroflux.org> pkgname=xinetd pkgver=2.3.14 -pkgrel=7 +pkgrel=8 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64' 'mips64el') url="http://www.xinetd.org/" diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 11aed0c85..f1470b1d9 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122044 2011-05-02 00:18:38Z heftig $ +# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') url="http://www.alsa-project.org" diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 2dbf5d668..cf0bb42f2 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134019 2011-08-01 10:23:47Z andrea $ +# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.4.3 -pkgrel=1 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index c48d39b3c..3c6a33eec 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141482 2011-10-30 18:13:40Z giovanni $ +# $Id: PKGBUILD 142567 2011-11-12 08:25:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10648 +pkgver=10674 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('dc9d4bbe4b1b2fd263e98d32e71f6284') +md5sums=('3557fb22e7ca7d973414d7eedfbbb79f') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 73b0cd341..6d8566651 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 142398 2011-11-09 01:26:09Z bisson $ +# $Id: PKGBUILD 142549 2011-11-11 23:52:56Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious pkgver=3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' url='http://audacious-media-player.org/' license=('GPL3') arch=('i686' 'x86_64' 'mips64el') -depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' +depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('p7zip-libre: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") @@ -22,8 +22,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - [[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2' - ./configure --prefix=/usr ${_extraopts} + ./configure --prefix=/usr make } diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index a0ecb58ef..9e33a4c91 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140069 2011-10-06 07:33:44Z ibiru $ +# $Id: PKGBUILD 142664 2011-11-12 17:45:03Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=4 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -98,7 +98,7 @@ package_avidemux-gtk() { package_avidemux-qt() { pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') + depends=("avidemux-cli=${pkgver}" 'qt') install=avidemux.install cd "${srcdir}/${pkgbase}_${pkgver}" diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 4f63eeece..ed99212ff 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138192 2011-09-18 13:23:24Z bisson $ +# $Id: PKGBUILD 142478 2011-11-10 14:19:09Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=4 +pkgrel=5 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' @@ -15,9 +15,11 @@ license=('GPL') depends=('openssl' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" + 'msn.patch' 'xinetd' 'rc.d') sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' + 'e5880344ff96e6f061d850e7207f5f0bb31fb82b' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' 'be09d29af3853825778331df451f16ca9e452d03') @@ -26,6 +28,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../msn.patch ./configure --prefix=/usr \ --etcdir=/etc/bitlbee \ diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch new file mode 100644 index 000000000..e126784bf --- /dev/null +++ b/extra/bitlbee/msn.patch @@ -0,0 +1,29 @@ +--- bitlbee-3.0.3.old/protocols/msn/soap.h 2011-06-12 08:53:51.000000000 -0300 ++++ bitlbee-3.0.3/protocols/msn/soap.h 2011-11-09 21:35:56.000000000 -0200 +@@ -115,7 +115,7 @@ int msn_soapq_flush( struct im_connectio + "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \ + "<wsp:AppliesTo>" \ + "<wsa:EndpointReference>" \ +- "<wsa:Address>contacts.msn.com</wsa:Address>" \ ++ "<wsa:Address>local-bay.contacts.msn.com</wsa:Address>" \ + "</wsa:EndpointReference>" \ + "</wsp:AppliesTo>" \ + "<wsse:PolicyReference xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI\"></wsse:PolicyReference>" \ +@@ -198,7 +198,7 @@ int msn_soap_oim_send_queue( struct im_c + "</soap:Body>" \ + "</soap:Envelope>" + +-#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx" ++#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx" + #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership" + + #define SOAP_MEMLIST_PAYLOAD \ +@@ -233,7 +233,7 @@ int msn_soap_memlist_request( struct im_ + int msn_soap_memlist_edit( struct im_connection *ic, const char *handle, gboolean add, int list ); + + +-#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx" ++#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx" + #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll" + + #define SOAP_ADDRESSBOOK_PAYLOAD \ diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 7f7524a58..5c8ff5b77 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141279 2011-10-28 02:04:28Z eric $ +# $Id: PKGBUILD 142616 2011-11-12 17:15:07Z ibiru $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -13,7 +13,7 @@ _svn=false pkgname=blender pkgver=2.60a -pkgrel=1 +pkgrel=2 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index beb0e41cc..3e826570a 100644 --- a/extra/cmus/PKGBUILD +++ b/extra/cmus/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 132775 2011-07-26 00:10:12Z eric $ +# $Id: PKGBUILD 142618 2011-11-12 17:15:10Z ibiru $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' +makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 83a0afe72..fb496e309 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 139601 2011-10-03 17:47:38Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142485 2011-11-10 18:57:46Z ronald $ +# Maintainer: Andrea Scarpino <ronald@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.2.0 -pkgrel=1 +pkgver=2.3.0 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('be6100de4961a8cb99a8d9d1688a0460') +sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee') build() { cd "${srcdir}" @@ -43,6 +44,10 @@ package_digikam() { make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/po make DESTDIR="${pkgdir}" install + + # these are in oxygen-icons + rm -rf ${pkgdir}/usr/share/icons + } package_libkface() { @@ -80,7 +85,7 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson' 'libkvkontakte') + 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') optdepends=('libkgeomap' 'libmediawiki' 'libgpod' diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index cf1cbcd38..8f5fe461c 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140859 2011-10-20 05:42:04Z ibiru $ +# $Id: PKGBUILD 142650 2011-11-12 17:18:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 4d18d7f6b..b6ff5f5b8 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z ibiru $ +# $Id: PKGBUILD 142620 2011-11-12 17:15:14Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20111003 -pkgrel=1.1 +pkgver=20111108 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" license=('GPL') if [ "${CARCH}" = "mips64el" ] ; then - depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libxfixes' 'schroedinger' 'libvpx' 'openjpeg' 'rtmpdump') + depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libxfixes' 'schroedinger' 'libvpx' 'openjpeg' 'rtmpdump' 'speex' 'gsm') makedepends=('git' 'pkg-config') else - depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') + depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm') makedepends=('yasm' 'git' 'pkg-config') fi #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('38139817bee918a5664c549adb487468' +md5sums=('bad7e47f6974cee62d98ce9de710076c' '081d03278559a351322157a441fabcf5') build() { @@ -42,6 +42,8 @@ build() { --enable-libx264 \ --enable-libvpx \ --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ --enable-postproc \ --enable-shared \ --enable-x11grab \ diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index dcf15c5e3..568d9f583 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -4,16 +4,16 @@ pkgname=ffmpegthumbnailer pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('ffmpeg' 'libjpeg' 'libpng') optdepends=('gvfs: support for gio uris') -source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz - ffmpegthumbnailer.desktop) -options=(!libtool) +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + 'ffmpegthumbnailer.desktop') +options=('!libtool') sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53') @@ -30,7 +30,5 @@ package() { # FS#24105: Generate thumbnails in nautilus install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \ - ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop + ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop } - - diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index 1b508835d..6f6d25f5e 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 140871 2011-10-20 05:42:16Z ibiru $ +# $Id: PKGBUILD 142520 2011-11-11 10:53:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.6.4.1 +pkgver=0.6.5 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Folks" license=('LGPL2.1') depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') -makedepends=('gobject-introspection' 'vala' 'intltool') +makedepends=('gobject-introspection' 'intltool') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b6cd5e982f4496cbe6370ca31cc85dcdeb6efccc95c1d940e654f8226cd95578') +sha256sums=('86fd13cb32f3e85a96f9bc999616307323c967baddca3f9f3b402f23629bd5ee') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD new file mode 100644 index 000000000..bb5c2d2b5 --- /dev/null +++ b/extra/fprintd/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 142462 2011-11-10 09:32:21Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Nikolay Rysev <mad.f3ka@gmail.com> + +pkgname=fprintd +pkgver=0.4.1 +pkgrel=3 +pkgdesc="D-Bus service to access fingerprint readers" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/fprint/fprintd" +license=(GPL) +depends=(libfprint dbus-glib polkit) +makedepends=(intltool gtk-doc) +groups=(fprint) +options=(!libtool) +_snap=V_${pkgver//./_} +source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2) +md5sums=('58fcac035c181dce8f49c374181aa2ae') + +build() { + cd "$srcdir/$_snap" + ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --disable-static + make +} + +package() { + cd "$srcdir/$_snap" + make DESTDIR="$pkgdir" pammoddir="/lib/security" install +} diff --git a/extra/gegl/0.1.6-ffmpeg.patch b/extra/gegl/0.1.6-ffmpeg.patch new file mode 100644 index 000000000..51fb95d28 --- /dev/null +++ b/extra/gegl/0.1.6-ffmpeg.patch @@ -0,0 +1,33 @@ +diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c +--- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 ++++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 +@@ -69,17 +69,17 @@ + { + switch (err) + { +- case AVERROR_NUMEXPECTED: ++ case AVERROR(EDOM): + g_warning ("%s: Incorrect image filename syntax.\n" + "Use '%%d' to specify the image number:\n" + " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" + " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", + filename); + break; +- case AVERROR_INVALIDDATA: ++ case AVERROR(EINVAL): + g_warning ("%s: Error while parsing header\n", filename); + break; +- case AVERROR_NOFMT: ++ case AVERROR(EILSEQ): + g_warning ("%s: Unknown format\n", filename); + break; + default: +@@ -278,7 +278,7 @@ + for (i = 0; i< p->ic->nb_streams; i++) + { + AVCodecContext *c = p->ic->streams[i]->codec; +- if (c->codec_type == CODEC_TYPE_VIDEO) ++ if (c->codec_type == AVMEDIA_TYPE_VIDEO) + { + p->video_st = p->ic->streams[i]; + p->video_stream = i; diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 2d99183f7..808942a8a 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 110564 2011-02-20 03:00:42Z eric $ +# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl pkgver=0.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" license=('GPL3' 'LGPL3') -depends=('babl' 'libpng' 'libjpeg' 'gtk2') +depends=('babl' 'gtk2') makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') optdepends=('openexr: for using the openexr plugin' \ 'ffmpeg: for using the ffmpeg plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('af5e5a7d3c7ddfaa2b3414de2a7e9113') -sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ + 0.1.6-ffmpeg.patch) +sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' + 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index ebb9bf7df..13e2761f2 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142365 2011-11-08 21:23:02Z andyrtr $ +# $Id: PKGBUILD 142708 2011-11-13 11:53:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.7 +pkgver=3.0.8 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') [ "$CARCH" = "mips64el" ] || makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('840c96c75817c0f800a47805e275db7e') +md5sums=('bce40a4e9bec343b266707eb9819132b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index 24954127d..fab274a09 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,42 +1,39 @@ -# $Id: PKGBUILD 137743 2011-09-10 14:59:36Z pierre $ +# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> -pkgbase=graphite -pkgname=('libgraphite' 'pango-graphite') -pkgver=2.3.1 -pkgrel=2 +pkgname=graphite +pkgver=1.0.3 +pkgrel=1 +epoch=1 arch=('i686' 'x86_64' 'mips64el') url="http://graphite.sil.org/" -makedepends=('pango' 'gcc-libs') +pkgdesc='reimplementation of the SIL Graphite text processing engine' +license=('custom_SIL Dual license') +depends=('gcc-libs') +makedepends=('cmake' 'freetype2') options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz") -md5sums=('d35724900f6a4105550293686688bbb3') +source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") +md5sums=('3bf481ca95109b14435125c0dd1f2217') build() { - cd "${srcdir}/silgraphite-${pkgver}" - ./configure --prefix=/usr --disable-static + cd "${srcdir}" + mkdir build + cd build + cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr make } -package_libgraphite() { - pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers' - license=('custom_SIL Dual license') - depends=('gcc-libs') +check() { + cd "${srcdir}"/build + ctest +} - cd "${srcdir}/silgraphite-${pkgver}"/engine +package() { + cd "${srcdir}"/build make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} - install -m644 license/*.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ -} - -package_pango-graphite() { - pkgdesc="SILGraphite support for pango" - license=('LGPL') - depends=('pango' 'libgraphite') - install=pango-graphite.install - - cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite - make DESTDIR="$pkgdir/" install + install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/ } diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 0ddce1182..080217834 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140071 2011-10-06 07:33:46Z ibiru $ +# $Id: PKGBUILD 142666 2011-11-12 17:45:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 198a7c697..67d84ecd1 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140923 2011-10-20 05:43:38Z ibiru $ +# $Id: PKGBUILD 142534 2011-11-11 18:06:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.7 +pkgver=2.24.8 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz xid-collision-debug.patch) -sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994' +sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index dcea02a80..bd92b9825 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140925 2011-10-20 05:43:41Z ibiru $ +# $Id: PKGBUILD 142690 2011-11-12 18:51:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,13 @@ makedepends=('gobject-introspection') options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3' +sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { - cd "${srcdir}/gtk+-${pkgver}" + cd "$srcdir/gtk+-$pkgver" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -31,8 +31,8 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/gtk+-$pkgver" + make DESTDIR="$pkgdir" install - install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini" + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 78479b8ab..4bbc11f02 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140573 2011-10-17 08:14:49Z jgc $ +# $Id: PKGBUILD 142652 2011-11-12 17:18:29Z ibiru $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=3 +pkgrel=4 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index a8836e6e5..9f1e4287e 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 106655 2011-01-17 20:23:05Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: jlvsimoes +# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=k3b pkgver=2.0.2 -pkgrel=1 -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' - 'shared-mime-info' 'libxft') -makedepends=('cmake' 'pkgconfig' 'automoc4' ) +pkgrel=4 pkgdesc="Feature-rich and easy to handle CD burning application" -url="http://k3b.sourceforge.net/" arch=("i686" "x86_64" 'mips64el') +url="http://k3b.org/" license=('GPL') -install="${pkgname}.install" +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') optdepends=('dvd+rw-tools: for dvd burning support' - 'vcdimager: for vcd burning support' - 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support') + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b') build() { cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -33,7 +35,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } -md5sums=('c86113af31a2032e57fd2f302b5f637a') diff --git a/extra/k3b/k3b-2.0.2-ffmpeg.patch b/extra/k3b/k3b-2.0.2-ffmpeg.patch new file mode 100644 index 000000000..2878b1edc --- /dev/null +++ b/extra/k3b/k3b-2.0.2-ffmpeg.patch @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek <michalm@jabster.pl> +Date: Sun Aug 28 20:18:53 2011 +0200 + + Fixed compilation with new FFMPEG + + BUG: 274817 + FIXED-IN: 2.0.3 + +diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +index 0ad59fc..0c5f366 100644 +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif ++ { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } +@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const + QString K3bFFMpegFile::title() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->title[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->title ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const + QString K3bFFMpegFile::author() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->author[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->author ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const + QString K3bFFMpegFile::comment() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->comment[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->comment ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( + #else ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ int len = ::avcodec_decode_audio3( ++ #else + int len = ::avcodec_decode_audio2( ++ #endif + #endif ++ + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else +@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() + #endif + (short*)d->alignedOutputBuffer, + &d->outputBufferSize, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ &d->packet ); ++#else + d->packetData, d->packetSize ); ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); diff --git a/extra/k3b/k3b.install b/extra/k3b/k3b.install index a60d358ce..413ad60f7 100644 --- a/extra/k3b/k3b.install +++ b/extra/k3b/k3b.install @@ -1,12 +1,13 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 14a8e541e..d7207015d 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141755 2011-11-02 18:12:20Z andrea $ +# $Id: PKGBUILD 142565 2011-11-12 08:14:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt pkgver=4.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index cd59d8d24..cde1482de 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141867 2011-11-02 18:15:28Z andrea $ +# $Id: PKGBUILD 142628 2011-11-12 17:15:23Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') pkgver=4.7.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 56a5e6907..01d3dad85 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $ +# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,29 +37,30 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=9 +pkgrel=11 arch=('i686' 'x86_64' 'mips64el') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons') + 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf') [ "$CARCH" = "mips64el" ] && \ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'libkdcraw' 'oxygen-icons') + 'libwpg' 'libkdcraw' 'oxygen-icons' 'libgsf') groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch') + 'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch') sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') - + 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739' + 'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa') build() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" patch -p1 -i "${srcdir}"/gcc46.patch + patch -p1 -i "${srcdir}"/qt48fix.patch cd "${srcdir}" mkdir build @@ -75,8 +76,8 @@ build() { package_koffice-filters(){ pkgdesc="Filters for the KDE office suite" - depends=('shared-mime-info') - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + depends=('shared-mime-info' 'libgsf') + optdepends=('libwpd: WordPerfect document importer' 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' 'libkdcraw: support for raw images' 'poppler: support for pdf' 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch new file mode 100644 index 000000000..de72926d5 --- /dev/null +++ b/extra/koffice/qt48fix.patch @@ -0,0 +1,10 @@ +--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-02-17 13:10:38.000000000 +0100 ++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-09-08 15:03:31.932039128 +0200 +@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh + << "visible="<<ba.isVisible() + << "brush="<<ba.brush() + << "pixmapmode="<<ba.pixmapMode() +- << "pixmap="<<ba.pixmap() + << ")"; + return dbg; + } diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index 05f8f1873..a3c3ed9e2 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 105372 2011-01-08 12:01:40Z tpowa $ +# $Id: PKGBUILD 142630 2011-11-12 17:15:25Z ibiru $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=kradio pkgver=4.0.2 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -pkgdesc="KRadio is a comfortable KDE radio application" +pkgdesc="A comfortable KDE radio application" url="http://kradio.sourceforge.net/" -depends=('lame' 'kdelibs' 'libsndfile' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('pkgconfig' 'automoc4') -source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2) +depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') +makedepends=('pkg-config' 'automoc4' 'cmake') +install=kradio.install +source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff) options=(!libtool) build() { - cd $srcdir + cd "$srcdir" + (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff") mkdir build cd build cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release @@ -22,7 +24,9 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$startdir/pkg install + cd "$srcdir/build" + make DESTDIR="$pkgdir" install } -md5sums=('18fea3e2bc7100882075187c6a89f7bd') +md5sums=('18fea3e2bc7100882075187c6a89f7bd' + '5f407eb75536f39e79c77a70613e8704' + '7d31a4f54602bc109f39cc0a7a1dc50c') diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff new file mode 100644 index 000000000..27d224fec --- /dev/null +++ b/extra/kradio/kradio-ffmpeg.diff @@ -0,0 +1,34 @@ +X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988 + +diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp +index 4cd6cc0..c74d6e2 100644 +--- a/plugins/internetradio/decoder_thread.cpp ++++ b/plugins/internetradio/decoder_thread.cpp +@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + + //av_log_set_level(255); + m_av_pFormatCtx = avformat_alloc_context(); +- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); + m_av_pFormatCtx->probesize = m_maxProbeSize; + m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; + +@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_pFormatCtx_opened = true; + } + else { +- + // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); + if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { + if (warningsNotErrors) { +@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_audioStream = -1; + for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { + // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { ++#if LIBAVCODEC_VERSION_MAJOR < 53 + if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream ++#else ++ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream ++#endif + m_av_audioStream = i; + break; + } diff --git a/extra/kradio/kradio.install b/extra/kradio/kradio.install new file mode 100644 index 000000000..af52669f5 --- /dev/null +++ b/extra/kradio/kradio.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD new file mode 100644 index 000000000..e86ec45dc --- /dev/null +++ b/extra/libfprint/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142461 2011-11-10 09:30:27Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=libfprint +pkgver=0.4.0 +pkgrel=1 +pkgdesc="Library for fingerprint readers" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/fprint/libfprint" +license=(LGPL) +depends=(libusb nss gdk-pixbuf2) +groups=(fprint) +options=(!libtool !emptydirs) +_snap=$pkgname-48ec64f68330452b011d14be67653f1d48fb1405 +source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2) +md5sums=('858a0f0d7abd21ac494f9bec904dc156') + +build() { + cd "$srcdir/$_snap" + ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \ + --disable-examples-build --disable-x11-examples-build + make +} + +package() { + cd "$srcdir/$_snap" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/lib/udev/rules.d" + mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" +} diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index e99ef7ae1..aea20a745 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $ +# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -35,16 +35,16 @@ pkgname=('libreoffice-common' 'libreoffice-extension-validator' \ 'libreoffice-extension-watch-window' \ 'libreoffice-extension-wiki-publisher') -_LOver=3.4.3.2 -pkgver=3.4.3 -pkgrel=4 +_LOver=3.4.4.2 +pkgver=3.4.4 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'p7zip-libre' 'xulrunner' 'unixodbc' #'boost' - we use internal one for now that has some gcc4.6 fixes. + 'sane' 'perl-archive-zip' 'zip' 'p7zip-libre' 'xulrunner' 'unixodbc' 'boost' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'vigra' 'libldap' 'libmythes' 'libwpg' 'imagemagick' 'gstreamer0.10-base' @@ -52,17 +52,17 @@ makedepends=( # makedepends # the depends from libreoffice main pkg "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' # 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script 'ttf-dejavu') # to satisfy regression tests - # translate-toolkit - todo move them to extra to allow --with-system-foo builds + # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors [ "${CARCH}" != "mips64el" ] && makedepends+=('hsqldb-java' 'apache-ant' 'beanshell' 'junit' 'mesa' 'java-environment' 'libgl' 'lucene') -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -90,10 +90,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt @@ -108,15 +105,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_ct2n.diff vbahelper.visibility.patch scp2-more-reasonable-file-access-rights.diff - java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842 oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 - poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe - pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b - poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b - build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42 - fix-nobody-temp-dir.patch) + RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -151,28 +142,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) -md5sums=('7c2e73f1197d169519f86efe422e5df9' - '823956297a7e0b7603c585c49bd9fd4e' - '465b3be0e30f88e1139c45d2e2217927' - 'a1d5af5be5eb522c8a24feacbb0161fa' - '8b972e130dfe62eb41d1d71d72de4b76' - 'a6b22494e3a65a3b242ecb896aa7ab48' - 'b7d86f8baee5b31af210cc81785e5676' - 'de6c062d334daab99cf0592aa3568215' - 'df46914d540ef0126cd746d09c68ca2a' - '8f308250c397ddc6fdb1aae13e102927' - '1fd00a0fcfd4a5d1956c3f6a0990d1ce' - '86914ac8bc30ea721b708b2f2faa3111' - '1452229e57ac3c4191e798eac4c0a7e0' - 'bb46bdb682689629d432cdbf5f3f42c2' - 'bec7f633562762debdf810690002e688' - '87061613efece1c253906a90cd4dc01f' - '308284d7d1d1bd6860d128b26e24390b' - 'fa8b36365a2b2fb110c44886d7069774' - 'da8a40cac4bd9d4f6f326e0e3b1b7e2a' + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) +md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' + 'db423cbb1cee416b718138044a5de930' + '31944d2139d6d81ef1131bd513530621' + 'f447fd4ffe54aab9561c6caa262754b3' + '97fe698737a35c8803712d4e08007620' + 'acff44d97a5106d9b53c747dabeb0800' + '620d43a0b9f36388f423e030513864ef' + '4c5b1ed870363eca2602f0cb42a8415a' + '702c6ca31525d7d2c2ded86c77b0bd2e' + 'ac9b3acf78f43c1395d0e2dedc860f30' + 'd8d2c41cb86bc8ba2a07e001a5317abb' + '4d4af2fc06dbe33ec2307df812f7abe1' + '1398a566eb76598bf3005e187fc2386c' + 'dd962d2d57f88b9e07e665adad3cabbc' + 'fff0fc9cd16ef1eb2b2ed5d0a6e77f95' + 'e54d41d39e63d04ac4a88ce79e37af98' + 'dbc71403040f447683bf55d1f0be3cad' + '69ce5b72f44b008d0e78767c5b1dbf39' + '34a2e8ae6b81a042966740263c53e135' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -198,10 +187,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' '18f577b374d60b3c760a3a3350407632' '0ff7d225d087793c8c2c680d77aac3e7' '185d60944ea767075d27247c3162b3bc' - 'b4cae0700aa1c2aef7eb7f345365e6f1' '90401bca927835b6fbae4a707ed187c8' - 'f02578f5218f217a9f20e9c30e119c6a' - '0625a7d661f899a8ce263fc8a9879108' '451ccf439a36a568653b024534669971' '7e7efc5d4a03126bb9ae3ae9aa2c4e87' '41c9b65ad60af4b3255bbecdfef11736' @@ -216,19 +202,14 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' '37638431e7e40baf2e47966ebb9bc0e9' - 'ca6032e86229ae798f3744ae244f5bfe' '3c6c62e77c30649a3dfe73512947cc9a' - '64497be966802e62ffe3282d3facf7b7' - '89ff871e77e10357a976fe9d1ab3a65a' - 'c4cb0d7f2602396a3f4cac55b8a4e308' - 'b8f1fb7f3902d22aeaa2575c6b08a62c' - '3b7187740fb824c19be04f22531c52de') + 'eb35d4c715e0dfc23bbc706996033829') build() { if [ "${CARCH}" != "mips64el" ] ; then unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh extraconf="--enable-opengl --enable-ext-scripting-beanshell --with-system-lucene --with-ant-home=\"/usr/share/java/apache-ant\" --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar --with-java-target-version=1.5 --enable-odk --enable-ext-diagram --enable-ext-google-docs --enable-ext-nlpsolver --enable-ext-report-builder --enable-ext-scripting-javascript --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher" @@ -253,20 +234,15 @@ build() { cd ${srcdir}/build # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_boost.diff + #patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff - patch -Np1 -i ${srcdir}/java-detection.diff patch -Np1 -i ${srcdir}/oracle-recognition.diff - patch -Np1 -i ${srcdir}/poppler-check.diff - patch -Np1 -i ${srcdir}/pdfimport.diff - patch -Np1 -i ${srcdir}/poppler-buildfix.diff - patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff - patch -Np1 -i ${srcdir}/fix-nobody-temp-dir.patch + patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff # Checks if --hash-style is accepted, not if --hash-style=both is accepted. [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk - + # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 # unset CFLAGS @@ -294,7 +270,7 @@ build() { # fi # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -v -f + autoconf -f # non-SMP test build # export MAKEFLAGS="-j1" @@ -311,7 +287,6 @@ build() { --enable-crashdump \ --enable-dbus \ --enable-evolution2\ - --enable-graphite --without-system-graphite \ --enable-gio\ --disable-gnome-vfs\ --disable-kde\ @@ -389,7 +364,7 @@ package_libreoffice-common() { install=${pkgbase}.install depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libxslt' "icu>=4.6" - 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script #'java-runtime' #'saxon' diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 0a4b9a343..99c3de565 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141480 2011-10-30 17:14:30Z giovanni $ +# $Id: PKGBUILD 142561 2011-11-12 07:58:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.10.27 +pkgver=2011.11.08 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('fe776efc25fbb98c6279b97cb9c48006') +md5sums=('962ff6b036247e2abac091a6047eb822') build() { cd ${srcdir}/live diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index e2001bd5a..c83528dd4 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141252 2011-10-27 12:55:01Z juergen $ +# $Id: PKGBUILD 142503 2011-11-10 20:08:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.24.0 -pkgrel=7 +pkgver=5.25.1 +pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('13586c1221bb5f36067a4cce1e6d5fb31e44e41c' +sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 13f0cf3ff..ed4634c49 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 129367 2011-06-27 05:48:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142632 2011-11-12 17:15:28Z ibiru $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Adrià Arrufat <swiftscythe@gmail.com> pkgname=mediastreamer pkgver=2.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') -url="http://www.linphone.org" +url="http://www.linphone.org/" license=('GPL') depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') makedepends=('cmake' 'automoc4') diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 190aa7ddb..e87dc16b8 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142440 2011-11-09 20:39:02Z dan $ +# $Id: PKGBUILD 142481 2011-11-10 15:13:21Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz memcached.conf memcached.sh) changelog=ChangeLog -sha256sums=('854a5fa6dfde478d1bb440498e378bd073f303d51bb82c611001eecdec9b4a79' +sha256sums=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf' '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 2b252e890..5401bfc0a 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136884 2011-09-02 16:14:24Z ronald $ +# $Id: PKGBUILD 142634 2011-11-12 17:15:30Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" @@ -12,15 +12,20 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') makedepends=('pkg-config') install=miro.install -source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840') +options=('!makeflags') +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840' + 'f0c851d51318c0e0be8b91463ef901625d2587a9') build() { - cd "${srcdir}/${pkgname}-${pkgver}/linux" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/ffmpeg.patch" + cd linux python2 setup.py install --root="${pkgdir}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch new file mode 100644 index 000000000..edf378459 --- /dev/null +++ b/extra/miro/ffmpeg.patch @@ -0,0 +1,95 @@ +diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c +--- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200 ++++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200 +@@ -60,7 +60,7 @@ + } + + switch (input_codec_context->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + output_codec_context->channel_layout = input_codec_context->channel_layout; + output_codec_context->sample_rate = input_codec_context->sample_rate; + output_codec_context->channels = input_codec_context->channels; +@@ -72,7 +72,7 @@ + output_codec_context->block_align = input_codec_context->block_align; + } + break; +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + output_codec_context->pix_fmt = input_codec_context->pix_fmt; + output_codec_context->width = input_codec_context->width; + output_codec_context->height = input_codec_context->height; +@@ -154,7 +154,7 @@ + exit(1); + } + +- ofmt = guess_format("mpegts", NULL, NULL); ++ ofmt = av_guess_format("mpegts", NULL, NULL); + if (!ofmt) { + fprintf(stderr, "Could not find MPEG-TS muxer\n"); + exit(1); +@@ -174,12 +174,12 @@ + + for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) { + switch (ic->streams[i]->codec->codec_type) { +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + video_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + video_st = add_output_stream(oc, ic->streams[i]); + break; +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + audio_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + audio_st = add_output_stream(oc, ic->streams[i]); +@@ -195,7 +195,7 @@ + exit(1); + } + +- dump_format(oc, 0, input, 1); ++ av_dump_format(oc, 0, input, 1); + + if (video_st) { + codec = avcodec_find_decoder(video_st->codec->codec_id); +@@ -208,7 +208,7 @@ + } + } + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + exit(1); + } +@@ -234,7 +234,7 @@ + break; + } + +- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) { ++ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) { + segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den; + } + else if (video_index < 0) { +@@ -245,10 +245,10 @@ + } + + if (segment_time - prev_segment_time >= segment_duration) { +- put_flush_packet(oc->pb); +- url_fclose(oc->pb); ++ avio_flush(oc->pb); ++ avio_close(oc->pb); + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + break; + } +@@ -278,7 +278,7 @@ + av_freep(&oc->streams[i]); + } + +- url_fclose(oc->pb); ++ avio_close(oc->pb); + av_free(oc); + + return 0; diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index dbb54a577..9e460b754 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $ +# $Id: PKGBUILD 142636 2011-11-12 17:15:33Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=20110528 -pkgrel=3 +pkgrel=4 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64' 'mips64el') url="http://moc.daper.net/" license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' @@ -18,15 +18,15 @@ optdepends=('speex: for using the speex plugin' 'libmodplug: for using the modplug plugin') options=('!libtool') source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ - gcc-undefined-symbols.diff) -md5sums=('003fd01af2165264eb666040e4f586cd' - 'efacb8559e9145e15b0c25f8fa2a9d79') + gcc-undefined-symbols.diff moc-ffmpeg.patch) sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' - 'a811a4ac7e049914aab528d3f06a6be6634c2720') + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') build() { cd "${srcdir}/${pkgname}" patch -p0 -i ../gcc-undefined-symbols.diff + patch -p0 -i ../moc-ffmpeg.patch # Disabling aac to use the external ffmpeg to play them (FS#13164) ./autogen.sh diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/extra/moc/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include <ffmpeg/avformat.h> + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 68a57c53e..4578958de 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141091 2011-10-23 16:35:52Z dreisner $ +# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> @@ -6,7 +6,7 @@ pkgname=mpd pkgver=0.16.5 -pkgrel=1 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD new file mode 100644 index 000000000..d2c2125af --- /dev/null +++ b/extra/nawk/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 142711 2011-11-13 14:58:31Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=nawk +pkgver=20110810 +pkgrel=3 +pkgdesc="The one, true implementation of AWK" +url="http://cm.bell-labs.com/who/bwk/" +license=('MIT') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('glibc') +source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz" + 'manpage-naming.patch') +md5sums=('a7062ecade93dc4cb39190e48db9a51d' + '8486d387a51fe3b3c9875c4151ad92b4') + +build() { + patch -Np1 < manpage-naming.patch + sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE + + make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS" +} + +package() { + install -Dm755 a.out "$pkgdir/usr/bin/nawk" + install -Dm644 awk.1 "$pkgdir/usr/share/man/man1/nawk.1" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/nawk/LICENSE" +} diff --git a/extra/nawk/manpage-naming.patch b/extra/nawk/manpage-naming.patch new file mode 100644 index 000000000..782f5e427 --- /dev/null +++ b/extra/nawk/manpage-naming.patch @@ -0,0 +1,46 @@ +diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1 +--- ./nawk-20100523.orig/awk.1 2007-03-31 16:56:19.000000000 -0400 ++++ nawk-20100523/awk.1 2010-09-20 21:49:16.840069318 -0400 +@@ -7,13 +7,11 @@ + .fi + .ft 1 + .. +-awk +-.TH AWK 1 +-.CT 1 files prog_other ++.TH NAWK 1 + .SH NAME +-awk \- pattern-directed scanning and processing language ++nawk \- pattern-directed scanning and processing language + .SH SYNOPSIS +-.B awk ++.B nawk + [ + .BI \-F + .I fs +@@ -32,7 +30,7 @@ + .I file ... + ] + .SH DESCRIPTION +-.I Awk ++.I Nawk + scans each input + .I file + for lines that match any of a set of patterns specified literally in +@@ -198,7 +196,6 @@ + .BR atan2 + are built in. + Other built-in functions: +-.TF length + .TP + .B length + the length of its argument +@@ -407,7 +404,6 @@ + do not combine with other patterns. + .PP + Variable names with special meanings: +-.TF FILENAME + .TP + .B CONVFMT + conversion format used when converting numbers + diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 987765ab6..e0e0b19d2 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141897 2011-11-02 20:59:04Z ibiru $ +# $Id: PKGBUILD 142489 2011-11-10 19:42:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,8 +6,8 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.1.95 -pkgrel=2 +pkgver=0.9.2.0 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,10 +15,10 @@ url="http://www.gnome.org/projects/NetworkManager/" depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes') makedepends=('intltool' 'gnome-bluetooth') optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool') +options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc') +sha256sums=('ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 91b1bbe1f..14ca124b2 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141466 2011-10-30 15:23:37Z ibiru $ +# $Id: PKGBUILD 142493 2011-11-10 19:42:06Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('3e48b04a5cfffb3c83bb7b1df77cb015b58e8335c975596a916c7caf1bb87102') +sha256sums=('169094ae93f982a45e4c57fa7226637eb948ae309a2a6ece88e179ce798a86c0') build() { cd "${srcdir}/NetworkManager-openconnect-${pkgver}" diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 7fcd54bed..4a237161d 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141468 2011-10-30 15:23:39Z ibiru $ +# $Id: PKGBUILD 142495 2011-11-10 19:42:11Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('2c988bfcfe8bc011a26cd2e7f58ea528ef6d923d4af74d5c7633dd26d1bb792f') +sha256sums=('a23705a0ece4d9c5438ca7c3905abc25a43aaf3a49cabb9ef21d043c338a2744') build() { cd "${srcdir}/NetworkManager-openvpn-${pkgver}" diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 3e3d6bfff..35f071145 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141470 2011-10-30 15:23:41Z ibiru $ +# $Id: PKGBUILD 142497 2011-11-10 19:42:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('83d432e24f2a6a011068d725591f7a95175a5e68b5b1af398f67db657659ca10') +sha256sums=('2b340db7f63d39aa781099b888d4e3352e8eaa14ec4d46154bf504262fda42ba') build() { cd "${srcdir}/NetworkManager-pptp-${pkgver}" diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 25ccfdab5..d992f7886 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141472 2011-10-30 15:23:43Z ibiru $ +# $Id: PKGBUILD 142499 2011-11-10 19:42:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('92f8d701eef988b68462fd36f8fed0f974aee0b2f1c651d188b5ed67b701ea69') +sha256sums=('d74bda9df11f4d3f0589d08c7f6247dc884de6daa1bab8d9c33636bc09752e40') build() { cd "${srcdir}/NetworkManager-vpnc-${pkgver}" diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 595d0f4c9..cc0193e0b 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141464 2011-10-30 15:23:34Z ibiru $ +# $Id: PKGBUILD 142491 2011-11-10 19:42:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,7 +6,7 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') @@ -18,13 +18,14 @@ optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') + 'bluez: Bluetooth support' + 'openresolv: openresolv support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468' +sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') @@ -44,6 +45,7 @@ build() { --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/lib/systemd/system \ + --with-resolvconf=/usr/sbin/resolvconf \ --disable-static \ --enable-more-warnings=no \ --disable-wimax diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 2e1336805..5486f00ad 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140067 2011-10-06 07:33:41Z ibiru $ +# $Id: PKGBUILD 142672 2011-11-12 17:47:17Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.ekiga.org" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 360db2427..fb2ee89fc 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $ +# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,12 +6,12 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' +depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030' 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') optdepends=('python2-numpy: Python 2.x interface' diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index e79852f0f..234825d30 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,23 +1,33 @@ -# $Id: PKGBUILD 141011 2011-10-21 10:45:03Z ibiru $ +# $Id: PKGBUILD 142670 2011-11-12 17:46:43Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.0 -pkgrel=2 +pkgver=0.18.1 +pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'libtool') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" +_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e) -md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77' - '8f4a296fdd98446858d5ea74d7c496ab') + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 + git-fixes.patch) +md5sums=('d30e883a27423c936ef338ce1d967e2d' + '9dc64c254a31e570507bdd4ad4ba629a' + 'a73ba6515aa73cb20c480692da52c79e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" +<<<<<<< HEAD patch -Np1 -i "${srcdir}/fix_cairo.patch" +======= + sed -i -e '/AC_PATH_XTRA/d' configure.ac + patch -Np1 -i "${srcdir}/git-fixes.patch" + + autoreconf -fi +>>>>>>> 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ @@ -29,6 +39,13 @@ build() { make } +check() { + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} + make check +} + package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch new file mode 100644 index 000000000..a18a31aec --- /dev/null +++ b/extra/poppler/git-fixes.patch @@ -0,0 +1,107 @@ +From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:02:19 +0000 +Subject: pdftocairo: Make sure beginDocument() is always called + +This fixes a crash when rendering only odd/even pages in a printing +format. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index e458ee5..1b67c90 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) { + lastPage = firstPage; + } + ++ // Make sure firstPage is always used so that beginDocument() is called ++ if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ firstPage++; ++ + cairoOut = new CairoOutputDev(); + cairoOut->startDoc(doc->getXRef(), doc->getCatalog()); + if (sz != 0) +-- +cgit v0.9.0.2-2-gbebe +From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:08:46 +0000 +Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable + +This fixes an error in my previous commit. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index 1b67c90..d0d1ec6 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) { + } + + // Make sure firstPage is always used so that beginDocument() is called +- if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1)) + firstPage++; + + cairoOut = new CairoOutputDev(); +-- +cgit v0.9.0.2-2-gbebe +From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Tue, 01 Nov 2011 08:40:53 +0000 +Subject: Fix pkg-config files + +We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ +--- +diff --git a/configure.ac b/configure.ac +index 3a120ca..c4f5b92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then + POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" + + GLIB_REQUIRED=2.18 ++ AC_SUBST(GLIB_REQUIRED) + AC_ARG_ENABLE(poppler-glib, + AC_HELP_STRING([--disable-poppler-glib], + [Don't compile poppler glib wrapper.]), +diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in +index 55a2278..5fcb6f2 100644 +--- a/poppler-glib-uninstalled.pc.in ++++ b/poppler-glib-uninstalled.pc.in +@@ -1,7 +1,7 @@ + Name: poppler-glib + Description: GLib wrapper for poppler - uninstalled + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + + Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/glib +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 3264ed6..e15e669 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -6,7 +6,7 @@ includedir=${prefix}/include + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @POPPLER_VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in +index 04d9bb9..9ba8978 100644 +--- a/poppler-glib.pc.in ++++ b/poppler-glib.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index d8c966d4d..657199f72 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 123072 2011-05-07 23:41:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5.1 -pkgrel=2 +pkgver=2.6 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt') +makedepends=('python2-pyqt' 'chrpath') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('dd7edef5ff674d307057a3c12dbd8fce' +md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' '8cf9c06252e2f11ab00e62848e322fd3') @@ -57,6 +58,9 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -65,4 +69,7 @@ package_python2-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 34b5af780..0078dbeaf 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141249 2011-10-27 10:32:50Z ronald $ +# $Id: PKGBUILD 142507 2011-11-10 20:30:04Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.13.2 +pkgver=2.14.0 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') @@ -20,9 +20,10 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png') install=r.install -sha1sums=('3c8e3055b2d76cf79627325af8846848ca9a7e90' +sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978') + build() { cd ${srcdir}/R-${pkgver} sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD index c5b485f8b..562d2542d 100644 --- a/extra/rest/PKGBUILD +++ b/extra/rest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141264 2011-10-27 16:23:45Z ibiru $ +# $Id: PKGBUILD 142505 2011-11-10 20:16:20Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=rest -pkgver=0.7.11 +pkgver=0.7.12 pkgrel=1 pkgdesc="A helper library for RESTful services." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'libxml2' 'libsoup-gnome') makedepends=('gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('3a57a56433761c87ccdbfe6d57119361dc004286356c12815dc7a22b7b315490') +sha256sums=('16ffa4929078dabfcfac31f9ce942072ebab67e3339ce9f378127457b03baf3a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index b2c5880a7..bb080bc93 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $ +# $Id: PKGBUILD 142547 2011-11-11 23:39:40Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=11.06 +pkgver=11.11 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('77ab43d06de53ace338843ff82e26288') +md5sums=('1db7bb5289f08e634e2f1207ae163ad7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 577657653..a0e982625 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $ +# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') -depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' @@ -17,12 +17,14 @@ optdepends=('libao: for ao plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee') -sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + sox-14.3.2-ffmpeg.patch) +sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' + '86caa6aa86a0bf7a048522114d4efd11acbbda70') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch new file mode 100644 index 000000000..5289b9b47 --- /dev/null +++ b/extra/sox/sox-14.3.2-ffmpeg.patch @@ -0,0 +1,40 @@ +Index: sox-14.3.2/src/ffmpeg.c +=================================================================== +--- sox-14.3.2.orig/src/ffmpeg.c ++++ sox-14.3.2/src/ffmpeg.c +@@ -91,7 +91,7 @@ static int stream_component_open(priv_t + + if (!codec || avcodec_open(enc, codec) < 0) + return -1; +- if (enc->codec_type != CODEC_TYPE_AUDIO) { ++ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); + return -1; + } +@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) + /* Find audio stream (FIXME: allow different stream to be selected) */ + for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { + AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; +- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { ++ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { + ffmpeg->audio_index = i; + break; + } +@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo + + c = st->codec; + c->codec_id = codec_id; +- c->codec_type = CODEC_TYPE_AUDIO; ++ c->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + c->bit_rate = 256000; /* FIXME: allow specification */ +@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t + av_init_packet(&pkt); + pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); + pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ffmpeg->audio_st->index; + pkt.data = ffmpeg->audio_buf_aligned; + diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index a8328580f..5ea251f2b 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131054 2011-07-09 22:10:28Z ronald $ +# $Id: PKGBUILD 142487 2011-11-10 19:40:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64" 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' +sha1sums=('e721a9cef0c736354c477fdb25cce607a9a3b52e' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') @@ -36,6 +36,3 @@ package() { install -Dm644 ${srcdir}/stellarium.png \ ${pkgdir}/usr/share/pixmaps/stellarium.png } -sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' - 'c9cc79212542238227b5bd6af99f60fe056f4ab2' - 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index e594a1500..699f9ef42 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 128924 2011-06-25 14:08:35Z allan $ +# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl -pkgver=8.5.10 +pkgver=8.5.11 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') -depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('a08eaf8467c0631937067c1948dd326b') +md5sums=('b01a9691c83990b3db0ce62d1012ca67') build() { cd ${srcdir}/tcl${pkgver}/unix @@ -25,6 +24,11 @@ build() { make } +#check() { +# cd ${srcdir}/tcl${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tcl${pkgver}/unix diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index f10e33200..ef1c58f8e 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128929 2011-06-25 14:10:32Z allan $ +# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.10 +pkgver=8.5.11 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('adfdaca46cc95fec8557df8ecdb0715c') +md5sums=('b61b72f0aad230091b100746f078b8f1') build() { cd ${srcdir}/tk${pkgver}/unix @@ -25,6 +25,11 @@ build() { make } +#check() { +# cd ${srcdir}/tk${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tk${pkgver}/unix diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 574fd836c..e1d3d72ae 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141260 2011-10-27 15:31:43Z heftig $ +# $Id: PKGBUILD 142660 2011-11-12 17:18:45Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgbase=tracker pkgname=(tracker libtracker-sparql) pkgver=0.12.7 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(mips64el) license=('GPL') diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 3b7ff35df..be7152f11 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137997 2011-09-13 21:30:20Z eric $ +# $Id: PKGBUILD 142644 2011-11-12 17:15:42Z ibiru $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,31 +6,29 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.5 -pkgrel=6 +pkgrel=7 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" license=('GPL') -depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' +depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') makedepends=('nasm') options=('!libtool' '!makeflags') source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch) -md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' - 'c0bd49a88f667c68c4430ad25bbed510' - 'af4056b7530a6f147594f676849e7c7b' - 'c299cfc6c4be6a5512d1a129f04e5450') + transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch) sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' - '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2' + '2d3bb4486394ee55540e772f134e193874e5c2b4') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 < ../transcode-1.1.5-jpeg-7.patch patch -p1 < ../transcode-1.1.5-mpa.patch + patch -p1 < ../transcode-1.1.5-ffmpeg.patch # building from here ./configure --prefix=/usr \ diff --git a/extra/transcode/transcode-1.1.5-ffmpeg.patch b/extra/transcode/transcode-1.1.5-ffmpeg.patch new file mode 100644 index 000000000..86e8272e9 --- /dev/null +++ b/extra/transcode/transcode-1.1.5-ffmpeg.patch @@ -0,0 +1,124 @@ +Index: transcode-1.1.5/encode/encode_lavc.c +=================================================================== +--- transcode-1.1.5.orig/encode/encode_lavc.c ++++ transcode-1.1.5/encode/encode_lavc.c +@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa + /* + * context *transcode* (not libavcodec) defaults + */ +- pd->ff_vcontext.mb_qmin = 2; +- pd->ff_vcontext.mb_qmax = 31; + pd->ff_vcontext.max_qdiff = 3; + pd->ff_vcontext.max_b_frames = 0; + pd->ff_vcontext.me_range = 0; +@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri + // handled by transcode core + // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + // handled by transcode core +- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, +- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +Index: transcode-1.1.5/export/aud_aux.c +=================================================================== +--- transcode-1.1.5.orig/export/aud_aux.c ++++ transcode-1.1.5/export/aud_aux.c +@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- + memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all +- mpa_ctx.codec_type = CODEC_TYPE_AUDIO; ++ mpa_ctx.codec_type = AVMEDIA_TYPE_AUDIO; + mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. + mpa_ctx.channels = vob->dm_chan; // channels + mpa_ctx.sample_rate = vob->a_rate; +Index: transcode-1.1.5/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.5.orig/export/export_ffmpeg.c ++++ transcode-1.1.5/export/export_ffmpeg.c +@@ -643,8 +643,6 @@ MOD_init + + lavc_venc_context->bit_rate = vob->divxbitrate * 1000; + lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; +- lavc_venc_context->mb_qmin = lavc_param_mb_qmin; +- lavc_venc_context->mb_qmax = lavc_param_mb_qmax; + lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); + lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); + lavc_venc_context->max_qdiff = lavc_param_vqdiff; +Index: transcode-1.1.5/import/decode_lavc.c +=================================================================== +--- transcode-1.1.5.orig/import/decode_lavc.c ++++ transcode-1.1.5/import/decode_lavc.c +@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode) + + //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read); + do { +- len = avcodec_decode_video(lavc_dec_context, &picture, +- &got_picture, buffer+buf_len, mp4_size-buf_len); ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = buffer+buf_len; ++ pkt.size = mp4_size-buf_len; ++ len = avcodec_decode_video2(lavc_dec_context, &picture, ++ &got_picture, &pkt); + + if (len < 0) { + tc_log_error(__FILE__, "frame decoding failed"); +Index: transcode-1.1.5/import/probe_ffmpeg.c +=================================================================== +--- transcode-1.1.5.orig/import/probe_ffmpeg.c ++++ transcode-1.1.5/import/probe_ffmpeg.c +@@ -47,7 +47,7 @@ static void translate_info(const AVForma + for (i = 0; i < ctx->nb_streams; i++) { + st = ctx->streams[i]; + +- if (st->codec->codec_type == CODEC_TYPE_VIDEO) { ++ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + info->bitrate = st->codec->bit_rate / 1000; + info->width = st->codec->width; + info->height = st->codec->height; +@@ -65,7 +65,7 @@ static void translate_info(const AVForma + for (i = 0; i < ctx->nb_streams; i++) { + st = ctx->streams[i]; + +- if (st->codec->codec_type == CODEC_TYPE_AUDIO ++ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO + && j < TC_MAX_AUD_TRACKS) { + info->track[j].format = 0x1; /* known wrong */ + info->track[j].chan = st->codec->channels; +Index: transcode-1.1.5/export/ffmpeg_cfg.c +=================================================================== +--- transcode-1.1.5.orig/export/ffmpeg_cfg.c ++++ transcode-1.1.5/export/ffmpeg_cfg.c +@@ -34,8 +34,6 @@ int lavc_param_vme = 4; + //int lavc_param_vqscale = 0; + //int lavc_param_vqmin = 2; + //int lavc_param_vqmax = 31; +-int lavc_param_mb_qmin = 2; +-int lavc_param_mb_qmax = 31; + int lavc_param_lmin = 2; + int lavc_param_lmax = 31; + int lavc_param_vqdiff = 3; +@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={ + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +Index: transcode-1.1.5/export/ffmpeg_cfg.h +=================================================================== +--- transcode-1.1.5.orig/export/ffmpeg_cfg.h ++++ transcode-1.1.5/export/ffmpeg_cfg.h +@@ -13,8 +13,6 @@ extern int lavc_param_vme; + //extern int lavc_param_vqscale; + //extern int lavc_param_vqmin; + //extern int lavc_param_vqmax; +-extern int lavc_param_mb_qmin; +-extern int lavc_param_mb_qmax; + extern int lavc_param_lmin; + extern int lavc_param_lmax; + extern int lavc_param_vqdiff; diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 7f3c4bc70..b0804978b 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140583 2011-10-17 08:15:09Z jgc $ +# $Id: PKGBUILD 142662 2011-11-12 17:18:47Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler pkgver=0.1.22 -pkgrel=3 +pkgrel=4 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') @@ -15,7 +15,7 @@ makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') optdepends=('ffmpegthumbnailer: for video thumbnails' 'gstreamer0.10: for video thumbnails') options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2 +source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 fix-video-image.patch) md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' 'be9b0f1c3a4b0be102774c84d5ac29e6') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6c899f321..c4be326df 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140130 2011-10-07 15:51:39Z giovanni $ +# $Id: PKGBUILD 142646 2011-11-12 17:15:45Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.12 -pkgrel=1 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -28,8 +28,9 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') [ "$CARCH" = "mips64el" ] && { makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' @@ -42,7 +43,6 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' 'libpulse: PulseAudio support') } conflicts=('vlc-plugin') diff --git a/extra/vlc/vlc.install b/extra/vlc/vlc.install index 4a1091bc5..dc4961cae 100644 --- a/extra/vlc/vlc.install +++ b/extra/vlc/vlc.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins update-desktop-database -q } diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 28994abc2..1e1228bba 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 135620 2011-08-16 16:43:05Z dreisner $ +# $Id: PKGBUILD 142551 2011-11-12 00:27:55Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=vpnc -pkgver=0.5.3.svn457 +_vpncver=0.5.3 +pkgver=$_vpncver.svn472 pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" @@ -14,9 +15,23 @@ arch=('i686' 'x86_64') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('033e642e17200a0efc0eda1c1c1886a2' +md5sums=('51c350341ad4e7f8efbba19810b138a3' 'a3f4e0cc682f437e310a1c86ae198e45') +mktarball() { + svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk + pushd trunk + _svnrev=$(svn info | awk '/^Revision:/ { print $2 }') + popd + + git clone git://git.infradead.org/users/dwmw2/vpnc-scripts.git + cp vpnc-scripts/vpnc-script trunk/ + + find trunk/ -type d -name .svn -exec rm -rf {} + + mv trunk "$pkgname-$_vpncver.svn$_svnrev" + tar cJf "$pkgname-$_vpncver.svn$_svnrev"{.tar.xz,} +} + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 679d89cc3..14cb5013b 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,35 +1,38 @@ -# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $ +# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vte pkgver=0.28.2 -pkgrel=2 +pkgrel=3 pkgdesc="Virtual Terminal Emulator widget for use with GTK2" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') options=('!libtool' '!emptydirs') depends=('gtk2' 'vte-common') -makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc') +makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz) -sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ - --enable-introspection --with-gtk=2.0 \ - --enable-gtk-doc + --enable-introspection --with-gtk=2.0 make } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir/usr/lib/vte/gnome-pty-helper" } diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 87ae483fc..8b2f70aed 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 140961 2011-10-20 05:44:24Z ibiru $ +# $Id: PKGBUILD 142687 2011-11-12 18:46:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) pkgver=0.30.1 -pkgrel=1 +pkgrel=2 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz) -sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "${srcdir}/vte-${pkgver}" + cd "$srcdir/vte-$pkgver" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ @@ -28,15 +31,15 @@ build() { package_vte3(){ depends=('gtk3' 'vte-common') - cd "${srcdir}/vte-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/vte-$pkgver" + make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir"/usr/lib/vte/gnome-pty-helper } package_vte-common() { pkgdesc="Common files used by vte and vte3" - cd "${srcdir}/vte-${pkgver}" + cd "$srcdir/vte-$pkgver" - make -C gnome-pty-helper DESTDIR="${pkgdir}" install + make -C gnome-pty-helper DESTDIR="$pkgdir" install } diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index cfa7bfb72..78a9bf82e 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140061 2011-10-06 07:33:34Z ibiru $ +# $Id: PKGBUILD 142608 2011-11-12 17:14:58Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20111001 +pkgver=20111030 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('dd67dca96ac79e7cb963bfcbf68e017b') +md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 4662ab34f..8f1468f0f 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 137999 2011-09-13 21:30:22Z eric $ +# $Id: PKGBUILD 142648 2011-11-12 17:15:49Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.1.19 -pkgrel=5 +pkgrel=6 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" license=('LGPL' 'GPL') -depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') optdepends=('imagemagick: for using the imagemagick plugin' \ @@ -25,19 +25,19 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libmng: for using the mng plugin' \ 'aalib: for using the aalib plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2 - xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch) -md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' - '9776df4eb54d2f1f68d8268adbc3b5c2' - '8662fb124870b1dd7effe4ff5e2a2e3d') -sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz + xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch + xine-lib-1.1.19-ffmpeg.patch) +sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d' '121a8358d7919b2e51067412373f52848290338a' - '920bf27e6e3523dfe4cc9c802ff713e9688a3f34') + '920bf27e6e3523dfe4cc9c802ff713e9688a3f34' + 'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch - patch -p0 < ../xine-lib-1.1.19-xvmc.patch + patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch" + patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch" + patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch" sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h diff --git a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch new file mode 100644 index 000000000..6817aa989 --- /dev/null +++ b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch @@ -0,0 +1,380 @@ +diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c +--- a/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 19:46:49 2011 -0400 +@@ -46,6 +46,12 @@ + + #define AUDIOBUFSIZE (64 * 1024) + ++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++# define AVAUDIO 3 ++#else ++# define AVAUDIO 2 ++#endif ++ + typedef struct { + audio_decoder_class_t decoder_class; + } ff_audio_class_t; +@@ -255,6 +261,9 @@ + buf->decoder_info[2]); + + } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { ++#if AVAUDIO > 2 ++ AVPacket avpkt; ++#endif + + if( !this->decoder_ok ) { + if ( ! this->context || ! this->codec ) { +@@ -286,11 +295,21 @@ + if (!this->output_open) { + if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++#if AVAUDIO > 2 ++ av_init_packet (&avpkt); ++ avpkt.data = (uint8_t *)&this->buf[0]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ avcodec_decode_audio3 (this->context, ++ (int16_t *)this->decode_buffer, ++ &decode_buffer_size, &avpkt); ++#else + avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[0], + this->size); ++#endif + this->audio_bits = this->context->bits_per_sample; + this->audio_sample_rate = this->context->sample_rate; + this->audio_channels = this->context->channels; +@@ -311,12 +330,21 @@ + offset = 0; + while (this->size>0) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++#if AVAUDIO > 2 ++ av_init_packet (&avpkt); ++ avpkt.data = (uint8_t *)&this->buf[offset]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ bytes_consumed = avcodec_decode_audio3 (this->context, ++ (int16_t *)this->decode_buffer, ++ &decode_buffer_size, &avpkt); ++#else + bytes_consumed = avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[offset], + this->size); +- ++#endif + if (bytes_consumed<0) { + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "ffmpeg_audio_dec: error decompressing audio frame\n"); +diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c +--- a/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 19:46:49 2011 -0400 +@@ -58,6 +58,14 @@ + + #define ENABLE_DIRECT_RENDERING + ++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++# define AVVIDEO 2 ++#else ++# define AVVIDEO 1 ++# define pp_context pp_context_t ++# define pp_mode pp_mode_t ++#endif ++ + /* reordered_opaque appeared in libavcodec 51.68.0 */ + #define AVCODEC_HAS_REORDERED_OPAQUE + #if LIBAVCODEC_VERSION_INT < 0x334400 +@@ -116,8 +124,8 @@ + + int pp_quality; + int pp_flags; +- pp_context_t *pp_context; +- pp_mode_t *pp_mode; ++ pp_context *our_context; ++ pp_mode *our_mode; + + /* mpeg-es parsing */ + mpeg_parser_t *mpeg_parser; +@@ -444,23 +452,23 @@ + this->pp_quality = this->class->pp_quality; + + if(this->pp_available && this->pp_quality) { +- if(!this->pp_context && this->context) +- this->pp_context = pp_get_context(this->context->width, this->context->height, ++ if(!this->our_context && this->context) ++ this->our_context = pp_get_context(this->context->width, this->context->height, + this->pp_flags); +- if(this->pp_mode) +- pp_free_mode(this->pp_mode); ++ if(this->our_mode) ++ pp_free_mode(this->our_mode); + +- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", ++ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", + this->pp_quality); + } else { +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } + +- if(this->pp_context) { +- pp_free_context(this->pp_context); +- this->pp_context = NULL; ++ if(this->our_context) { ++ pp_free_context(this->our_context); ++ this->our_context = NULL; + } + } + } +@@ -1055,12 +1063,26 @@ + } + + /* skip decoding b frames if too late */ ++#if AVVIDEO > 1 ++ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; ++#else + this->context->hurry_up = (this->skipframes > 0); ++#endif + + lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); ++#if AVVIDEO > 1 ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; ++ avpkt.size = this->mpeg_parser->buffer_size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ len = avcodec_decode_video2 (this->context, this->av_frame, ++ &got_picture, &avpkt); ++#else + len = avcodec_decode_video (this->context, this->av_frame, + &got_picture, this->mpeg_parser->chunk_buffer, + this->mpeg_parser->buffer_size); ++#endif + lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", + len, got_picture); + len = current - buf->content - offset; +@@ -1112,7 +1134,13 @@ + + } else { + +- if (this->context->hurry_up) { ++ if ( ++#if AVVIDEO > 1 ++ this->context->skip_frame != AVDISCARD_DEFAULT ++#else ++ this->context->hurry_up ++#endif ++ ) { + /* skipped frame, output a bad frame */ + img = this->stream->video_out->get_frame (this->stream->video_out, + this->bih.biWidth, +@@ -1304,13 +1332,25 @@ + got_picture = 0; + } else { + /* skip decoding b frames if too late */ ++#if AVVIDEO > 1 ++ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; ++#else + this->context->hurry_up = (this->skipframes > 0); +- ++#endif + lprintf("buffer size: %d\n", this->size); ++#if AVVIDEO > 1 ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = (uint8_t *)&chunk_buf[offset]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ len = avcodec_decode_video2 (this->context, this->av_frame, ++ &got_picture, &avpkt); ++#else + len = avcodec_decode_video (this->context, this->av_frame, + &got_picture, &chunk_buf[offset], + this->size); +- ++#endif + #ifdef AVCODEC_HAS_REORDERED_OPAQUE + /* reset consumed pts value */ + this->context->reordered_opaque = ff_tag_pts(this, 0); +@@ -1432,7 +1472,7 @@ + img->base, img->pitches, + img->width, img->height, + this->av_frame->qscale_table, this->av_frame->qstride, +- this->pp_mode, this->pp_context, ++ this->our_mode, this->our_context, + this->av_frame->pict_type); + + } else if (!this->av_frame->opaque) { +@@ -1676,11 +1716,11 @@ + free(this->buf); + this->buf = NULL; + +- if(this->pp_context) +- pp_free_context(this->pp_context); ++ if(this->our_context) ++ pp_free_context(this->our_context); + +- if(this->pp_mode) +- pp_free_mode(this->pp_mode); ++ if(this->our_mode) ++ pp_free_mode(this->our_mode); + + mpeg_parser_dispose(this->mpeg_parser); + +@@ -1721,8 +1761,8 @@ + this->aspect_ratio = 0; + + this->pp_quality = 0; +- this->pp_context = NULL; +- this->pp_mode = NULL; ++ this->our_context = NULL; ++ this->our_mode = NULL; + + this->mpeg_parser = NULL; + +diff -r 717450d734f7 src/post/planar/pp.c +--- a/src/post/planar/pp.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/post/planar/pp.c Mon May 16 19:46:49 2011 -0400 +@@ -35,6 +35,12 @@ + # include <libpostproc/postprocess.h> + #endif + ++#if LIBPOSTPROC_VERSION_MAJOR < 52 ++# define pp_context pp_context_t ++# define pp_mode pp_mode_t ++# define PP_PARAMETERS_T ++#endif ++ + #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ + + /* plugin class initialization function */ +@@ -76,14 +82,15 @@ + + /* libpostproc specific stuff */ + int pp_flags; +- pp_context_t *pp_context; +- pp_mode_t *pp_mode; ++ pp_context *our_context; ++ pp_mode *our_mode; + + pthread_mutex_t lock; + }; + + + static int set_parameters (xine_post_t *this_gen, void *param_gen) { ++#ifdef PP_PARAMETERS_T + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + pp_parameters_t *param = (pp_parameters_t *)param_gen; + +@@ -92,17 +99,18 @@ + memcpy( &this->params, param, sizeof(pp_parameters_t) ); + + pthread_mutex_unlock (&this->lock); +- ++#endif + return 1; + } + + static int get_parameters (xine_post_t *this_gen, void *param_gen) { ++#ifdef PP_PARAMETERS_T + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + pp_parameters_t *param = (pp_parameters_t *)param_gen; + + + memcpy( param, &this->params, sizeof(pp_parameters_t) ); +- ++#endif + return 1; + } + +@@ -202,8 +210,8 @@ + if(cpu_caps & MM_ACCEL_X86_3DNOW) + this->pp_flags |= PP_CPU_CAPS_3DNOW; + +- this->pp_mode = NULL; +- this->pp_context = NULL; ++ this->our_mode = NULL; ++ this->our_context = NULL; + + pthread_mutex_init (&this->lock, NULL); + +@@ -248,13 +256,13 @@ + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + + if (_x_post_dispose(this_gen)) { +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } +- if(this->pp_context) { +- pp_free_context(this->pp_context); +- this->pp_context = NULL; ++ if(this->our_context) { ++ pp_free_context(this->our_context); ++ this->our_context = NULL; + } + free(this); + } +@@ -304,7 +312,7 @@ + + pthread_mutex_lock (&this->lock); + +- if( !this->pp_context || ++ if( !this->our_context || + this->frame_width != yv12_frame->width || + this->frame_height != yv12_frame->height ) { + +@@ -312,32 +320,32 @@ + this->frame_height = yv12_frame->height; + pp_flags = this->pp_flags; + +- if(this->pp_context) +- pp_free_context(this->pp_context); ++ if(this->our_context) ++ pp_free_context(this->our_context); + +- this->pp_context = pp_get_context(frame->width, frame->height, pp_flags); ++ this->our_context = pp_get_context(frame->width, frame->height, pp_flags); + +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } + } + +- if(!this->pp_mode) +- this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode, ++ if(!this->our_mode) ++ this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode, + this->params.quality); + +- if(this->pp_mode) ++ if(this->our_mode) + pp_postprocess(yv12_frame->base, yv12_frame->pitches, + out_frame->base, out_frame->pitches, + (frame->width+7)&(~7), frame->height, + NULL, 0, +- this->pp_mode, this->pp_context, ++ this->our_mode, this->our_context, + 0 /*this->av_frame->pict_type*/); + + pthread_mutex_unlock (&this->lock); + +- if(this->pp_mode) { ++ if(this->our_mode) { + skip = out_frame->draw(out_frame, stream); + _x_post_frame_copy_up(frame, out_frame); + } else { diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index 80a61b2af..81796c041 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -3,12 +3,12 @@ # Maintainer (Parabola): xihh pkgname=ghostscript-libre -pkgver=9.02 -pkgrel=2 +pkgver=9.04 +pkgrel=5 pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') #non free files removed -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? makedepends=('gtk2' 'gnutls') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') @@ -16,17 +16,18 @@ conflicts=('ghostscript') replaces=('ghostscript-lrpng' 'ghostscript') provides=('ghostscript-lprng' "ghostscript=$pkgver") url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz + ghostscript-cups-rgbw.patch) options=('!libtool' '!makeflags') -md5sums=('f67151444bd56a7904579fc75a083dd6') build() { cd ${srcdir}/ghostscript-${pkgver} + + # fix broken color printing https://bugs.archlinux.org/task/25519 + patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff - # delete non-free packages - grep -l "are not altered" Resource/CMap/* | xargs rm -fv + rm -rf jpeg libpng zlib jasper expat tiff freetype lcms ./configure --prefix=/usr \ --enable-dynamic \ @@ -36,7 +37,11 @@ build() { --with-x \ --with-drivers=ALL\ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --disable-compile-inits # needed for linking with system-zlib + --with-install-cups \ + --enable-fontconfig \ + --enable-freetype \ + --without-luratech \ + --disable-compile-inits #--help # needed for linking with system-zlib make # Build IJS @@ -65,3 +70,5 @@ package() { cd ${srcdir}/ghostscript-${pkgver}/ijs make DESTDIR=${pkgdir} install } +md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb' + 'fd89baafac6589dc93ba71a48c2ba9b4') diff --git a/libre/ghostscript-libre/SRCBUILD b/libre/ghostscript-libre/SRCBUILD new file mode 100644 index 000000000..dc28e857e --- /dev/null +++ b/libre/ghostscript-libre/SRCBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer (Parabola): xihh + +pkgname=ghostscript-libre +pkgver=9.04 +pkgrel=5 +pkgdesc="An interpreter for the PostScript language without non-free files" +arch=('any') +license=('GPL3') #non free files removed +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +md5sums=('9f6899e821ab6d78ab2c856f10fa3023') +options=(!strip !docs !libtool !emptydirs !zipman !purge) + +build() { + cd ${srcdir}/ghostscript-${pkgver} + + export PKGEXT=.src.tar.xz + + # delete non-free packages + grep -l "are not altered" Resource/CMap/* | xargs rm -fv +} + +package() { + cd ${srcdir} + export PKGEXT=.src.tar.xz + export PKGDEST=${startdir} + + mv ghostscript-${pkgver} ${pkgdir}/ + +} diff --git a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch new file mode 100644 index 000000000..00f99c844 --- /dev/null +++ b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch @@ -0,0 +1,264 @@ +diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c +--- ghostscript-9.04/cups/gdevcups.c.cups-rgbw 2011-08-05 12:12:21.000000000 +0100 ++++ ghostscript-9.04/cups/gdevcups.c 2011-08-22 10:54:24.614010581 +0100 +@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s + unsigned short EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */ + int Density[CUPS_MAX_VALUE + 1];/* Density LUT */ + int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */ ++ int user_icc; + int cupsRasterVersion; + + /* Used by cups_put_params(): */ +@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device = + {0x00}, /* EncodeLUT */ + {0x00}, /* Density */ + {0x00}, /* Matrix */ ++ 0, + 3 /* cupsRasterVersion */ + }; + +@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D + + case CUPS_CSPACE_RGB : + case CUPS_CSPACE_RGBW : ++ c0 = c + k; ++ c1 = m + k; ++ c2 = y + k; + if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) { +- c0 = c; +- c1 = m; +- c2 = y; +- c3 = k; +- } else { +- c0 = c + k; +- c1 = m + k; +- c2 = y + k; ++ if ((k >= frac_1 - 1) || ++ ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) { ++ c0 = frac_1; ++ c1 = frac_1; ++ c2 = frac_1; ++ c3 = frac_1; ++ } else ++ c3 = 0; + } + + if (c0 < 0) +@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D + out[2] = frac_1 - (frac)cups->Density[c2]; + + if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) { +- if (c3 < 0) +- c3 = 0; +- else if (c3 > frac_1) +- c3 = frac_1; +- out[3] = frac_1 - (frac)cups->Density[c3]; ++ if (c3 == 0) ++ out[3] = frac_1; ++ else if (c3 == frac_1) ++ out[3] = 0; ++ else ++ out[3] = frac_1; + } + break; + +@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device *pdev, + * cups->DecodeLUT actually maps to RGBW, not CMYK... + */ + +- k = cups->DecodeLUT[c3]; +- c = cups->DecodeLUT[c0] + k - gx_max_color_value; +- m = cups->DecodeLUT[c1] + k - gx_max_color_value; +- y = cups->DecodeLUT[c2] + k - gx_max_color_value; ++ if (c3 == 0) { ++ c = 0; ++ m = 0; ++ y = 0; ++ } else { ++ c = cups->DecodeLUT[c0]; ++ m = cups->DecodeLUT[c1]; ++ y = cups->DecodeLUT[c2]; ++ } + + if (c > gx_max_color_value) + prgb[0] = gx_max_color_value; +@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device *pdev, + switch (cups->header.cupsBitsPerColor) + { + default : +- i = 0x0e; ++ i = 0x00; + break; + case 2 : +- i = 0xfc; ++ i = 0x00; + break; + case 4 : +- i = 0xfff0; ++ i = 0x0000; + break; + case 8 : +- i = 0xffffff00; ++ i = 0x00000000; + break; + #ifdef GX_COLOR_INDEX_TYPE + case 16 : +- i = 0xffffffffffff0000; ++ i = 0x0000000000000000; + break; + #endif /* GX_COLOR_INDEX_TYPE */ + } +@@ -2929,7 +2940,10 @@ cups_put_params(gx_device *pdev, /* + int xflip = 0, + yflip = 0; + int found = 0; +- ++ gs_param_string icc_pro_dummy; ++ int old_cmps = cups->color_info.num_components; ++ int old_depth = cups->color_info.depth; ++ + #ifdef DEBUG + dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist); + #endif /* DEBUG */ +@@ -3024,6 +3038,11 @@ cups_put_params(gx_device *pdev, /* + margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0; + color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 || + param_read_int(plist, "cupsBitsPerColor", &intval) == 0; ++ ++ if (!cups->user_icc) { ++ cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0; ++ } ++ + /* We set the old dimensions to 1 if we have a color depth change, so + that memory reallocation gets forced. This is perhaps not the correct + approach to prevent crashes like in bug 690435. We keep it for the +@@ -3134,12 +3153,20 @@ cups_put_params(gx_device *pdev, /* + if ((code = gdev_prn_put_params(pdev, plist)) < 0) + return (code); + ++ /* If cups_set_color_info() changed the color model of the device we want to ++ * force the raster memory to be recreated/reinitialized ++ */ ++ if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) { ++ width_old = 0; ++ height_old = 0; ++ } ++ else { + /* pdev->width/height may have been changed by the call to + * gdev_prn_put_params() + */ +- width_old = pdev->width; +- height_old = pdev->height; +- ++ width_old = pdev->width; ++ height_old = pdev->height; ++ } + /* + * Update margins/sizes as needed... + */ +@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev) /* + for (k = 0; k <= CUPS_MAX_VALUE; k ++) + cups->Density[k] = k; + } +- /* Set up the ICC profile for ghostscript to use based upon the color space. +- This is different than the PPD profile above which appears to be some sort +- of matrix based TRC profile */ +- switch (cups->header.cupsColorSpace) { +- /* Use RGB profile for this */ +- case CUPS_CSPACE_RGBW: +- if (pdev->icc_struct == NULL) { +- pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); +- } +- if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) { +- code = gsicc_set_device_profile(pdev, pdev->memory, +- DEFAULT_RGB_ICC, gsDEFAULTPROFILE); +- } +- break; +- default: +- break; ++ if (!cups->user_icc) { ++ /* Set up the ICC profile for ghostscript to use based upon the color space. ++ This is different than the PPD profile above which appears to be some sort ++ of matrix based TRC profile */ ++ switch (cups->header.cupsColorSpace) ++ { ++ default : ++ case CUPS_CSPACE_RGBW : ++ case CUPS_CSPACE_RGB : ++ case CUPS_CSPACE_RGBA : ++ case CUPS_CSPACE_CMY : ++ case CUPS_CSPACE_YMC : ++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC ++ case CUPS_CSPACE_CIELab : ++ case CUPS_CSPACE_ICC1 : ++ case CUPS_CSPACE_ICC2 : ++ case CUPS_CSPACE_ICC3 : ++ case CUPS_CSPACE_ICC4 : ++ case CUPS_CSPACE_ICC5 : ++ case CUPS_CSPACE_ICC6 : ++ case CUPS_CSPACE_ICC7 : ++ case CUPS_CSPACE_ICC8 : ++ case CUPS_CSPACE_ICC9 : ++ case CUPS_CSPACE_ICCA : ++ case CUPS_CSPACE_ICCB : ++ case CUPS_CSPACE_ICCC : ++ case CUPS_CSPACE_ICCD : ++ case CUPS_CSPACE_ICCE : ++ case CUPS_CSPACE_ICCF : ++# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */ ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory, ++ (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ ++ case CUPS_CSPACE_W : ++ case CUPS_CSPACE_WHITE : ++ case CUPS_CSPACE_K : ++ case CUPS_CSPACE_GOLD : ++ case CUPS_CSPACE_SILVER : ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory, ++ (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ case CUPS_CSPACE_KCMYcm : ++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC ++ case CUPS_CSPACE_CIEXYZ : ++#endif ++ case CUPS_CSPACE_CMYK : ++ case CUPS_CSPACE_YMCK : ++ case CUPS_CSPACE_KCMY : ++ case CUPS_CSPACE_GMCK : ++ case CUPS_CSPACE_GMCS : ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory, ++ (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ } + } + } + + diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index e6b7679cd..55cf77538 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -9,11 +9,11 @@ pkgrel=3 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam' 'texlive-bin') +conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' @@ -22,10 +22,10 @@ source=('texmf.cnf' 'fix-fontforge-encoding.patch' '09-texlive-fonts.conf' 'archlinux-build.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' + 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' + 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" - 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' + 'ftp://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index fdf89a41c..d91909319 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,6 +1,6 @@ pkgname=tinc pkgver=1.0.16 -pkgrel=1 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64 mips64el) url="http://www.tinc-vpn.org/" @@ -9,9 +9,6 @@ depends=('lzo2' 'zlib' 'openssl') source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz tincd.conf tincd.rcd) -md5sums=('f1c7ed94878725fb2cf4efb02bf160da' - '9b40646cd898709e90ae3c32baecb075' - '75516d05803ee6c6b22516e10129ad99') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,5 +25,8 @@ package() { install -d $pkgdir/etc/{tinc,rc.d,conf.d} install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd - install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd + install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd.conf } +md5sums=('f1c7ed94878725fb2cf4efb02bf160da' + 'b1b0c4a37c007aa8703128269ea9a3e8' + '89a91a80c1dee4b365958bd9e6242d5a') diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf index 84547936c..3b8a867be 100644 --- a/social/tinc/tincd.conf +++ b/social/tinc/tincd.conf @@ -1 +1,2 @@ NETNAME=yournetname +OPTIONS="-R -U nobody" diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd index f0a456e17..d790ef86f 100644 --- a/social/tinc/tincd.rcd +++ b/social/tinc/tincd.rcd @@ -13,6 +13,7 @@ case "$1" in stat_busy "Starting ${daemon_name}" [ -z "$PID" ] && \ /usr/sbin/tincd -n ${NETNAME} \ + ${OPTIONS} \ --pidfile=/var/run/tinc.${NETNAME} &> /dev/null if [ $? -gt 0 ]; then diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD new file mode 100644 index 000000000..9f3f341ab --- /dev/null +++ b/staging/kadu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $ +# Maintainer: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> + +pkgname=kadu +pkgver=0.10.1 +pkgrel=2 +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') +url="http://www.kadu.net/" +license=('GPL') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('6211a9a9e02d645268cbf055892601a0') + +build() { + cd $srcdir/kadu-$pkgver + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/kadu-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} +} diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD index 8a01a346e..04ee16493 100644 --- a/staging/koffice/PKGBUILD +++ b/staging/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142363 2011-11-08 21:20:27Z ronald $ +# $Id: PKGBUILD 142476 2011-11-10 12:11:05Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD index 11da0f20b..04e12bff5 100644 --- a/testing/dhcpcd/PKGBUILD +++ b/testing/dhcpcd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142367 2011-11-08 21:52:38Z ronald $ +# $Id: PKGBUILD 142451 2011-11-10 07:06:35Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD new file mode 100644 index 000000000..4914b1953 --- /dev/null +++ b/testing/glib2/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 142559 2011-11-12 07:37:46Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glib2 +pkgver=2.30.2 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre' 'libffi') +makedepends=('pkgconfig' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz + glib2.sh + glib2.csh) +sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82' + '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + +build() { + cd "${srcdir}/glib-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd "${srcdir}/glib-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/etc/profile.d" + install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" + install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" + + for _i in "${pkgdir}/etc/bash_completion.d/"*; do + chmod -x "${_i}" + done + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen +} diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh new file mode 100644 index 000000000..7aa3a2ffa --- /dev/null +++ b/testing/glib2/glib2.csh @@ -0,0 +1 @@ +setenv G_BROKEN_FILENAMES 1 diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh new file mode 100644 index 000000000..96a056e1e --- /dev/null +++ b/testing/glib2/glib2.sh @@ -0,0 +1 @@ +export G_BROKEN_FILENAMES=1 diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD new file mode 100644 index 000000000..57aecb648 --- /dev/null +++ b/testing/gtk2/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 142501 2011-11-10 19:53:45Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.8 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz + xid-collision-debug.patch) +sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + +build() { + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_gtk2() { + pkgdesc="GTK+ is a multi-platform toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + + cd "${srcdir}/gtk+-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm ${pkgdir}/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2') + + cd "${srcdir}/gtk+-${pkgver}/gtk" + + install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache +} diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install new file mode 100644 index 000000000..4e2b72f1b --- /dev/null +++ b/testing/gtk2/gtk2.install @@ -0,0 +1,16 @@ +post_install() { + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null +} diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch new file mode 100644 index 000000000..d61238c3b --- /dev/null +++ b/testing/gtk2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + diff --git a/testing/nouveau-drm-lts/COPYING b/testing/nouveau-drm-lts/COPYING new file mode 100644 index 000000000..6e74c337c --- /dev/null +++ b/testing/nouveau-drm-lts/COPYING @@ -0,0 +1,48 @@ + Copyright 2005 Adam Jackson. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation on the rights to use, copy, modify, merge, + publish, distribute, sub license, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +------------------------------------------------------------------------ + + Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS + SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/testing/nouveau-drm-lts/Makefile b/testing/nouveau-drm-lts/Makefile new file mode 100644 index 000000000..123bc5339 --- /dev/null +++ b/testing/nouveau-drm-lts/Makefile @@ -0,0 +1,102 @@ +# This Makefile is loosely based on the drm.git/linux-core/Makefile and +# the preliminary work by Christopher James Halse Rogers. +# Edited by Pekka Paalanen <pq@iki.fi> + +# By default, the build is done against the running linux kernel source. +# To build against a different kernel source tree, set LINUXDIR: +# +# make LINUXDIR=/path/to/kernel/source + +# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. +# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: +# +# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 + + +ifndef LINUXDIR +RUNNING_REL := $(shell uname -r) + +LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ + echo /lib/modules/$(RUNNING_REL)/source; \ + else echo /lib/modules/$(RUNNING_REL)/build; fi) +endif + +NOUVEAUGITREMOTE ?= origin +NOUVEAUROOTDIR ?= $(CURDIR)/.. +override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) + +TESTFILE := include/drm/nouveau_drm.h +ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) +$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ + please set NOUVEAUROOTDIR) +endif + +GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ + git describe --always --abbrev=17 2> /dev/null) + +DRMINC := -I$(NOUVEAUROOTDIR)/include/drm +DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm +DRMCFG := \ + CONFIG_DRM=m \ + CONFIG_DRM_KMS_HELPER=m \ + CONFIG_DRM_TTM=m \ + CONFIG_DRM_NOUVEAU=m \ + CONFIG_DRM_NOUVEAU_KMS=n \ + CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ + CONFIG_DRM_NOUVEAU_DEBUG=y \ + CONFIG_DRM_I2C_CH7006=m \ + CONFIG_DRM_TDFX=n \ + CONFIG_DRM_R128=n \ + CONFIG_DRM_RADEON=n \ + CONFIG_DRM_MGA=n \ + CONFIG_DRM_I810=n \ + CONFIG_DRM_I830=n \ + CONFIG_DRM_I915=n \ + CONFIG_DRM_SIS=n \ + CONFIG_DRM_SAVAGE=n \ + CONFIG_DRM_VIA=n + +EXTRA_CFLAGS := +MYEXTRA_CFLAGS := +MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT +MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG + +ifneq ($(GIT_REVISION),) +MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' +endif + +MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) + +MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) +ifneq ($(MYEXTRA_CFLAGS),) +MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" +endif + +.PHONY: all modules install clean archive FORCE + +all: modules +FORCE: + +modules: + $(MAKE) $(MYPARMS) modules + +install: + $(MAKE) $(MYPARMS) modules_install + +clean: + $(MAKE) $(MYPARMS) clean + +archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz + +newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau + +%.tar: FORCE + GIT_DIR=$(NOUVEAUROOTDIR)/.git \ + git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ + drivers/gpu/drm include/drm $(EXTRAS) > $@ + +%.tar.gz: %.tar + gzip -9 -c $< > $@ + +# The commit id of the archive can be read with +# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/testing/nouveau-drm-lts/PKGBUILD b/testing/nouveau-drm-lts/PKGBUILD new file mode 100644 index 000000000..1899ca19a --- /dev/null +++ b/testing/nouveau-drm-lts/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 142530 2011-11-11 16:57:55Z tpowa $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: buddabrod <buddabrod@gmail.com> + +pkgname=nouveau-drm-lts +_snapdate=20100313 +pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version +_extramodules=extramodules-2.6.32-lts +_kernver="$(cat /lib/modules/${_extramodules}/version)" +pkgrel=7 +pkgdesc="nvidia opensource X driver" +arch=('i686' 'x86_64') +url="http://nouveau.freedesktop.org/" +depends=("kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") +makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") +# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd +optdepends=('nouveau-firmware: needed for very new card (NV50 family and above) to work properly where the OSS replacement does not work well') +#makedepends=('git' 'autoconf' 'pkgconfig') +install=nouveau-drm.install +license=('GPL') +options=('!strip') +source=(ftp://ftp.archlinux.org/other/${pkgname/-lts//}/master-${_snapdate}.tar.gz + # http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz + # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat + Makefile) +md5sums=('ad7ad0fb73d56bcff3d2b54a70c3d511' + 'e7d5df80186d5c736e82b0a7d46216bc') + +build() { + cd ${srcdir}/master + mkdir nouveau + cp $srcdir/Makefile ${srcdir}/master/nouveau/ + cd nouveau + make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" +} + +package() { + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko + + # install script + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install + # gzip -9 modules + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} diff --git a/testing/nouveau-drm-lts/dont_check_for_pthread.patch b/testing/nouveau-drm-lts/dont_check_for_pthread.patch new file mode 100644 index 000000000..050f55767 --- /dev/null +++ b/testing/nouveau-drm-lts/dont_check_for_pthread.patch @@ -0,0 +1,49 @@ +diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac +--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 ++++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 +@@ -32,10 +32,6 @@ + AC_HEADER_STDC + AC_SYS_LARGEFILE + +-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) +-AC_SUBST(PTHREADSTUBS_CFLAGS) +-AC_SUBST(PTHREADSTUBS_LIBS) +- + pkgconfigdir=${libdir}/pkgconfig + AC_SUBST(pkgconfigdir) + AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], +diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am +--- libdrm-2.4.0/libdrm/intel/Makefile.am 2008-10-14 01:39:32.000000000 +0200 ++++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am 2008-10-21 10:49:00.000000000 +0200 +@@ -26,13 +26,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir)/libdrm \ + -I$(top_srcdir)/libdrm/intel \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/shared-core + + libdrm_intel_la_LTLIBRARIES = libdrm_intel.la + libdrm_intel_ladir = $(libdir) + libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_intel_la_LIBADD = ../libdrm.la + + libdrm_intel_la_SOURCES = \ + intel_bufmgr.c \ +--- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig 2009-02-28 19:06:24.000000000 +0000 ++++ libdrm-2.4.5/libdrm/nouveau/Makefile.am 2009-02-28 19:06:33.000000000 +0000 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir)/libdrm \ + -I$(top_srcdir)/libdrm/nouveau \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/shared-core + + libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la + libdrm_nouveau_ladir = $(libdir) + libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_nouveau_la_LIBADD = ../libdrm.la + + libdrm_nouveau_la_SOURCES = \ + nouveau_device.c \ diff --git a/testing/nouveau-drm-lts/nouveau-drm.install b/testing/nouveau-drm-lts/nouveau-drm.install new file mode 100644 index 000000000..2aa581d47 --- /dev/null +++ b/testing/nouveau-drm-lts/nouveau-drm.install @@ -0,0 +1,16 @@ +post_install() { + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + echo "if you are running kms in early mode please rebuild your initrd" +} + +post_upgrade() { + post_install $1 + rmmod nouveau || echo 'In order to use the new nouveau module, exit Xserver and unload it manually.' +} + +post_remove() { + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD new file mode 100644 index 000000000..cbdb700c3 --- /dev/null +++ b/testing/proftpd/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 142449 2011-11-10 05:57:41Z eric $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=proftpd +pkgver=1.3.4 +pkgrel=1 +pkgdesc="A high-performance, scalable FTP server" +arch=('i686' 'x86_64') +url="http://www.proftpd.org" +license=('GPL') +depends=('libldap' 'libmysqlclient' 'postgresql-libs') +backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') +md5sums=('7734142c7fa7212ab9f188a617a4be87' + '0426c03ca88f1b8794006916ac6466ce' + '99f6f9a989e70e3fa50809fc2bbbbb0a' + 'ddb09eb13131becdf0e081eef413116b' + '71d5932b0461c318ed68c2c0c2660736') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --disable-pam \ + --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ + --sysconfdir=/etc \ + --localstatedir=/var/run \ + --enable-ctrls \ + --enable-ipv6 \ + --with-includes=/usr/include/mysql:/usr/include/postgresql \ + --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ + --enable-nls + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" + install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" + install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" + install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" +} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd new file mode 100755 index 000000000..357a7663d --- /dev/null +++ b/testing/proftpd/proftpd @@ -0,0 +1,41 @@ +#!/bin/bash + +# source application-specific settings +PROFTPD_ARGS= +[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ProFTPd Server" + /usr/sbin/proftpd ${PROFTPD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon proftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping ProFTPd Server" + [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/proftpd.pid + rm_daemon proftpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d new file mode 100644 index 000000000..1a5a8a201 --- /dev/null +++ b/testing/proftpd/proftpd.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to proftpd +# +PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate new file mode 100644 index 000000000..7b6d7a87b --- /dev/null +++ b/testing/proftpd/proftpd.logrotate @@ -0,0 +1,5 @@ +/var/log/xferlog { + postrotate + /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD new file mode 100644 index 000000000..996661740 --- /dev/null +++ b/testing/run-parts/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 142524 2011-11-11 14:47:40Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=run-parts +pkgver=4.0.4 +pkgrel=1 +pkgdesc='run scripts or programs in a directory' +arch=('i686' 'x86_64') +url='http://packages.qa.debian.org/d/debianutils.html' +license=('GPL') +depends=('glibc') +source=("ftp://ftp.archlinux.org/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('9a14722c7422c6d16f30c80b74201d9c803beeef2bb4c004964d0979eaa1232f') + +build() { + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts +} + +package() { + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + for l in po4a/*/run-parts.8; do + install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 + done +} diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD new file mode 100644 index 000000000..d96ccbb34 --- /dev/null +++ b/testing/syslog-ng/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 142718 2011-11-13 17:30:10Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=syslog-ng +pkgver=3.3.2 +pkgrel=1 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +license=('GPL2') +groups=('base') +url="http://www.balabit.com/network-security/syslog-ng/" +depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') +makedepends=('flex' 'pkg-config') +optdepends=('logrotate: for rotating log files') +provides=('logger') +options=('!libtool') +backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ + 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') +source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" + syslog-ng.conf + syslog-ng.logrotate + syslog-ng.rc) +sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638' + '98074e0facfc6ef036202662cc86d04b38a2c142' + 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' + 'a6ad26912b5bcbe1b47b003309945d733613b98f') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib \ + --localstatedir=/var/lib/syslog-ng \ + --with-pidfile-dir=/run \ + --disable-spoof-source \ + --enable-systemd \ + --with-systemdsystemunitdir=/lib/systemd/system + + make +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" + install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng" +} diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..8f86eac2f --- /dev/null +++ b/testing/syslog-ng/syslog-ng.conf @@ -0,0 +1,92 @@ +@version: 3.3 +# +# /etc/syslog-ng/syslog-ng.conf +# + +options { + stats_freq (0); + flush_lines (0); + time_reopen (10); + log_fifo_size (10000); + chain_hostnames (off); + use_dns (no); + use_fqdn (no); + create_dirs (no); + keep_hostname (yes); + perm(0640); + group("log"); +}; + +source src { + unix-dgram("/dev/log"); + internal(); + file("/proc/kmsg"); +}; + +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; + +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { program(syslog-ng); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_ppp { facility(local2); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; +filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; +filter f_emergency { level(emerg); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; + +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; + +# Log everything to tty12 +#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate new file mode 100644 index 000000000..e0e6929f2 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.logrotate @@ -0,0 +1,7 @@ +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc new file mode 100755 index 000000000..516b03da3 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.rc @@ -0,0 +1,66 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +checkconfig() { + if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then + stat_fail + exit 1 + fi +} + +pidfile=/run/syslog-ng.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in + start) + stat_busy "Starting Syslog-NG" + checkconfig + if [[ -z $PID ]] && /usr/sbin/syslog-ng; then + add_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Syslog-NG" + if [[ $PID ]] && kill $PID &>/dev/null; then + rm_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [[ -z $PID ]]; then + stat_fail + else + checkconfig + if kill -HUP $PID &>/dev/null; then + stat_done + else + stat_fail + exit 1 + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD new file mode 100644 index 000000000..a48cb6eff --- /dev/null +++ b/testing/valgrind/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142728 2011-11-14 01:17:20Z allan $ +# Maintainer: Dan McGee <dan@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=valgrind +pkgver=3.7.0 +pkgrel=1 +pkgdesc="A tool to help find memory-management problems in programs" +arch=('i686' 'x86_64') +license=('GPL') +url="http://valgrind.org/" +depends=('glibc>=2.14' 'glibc<2.15' 'perl') +makedepends=('gdb') +options=('!emptydirs') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) +md5sums=('a855fda56edf05614f099dca316d1775') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + if [ "${CARCH}" = "x86_64" ]; then + ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit + else + ./configure --prefix=/usr --mandir=/usr/share/man + fi + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} |