diff options
42 files changed, 882 insertions, 152 deletions
diff --git a/community-staging/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD new file mode 100644 index 000000000..4b49c0602 --- /dev/null +++ b/community-staging/deadbeef/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 57696 2011-11-01 10:47:22Z jelle $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Alexey Yakovenko <waker@users.sourceforge.net> + +pkgname=deadbeef +pkgver=0.5.1 +pkgrel=3 +pkgdesc='An audio player for GNU/Linux based on GTK2.' +arch=('i686' 'x86_64') +url='http://deadbeef.sourceforge.net' +license=('GPL2') +depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' + 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' + 'libsamplerate') +optdepends=('libsamplerate: for Resampler plugin' + 'libvorbis: for Ogg Vorbis playback' + 'libmad: for MP1/MP2/MP3 playback' + 'flac: for FLAC playback' + 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support' + 'imlib2: for artwork plugin' + 'wavpack: for WavPack playback' + 'libsndfile: for Wave playback' + 'libcdio: audio cd plugin' + 'libcddb: audio cd plugin' + 'ffmpeg: for WMA, AA, OMA, AC, etc.' + 'faad2: for AAC/MP4 support' + 'dbus: for OSD notifications support' + 'pulseaudio: for PulseAudio output plugin' + 'libx11: for global hotkeys plugin' + 'zlib: for Audio Overload plugin' + 'libzip: for vfs_zip plugin') +options=('!libtool') +install='deadbeef.install' +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 +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install +} +md5sums=('be8359d1bd9cf7679cf2ca748996e726' + '6cc7623734af310095534c361c9f64e8') diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install new file mode 100644 index 000000000..eaf1b9a69 --- /dev/null +++ b/community-staging/deadbeef/deadbeef.install @@ -0,0 +1,14 @@ +pkgname=deadbeef + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/deadbeef/ffmpeg.patch b/community-staging/deadbeef/ffmpeg.patch new file mode 100644 index 000000000..925b84408 --- /dev/null +++ b/community-staging/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-staging/dvdstyler/PKGBUILD b/community-staging/dvdstyler/PKGBUILD new file mode 100644 index 000000000..f0d8ccc70 --- /dev/null +++ b/community-staging/dvdstyler/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 57687 2011-11-01 09:55:55Z ebelanger $ +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=dvdstyler +pkgver=2.0 +pkgrel=2 +pkgdesc="Cross-platform DVD authoring application" +arch=('i686' 'x86_64') +url="http://www.dvdstyler.de/" +license=('GPL') +depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') +makedepends=('zip' 'xmlto' 'docbook-xsl') +optdepends=('dvdisaster: ECC support') +options=('!makeflags') +source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2) +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 +} + +package() { + cd "${srcdir}/DVDStyler-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/electricsheep/PKGBUILD b/community-staging/electricsheep/PKGBUILD new file mode 100644 index 000000000..7becdf2ba --- /dev/null +++ b/community-staging/electricsheep/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57681 2011-11-01 05:04:13Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=electricsheep +pkgver=2.7b12 +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/" +license=('GPL') +depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') +makedepends=('xscreensaver') +optdepends=('xscreensaver: to use electricsheep with xscreensaver') +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 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}/usr/share/applications/screensavers" + install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" + make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \ + GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install + install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" + install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml" + install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver" +} diff --git a/community-staging/electricsheep/electricsheep-ffmpeg.patch b/community-staging/electricsheep/electricsheep-ffmpeg.patch new file mode 100644 index 000000000..b04cf41b0 --- /dev/null +++ b/community-staging/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-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD new file mode 100644 index 000000000..2e1960eee --- /dev/null +++ b/community-staging/gpac/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57689 2011-11-01 10:02:30Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=gpac +pkgver=0.4.5 +pkgrel=9 +pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" +arch=('i686' 'x86_64') +url="http://gpac.sourceforge.net" +depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut') +license=('LGPL') +options=('!makeflags') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + libpng14-infopp-null.patch openjpeg14.patch) +sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8' + '00ba08808ec46ef6b8301ede26e500b3449253c1' + '95747ca98cdf0efc33ec776764401f5a83818ab5') + +build() { + 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" + + 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 +} diff --git a/community-staging/gpac/libpng14-infopp-null.patch b/community-staging/gpac/libpng14-infopp-null.patch new file mode 100644 index 000000000..b02456557 --- /dev/null +++ b/community-staging/gpac/libpng14-infopp-null.patch @@ -0,0 +1,12 @@ +diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c +--- gpac.orig/src/media_tools/img.c 2010-01-24 19:03:28.000000000 +0200 ++++ gpac/src/media_tools/img.c 2010-01-24 19:04:07.000000000 +0200 +@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi + /* Allocate/initialize the image information data. REQUIRED */ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) { +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + return GF_IO_ERR; + } + diff --git a/community-staging/gpac/openjpeg14.patch b/community-staging/gpac/openjpeg14.patch new file mode 100644 index 000000000..68a625eeb --- /dev/null +++ b/community-staging/gpac/openjpeg14.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/show_bug.cgi?id=361359 + +Index: gpac/modules/img_in/jp2_dec.c +=================================================================== +--- gpac.orig/modules/img_in/jp2_dec.c ++++ gpac/modules/img_in/jp2_dec.c +@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe + return GF_OK; + } + ++char opj_version_buffer[500]; ++ + static const char *JP2_GetCodecName(GF_BaseDecoder *dec) + { ++#ifndef OPENJPEG_VERSION ++ snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version()); ++ return opj_version_buffer; ++#else + return "OpenJPEG "OPENJPEG_VERSION ; ++#endif + } + + diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD index 32785be10..cff8dd04a 100644 --- a/community-staging/lightspark/PKGBUILD +++ b/community-staging/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.5.1 -pkgrel=3 +pkgver=0.5.2.1 +pkgrel=2 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' @@ -13,10 +13,16 @@ depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpul makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') optdepends=('gnash-gtk: fallback support') install="lightspark.install" -source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tgz") -md5sums=('aa0daa22646c2a663ec5045074451d45') +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" + 'llvm29.diff') +md5sums=('ac2233a83e8bf0b305563bbce322cd76' + '5f717d1d9ead478184ca68f6ac068099') build() { + cd lightspark-${pkgver} + patch -Np0 -i ${srcdir}/llvm29.diff + cd ${srcdir} + rm -rf build mkdir build cd build @@ -26,7 +32,7 @@ build() { -DCOMPILE_PLUGIN=1 \ -DCMAKE_BUILD_TYPE=Release \ -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - .. + ../lightspark-${pkgver} make } diff --git a/community-staging/lightspark/llvm29.diff b/community-staging/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community-staging/lightspark/llvm29.diff @@ -0,0 +1,12 @@ +--- CMakeLists.txt.old 2011-11-01 22:07:52.475608726 +0000 ++++ CMakeLists.txt 2011-11-01 22:08:52.046241925 +0000 +@@ -152,7 +152,8 @@ + MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!") + ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) +- MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ #MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ ADD_DEFINITIONS(-DLLVM_29) + ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8) + ADD_DEFINITIONS(-DLLVM_28) diff --git a/community-testing/acpitool/PKGBUILD b/community-testing/acpitool/PKGBUILD new file mode 100644 index 000000000..d9b079988 --- /dev/null +++ b/community-testing/acpitool/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 57685 2011-11-01 09:10:22Z 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=4 +pkgdesc="ACPI client - replacement for apm tool" +url="http://sourceforge.net/projects/acpitool/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gcc-libs') +source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2 + linux-3.0.patch + sysfs-battery.patch) +md5sums=('9e4ec55201be0be71ffbc56d38b42b57' + 'eb149edb32be6cdf20a7d16beb3e9f70' + '8211c37dbf888b76388699b7c6098503') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/linux-3.0.patch + patch -p1 <$srcdir/sysfs-battery.patch + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" install +} diff --git a/community-testing/acpitool/linux-3.0.patch b/community-testing/acpitool/linux-3.0.patch new file mode 100644 index 000000000..ba454a0c2 --- /dev/null +++ b/community-testing/acpitool/linux-3.0.patch @@ -0,0 +1,18 @@ +diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp +--- acpitool-0.5.1/src/acpitool.cpp 2009-08-13 23:37:48.000000000 +0400 ++++ acpitool-0.5.1.my/src/acpitool.cpp 2011-08-11 21:53:17.000000000 +0400 +@@ -205,8 +205,12 @@ + Kernel_24 = 1; + Kernel_26 = 0; + } +- +- if(strncmp(str,"2.6",3)==0) ++ else if(strncmp(str,"2.6",3)==0) ++ { ++ Kernel_24 = 0; ++ Kernel_26 = 1; ++ } ++ else + { + Kernel_24 = 0; + Kernel_26 = 1; diff --git a/community-testing/acpitool/sysfs-battery.patch b/community-testing/acpitool/sysfs-battery.patch new file mode 100644 index 000000000..11a58ecc5 --- /dev/null +++ b/community-testing/acpitool/sysfs-battery.patch @@ -0,0 +1,50 @@ +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-01 13:07:20.000000000 +0400 +@@ -781,45 +781,7 @@ + + int Count_Batteries_ProcFS() + { +- DIR *battery_dir; +- char *name, *dirname; +- int t = 0; +- +- dirname = "/proc/acpi/battery/"; +- battery_dir = opendir(dirname); +- if(battery_dir) +- { +- struct dirent **namelist; +- int n = 0; +- +- n = scandir(dirname, &namelist, 0, alphasort); +- if(n<0) +- t = -1; +- else +- { +- while(n--) +- { +- name = namelist[n]->d_name; +- // skip . and .. // +- if (!strcmp (".", name) || !strcmp ("..", name)) +- { +- // do nothing +- } +- else +- { +- t++; +- } +- free(namelist[n]); +- } +- free(namelist); +- } +- } +- else +- { +- t = 0; +- } +- closedir(battery_dir); +- return t; ++ return 0; + } + + diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD index 517c91293..5fcce3d22 100644 --- a/community-testing/gambas3/PKGBUILD +++ b/community-testing/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57225 2011-10-24 20:32:33Z andrea $ +# $Id: PKGBUILD 57734 2011-11-01 19:55:59Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' '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.5 +pkgver=2.99.6 pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') @@ -20,14 +20,14 @@ url="http://gambas.sourceforge.net/" license=('GPL') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'qtwebkit' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('dfa16f5208463e81ba8ca801948c353a' +md5sums=('746aaae5494c4b267bdae802c5c006d5' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD index c61cd1b00..4e238db97 100644 --- a/community-testing/shotwell/PKGBUILD +++ b/community-testing/shotwell/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 57609 2011-10-31 14:06:37Z spupykin $ +# $Id: PKGBUILD 57683 2011-11-01 08:40:42Z spupykin $ # 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.5 -pkgrel=1 +pkgrel=2 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" - "build-hack.patch") + "fix-with-libraw-0.4.patch") md5sums=('d437c73127b1cb29a8f9c014effc6aa0' 'bf35262cc611de447147d01cbac33767' - 'afc8657b3fb3803d40f5e621e7857af8') + '488787b6d2cbc7348bc88348b78b6005') build() { cd "${srcdir}/vala-0.12.1" @@ -29,14 +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 - # hack - make || true - patch -p1 <$srcdir/build-hack.patch + make } diff --git a/community-testing/shotwell/fix-with-libraw-0.4.patch b/community-testing/shotwell/fix-with-libraw-0.4.patch new file mode 100644 index 000000000..f6f021b61 --- /dev/null +++ b/community-testing/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/choqok/PKGBUILD b/community/choqok/PKGBUILD index fda3f16a5..b65736aaf 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44627 2011-04-09 15:52:17Z andrea $ +# $Id: PKGBUILD 57710 2011-11-01 14:51:22Z plewis $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl> pkgname=choqok -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url="http://choqok.gnufolks.org/" @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebase-konqueror: proxy support') install="${pkgname}.install" source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5006404ce250d4a75d4bb762c747962d') +md5sums=('05d01f4c93c081f3a84ea013cfba7229') build() { cd ${srcdir} diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD index 9d3464f89..85186118a 100644 --- a/community/e4rat/PKGBUILD +++ b/community/e4rat/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 57458 2011-10-28 07:42:34Z mtorromeo $ +# $Id: PKGBUILD 57697 2011-11-01 11:45:09Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> pkgname=e4rat pkgver=0.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." arch=('i686' 'x86_64') url="http://e4rat.sourceforge.net/" license=('GPL') depends=('e2fsprogs' 'util-linux') -makedepends=('audit' 'boost' 'cmake' 'e2fsprogs' 'perl' 'util-linux') +makedepends=('audit' 'boost' 'cmake') options=(!strip) -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_"$pkgver"_src.tar.gz) +backup=(etc/e4rat.conf) +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) build() { - unset LDFLAGS - cd "$srcdir/$pkgname-$pkgver" - cmake -DCMAKE_BUILD_TYPE=Release . - make + unset LDFLAGS + cd "$srcdir/$pkgname-$pkgver" + cmake -DCMAKE_BUILD_TYPE=Release . + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -dm755 "$pkgdir"/var/lib/$pkgname + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -dm755 "$pkgdir/var/lib/$pkgname" } md5sums=('cbb1f3cdd2b8c96b4402028da07b11f2') diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD index 2e919d73e..143d60c29 100644 --- a/community/fityk/PKGBUILD +++ b/community/fityk/PKGBUILD @@ -4,7 +4,7 @@ pkgname=fityk pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc='A program for nonlinear fitting of analytical functions to data.' arch=('i686' 'x86_64') url='http://www.unipress.waw.pl/fityk/' @@ -14,7 +14,7 @@ makedepends=('boost' 'git' 'python-sphinx' 'swig') options=('!libtool') install='fityk.install' source=('http://biolpc22.york.ac.uk/pub/Daily_HEAD/wxWidgets.tar.gz') # daily snapshot because fityk requires a version that hasn't been released yet... -md5sums=('e02d7a4af1201d39e20a864cd15f530f') +md5sums=('99bb0cf3813ee173edc9cbbc026a78ca') build() { cd wxWidgets diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 50b0dacda..df6e45db6 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56945 2011-10-17 08:20:48Z ibiru $ +# $Id: PKGBUILD 57730 2011-11-01 19:01:23Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' '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.5 +pkgver=2.99.6 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') @@ -20,14 +20,14 @@ url="http://gambas.sourceforge.net/" license=('GPL') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew>=1.7.0' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'qt' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('dfa16f5208463e81ba8ca801948c353a' +md5sums=('746aaae5494c4b267bdae802c5c006d5' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') @@ -42,7 +42,7 @@ build() { package_gambas3-runtime() { depends=('libffi' 'xdg-utils') - pkgdesc="Gambas3 runtime environment" + pkgdesc="Runtime environment" install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc @@ -78,7 +78,7 @@ package_gambas3-runtime() { package_gambas3-devel() { depends=('gambas3-runtime') - pkgdesc="Gambas3 development environment" + pkgdesc="Development environment" cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc make DESTDIR="${pkgdir}" install @@ -88,7 +88,7 @@ package_gambas3-ide() { depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') - pkgdesc="Gambas3 Integrated Development Environment" + pkgdesc="Integrated Development Environment" cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" install @@ -106,7 +106,7 @@ package_gambas3-ide() { package_gambas3-script() { depends=('gambas3-devel') - pkgdesc="Gambas3 scripter and server programs support" + pkgdesc="Scripter and server programs support" install=gambas3-script.install cd ${srcdir}/${pkgbase}-${pkgver} @@ -133,7 +133,7 @@ package_gambas3-examples() { 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' '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') - pkgdesc="Gambas3 examples" + pkgdesc="Applications examples" cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" install @@ -144,7 +144,7 @@ package_gambas3-examples() { package_gambas3-gb-cairo() { depends=('gambas3-runtime' 'cairo') - pkgdesc="Gambas3 cairo component" + pkgdesc="Cairo component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -162,7 +162,7 @@ package_gambas3-gb-cairo() { package_gambas3-gb-chart() { depends=('gambas3-gb-form') - pkgdesc="Gambas3 chart component" + pkgdesc="Chart component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -187,7 +187,7 @@ package_gambas3-gb-chart() { package_gambas3-gb-compress() { depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas3 compression support component" + pkgdesc="Compression support component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -208,7 +208,7 @@ package_gambas3-gb-compress() { package_gambas3-gb-crypt() { depends=('gambas3-runtime') - pkgdesc="Gambas3 MD5/DES crypting component" + pkgdesc="MD5/DES crypting component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -226,7 +226,7 @@ package_gambas3-gb-crypt() { package_gambas3-gb-db() { depends=('gambas3-runtime') - pkgdesc="Gambas3 database access component" + pkgdesc="Database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -242,7 +242,7 @@ package_gambas3-gb-db() { package_gambas3-gb-db-form() { depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Gambas3 database form component" + pkgdesc="Database form component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -267,7 +267,7 @@ package_gambas3-gb-db-form() { package_gambas3-gb-db-mysql() { depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="Gambas3 MySQL database access component" + pkgdesc="MySQL database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -285,7 +285,7 @@ package_gambas3-gb-db-mysql() { package_gambas3-gb-db-odbc() { depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="Gambas3 ODBC database access component" + pkgdesc="ODBC database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -303,7 +303,7 @@ package_gambas3-gb-db-odbc() { package_gambas3-gb-db-postgresql() { depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="Gambas3 PostgreSQL database access component" + pkgdesc="PostgreSQL database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -321,7 +321,7 @@ package_gambas3-gb-db-postgresql() { package_gambas3-gb-db-sqlite2() { depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Gambas3 Sqlite2 database access component" + pkgdesc="Sqlite2 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -339,7 +339,7 @@ package_gambas3-gb-db-sqlite2() { package_gambas3-gb-db-sqlite3() { depends=('gambas3-gb-db' 'sqlite3') - pkgdesc="Gambas3 Sqlite3 database access component" + pkgdesc="Sqlite3 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -357,7 +357,7 @@ package_gambas3-gb-db-sqlite3() { package_gambas3-gb-desktop() { depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Gambas3 desktop component" + pkgdesc="Desktop component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -379,7 +379,7 @@ package_gambas3-gb-desktop() { package_gambas3-gb-dbus() { depends=('gambas3-runtime' 'dbus-core') - pkgdesc="Gambas3 DBUS component" + pkgdesc="DBUS component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -397,7 +397,7 @@ package_gambas3-gb-dbus() { package_gambas3-gb-eval-highlight() { depends=('gambas3-runtime') - pkgdesc="Gambas3 expression evaluator highlight component" + pkgdesc="Expression evaluator highlight component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -417,7 +417,7 @@ package_gambas3-gb-eval-highlight() { package_gambas3-gb-form() { depends=('gambas3-gb-gui') - pkgdesc="Gambas3 form component" + pkgdesc="Form component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -446,7 +446,7 @@ package_gambas3-gb-form() { package_gambas3-gb-form-dialog() { depends=('gambas3-gb-form') - pkgdesc="Gambas3 form dialog component" + pkgdesc="Form dialog component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -475,7 +475,7 @@ package_gambas3-gb-form-dialog() { package_gambas3-gb-form-mdi() { depends=('gambas3-gb-form') - pkgdesc="Gambas3 form MDI component" + pkgdesc="Form MDI component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -504,7 +504,7 @@ package_gambas3-gb-form-mdi() { package_gambas3-gb-form-stock() { depends=('gambas3-runtime') - pkgdesc="Gambas3 default stock icons component" + pkgdesc="Default stock icons component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -528,7 +528,7 @@ package_gambas3-gb-form-stock() { package_gambas3-gb-gtk() { depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="Gambas3 graphical GTK+ toolkit component" + pkgdesc="GTK+ toolkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -546,7 +546,7 @@ package_gambas3-gb-gtk() { package_gambas3-gb-gui() { depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Gambas3 automatic gui toolkit chooser" + pkgdesc="Automatic gui toolkit chooser" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -569,7 +569,7 @@ package_gambas3-gb-gui() { package_gambas3-gb-image() { depends=('gambas3-runtime') - pkgdesc="Gambas3 image component" + pkgdesc="Image component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -585,7 +585,7 @@ package_gambas3-gb-image() { package_gambas3-gb-image-effect() { depends=('gambas3-gb-image') - pkgdesc="Gambas3 image effect component" + pkgdesc="Image effect component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -601,7 +601,7 @@ package_gambas3-gb-image-effect() { package_gambas3-gb-image-imlib() { depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Gambas3 imlib component" + pkgdesc="Imlib component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -619,7 +619,7 @@ package_gambas3-gb-image-imlib() { package_gambas3-gb-image-io() { depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Gambas3 input/output component" + pkgdesc="Input/Output component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -637,7 +637,7 @@ package_gambas3-gb-image-io() { package_gambas3-gb-net() { depends=('gambas3-runtime') - pkgdesc="Gambas3 network component" + pkgdesc="Network component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -655,7 +655,7 @@ package_gambas3-gb-net() { package_gambas3-gb-net-curl() { depends=('gambas3-gb-net' 'curl') - pkgdesc="Gambas3 curl component" + pkgdesc="Curl component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -673,7 +673,7 @@ package_gambas3-gb-net-curl() { package_gambas3-gb-net-smtp() { depends=('gambas3-runtime' 'glib2') - pkgdesc="Gambas3 SMTP component" + pkgdesc="SMTP component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -691,7 +691,7 @@ package_gambas3-gb-net-smtp() { package_gambas3-gb-opengl() { depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="Gambas3 OpenGL component" + pkgdesc="OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -713,7 +713,7 @@ package_gambas3-gb-opengl() { package_gambas3-gb-opengl-glu() { depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GL Utility component" + pkgdesc="GL Utility component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -731,7 +731,7 @@ package_gambas3-gb-opengl-glu() { package_gambas3-gb-opengl-glsl() { depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GLSL component" + pkgdesc="GLSL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -749,7 +749,7 @@ package_gambas3-gb-opengl-glsl() { package_gambas3-gb-option() { depends=('gambas3-runtime') - pkgdesc="Gambas3 getopt component" + pkgdesc="Getopt component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -765,7 +765,7 @@ package_gambas3-gb-option() { package_gambas3-gb-pcre() { depends=('gambas3-runtime' 'pcre') - pkgdesc="Gambas3 PCRE component" + pkgdesc="PCRE component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -783,7 +783,7 @@ package_gambas3-gb-pcre() { package_gambas3-gb-pdf() { depends=('gambas3-runtime' 'poppler') - pkgdesc="Gambas3 PDF component" + pkgdesc="PDF component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -801,7 +801,7 @@ package_gambas3-gb-pdf() { package_gambas3-gb-qt4() { depends=('gambas3-gb-image' 'qt') - pkgdesc="Gambas3 Qt4 toolkit component" + pkgdesc="Qt4 toolkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -825,7 +825,7 @@ package_gambas3-gb-qt4() { package_gambas3-gb-qt4-ext() { depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit extended component" + pkgdesc="Qt4 toolkit extended component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -843,7 +843,7 @@ package_gambas3-gb-qt4-ext() { package_gambas3-gb-qt4-opengl() { depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Gambas3 Qt4 toolkit OpenGL component" + pkgdesc="Qt4 toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -860,8 +860,8 @@ package_gambas3-gb-qt4-opengl() { } package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit webkit component" + depends=('gambas3-gb-qt4') # qt-webkit + pkgdesc="Qt4 toolkit webkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -879,7 +879,7 @@ package_gambas3-gb-qt4-webkit() { package_gambas3-gb-report() { depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Gambas3 report component" + pkgdesc="Report component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -904,7 +904,7 @@ package_gambas3-gb-report() { package_gambas3-gb-sdl() { depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="Gambas3 SDL component" + pkgdesc="SDL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -922,7 +922,7 @@ package_gambas3-gb-sdl() { package_gambas3-gb-sdl-sound() { depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="Gambas3 SDL sound component" + pkgdesc="SDL sound component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -940,7 +940,7 @@ package_gambas3-gb-sdl-sound() { package_gambas3-gb-settings() { depends=('gambas3-runtime') - pkgdesc="Gambas3 setting component" + pkgdesc="Setting component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -960,7 +960,7 @@ package_gambas3-gb-settings() { package_gambas3-gb-signal() { depends=('gambas3-runtime') - pkgdesc="Gambas3 signal component" + pkgdesc="Signal component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -976,7 +976,7 @@ package_gambas3-gb-signal() { package_gambas3-gb-v4l() { depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Gambas3 video4linux component" + pkgdesc="Video4linux component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -994,7 +994,7 @@ package_gambas3-gb-v4l() { package_gambas3-gb-vb() { depends=('gambas3-runtime') - pkgdesc="Gambas3 VB transitional component" + pkgdesc="VB transitional component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1010,7 +1010,7 @@ package_gambas3-gb-vb() { package_gambas3-gb-xml() { depends=('gambas3-runtime' 'libxml2') - pkgdesc="Gambas3 XML component" + pkgdesc="XML component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1032,7 +1032,7 @@ package_gambas3-gb-xml() { package_gambas3-gb-xml-rpc() { depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="Gambas3 XML-RPC component" + pkgdesc="XML-RPC component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1060,7 +1060,7 @@ package_gambas3-gb-xml-rpc() { package_gambas3-gb-xml-xslt() { depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="Gambas3 XML-XSLT component" + pkgdesc="XML-XSLT component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1078,7 +1078,7 @@ package_gambas3-gb-xml-xslt() { package_gambas3-gb-web() { depends=('gambas3-runtime') - pkgdesc="Gambas3 CGI component" + pkgdesc="CGI component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index 5468f6f69..38164439b 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ginac pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64') url='http://www.ginac.de' diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index dc4b902b2..a7bab40dc 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gummi pkgver=0.5.8 -pkgrel=3 +pkgrel=4 pkgdesc='Simple LaTex editor for GTK users' arch=('i686' 'x86_64') url='http://gummi.midnightcoding.org/' diff --git a/community/libreplaygain/PKGBUILD b/community/libreplaygain/PKGBUILD index 63712d22e..19505622d 100644 --- a/community/libreplaygain/PKGBUILD +++ b/community/libreplaygain/PKGBUILD @@ -1,6 +1,9 @@ -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> +# $Id: PKGBUILD 57695 2011-11-01 10:46:06Z andrea $ +# Maintainer: +# Contributor: Corrado Primier <bardo@aur.archlinux.org> + pkgname=libreplaygain -pkgver=453 +pkgver=475 pkgrel=1 pkgdesc="A library to adjust audio gain" arch=('i686' 'x86_64') @@ -8,19 +11,24 @@ url="http://www.musepack.net/index.php?pg=src" license=('LGPL') depends=('glibc') makedepends=('cmake') -source=(http://files.musepack.net/source/${pkgname}_r${pkgver}.tar.gz) -md5sums=('1bde8f0319fd2a2b9921b2a2dfc47655') +source=("http://files.musepack.net/source/${pkgname}_r${pkgver}.tar.gz") +md5sums=('e27b3b1249b7fbae92d656d9e3d26633') build() { - mkdir "${srcdir}/${pkgname}_r${pkgver}/build" - cd "${srcdir}/${pkgname}_r${pkgver}/build" + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}_r${pkgver}/ \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make DESTDIR="${pkgdir}/" install +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install - mkdir -p "${pkgdir}/usr/include/replaygain/" - install -Dm644 ${srcdir}/${pkgname}_r${pkgver}/include/replaygain/* \ - ${pkgdir}/usr/include/replaygain/ + install -d "${pkgdir}/usr/include/replaygain/" + install -Dm644 "${srcdir}"/${pkgname}_r${pkgver}/include/replaygain/* \ + "${pkgdir}/usr/include/replaygain/" } - -# vim:set ts=2 sw=2 et: diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index bebe10722..517bbb7bc 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2.1 +pkgrel=1 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' @@ -13,10 +13,15 @@ depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpul makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') optdepends=('gnash-gtk: fallback support') install="lightspark.install" -source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tgz") -md5sums=('aa0daa22646c2a663ec5045074451d45') +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" + 'llvm29.diff') +md5sums=('ac2233a83e8bf0b305563bbce322cd76') build() { + cd lightspark-${pkgver} + patch -Np0 -i ${srcdir}/llvm29.diff + cd ${srcdir} + rm -rf build mkdir build cd build @@ -26,7 +31,7 @@ build() { -DCOMPILE_PLUGIN=1 \ -DCMAKE_BUILD_TYPE=Release \ -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - .. + ../lightspark-${pkgver} make } @@ -36,3 +41,5 @@ package() { make DESTDIR=${pkgdir} install } +md5sums=('ac2233a83e8bf0b305563bbce322cd76' + '5f717d1d9ead478184ca68f6ac068099') diff --git a/community/lightspark/llvm29.diff b/community/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community/lightspark/llvm29.diff @@ -0,0 +1,12 @@ +--- CMakeLists.txt.old 2011-11-01 22:07:52.475608726 +0000 ++++ CMakeLists.txt 2011-11-01 22:08:52.046241925 +0000 +@@ -152,7 +152,8 @@ + MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!") + ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) +- MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ #MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ ADD_DEFINITIONS(-DLLVM_29) + ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8) + ADD_DEFINITIONS(-DLLVM_28) diff --git a/community/lxdm/lxdm-conf.patch b/community/lxdm/lxdm-conf.patch new file mode 100644 index 000000000..1744e557e --- /dev/null +++ b/community/lxdm/lxdm-conf.patch @@ -0,0 +1,11 @@ +--- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 ++++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 +@@ -27,7 +27,7 @@ + gtk_theme=Clearlooks + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++# bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index f0636c120..78b32e1f0 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mongodb pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') url='http://www.mongodb.org' diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 012b60f77..88fa06b7b 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -7,7 +7,7 @@ pkgname=nodejs pkgver=0.4.12 -pkgrel=1 +pkgrel=2 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index eac2726b7..1339b6ac7 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -3,7 +3,7 @@ pkgname=nut pkgver=17.3 -pkgrel=1 +pkgrel=2 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index e5a597bdd..79a6d8ac0 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138285 2011-09-19 20:41:10Z ibiru $ +# $Id: PKGBUILD 141669 2011-11-02 03:17:44Z eric $ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz banshee-recent-gpod.patch) -sha256sums=('85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815' -'018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9') +sha256sums=('55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5' + '018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/libmpcdec/PKGBUILD b/extra/libmpcdec/PKGBUILD index 3cd953784..a8f30dbd7 100644 --- a/extra/libmpcdec/PKGBUILD +++ b/extra/libmpcdec/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 57066 2009-10-31 11:59:42Z allan $ +# $Id: PKGBUILD 141656 2011-11-01 10:26:35Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libmpcdec pkgver=1.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Musepack decoding library" arch=('i686' 'x86_64') url="http://musepack.net/" license=('custom') depends=('glibc') options=('!libtool') -source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2) +source=("http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2") md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/extra/libsexy/PKGBUILD b/extra/libsexy/PKGBUILD index d40911e2c..86536f8b3 100644 --- a/extra/libsexy/PKGBUILD +++ b/extra/libsexy/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 57006 2009-10-31 07:29:59Z allan $ +# $Id: PKGBUILD 141654 2011-11-01 10:11:25Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libsexy pkgver=0.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="Doing naughty things to good widgets." arch=('i686' 'x86_64') license=('GPL') @@ -10,13 +11,17 @@ url="http://chipx86.com/wiki/Libsexy" depends=('gtk2' 'libxml2') makedepends=('iso-codes' 'pkgconfig') options=('!libtool') -source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz) +source=("http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz") md5sums=('33c079a253270ec8bfb9508e4bb30754') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -f ${pkgdir}/usr/lib/libsexy.a diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index 3ed250d56..3cf29cf07 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 56738 2009-10-26 14:27:28Z giovanni $ +# $Id: PKGBUILD 141650 2011-11-01 10:06:18Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> pkgname=ode pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64') url="http://www.ode.org" license=('LGPL' 'BSD') depends=('gcc-libs' 'bash') -source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('712579afabc2a15aa56e399f76171477') @@ -18,9 +18,13 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-shared - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir}/ install install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT } diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index f7036e8ba..8843af016 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -2,22 +2,21 @@ # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgname=crosstool-ng -pkgver=1.11.3 -pkgrel=2 +pkgver=1.13.0 +pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') url="http://crosstool-ng.org/" license=(GPL2) -depends=('cvs') +depends=('cvs' 'curl') +makedepends=('libtool') optdepends=('subversion: for retrieving eglibc sources') -source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - libc_ports_short_name.patch) -md5sums=('3830cbdcc7e1a60c93caeaf98f718187' - '0a95af7e6ba35e02e38c71a3121b4448') +source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2) + #libc_ports_short_name.patch) build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/libc_ports_short_name.patch + #patch -Np1 -i $srcdir/libc_ports_short_name.patch ./configure --prefix=/usr make @@ -27,3 +26,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } +md5sums=('55fba9f37b9f9ed0aeb6c50fbd8b6429') diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD index c804b8409..ba869598e 100644 --- a/social/monkeysphere/PKGBUILD +++ b/social/monkeysphere/PKGBUILD @@ -4,7 +4,7 @@ # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere pkgver=0.35 -pkgrel=1 +pkgrel=2 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" arch=('i686' 'x86_64') url="http://web.monkeysphere.info/" diff --git a/social/monkeysphere/monkeysphere.install b/social/monkeysphere/monkeysphere.install index cc31e728d..2013f9f41 100644 --- a/social/monkeysphere/monkeysphere.install +++ b/social/monkeysphere/monkeysphere.install @@ -12,7 +12,9 @@ post_install() { echo ">>> Creating monkeysphere user and group and setting permissions..." getent group monkeysphere >/dev/null || usr/sbin/groupadd monkeysphere getent passwd monkeysphere >/dev/null || usr/sbin/useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere - chown monkeysphere:monkeysphere /var/lib/monkeysphere + +# Should be root:root for sshd to work + chown root:root /var/lib/monkeysphere } # arg 1: the new package version @@ -24,7 +26,8 @@ pre_upgrade() { # arg 1: the new package version # arg 2: the old package version post_upgrade() { - /bin/true +# Should be root:root for sshd to work + chown root:root /var/lib/monkeysphere } # arg 1: the old package version diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD index 0a63ec61b..ebbb49727 100644 --- a/staging/kdebase-workspace/PKGBUILD +++ b/staging/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141627 2011-10-31 22:51:23Z andrea $ +# $Id: PKGBUILD 141663 2011-11-01 20:17:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -33,9 +33,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'fix-powerprofiles.patch') -sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' @@ -43,8 +42,7 @@ sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514' - '7c514a0727f904359d2ab12078e9868488ded3e6') + 'd509dac592bd8b310df27991b208c95b6d907514') build() { cd "${srcdir}"/${_pkgname}-${pkgver} @@ -53,8 +51,6 @@ build() { patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch - patch -Rp1 -i "${srcdir}"/fix-powerprofiles.patch - cd "${srcdir}" mkdir build cd build diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD new file mode 100644 index 000000000..fd99a559d --- /dev/null +++ b/staging/transcode/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 141640 2011-11-01 05:00:23Z eric $ +# Maintainer: +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: roberto <roberto@archlinux.org> + +pkgname=transcode +_sripver=0.3-4 +pkgver=1.1.5 +pkgrel=7 +pkgdesc="A video/DVD ripper and encoder for the terminal/console" +arch=('i686' 'x86_64') +url="http://tcforge.berlios.de/" +license=('GPL') +depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' + 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') +makedepends=('nasm') +options=('!libtool' '!makeflags') +source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 + http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz + transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch) +sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' + '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2' + '2d3bb4486394ee55540e772f134e193874e5c2b4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 < ../transcode-1.1.5-jpeg-7.patch + patch -p1 < ../transcode-1.1.5-mpa.patch + patch -p1 < ../transcode-1.1.5-ffmpeg.patch + + # building from here + ./configure --prefix=/usr \ + --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ + --enable-lame --enable-ogg --enable-vorbis --enable-theora \ + --enable-libdv --enable-libxml2 --enable-v4l \ + --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ + --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ + --enable-xvid --enable-x264 --enable-alsa \ + --enable-libmpeg2 --enable-libmpeg2convert \ + --with-libxml2-prefix=/usr \ + --with-mjpegtools-prefix=/usr \ + --with-imagemagick-prefix=/usr \ + --with-libdv-includes=/usr \ + --with-libpostproc-includes=/usr/include/libpostproc \ + --with-ogg-prefix=/usr \ + --with-lame-libs=/usr \ + --with-lzo-libs=/usr/lib \ + --with-libavcodec-prefix=/usr \ + --with-libavcodec-includes=/usr/include \ + --with-libavcodec-libs=/usr/lib + + make + ############################################################################## + # this imports the latest subtitleripper sources and replaces the internal + mkdir contrib + mv "${srcdir}/subtitleripper" contrib/subrip + # removes dependency on libppm, make it dependend on netpbm just failed, argh... + cd contrib/subrip + sed -e 's|^\(.*lppm.*\)$|#\1|' \ + -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ + -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ + -i Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + cd contrib/subrip + install -m 755 pgm2txt "${pkgdir}/usr/bin/" + install -m 755 srttool "${pkgdir}/usr/bin/" + install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" + install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/" + install -m 755 vobsub2pgm "${pkgdir}/usr/bin/" +} diff --git a/staging/transcode/transcode-1.1.5-ffmpeg.patch b/staging/transcode/transcode-1.1.5-ffmpeg.patch new file mode 100644 index 000000000..86e8272e9 --- /dev/null +++ b/staging/transcode/transcode-1.1.5-ffmpeg.patch @@ -0,0 +1,124 @@ +Index: transcode-1.1.5/encode/encode_lavc.c +=================================================================== +--- transcode-1.1.5.orig/encode/encode_lavc.c ++++ transcode-1.1.5/encode/encode_lavc.c +@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa + /* + * context *transcode* (not libavcodec) defaults + */ +- pd->ff_vcontext.mb_qmin = 2; +- pd->ff_vcontext.mb_qmax = 31; + pd->ff_vcontext.max_qdiff = 3; + pd->ff_vcontext.max_b_frames = 0; + pd->ff_vcontext.me_range = 0; +@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri + // handled by transcode core + // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + // handled by transcode core +- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, +- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +Index: transcode-1.1.5/export/aud_aux.c +=================================================================== +--- transcode-1.1.5.orig/export/aud_aux.c ++++ transcode-1.1.5/export/aud_aux.c +@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- + memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all +- mpa_ctx.codec_type = CODEC_TYPE_AUDIO; ++ mpa_ctx.codec_type = AVMEDIA_TYPE_AUDIO; + mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. + mpa_ctx.channels = vob->dm_chan; // channels + mpa_ctx.sample_rate = vob->a_rate; +Index: transcode-1.1.5/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.5.orig/export/export_ffmpeg.c ++++ transcode-1.1.5/export/export_ffmpeg.c +@@ -643,8 +643,6 @@ MOD_init + + lavc_venc_context->bit_rate = vob->divxbitrate * 1000; + lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; +- lavc_venc_context->mb_qmin = lavc_param_mb_qmin; +- lavc_venc_context->mb_qmax = lavc_param_mb_qmax; + lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); + lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); + lavc_venc_context->max_qdiff = lavc_param_vqdiff; +Index: transcode-1.1.5/import/decode_lavc.c +=================================================================== +--- transcode-1.1.5.orig/import/decode_lavc.c ++++ transcode-1.1.5/import/decode_lavc.c +@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode) + + //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read); + do { +- len = avcodec_decode_video(lavc_dec_context, &picture, +- &got_picture, buffer+buf_len, mp4_size-buf_len); ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = buffer+buf_len; ++ pkt.size = mp4_size-buf_len; ++ len = avcodec_decode_video2(lavc_dec_context, &picture, ++ &got_picture, &pkt); + + if (len < 0) { + tc_log_error(__FILE__, "frame decoding failed"); +Index: transcode-1.1.5/import/probe_ffmpeg.c +=================================================================== +--- transcode-1.1.5.orig/import/probe_ffmpeg.c ++++ transcode-1.1.5/import/probe_ffmpeg.c +@@ -47,7 +47,7 @@ static void translate_info(const AVForma + for (i = 0; i < ctx->nb_streams; i++) { + st = ctx->streams[i]; + +- if (st->codec->codec_type == CODEC_TYPE_VIDEO) { ++ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + info->bitrate = st->codec->bit_rate / 1000; + info->width = st->codec->width; + info->height = st->codec->height; +@@ -65,7 +65,7 @@ static void translate_info(const AVForma + for (i = 0; i < ctx->nb_streams; i++) { + st = ctx->streams[i]; + +- if (st->codec->codec_type == CODEC_TYPE_AUDIO ++ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO + && j < TC_MAX_AUD_TRACKS) { + info->track[j].format = 0x1; /* known wrong */ + info->track[j].chan = st->codec->channels; +Index: transcode-1.1.5/export/ffmpeg_cfg.c +=================================================================== +--- transcode-1.1.5.orig/export/ffmpeg_cfg.c ++++ transcode-1.1.5/export/ffmpeg_cfg.c +@@ -34,8 +34,6 @@ int lavc_param_vme = 4; + //int lavc_param_vqscale = 0; + //int lavc_param_vqmin = 2; + //int lavc_param_vqmax = 31; +-int lavc_param_mb_qmin = 2; +-int lavc_param_mb_qmax = 31; + int lavc_param_lmin = 2; + int lavc_param_lmax = 31; + int lavc_param_vqdiff = 3; +@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={ + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +Index: transcode-1.1.5/export/ffmpeg_cfg.h +=================================================================== +--- transcode-1.1.5.orig/export/ffmpeg_cfg.h ++++ transcode-1.1.5/export/ffmpeg_cfg.h +@@ -13,8 +13,6 @@ extern int lavc_param_vme; + //extern int lavc_param_vqscale; + //extern int lavc_param_vqmin; + //extern int lavc_param_vqmax; +-extern int lavc_param_mb_qmin; +-extern int lavc_param_mb_qmax; + extern int lavc_param_lmin; + extern int lavc_param_lmax; + extern int lavc_param_vqdiff; diff --git a/staging/transcode/transcode-1.1.5-jpeg-7.patch b/staging/transcode/transcode-1.1.5-jpeg-7.patch new file mode 100644 index 000000000..288932a61 --- /dev/null +++ b/staging/transcode/transcode-1.1.5-jpeg-7.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/show_bug.cgi?id=294488 + +Patch by: Salah Coronya + +Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore. + +--- export/export_jpg.c ++++ export/export_jpg.c +@@ -91,6 +91,7 @@ + + jpeg_set_quality(&encinfo, quality, TRUE); + encinfo.raw_data_in = TRUE; ++ encinfo.do_fancy_downsampling = FALSE; + encinfo.in_color_space = JCS_YCbCr; + + encinfo.comp_info[0].h_samp_factor = 2; diff --git a/staging/transcode/transcode-1.1.5-mpa.patch b/staging/transcode/transcode-1.1.5-mpa.patch new file mode 100644 index 000000000..e7fb0fc1c --- /dev/null +++ b/staging/transcode/transcode-1.1.5-mpa.patch @@ -0,0 +1,10 @@ +--- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500 ++++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500 +@@ -347,6 +347,7 @@ + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- + memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all ++ mpa_ctx.codec_type = CODEC_TYPE_AUDIO; + mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. + mpa_ctx.channels = vob->dm_chan; // channels + mpa_ctx.sample_rate = vob->a_rate; |