diff options
Diffstat (limited to 'community')
58 files changed, 1303 insertions, 223 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 0caf35d71..c550afef0 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') 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 8619bbbc8..28b5f9c15 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') 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 8d4a63c9e..1320b04d8 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') 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 7ffd429be..f797ba0f4 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') 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 c4b934aad..da38ae549 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') 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/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index 093fe7296..7f086d67f 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') url="http://www.v2v.cc/~j/ffmpeg2theora/" diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index c88386caa..debefafd2 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') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index df6e45db6..eb5599e8f 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') 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/gnash/PKGBUILD b/community/gnash/PKGBUILD index dbb756e2c..68f826412 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) 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 a9ea47daf..624656ee9 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') 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/gpac/PKGBUILD b/community/gpac/PKGBUILD index a38817828..f040dc500 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') 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/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 4de8eb067..a5d66830f 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') @@ -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/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 37ff847c7..c51383fe2 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') @@ -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/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index e3bfb94d4..72ba96bc4 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') -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 420a82cc4..3ff564293 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") license=('GPL') diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 07d05193f..9641c3674 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') 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/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 517bbb7bc..cff8dd04a 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') 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/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 4d960d8e7..c2107abc2 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') 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/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index fb3f6e59e..a346dceac 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') url="http://sourceforge.net/projects/minidlna/" diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 3bbe6583a..e9b0613d3 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') 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 dcb3828af..7114817f7 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') 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 7f012d00b..74f14d424 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,44 +1,43 @@ -# $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 +pkgver=2.0.20111101 +pkgrel=1 pkgdesc="A movie player" arch=('i686' 'x86_64') license=('GPL') url="http://www.mplayer2.org/" depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' - 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa') -makedepends=('live-media' 'mesa' 'unzip' 'yasm') +makedepends=('live-media' 'mesa' 'unzip' 'yasm' 'git') 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() { - # Custom CFLAGS break the mplayer build - unset CFLAGS LDFLAGS +# source PKGBUILD && mksource +mksource() { + _gitroot="git://git.mplayer2.org/mplayer2.git" + _gitname="${pkgname}-${pkgver}" - cd "${srcdir}/${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}" ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -49,7 +48,6 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ - --enable-xvmc \ --language=all \ --enable-translation \ --confdir=/etc/mplayer diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index c53ffe04a..437f6ea1c 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') @@ -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/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index a8c0f7d88..731058d5d 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') license=('custom:OSGPL') diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 1daa3890a..70c6e2a87 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 58360 2011-11-12 10:52:56Z ibiru $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.11 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index ce90dd8a5..1b5652a0e 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') 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 6a84f1908..9937c04db 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') -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/pragha/PKGBUILD b/community/pragha/PKGBUILD index 7dd6902ce..dedba8ceb 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') @@ -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/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD index 2b93c0bf0..45587a5d9 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') 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/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index cea4c5e1d..6e5964a32 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') 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 75ec29542..42a0bf0fc 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') 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/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD index 21cdc3ba6..d4c727c31 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') 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/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 06412266b..db9b90cb5 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') 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/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD index 620e86ab8..db984ea91 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') 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 d720c5fa5..97f4111dc 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) 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/tora/PKGBUILD b/community/tora/PKGBUILD index de4385053..49b8e64fa 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') 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/vtk/PKGBUILD b/community/vtk/PKGBUILD index d1f035081..4dadb8d58 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') 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/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD index 28bcc240d..16e881116 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') url="http://wxsvg.sourceforge.net/" diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 64af8d2a1..56fff3d7b 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') url="http://xmms2.org/" diff --git a/community/xvidcap/PKGBUILD b/community/xvidcap/PKGBUILD index 476d1d192..6d68a48a9 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") 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, + _ |