diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /community | |
parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'community')
103 files changed, 1700 insertions, 398 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, + _ |