diff options
142 files changed, 5495 insertions, 124 deletions
diff --git a/community-testing/cherokee/PKGBUILD b/community-testing/cherokee/PKGBUILD new file mode 100644 index 000000000..07cd74624 --- /dev/null +++ b/community-testing/cherokee/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 57980 2011-11-05 11:37:54Z ibiru $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Link Dupont <link@subpop.net> + +pkgname=cherokee +pkgver=1.2.101 +pkgrel=2 +pkgdesc="A very fast, flexible and easy to configure Web Server" +arch=('i686' 'x86_64') +url="http://www.cherokee-project.com/" +license=('GPL2') +depends=('openssl' 'pcre') +makedepends=('python2' 'gettext' 'libldap' 'pam' 'libmysqlclient' + 'ffmpeg' 'geoip') +optdepends=('python2: cherokee-admin (administrative web interface)' + 'libldap: ldap validator' + 'pam: pam validator' + 'libmysqlclient: mysql validator' + 'ffmpeg: Audio/Video streaming handler' + 'geoip: GeoIP rule module' + 'rrdtool: RRDtool based information collector') +backup=('etc/cherokee/cherokee.conf' + 'etc/logrotate.d/cherokee' + 'etc/pam.d/cherokee') +options=('!libtool') +source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz + cherokee.rc + cherokee.logrotate + fix-ctk-path-handler-match.patch) +sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8' + '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86' + '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e' + '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix path matching bug in CTK apps (e.g. market) + patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch" + + # Use subdirectory for logs + sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre + + # Use Python 2 in cherokee-admin + sed -i 's/"python"/"python2"/' cherokee/main_admin.c + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --with-wwwroot=/srv/http \ + --with-wwwuser=http \ + --with-wwwgroup=http \ + --with-python=python2 \ + --enable-os-string="Arch Linux" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make -j1 DESTDIR="$pkgdir" install + + # PAM configuration file for cherokee + install -D -m644 pam.d_cherokee "$pkgdir/etc/pam.d/$pkgname" + + # Fix ownership of /var/lib/cherokee/graphs + chown -R http:http "$pkgdir/var/lib/$pkgname/graphs" + + # Use Python 2 + sed -i 's/env python$/&2/' \ + "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \ + "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}} + sed -i -r "s/['\"]python/&2/g" \ + "$pkgdir/usr/share/cherokee/admin/wizards/django.py" + + # Compile Python scripts + python2 -m compileall "$pkgdir" + python2 -O -m compileall "$pkgdir" + + install -d -o http -g http "$pkgdir/var/log/$pkgname" + install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname" + install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" + + # Cleanup + rm -rf "$pkgdir/srv" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/cherokee/cherokee.logrotate b/community-testing/cherokee/cherokee.logrotate new file mode 100644 index 000000000..19207fd02 --- /dev/null +++ b/community-testing/cherokee/cherokee.logrotate @@ -0,0 +1,9 @@ +/var/log/cherokee/*.error /var/log/cherokee/*.access { + daily + rotate 14 + compress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/community-testing/cherokee/cherokee.rc b/community-testing/cherokee/cherokee.rc new file mode 100755 index 000000000..2d413dc13 --- /dev/null +++ b/community-testing/cherokee/cherokee.rc @@ -0,0 +1,65 @@ +#!/bin/bash + +daemon_name=cherokee + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid + if kill $PID &>/dev/null; then + rm_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + reload) + stat_busy "Reloading $daemon_name daemon" + [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid + if kill -HUP $PID &>/dev/null; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + restart) + stat_busy "Restarting $daemon_name daemon" + [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid + if kill -USR1 $PID &>/dev/null; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|reload|restart|status}" +esac + +exit 0 diff --git a/community-testing/cherokee/fix-ctk-path-handler-match.patch b/community-testing/cherokee/fix-ctk-path-handler-match.patch new file mode 100644 index 000000000..abd20c5ef --- /dev/null +++ b/community-testing/cherokee/fix-ctk-path-handler-match.patch @@ -0,0 +1,16 @@ +diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py +--- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py 2011-06-06 14:17:35.000000000 +0300 ++++ cherokee-1.2.99/admin/CTK/CTK/Server.py 2011-09-16 03:31:06.000000000 +0300 +@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler) + my_thread.scgi_conn = self + my_thread.request_url = url + ++ # Drop the query string before matching against the handlers ++ path = url.split('?', 1)[0] ++ + for published in server._web_paths: +- if re.match (published._regex, url): ++ if re.match (published._regex, path): + # POST + if published._method == 'POST': + post = self._process_post() diff --git a/community-testing/deadbeef/PKGBUILD b/community-testing/deadbeef/PKGBUILD new file mode 100644 index 000000000..815dfd98f --- /dev/null +++ b/community-testing/deadbeef/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 57984 2011-11-05 11:38:14Z ibiru $ +# 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-testing/deadbeef/deadbeef.install b/community-testing/deadbeef/deadbeef.install new file mode 100644 index 000000000..eaf1b9a69 --- /dev/null +++ b/community-testing/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-testing/deadbeef/ffmpeg.patch b/community-testing/deadbeef/ffmpeg.patch new file mode 100644 index 000000000..925b84408 --- /dev/null +++ b/community-testing/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-testing/dvdstyler/PKGBUILD b/community-testing/dvdstyler/PKGBUILD new file mode 100644 index 000000000..13ddca6a2 --- /dev/null +++ b/community-testing/dvdstyler/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 57986 2011-11-05 11:38:22Z ibiru $ +# 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-testing/electricsheep/PKGBUILD b/community-testing/electricsheep/PKGBUILD new file mode 100644 index 000000000..d82e6cc2f --- /dev/null +++ b/community-testing/electricsheep/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57988 2011-11-05 11:38:29Z ibiru $ +# 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-testing/electricsheep/electricsheep-ffmpeg.patch b/community-testing/electricsheep/electricsheep-ffmpeg.patch new file mode 100644 index 000000000..b04cf41b0 --- /dev/null +++ b/community-testing/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-testing/ffmpeg2theora/PKGBUILD b/community-testing/ffmpeg2theora/PKGBUILD new file mode 100644 index 000000000..7a371dce2 --- /dev/null +++ b/community-testing/ffmpeg2theora/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 57990 2011-11-05 11:38:39Z 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=2 +pkgdesc="A simple converter to create Ogg Theora files" +arch=('i686' 'x86_64') +url="http://www.v2v.cc/~j/ffmpeg2theora/" +license=('GPL3') +depends=('ffmpeg') +makedepends=('pkgconfig' 'scons') +changelog=$pkgname.changelog +source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + scons +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man" +} diff --git a/community-testing/ffmpeg2theora/ffmpeg2theora.changelog b/community-testing/ffmpeg2theora/ffmpeg2theora.changelog new file mode 100644 index 000000000..adbe34807 --- /dev/null +++ b/community-testing/ffmpeg2theora/ffmpeg2theora.changelog @@ -0,0 +1,28 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * ffmpeg2theora 0.28-1 + * Upstream update + +2010-06-25 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.27-1 + * Upstream update + +2010-02-05 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.26-1 + * Upstream update + * Updated license + * Updated source url + +2010-01-10 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.25-1 + * Upstream update + * Built against ffmpeg 20100108 + +2009-06-06 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.24-1 + * Upstream update + * Added ChangeLog diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD new file mode 100644 index 000000000..68f826412 --- /dev/null +++ b/community-testing/gnash/PKGBUILD @@ -0,0 +1,79 @@ +# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgbase=gnash +pkgname=(gnash-common gnash-gtk) +pkgver=0.8.9 +pkgrel=5 +arch=(i686 x86_64) +url="http://www.gnu.org/software/gnash/" +license=(GPL3) +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + 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 + gentoo-ffmpeg-0.8.patch) +md5sums=('5b2be6b04a1bcc5fb404cc377034499e' + '98dec9a5c1b1084245a3f46b4022a6e2') + +build() { + cd "$srcdir/gnash-$pkgver" + + # Consolidated gentoo patches for ffmpeg compatibility + # as of 2011-10-31 + patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" + ./autogen.sh + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-plugins-install=system \ + --with-npapi-plugindir=/usr/lib/mozilla/plugins \ + --enable-gui=sdl,gtk \ + --enable-renderer=agg \ + --enable-media=gst,ffmpeg \ + --enable-hwaccel=vaapi + + make +} + +package_gnash-common() { + pkgdesc="A GNU Flash movie player" + depends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + boost-libs) + backup=(etc/gnashrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install + + # Split gnash-gtk + mkdir -p "$srcdir"/gtk/{bin,man1,share} + mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" + mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" + mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" + mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" +} + +package_gnash-gtk() { + pkgdesc="A GNU Flash movie player" + depends=("gnash-common=$pkgver" + gtk2 libldap hicolor-icon-theme desktop-file-utils) + install=gnash-gtk.install + backup=(etc/gnashpluginrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install-plugin + + install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} + mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" + mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" + mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" + mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" +} diff --git a/community-testing/gnash/gentoo-ffmpeg-0.8.patch b/community-testing/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community-testing/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-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-testing/gnash/gnash-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD new file mode 100644 index 000000000..065728481 --- /dev/null +++ b/community-testing/gpac/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57994 2011-11-05 11:38:57Z ibiru $ +# 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-testing/gpac/libpng14-infopp-null.patch b/community-testing/gpac/libpng14-infopp-null.patch new file mode 100644 index 000000000..b02456557 --- /dev/null +++ b/community-testing/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-testing/gpac/openjpeg14.patch b/community-testing/gpac/openjpeg14.patch new file mode 100644 index 000000000..68a625eeb --- /dev/null +++ b/community-testing/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-testing/kdenlive/PKGBUILD b/community-testing/kdenlive/PKGBUILD new file mode 100644 index 000000000..1d4ec4dd2 --- /dev/null +++ b/community-testing/kdenlive/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 58030 2011-11-05 13:50:01Z 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.8.2 +pkgrel=1 +pkgdesc="A non-linear video editor for Linux" +arch=('i686' 'x86_64') +url="http://www.kdenlive.org/" +license=('GPL') +depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' + 'libqzeitgeist') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa') +install=kdenlive.install +options=('docs') +source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz" + glu.patch) +md5sums=('0836842f489f6142cee101842ac76c54' + 'fd6c5fe46419ee505c562363d41f6e9f') + +build() { + export LDFLAGS="$LDFLAGS -lX11" + cd "${srcdir}" + mkdir -p build + cd build + (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch) + cmake ../kdenlive-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DLINK_LIBRARIES=-lX11 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/kdenlive/glu.patch b/community-testing/kdenlive/glu.patch new file mode 100644 index 000000000..a4c2f21fb --- /dev/null +++ b/community-testing/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-testing/kdenlive/kdenlive.install b/community-testing/kdenlive/kdenlive.install new file mode 100644 index 000000000..a3489ee9d --- /dev/null +++ b/community-testing/kdenlive/kdenlive.install @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/libdlna/PKGBUILD b/community-testing/libdlna/PKGBUILD new file mode 100644 index 000000000..89555cea3 --- /dev/null +++ b/community-testing/libdlna/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 57996 2011-11-05 11:39:05Z ibiru $ +# Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> +# Contributor: kastor <kastor@fobos.org.ar> +pkgname=libdlna +pkgver=0.2.3 +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' '!makeflags') # not parallel safe, error find -ldlna +makedepends=('ctags') +depends=('glibc' 'ffmpeg') +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} + 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-testing/libdlna/ffmpeg-0.8.patch b/community-testing/libdlna/ffmpeg-0.8.patch new file mode 100644 index 000000000..63b33a451 --- /dev/null +++ b/community-testing/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-testing/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community-testing/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch new file mode 100644 index 000000000..8620ab2eb --- /dev/null +++ b/community-testing/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-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD new file mode 100644 index 000000000..cff8dd04a --- /dev/null +++ b/community-testing/lightspark/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=lightspark +pkgver=0.5.2.1 +pkgrel=2 +pkgdesc='An alternative Flash Player for Linux.' +arch=('i686' 'x86_64') +url='http://lightspark.sourceforge.net' +license=('LGPL3') +conflicts=('lightspark-git') +depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') +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}.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 + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPILE_PLUGIN=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ + ../lightspark-${pkgver} + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/lightspark/lightspark.install b/community-testing/lightspark/lightspark.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community-testing/lightspark/lightspark.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-testing/lightspark/llvm29.diff b/community-testing/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community-testing/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/minidlna/PKGBUILD b/community-testing/minidlna/PKGBUILD new file mode 100644 index 000000000..612cc92c2 --- /dev/null +++ b/community-testing/minidlna/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 58002 2011-11-05 11:39:33Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer:Biginoz < biginoz AT free point fr> +# Contributor: Ignacio Galmarino <igalmarino@gmail.com> +# Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com> + +pkgname=minidlna +pkgver=1.0.22 +pkgrel=4 +pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/minidlna/" +license=('GPL') +depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite3') +conflicts=('minidlna-cvs') +backup=('etc/minidlna.conf' + 'etc/conf.d/minidlna') +changelog=changelog +source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz + minidlna.rc) +md5sums=('3de2f6b54f43bb998dfad3c8fa75cef3' + '8b064a6c344a3ad8029e2619dfe07b77') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR=$pkgdir make install + install -D -m755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna + mkdir -p $pkgdir/etc/conf.d + echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna +} diff --git a/community-testing/minidlna/changelog b/community-testing/minidlna/changelog new file mode 100644 index 000000000..35bf6239c --- /dev/null +++ b/community-testing/minidlna/changelog @@ -0,0 +1,4 @@ +2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru> + + * 1.0.22-3 : + add user configuration to /etc/conf.d/minidlna diff --git a/community-testing/minidlna/minidlna.rc b/community-testing/minidlna/minidlna.rc new file mode 100755 index 000000000..df44a549f --- /dev/null +++ b/community-testing/minidlna/minidlna.rc @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/minidlna.conf +. /etc/conf.d/minidlna + +PID=`pidof -o %PPID /usr/sbin/minidlna` + +case "$1" in + start) + stat_busy "Starting minidlna" + [ -z "$PID" ] && su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon minidlna + stat_done + fi + ;; + stop) + stat_busy "Stopping minidlna" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon minidlna + stat_done + fi + ;; + clean) + $0 stop + sleep 1 + stat_busy "Cleaning minidlna cache" + [ -z $db_dir ] || rm -r $db_dir/* + stat_done + sleep 1 + $0 start + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|clean}" +esac +exit 0 diff --git a/community-testing/mlt/PKGBUILD b/community-testing/mlt/PKGBUILD new file mode 100644 index 000000000..7bc6df243 --- /dev/null +++ b/community-testing/mlt/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 58004 2011-11-05 11:39:48Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> +# Contributor: funkyou <spamopfer@nickname.berlin.de> +# Contributor: tardo <tardo@nagi-fanboi.net> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> + +pkgbase=mlt +pkgname=('mlt' 'mlt-python-bindings') +pkgver=0.7.6 +pkgrel=1 +pkgdesc="An open source multimedia framework" +arch=('i686' 'x86_64') +url="http://www.mltframework.org" +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=('105969a63339da2f8ce4ddce1652c9e7') + +build() { + # mlt + cd $srcdir/mlt-$pkgver + +# [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= + SSE2=--disable-sse2 + + msg "SSE2=$SSE2" + ./configure --prefix=/usr --enable-gpl \ + --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \ + --avformat-vdpau \ + --avformat-swscale $SSE2 + make + + # mlt python bindings + cd $srcdir/mlt-$pkgver/src/swig/python + sed -i 's_path=`which python_path=`which python2_' build + sed -i 's_`python -c_`python2 -c_' build + sed -i 's#python-config#python2-config#' build + ./build +} + +package_mlt() { + depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins') + optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa") + conflicts=('mlt++<=0.3.8') + + cd $srcdir/mlt-$pkgver + make DESTDIR=$pkgdir install +} + +package_mlt-python-bindings() { + depends=('python2' 'mlt') + + cd $srcdir/mlt-$pkgver/src/swig/python + mkdir -p $pkgdir/usr/lib/python2.7/ + install -m755 mlt.py $pkgdir/usr/lib/python2.7/ + install -m755 _mlt.so $pkgdir/usr/lib/python2.7/ + install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/ +} diff --git a/community-testing/motion/PKGBUILD b/community-testing/motion/PKGBUILD new file mode 100644 index 000000000..320fab35f --- /dev/null +++ b/community-testing/motion/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 58006 2011-11-05 11:40:00Z ibiru $ +# Maintainer: + +pkgname=motion +pkgver=3.2.12 +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' 'v4l-utils') +backup=('etc/motion/motion.conf') +options=('!makeflags') +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 \ + --sysconfdir=/etc/motion + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" + + 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-testing/motion/ffmpeg-0.8.patch b/community-testing/motion/ffmpeg-0.8.patch new file mode 100644 index 000000000..5dcc6e686 --- /dev/null +++ b/community-testing/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-testing/motion/linux-headers.patch b/community-testing/motion/linux-headers.patch new file mode 100644 index 000000000..795c8aec5 --- /dev/null +++ b/community-testing/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-testing/motion/rc.motion b/community-testing/motion/rc.motion new file mode 100755 index 000000000..6ae95d17b --- /dev/null +++ b/community-testing/motion/rc.motion @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/motion` +case "$1" in + start) + stat_busy "Starting Motion" + [ -z "$PID" ] && /usr/bin/motion + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon motion + stat_done + fi + ;; + stop) + stat_busy "Stopping Motion" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon motion + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/mplayer2/PKGBUILD b/community-testing/mplayer2/PKGBUILD new file mode 100644 index 000000000..62a237a2e --- /dev/null +++ b/community-testing/mplayer2/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 58008 2011-11-05 11:40:07Z ibiru $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Bartek Piotrowski <barthalion@gmail.com> + +pkgname=mplayer2 +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' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa') +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 +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d') +options=('!emptydirs') + +# source PKGBUILD && mksource +mksource() { + _gitroot="git://git.mplayer2.org/mplayer2.git" + _gitname="${pkgname}-${pkgver}" + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + else + git clone "$_gitroot" "$_gitname" + fi + + tar -cJvf ${_gitname}.tar.xz ${_gitname} + rm -fr ${_gitname} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-arts \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --language=all \ + --enable-translation \ + --confdir=/etc/mplayer + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ + install -dm755 "${pkgdir}"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf + + install -dm755 "${pkgdir}"/usr/share/applications/ + install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/ +} diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD new file mode 100644 index 000000000..bd765ef2a --- /dev/null +++ b/community-testing/openscenegraph/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 58010 2011-11-05 11:40:11Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hans Janssen <janserv@gmail.com> +# Contributor: my64 <packages@obordes.com> +# Contributor: Colin Pitrat <colin.pitrat@gmail.com> + +pkgname=openscenegraph +pkgver=3.0.1 +pkgrel=2 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') +conflicts=('openthreads') +provides=('openthreads') +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") +md5sums=('c43a25d023e635c3566b2083d8e6d956') + +build() { + cd OpenSceneGraph-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD new file mode 100644 index 000000000..6b5b115ed --- /dev/null +++ b/community-testing/performous/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 58012 2011-11-05 11:40:18Z ibiru $ +# Maintainer : Laurent Carlier <lordheavym@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=performous +pkgver=0.6.1 +pkgrel=10 +pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' +arch=('i686' 'x86_64') +url="http://performous.org/" +license=('GPL') +depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ + '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 + 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/} + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make +} + +package() { + cd ${srcdir}/Performous-${pkgver}-Source/build + + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch new file mode 100644 index 000000000..22dd07213 --- /dev/null +++ b/community-testing/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-testing/picard/PKGBUILD b/community-testing/picard/PKGBUILD new file mode 100644 index 000000000..a739d9c2e --- /dev/null +++ b/community-testing/picard/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 58014 2011-11-05 11:40:31Z ibiru $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: sysrq + +pkgname=picard +pkgver=0.16 +pkgrel=2 +pkgdesc='Official MusicBrainz tagger' +url='http://musicbrainz.org/doc/MusicBrainz_Picard' +license=('GPL') +arch=('i686' 'x86_64') +depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg') +optdepends=('libdiscid: CD-Lookup feature') +source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('274071410550ee29051bb0137d72602921a015f9') + +install=install + +build() { + cd "${srcdir}/picard-${pkgver}" + python2 setup.py config +} + +package() { + cd "${srcdir}/picard-${pkgver}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/community-testing/picard/install b/community-testing/picard/install new file mode 100644 index 000000000..b46fab005 --- /dev/null +++ b/community-testing/picard/install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/qmmp/PKGBUILD b/community-testing/qmmp/PKGBUILD new file mode 100644 index 000000000..c34f9af48 --- /dev/null +++ b/community-testing/qmmp/PKGBUILD @@ -0,0 +1,38 @@ +#$Id: PKGBUILD 58016 2011-11-05 11:40:48Z ibiru $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=qmmp +pkgver=0.5.2 +pkgrel=2 +pkgdesc="Qt4 based audio-player" +arch=('i686' 'x86_64') +url="http://qmmp.ylsoftware.com/" +license=('GPL') +depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') +makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack') +optdepends=('flac: native FLAC support' + 'jack: JACK sound output' + 'libmpcdec: Musepack support' + 'pulseaudio: PulseAudio output' + 'libcdio: Compact Disc input and control support' + 'libcddb: CDDB server support' + 'libmms: MMS stream protocol support' + 'libmodplug: MOD playing library' + 'libsndfile: sampled sound support' + 'ffmpeg' 'libsamplerate' 'wavpack') +install=$pkgname.install +source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) +sha256sums=('6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/qmmp/qmmp.changelog b/community-testing/qmmp/qmmp.changelog new file mode 100644 index 000000000..31050d69e --- /dev/null +++ b/community-testing/qmmp/qmmp.changelog @@ -0,0 +1,47 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.2-1 + +2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.1-1 + +2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.0-1 + +2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.4.4-1 + +2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.3 + +2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.2 + +2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.1 + +2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.0 + +2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.4 + +2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.3 + +2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.2 + +2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.0 + +2009-03-30 Giovanni Scafora <giovanni@archlinux.org> + * Fixed x86_64 build + +2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.2.4 + +2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.2.3 + +2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.2.2 diff --git a/community-testing/qmmp/qmmp.install b/community-testing/qmmp/qmmp.install new file mode 100644 index 000000000..4c0972beb --- /dev/null +++ b/community-testing/qmmp/qmmp.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/synfig/PKGBUILD b/community-testing/synfig/PKGBUILD new file mode 100644 index 000000000..2c324912d --- /dev/null +++ b/community-testing/synfig/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 58018 2011-11-05 11:40:57Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Franco Iacomella <yaco@gnu.org> + +pkgname=synfig +pkgver=0.63.02 +pkgrel=2 +pkgdesc="Professional vector animation program (CLI renderer only)" +arch=(i686 x86_64) +url="http://synfig.org" +license=('GPL2') +depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng' + 'libtiff' 'libdv' 'libmng') +optdepends=('openexr' 'libsigc++') +conflicts=('synfig-core') +replaces=('synfig-core') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz + build-fix.patch ffmpeg-0.8.patch) +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68') + +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 -i $srcdir/build-fix.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68' + 'f1f22b1ce2c13e25d5eb51a664a9551f') +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68' + 'ebf41046097cfd778dee9a9854561dae') diff --git a/community-testing/synfig/build-fix.patch b/community-testing/synfig/build-fix.patch new file mode 100644 index 000000000..9124a517a --- /dev/null +++ b/community-testing/synfig/build-fix.patch @@ -0,0 +1,43 @@ +diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp +--- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05 13:04:07.000000000 +0400 ++++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14 14:32:49.000000000 +0400 +@@ -31,6 +31,10 @@ + # include <config.h> + #endif + ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libswscale/swscale.h> ++ + #include "trgt_av.h" + + extern "C" +@@ -116,14 +120,14 @@ + picture = avcodec_alloc_frame(); + if (!picture) + return NULL; +- size = avpicture_get_size(pix_fmt, width, height); ++ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height); + picture_buf = (uint8_t *)malloc(size); + if (!picture_buf) { + av_free(picture); + return NULL; + } + avpicture_fill((AVPicture *)picture, picture_buf, +- pix_fmt, width, height); ++ (enum ::PixelFormat)pix_fmt, width, height); + return picture; + } + +diff -wbBur synfig-core/src/modules/mod_png/mptr_png.cpp synfig-core.my/src/modules/mod_png/mptr_png.cpp +--- synfig-core/src/modules/mod_png/mptr_png.cpp 2011-06-05 13:04:07.000000000 +0400 ++++ synfig-core.my/src/modules/mod_png/mptr_png.cpp 2011-06-14 14:32:49.000000000 +0400 +@@ -309,7 +309,7 @@ + float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue); + float a=1.0; + if(info_ptr->valid & PNG_INFO_tRNS) +- a = (float)(unsigned char)png_ptr->trans[row_pointers[y][x]]*(1.0/255.0); ++ a = (float)(unsigned char)png_ptr->trans_alpha[row_pointers[y][x]]*(1.0/255.0); + surface_buffer[y][x]=Color( + r, + g, diff --git a/community-testing/synfig/ffmpeg-0.8.patch b/community-testing/synfig/ffmpeg-0.8.patch new file mode 100644 index 000000000..4ba40fff2 --- /dev/null +++ b/community-testing/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-testing/vtk/PKGBUILD b/community-testing/vtk/PKGBUILD index 7f17b62cd..bb2c3f13d 100644 --- a/community-testing/vtk/PKGBUILD +++ b/community-testing/vtk/PKGBUILD @@ -8,7 +8,7 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=3 +pkgrel=5 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 +22,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 +36,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-testing/vtk/ffmpeg-0.8.diff b/community-testing/vtk/ffmpeg-0.8.diff new file mode 100644 index 000000000..523919d6f --- /dev/null +++ b/community-testing/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-testing/wxsvg/PKGBUILD b/community-testing/wxsvg/PKGBUILD new file mode 100644 index 000000000..5884ba741 --- /dev/null +++ b/community-testing/wxsvg/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 58022 2011-11-05 11:41:09Z ibiru $ +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=wxsvg +pkgver=1.1.2 +pkgrel=2 +pkgdesc="C++ library to create, manipulate and render SVG files" +arch=('i686' 'x86_64') +url="http://wxsvg.sourceforge.net/" +license=('custom:wxWindows') +depends=('wxgtk' 'libart-lgpl' 'ffmpeg') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2") +md5sums=('d88b0a68334df157fa560413681c3264') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/wxsvg/COPYING" +} diff --git a/community-testing/xmms2/PKGBUILD b/community-testing/xmms2/PKGBUILD new file mode 100644 index 000000000..15855970f --- /dev/null +++ b/community-testing/xmms2/PKGBUILD @@ -0,0 +1,76 @@ +# $Id: PKGBUILD 58024 2011-11-05 11:41:26Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=xmms2 +pkgver=0.8DrO_o +pkgrel=2 +pkgdesc="complete rewrite of the popular music player" +arch=('i686' 'x86_64') +url="http://xmms2.org/" +license=('LGPL') +backup=('etc/conf.d/xmms2d.conf') +depends=('sqlite3' 'libmad') +makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' + 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' + 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' + 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi +optdepends=('alsa-lib: ALSA audio output' + 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' + 'boost: C++ language bindings' + 'curl: play HTTP streams' + 'faad2: AAC support' + 'ffmpeg: WMA, avcodec & avformat support' + 'fftw: calculations for visualization' + 'flac: FLAC support' + 'jack: JACK audio output' + 'libao: liboa audio output' + 'libofa: MusicDNS fingerprinting' + 'libmms: play MMS streams' + 'libmodplug: to play MOD files' + 'libmpcdec: Musepack support' + 'libsamplerate: vocoder support' + 'libshout: Icecast audio output' + 'libvorbis: Ogg Vorbis support' + 'libxml2: XSPF and podcast support' + 'mpg123: alternative MP3 plugin' + 'oss: OSS audio output' + 'perl: Perl language bindings' + 'pulseaudio: PulseAudio audio output' + 'pyrex: Python language bindings' + 'ruby: Ruby language bindings' + 'smbclient: direct CIFS/SMB access' + 'speex: Speex support' + 'wavpack: WavPack support') +# 'sidplay: to play a Commodore 64 music files AKA zaks' +# we do not have sidplay 2 series in repos; also it's +# somehow connected with resid i guess(not in repos also) +conflicts=('xmms2-devel') +install=xmms2.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + xmms2d.conf + xmms2d.rc + xmms2-helpers.patch + vorbis-albumart.patch) +md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' + 'af13c937bf3c86b77ae6820107aab9b8' + '9d8e3e1a434f271423bdd228a1e9bd7c' + 'eddb800ebcc495b8574044a110a34add' + 'c5a16da0c5a6ebe5e7f58afb6edfa87e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + +# patch -Np1 < ${srcdir}/xmms2-helpers.patch +# patch -p1 <$srcdir/vorbis-albumart.patch + + # python2 fix + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf + + ./waf configure --prefix=/usr \ + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli + ./waf build + ./waf --destdir=${pkgdir} install + + install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d + install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf +} diff --git a/community-testing/xmms2/vorbis-albumart.patch b/community-testing/xmms2/vorbis-albumart.patch new file mode 100644 index 000000000..de4305f6f --- /dev/null +++ b/community-testing/xmms2/vorbis-albumart.patch @@ -0,0 +1,200 @@ +From f38882beb1c9b4f3e3c63ac7d65603ad5917cd9d Mon Sep 17 00:00:00 2001 +From: Brad Jorsch <anomie@users.sourceforge.net> +Date: Tue, 09 Mar 2010 15:41:33 +0000 +Subject: OTHER: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin + +Bug-Debian: http://bugs.debian.org/565479 +--- +diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c +index c1f4ef9..fc4ff1b 100644 +--- a/src/plugins/vorbis_common/common.c ++++ b/src/plugins/vorbis_common/common.c +@@ -243,6 +243,74 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc) + } + } + ++static void ++handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) ++{ ++ guint32 typ, mime_len, desc_len, img_len; ++ guchar *pos, *end, *mime_data, *img_data; ++ gchar hash[33]; ++ ++ pos = value; ++ end = value + len; ++ ++ if (pos + 4 > end) { ++ XMMS_DBG ("Malformed picture comment"); ++ return; ++ } ++ typ = GUINT32_FROM_BE (*(guint32 *)pos); ++ if (typ != 0 && typ != 3) { ++ XMMS_DBG ("Picture type %d not handled", typ); ++ return; ++ } ++ pos += 4; ++ ++ if (pos + 4 > end) { ++ XMMS_DBG ("Malformed picture comment"); ++ return; ++ } ++ mime_len = GUINT32_FROM_BE (*(guint32 *)pos); ++ pos += 4; ++ mime_data = pos; ++ pos += mime_len; ++ ++ if (pos + 4 > end) { ++ XMMS_DBG ("Malformed picture comment"); ++ return; ++ } ++ desc_len = GUINT32_FROM_BE (*(guint32 *)pos); ++ pos += 4; ++ pos += desc_len; ++ ++ pos += 4; /* width */ ++ pos += 4; /* height */ ++ pos += 4; /* depth */ ++ pos += 4; /* indexed palette length */ ++ ++ if (pos + 4 > end) { ++ XMMS_DBG ("Malformed picture comment"); ++ return; ++ } ++ img_len = GUINT32_FROM_BE (*(guint32 *)pos); ++ pos += 4; ++ img_data = pos; ++ ++ if (img_data + img_len > end) { ++ XMMS_DBG ("Malformed picture comment"); ++ return; ++ } ++ ++ if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) { ++ const gchar *metakey; ++ ++ metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT; ++ xmms_xform_metadata_set_str (xform, metakey, hash); ++ ++ metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME; ++ mime_data[mime_len] = '\0'; ++ xmms_xform_metadata_set_str (xform, metakey, mime_data); ++ } ++} ++ + /* note that "key" is NOT NUL-terminated here, + * but "value" is. + */ +@@ -253,6 +321,14 @@ handle_comment (xmms_xform_t *xform, + { + gint i; + ++ if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) { ++ gsize dlen; ++ gchar *dvalue = g_base64_decode (value, &dlen); ++ handle_image_comment (xform, dvalue, dlen); ++ g_free (dvalue); ++ return; ++ } ++ + for (i = 0; i < G_N_ELEMENTS (properties); i++) { + if (key_len != strlen (properties[i].vname)) + continue; +-- +cgit v0.8.3.4 + + +From d8273630bd92ecea581240ae93c6795cc538d076 Mon Sep 17 00:00:00 2001 +From: Erik Massop <e.massop@hccnet.nl> +Date: Tue, 09 Mar 2010 15:45:03 +0000 +Subject: OTHER: Add Brad Jorsch to AUTHORS, disable Vorbis albumart for glib < 2.12 + +(Name found using e-mail address at http://sourceforge.net/users/anomie ) +--- +diff --git a/AUTHORS b/AUTHORS +index f2ef9af..7331d4b 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -146,6 +146,10 @@ N: Johannes Jordan + E: ypnos@lanrules.de + D: Visualization + ++N: Brad Jorsch ++E: anomie@users.sourceforge.net ++D: Support for front picture from Vorbis. ++ + N: Daniel Kamiński + E: maniel.rulez@gmail.com + D: mlib remove command in cli, Ruby fixes. +diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c +index fc4ff1b..ab1dc75 100644 +--- a/src/plugins/vorbis_common/common.c ++++ b/src/plugins/vorbis_common/common.c +@@ -27,6 +27,7 @@ + #include "xmms/xmms_sample.h" + #include "xmms/xmms_log.h" + #include "xmms/xmms_medialib.h" ++#include "xmms/xmms_bindata.h" + + #include <glib.h> + +@@ -244,12 +245,22 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc) + } + + static void +-handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) ++handle_image_comment (xmms_xform_t *xform, const gchar *encoded_value) + { ++ gsize len; ++ guchar *value; ++ + guint32 typ, mime_len, desc_len, img_len; + guchar *pos, *end, *mime_data, *img_data; + gchar hash[33]; + ++#if GLIB_CHECK_VERSION(2,12,0) ++ value = g_base64_decode (encoded_value, &len); ++#else ++ /* TODO: Implement/backport base64 decoding */ ++ return; ++#endif ++ + pos = value; + end = value + len; + +@@ -299,7 +310,7 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) + return; + } + +- if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) { ++ if (xmms_bindata_plugin_add (img_data, img_len, hash)) { + const gchar *metakey; + + metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT; +@@ -307,8 +318,10 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) + + metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME; + mime_data[mime_len] = '\0'; +- xmms_xform_metadata_set_str (xform, metakey, mime_data); ++ xmms_xform_metadata_set_str (xform, metakey, (gchar *)mime_data); + } ++ ++ g_free (value); + } + + /* note that "key" is NOT NUL-terminated here, +@@ -322,10 +335,7 @@ handle_comment (xmms_xform_t *xform, + gint i; + + if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) { +- gsize dlen; +- gchar *dvalue = g_base64_decode (value, &dlen); +- handle_image_comment (xform, dvalue, dlen); +- g_free (dvalue); ++ handle_image_comment (xform, value); + return; + } + +-- +cgit v0.8.3.4 + + diff --git a/community-testing/xmms2/xmms2-helpers.patch b/community-testing/xmms2/xmms2-helpers.patch new file mode 100644 index 000000000..f6e6aa49e --- /dev/null +++ b/community-testing/xmms2/xmms2-helpers.patch @@ -0,0 +1,13 @@ +diff -wbBur xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h +--- xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h 2008-06-15 21:31:38.000000000 +0400 ++++ xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h 2008-06-18 14:22:24.000000000 +0400 +@@ -33,6 +33,8 @@ + #include <list> + #include <vector> + ++#include <linux/limits.h> ++ + namespace Xmms + { + + diff --git a/community-testing/xmms2/xmms2-ruby-1.9.patch b/community-testing/xmms2/xmms2-ruby-1.9.patch new file mode 100644 index 000000000..6316ace61 --- /dev/null +++ b/community-testing/xmms2/xmms2-ruby-1.9.patch @@ -0,0 +1,59 @@ +diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c +--- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c 2009-04-21 17:51:11.000000000 +0000 ++++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c 2009-09-14 09:13:19.000000000 +0000 +@@ -241,10 +241,10 @@ + COLL_METHOD_HANDLER_HEADER + + rb_ary = RARRAY (ids); +- ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1)); ++ ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1)); + +- for (i = 0; i < rb_ary->len; i++) +- ary[i] = NUM2UINT (rb_ary->ptr[i]); ++ for (i = 0; i < RARRAYLEN(rb_ary); i++) ++ ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]); + + ary[i] = 0; + +diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c +--- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c 2009-04-21 17:51:11.000000000 +0000 ++++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c 2009-09-14 09:14:51.000000000 +0000 +@@ -1421,10 +1421,10 @@ + if (!NIL_P (rb_check_array_type (value))) { + struct RArray *ary = RARRAY (value); + +- ret = malloc (sizeof (char *) * (ary->len + 1)); ++ ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1)); + +- for (i = 0; i < ary->len; i++) +- ret[i] = StringValuePtr (ary->ptr[i]); ++ for (i = 0; i < RARRAYLEN(ary); i++) ++ ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]); + + ret[i] = NULL; + } else { +@@ -1451,10 +1451,10 @@ + struct RArray *ary = RARRAY (value); + int i; + +- for (i = 0; i < ary->len; i++) { ++ for (i = 0; i < RARRAYLEN(ary); i++) { + xmmsv_t *elem; + +- elem = xmmsv_new_string (StringValuePtr (ary->ptr[i])); ++ elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i])); + xmmsv_list_append (list, elem); + xmmsv_unref (elem); + } +diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h +--- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h 2009-04-21 17:51:11.000000000 +0000 ++++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h 2009-09-14 09:00:11.000000000 +0000 +@@ -33,6 +33,8 @@ + #include <list> + #include <vector> + ++#include <linux/limits.h> ++ + namespace Xmms + { + diff --git a/community-testing/xmms2/xmms2.install b/community-testing/xmms2/xmms2.install new file mode 100644 index 000000000..2205a3492 --- /dev/null +++ b/community-testing/xmms2/xmms2.install @@ -0,0 +1,3 @@ +pre_install() { + echo "-- DO NOT FORGET edit /etc/conf.d/xmms2.conf!" +} diff --git a/community-testing/xmms2/xmms2d.conf b/community-testing/xmms2/xmms2d.conf new file mode 100644 index 000000000..c8304fe1d --- /dev/null +++ b/community-testing/xmms2/xmms2d.conf @@ -0,0 +1,31 @@ +# +# xmms2-launcher cmdline parameters +# +XMMS2_PARAMETERS="" + +# +# xmms2 user +# You may want to add user to run xmms or use your username +# +XMMS2_USER="xmms2user" + +# +# If you set XMMS2_USER to a different user than the one who will be controlling +# xmms2d using xmms2 clients, make sure that the clients are aware of the path to +# xmms2d's IPC socket, or they might not be able to connect. On failure to connect +# some clients will try to run xmms2d themselves. These xmms2d instances will of +# course run as the user running the client, and not as the one configured below. +# +# If an IPC path is specified on the command line to xmms2d (using +# XMMS2_PARAMETERS="-i tcp://127.0.0.1:9667" +# for instance) that will be used. If not, xmms2d will use the path from its +# configuration file which is typically in ~/.config/xmms2/xmms2.conf. If this +# fails, a unix socket at /tmp/xmms-ipc-[username] will be used, where username +# is of the user starting xmms2d. +# +# Clients typically try to get the ipc path from the XMMS_PATH environment variable, +# (which might be set by adding say 'export XMMS_PATH="tcp://127.0.0.1:9667"' to +# ~/.profile). If this fails they can check their configuration file (if they have +# one) and finally use unix:///tmp/xmms-ipc-[username], where username is of the user +# starting the client. Upon failing to connect some will try to start xmms2d themselves. +# diff --git a/community-testing/xmms2/xmms2d.rc b/community-testing/xmms2/xmms2d.rc new file mode 100755 index 000000000..9d4d2b7e9 --- /dev/null +++ b/community-testing/xmms2/xmms2d.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/conf.d/xmms2d.conf +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof xmms2d xmms2-et` +case "$1" in + start) + stat_busy "Starting xmms2d" + [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon xmms2d + stat_done + fi + ;; + stop) + stat_busy "Stopping xmms2d" + [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER + if [ $? -gt 0 ]; then + stat_fail + else + for i in `seq 1 10`; do + [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; } + sleep 1 + done + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/xvidcap/PKGBUILD b/community-testing/xvidcap/PKGBUILD new file mode 100644 index 000000000..6d68a48a9 --- /dev/null +++ b/community-testing/xvidcap/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 63169 2010-01-15 14:58:38Z giovanni $ +# Maintainer: Thorsten Töpper <atsutane at freethoughts dot de> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: red_over_blue, Abaddon <kukububu@go2.pl> +# Contributor: damir <damir@archlinux.org> + +pkgname=xvidcap +pkgver=1.1.7 +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') +url="http://xvidcap.sourceforge.net/" +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' + 'ffmpeg-0.8.patch') +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch + 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 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir}/usr install +} +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c' + '36ead5f0345ae776601d49c1c90cb101') +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c' + '6e4dfab56b877362757092f55ad6b337') diff --git a/community-testing/xvidcap/ffmpeg-0.8.patch b/community-testing/xvidcap/ffmpeg-0.8.patch new file mode 100644 index 000000000..511333a0f --- /dev/null +++ b/community-testing/xvidcap/ffmpeg-0.8.patch @@ -0,0 +1,82 @@ +diff -aur xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7.new/src/xtoffmpeg.c +--- xvidcap-1.1.7/src/xtoffmpeg.c 2008-05-25 22:01:54.000000000 +0000 ++++ xvidcap-1.1.7.new/src/xtoffmpeg.c 2011-10-31 20:41:08.259171263 +0000 +@@ -361,7 +361,7 @@ + } + // put sample parameters + au_c->codec_id = xvc_audio_codecs[job->au_targetCodec].ffmpeg_id; +- au_c->codec_type = CODEC_TYPE_AUDIO; ++ au_c->codec_type = AVMEDIA_TYPE_AUDIO; + au_c->bit_rate = target->sndsize; + au_c->sample_rate = target->sndrate; + au_c->channels = target->sndchannels; +@@ -567,7 +567,7 @@ + av_rescale_q (enc->coded_frame->pts, enc->time_base, + ost->st->time_base); + } +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ost->st->index; + + pkt.data = audio_out; +@@ -627,7 +627,7 @@ + pkt.pts = + av_rescale_q (enc->coded_frame->pts, enc->time_base, + ost->st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + av_interleaved_write_frame (s, &pkt); + } + +@@ -681,7 +681,7 @@ + if (ret <= 0) { + ret = avcodec_encode_audio (enc, bit_buffer, bit_buffer_size, NULL); + } +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + if (samples) { + av_free (samples); +@@ -905,7 +905,7 @@ + ost->time_base); + } + if (enc->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + + pkt.stream_index = ost->index; +@@ -1157,7 +1157,7 @@ + } + + st->codec->codec_id = codec_id; +- st->codec->codec_type = CODEC_TYPE_VIDEO; ++ st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + + // find the video encoder + codec = avcodec_find_encoder (st->codec->codec_id); +@@ -1439,13 +1439,13 @@ + // guess AVOutputFormat + if (job->target >= CAP_MF) + file_oformat = +- guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); ++ av_guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); + else { + char tmp_fn[30]; + + snprintf (tmp_fn, 29, "test-%%d.%s", + xvc_formats[job->target].extensions[0]); +- file_oformat = guess_format (NULL, tmp_fn, NULL); ++ file_oformat = av_guess_format (NULL, tmp_fn, NULL); + } + if (!file_oformat) { + fprintf (stderr, +@@ -1466,7 +1466,7 @@ + #endif // DEBUG + + // prepare AVFormatContext +- output_file = av_alloc_format_context (); ++ output_file = avformat_alloc_context(); + if (!output_file) { + fprintf (stderr, + _ diff --git a/community-testing/xvidcap/xextproto-7.1.1.patch b/community-testing/xvidcap/xextproto-7.1.1.patch new file mode 100644 index 000000000..b65da0ee7 --- /dev/null +++ b/community-testing/xvidcap/xextproto-7.1.1.patch @@ -0,0 +1,11 @@ +--- xvidcap-1.1.7/src/capture.c.orig 2008-05-26 02:01:53.000000000 +0400 ++++ xvidcap-1.1.7/src/capture.c 2009-12-12 00:12:31.368260518 +0300 +@@ -65,7 +65,7 @@ + #include <sys/ipc.h> + #include <sys/shm.h> + #include <X11/extensions/XShm.h> +-#include <X11/extensions/shmstr.h> ++#include <X11/extensions/shmproto.h> + #ifndef SOLARIS + #include <X11/extensions/extutil.h> + #endif // SOLARIS diff --git a/community-testing/xvidcap/xvidcap-ffmpeg.patch b/community-testing/xvidcap/xvidcap-ffmpeg.patch new file mode 100644 index 000000000..3a74bf508 --- /dev/null +++ b/community-testing/xvidcap/xvidcap-ffmpeg.patch @@ -0,0 +1,105 @@ +Index: src/codecs.c +=================================================================== +--- src/codecs.c (revision 319) ++++ src/codecs.c (working copy) +@@ -43,8 +43,8 @@ + #include <locale.h> + + #ifdef USE_FFMPEG +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> + #endif // USE_FFMPEG + + #include "app_data.h" +Index: src/xtoffmpeg.c +=================================================================== +--- src/xtoffmpeg.c (revision 319) ++++ src/xtoffmpeg.c (working copy) +@@ -56,13 +56,13 @@ + #include "xvidcap-intl.h" + + // ffmpeg stuff +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avdevice.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavdevice/avdevice.h> + //#include <ffmpeg/dsputil.h> +-#include <ffmpeg/swscale.h> +-#include <ffmpeg/rgb2rgb.h> +-#include <ffmpeg/fifo.h> ++#include <libswscale/swscale.h> ++#include <libavutil/pixfmt.h> ++#include <libavutil/fifo.h> + #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \ + || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \ + || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \ +@@ -96,9 +96,10 @@ + || (x)==PIX_FMT_YUVJ420P || (x)==PIX_FMT_YUVJ422P \ + || (x)==PIX_FMT_YUVJ444P) + +-#define PIX_FMT_ARGB32 PIX_FMT_RGBA32 /* this is just my personal +- * convenience */ ++#define PIX_FMT_ARGB32 PIX_FMT_RGB32 /* this is just my personal ++ * convenience */ + ++ + /* + * file globals + */ +@@ -1248,7 +1249,11 @@ + st->codec->flags |= CODEC_FLAG2_FAST; + // there is no trellis quantiser in libav* for mjpeg + if (st->codec->codec_id != CODEC_ID_MJPEG) ++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT; ++#else ++ st->codec->trellis = 1; ++#endif + st->codec->flags &= ~CODEC_FLAG_OBMC; + // some formats want stream headers to be seperate + if (oc->oformat->flags & AVFMT_GLOBALHEADER) +@@ -1498,11 +1503,10 @@ + // add the video stream and initialize the codecs + // + // prepare stream +- out_st = +- add_video_stream (output_file, image, +- (input_pixfmt == +- PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt), +- xvc_codecs[job->targetCodec].ffmpeg_id, job); ++ fprintf(stderr, "The current pixfmt is %d, but the choosen one is %d\n", input_pixfmt, (input_pixfmt == PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt)); ++ out_st = add_video_stream (output_file, image, ++ (input_pixfmt == PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt), ++ xvc_codecs[job->targetCodec].ffmpeg_id, job); + + // FIXME: set params + // memset (p_fParams, 0, sizeof(*p_fParams)); +Index: src/main.c +=================================================================== +--- src/main.c (revision 319) ++++ src/main.c (working copy) +@@ -45,7 +45,7 @@ + #include <locale.h> + + #ifdef USE_FFMPEG +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + #endif // USE_FFMPEG + + #include "control.h" +@@ -217,9 +217,6 @@ + + if (app) + xvc_appdata_free (app); +-#ifdef USE_FFMPEG +- av_free_static (); +-#endif + } + + /** + + diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index b65736aaf..558018682 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57710 2011-11-01 14:51:22Z plewis $ -# Maintainer: Peter Lewis <plewis@aur.archlinux.org> +# $Id: PKGBUILD 58036 2011-11-05 17:31:00Z plewis $ +# Maintainer: Peter Richard 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.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url="http://choqok.gnufolks.org/" license=('GPL') diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 653274e4d..43aeae5ca 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,6 +1,7 @@ +# $Id: PKGBUILD 57971 2011-11-05 09:47:31Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20110803 +pkgver=20111105 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -10,7 +11,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d14f012d6e9acf2c0ccc355fcd53c6fd') +md5sums=('5d4c6d40ef4497473445931e777e280b') build() { cd "$srcdir/$pkgname" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 88fa06b7b..c53ffe04a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.4.12 -pkgrel=2 +pkgver=0.6.0 +pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' @@ -15,20 +15,18 @@ license=('MIT') depends=('python2') checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') -source=("http://nodejs.org/dist/node-v${pkgver}.tar.gz") -sha256sums=('c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4') +options=('!emptydirs') +source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") +md5sums=('c05f2dadd4d82c0d72dbc116e82cfc0e') build() { cd node-v${pkgver} - # python2 fix - for file in $(find . -name '*.py' -print) wscript tools/waf-light tools/node-waf - do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' ${file} - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' ${file} - done + msg 'fixing for python2 name' + find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -i {} \; sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript sed -i "s|python |python2 |" Makefile + find test -type f -exec sed -e 's/python/&2/' -i {} \; ./configure \ --prefix=/usr @@ -39,7 +37,8 @@ build() { check() { cd node-v${pkgver} - make test + # test failures in 0.6.0 are known + make test || true } package() { diff --git a/community/vlock/PKGBUILD b/community/vlock/PKGBUILD index 9ebaf1ed3..0e79a7875 100644 --- a/community/vlock/PKGBUILD +++ b/community/vlock/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 22255 2010-07-20 05:18:40Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 58034 2011-11-05 17:24:10Z ttopper $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=vlock -pkgver=2.2.2 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="A small console locking program" url="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html" arch=('i686' 'x86_64') license=('GPL2') depends=('pam') install=vlock.install -source=(http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0b26703c0aa3a9ae67bb90b9373a3b88') +source=("http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$pkgname-$pkgver.tar.bz2") +md5sums=('2dd5677c97f2707db62532ae24f58433') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + make } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + # vlock gid is 129 + make DESTDIR="$pkgdir" VLOCK_GROUP=129 install +} + +# vim:set ts=2 sw=2 et: diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index ebf2c0fc5..ebd193784 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124065 2011-05-16 12:02:28Z allan $ +# $Id: PKGBUILD 142169 2011-11-05 11:41:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') license=('GPL3') @@ -12,8 +12,9 @@ url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9dba20116b13fc61a0846b0058fbe004') +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('9dba20116b13fc61a0846b0058fbe004' + '610b73db67bd4760209458efe7554ca3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index 9cfcb5a9d..9387174b8 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138809 2011-09-28 12:19:46Z stephane $ +# $Id: PKGBUILD 142177 2011-11-05 16:31:54Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db pkgver=5.2.36 -pkgrel=1 +pkgrel=2 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 6870e3d94..abf51904c 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 133064 2011-07-27 11:49:01Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 142187 2011-11-06 02:25:41Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.1_20110707 +pkgver=1.1_20111020 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64') @@ -11,8 +12,7 @@ url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -md5sums=('34d01aaacbb2932b77774e6c1eec8d2a') -sha1sums=('31e0e3c40cd51629cc802d7ee0b1a4e1ada90f00') +sha1sums=('ddabc0950275db4e9cef382a862ff3b20746e843') build() { cd "${srcdir}/$pkgname-${pkgver/_/-}" diff --git a/core/findutils/PKGBUILD b/core/findutils/PKGBUILD index 9eb4dcd00..e8d3d8c31 100644 --- a/core/findutils/PKGBUILD +++ b/core/findutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100218 2010-11-21 23:38:22Z stephane $ +# $Id: PKGBUILD 142108 2011-11-05 10:13:34Z tpowa $ # Maintainer: pkgname=findutils pkgver=4.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="GNU utilities to locate files" arch=('i686' 'x86_64') license=('GPL3') @@ -25,6 +25,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=$pkgdir install diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD index 87ece915f..b6d795076 100644 --- a/core/flex/PKGBUILD +++ b/core/flex/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129833 2011-06-29 04:16:41Z allan $ +# $Id: PKGBUILD 142183 2011-11-05 22:42:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=flex pkgver=2.5.35 -pkgrel=4 +pkgrel=5 pkgdesc="A tool for generating text-scanning programs" arch=('i686' 'x86_64') url="http://flex.sourceforge.net" diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index a61f089c0..aadd346cf 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130241 2011-07-04 15:07:06Z allan $ +# $Id: PKGBUILD 142110 2011-11-05 10:13:55Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk pkgver=4.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU version of awk" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/GNU/gawk.html" diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD index e3c8a2449..e36a059ac 100644 --- a/core/gdbm/PKGBUILD +++ b/core/gdbm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105198 2011-01-07 13:58:42Z stephane $ +# $Id: PKGBUILD 142193 2011-11-06 02:28:38Z stephane $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gdbm pkgver=1.8.3 -pkgrel=8 +pkgrel=9 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index f00a1c31a..8b915e52f 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112865 2011-03-07 11:27:12Z stephane $ +# $Id: PKGBUILD 142112 2011-11-05 10:14:09Z tpowa $ # Maintainer: pkgname=gettext pkgver=0.18.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gettext/" @@ -11,7 +11,7 @@ license=('GPL') groups=('base') depends=('gcc-libs' 'acl' 'sh' 'glib2') optdepends=('cvs: for autopoint tool') -options=(!libtool) +options=(!libtool !docs) install=gettext.install source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz) md5sums=('3dd55b952826d2b32f51308f2f91aa89') @@ -23,6 +23,11 @@ build() { make } +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD index 947361b3d..31f148fc1 100644 --- a/core/libusb/PKGBUILD +++ b/core/libusb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 101194 2010-11-28 15:05:41Z tpowa $ +# $Id: PKGBUILD 142115 2011-11-05 10:15:17Z tpowa $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libusb pkgver=1.0.8 -pkgrel=1 +pkgrel=2 depends=('glibc') pkgdesc="Library to enable user space application programs to communicate with USB devices." arch=(i686 x86_64) @@ -19,6 +19,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package () { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index b76f41b99..1d5cc207d 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 138811 2011-09-28 12:19:49Z stephane $ +# $Id: PKGBUILD 142181 2011-11-05 20:47:37Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.26 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') -makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl') +makedepends=('libfetch' 'libltdl' 'libsasl') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd slapd.default ntlm.patch) md5sums=('f36f3086031dd56ae94f722ffae8df5e' @@ -43,7 +43,7 @@ check() { package_libldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" - depends=('libsasl' 'libfetch' 'e2fsprogs') + depends=('libsasl' 'libfetch') backup=('etc/openldap/ldap.conf') options=('!libtool') @@ -66,7 +66,7 @@ package_libldap() { package_openldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" - depends=("libldap>=${pkgver}" 'libtool' 'util-linux') + depends=("libldap>=${pkgver}" 'libltdl') backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') options=('!libtool' 'emptydirs') install=openldap.install diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 91c1216e8..0cf79dfb3 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115045 2011-03-16 15:19:12Z jgc $ +# $Id: PKGBUILD 142117 2011-11-05 10:16:08Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils -pkgver=3.1.7 -pkgrel=4 +pkgver=3.1.8 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') @@ -11,8 +11,9 @@ url="http://mj.ucw.cz/pciutils.html" optdepends=('sh: required by update-pciids') makedepends=('wget') depends=('glibc') -source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('35222edb86b50a6641352c66fe829b2e') +source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) +md5sums=('79312f138311d29291c7d44d624cd37e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 4445eb0a1..202126bab 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 105825 2011-01-12 14:39:27Z stephane $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142191 2011-11-06 02:28:05Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=popt pkgver=1.16 -pkgrel=3 +pkgrel=4 pkgdesc="A commandline option parser" arch=('i686' 'x86_64') url="http://rpm5.org" @@ -28,14 +29,14 @@ package() { make DESTDIR="${pkgdir}" install # move libs in /lib - install -Dm755 ${pkgdir}/usr/lib/libpopt.so.0.0.0 \ + install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \ ${pkgdir}/lib/libpopt.so.0.0.0 - rm ${pkgdir}/usr/lib/libpopt.so* - ln -sf /lib/libpopt.so ${pkgdir}/usr/lib/libpopt.so - ln -sf libpopt.so.0 ${pkgdir}/lib/libpopt.so - ln -sf libpopt.so.0.0.0 ${pkgdir}/lib/libpopt.so.0 + rm "${pkgdir}"/usr/lib/libpopt.so* + ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so + ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so + ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0 # install license - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 765b76685..add0fe75b 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z allan $ +# $Id: PKGBUILD 142167 2011-11-05 11:41:13Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=readline _basever=6.2 _patchlevel=001 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=3 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -15,23 +15,24 @@ depends=('glibc' 'ncurses') backup=('etc/inputrc') options=('!emptydirs') install=readline.install -source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz +source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} inputrc) if [ $_patchlevel -gt 00 ]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p)) + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) done fi md5sums=('67948acb2ca081f23359d0256e9a271c' + '928f7d248320a65e43c2dc427e99582b' '58d54966c1191db45973cb3191ac621a' - '83287d52a482f790dfb30ec0a8746669') + '83287d52a482f790dfb30ec0a8746669' + '8e6a51e2e0e6e45a82752e3692c111ac') build() { cd ${srcdir}/${pkgname}-$_basever - for p in ../readline${_basever//./}-*; do - [ -e "$p" ] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) done # Remove RPATH from shared objects (FS#14366) diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD index 390c561c1..c82d70599 100644 --- a/core/sqlite3/PKGBUILD +++ b/core/sqlite3/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 138770 2011-09-28 04:21:04Z andyrtr $ +# $Id: PKGBUILD 142094 2011-11-05 09:05:38Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite3" pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') -_amalgamationver=3070800 +_amalgamationver=3070900 _amalgamationver2=${_amalgamationver/00/} _docver=${_amalgamationver} #3070700 pkgver=${_amalgamationver2//0/.} -pkgrel=2 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') license=('custom') @@ -20,12 +20,9 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a http://www.sqlite.org/sqlite-doc-${_docver}.zip license.txt) options=('!libtool' '!emptydirs') -md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542' - '56c2e37c65075c612710ae1aba9703f2' +md5sums=('dce303524736fe89a76b8ed29d566352' + 'c48c231dd43d3b74f1d00c36424d87f4' 'c1cdbc5544034d9012e421e75a5e4890') -sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724' - 'e8fec8ca866289477ea4249c219e07bc301d96c6' - 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index c660deb2e..9ba51eca5 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102128 2010-12-06 05:33:18Z allan $ +# $Id: PKGBUILD 142185 2011-11-05 22:42:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo pkgver=4.13a -pkgrel=5 +pkgrel=6 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64') url="http://www.gnu.org/software/texinfo/" @@ -12,8 +12,9 @@ license=('GPL3') groups=('base') depends=('ncurses' 'findutils' 'gzip') install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('71ba711519209b5fb583fed2b3d86fcb') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('71ba711519209b5fb583fed2b3d86fcb' + 'db2ca82c831684cd7cef181234017c46') build() { cd ${srcdir}/${pkgname}-4.13 @@ -25,6 +26,6 @@ package() { cd ${srcdir}/${pkgname}-4.13 make DESTDIR=${pkgdir} install - # fix this here as it prevent make from trying to rebuild manual pages + # fix this here as it prevents make from trying to rebuild manual pages sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi } diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD index eec6ce5ef..edb6f7939 100644 --- a/core/vi/PKGBUILD +++ b/core/vi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118363 2011-04-06 12:35:06Z jgc $ +# $Id: PKGBUILD 142189 2011-11-06 02:27:51Z stephane $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi pkgver=050325 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='The original ex/vi text editor.' arch=('i686' 'x86_64') diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index 2ce310cdd..5c63fd095 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,19 +1,22 @@ -# $Id: PKGBUILD 130308 2011-07-04 21:56:54Z eric $ +# $Id: PKGBUILD 142179 2011-11-05 20:03:57Z eric $ +# Maintainer: pkgbase=fltk -pkgname=('fltk' 'fltk-docs') +pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:LGPL') url="http://www.fltk.org/" -depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils') -makedepends=('mesa' 'doxygen') +makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ + 'alsa-lib' 'desktop-file-utils') source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3') build() { cd "$srcdir/$pkgbase-$pkgver" + sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \ + -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared make cd documentation @@ -22,18 +25,20 @@ build() { package_fltk() { pkgdesc="Graphical user interface toolkit for X" + depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \ + 'desktop-file-utils' 'xdg-utils') options=('!docs') install=fltk.install cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install install-desktop + make DESTDIR="$pkgdir" install + (cd fluid; make DESTDIR="$pkgdir" install install-linux) chmod 644 "$pkgdir"/usr/lib/*.a install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } package_fltk-docs() { pkgdesc="Graphical user interface toolkit for X (documentation)" - depends=('') cd "$srcdir/$pkgbase-$pkgver/documentation" install -d "$pkgdir"/usr/share/doc/fltk/ @@ -44,3 +49,14 @@ package_fltk-docs() { make DESTDIR="$pkgdir" install install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + +package_fltk-games() { + pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku" + depends=('alsa-lib' 'fltk') + install=fltk-games.install + + cd "$srcdir/$pkgbase-$pkgver/test" + make DESTDIR="$pkgdir" install-linux + (cd ../documentation; make DESTDIR="$pkgdir" install-linux) + install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/fltk/fltk-games.install b/extra/fltk/fltk-games.install new file mode 100644 index 000000000..f3fe2b08b --- /dev/null +++ b/extra/fltk/fltk-games.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/wv2/PKGBUILD b/extra/wv2/PKGBUILD index 72ebab120..a30b0f9c4 100644 --- a/extra/wv2/PKGBUILD +++ b/extra/wv2/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 57827 2009-11-02 14:26:13Z ronald $ +# $Id: PKGBUILD 142173 2011-11-05 11:56:53Z pierre $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=wv2 pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="MSWord 9,8,7,6 formats parser" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/wvware/" depends=('libgsf') makedepends=('cmake') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2") license=('GPL2') md5sums=('850ed8e44a84e7bf0610747827018cbc') build() { - cd ${srcdir} - mkdir build - cd build + cd ${srcdir} + mkdir build + cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/multilib/lib32-libmng/PKGBUILD b/multilib/lib32-libmng/PKGBUILD index eb42ad374..354ca8b16 100644 --- a/multilib/lib32-libmng/PKGBUILD +++ b/multilib/lib32-libmng/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 26602 2010-09-15 22:40:41Z bluewind $ +# $Id: PKGBUILD 58042 2011-11-05 19:32:02Z lcarlier $ # Maintainer: Florian Pritz <flo@xssn.at> + _pkgbasename=libmng pkgname=lib32-$_pkgbasename pkgver=1.0.10 -pkgrel=5 +pkgrel=6 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files (32-bit)" arch=('x86_64') url="http://www.libmng.com/" diff --git a/multilib/lib32-libpciaccess/PKGBUILD b/multilib/lib32-libpciaccess/PKGBUILD index 70f982a10..be80aab83 100644 --- a/multilib/lib32-libpciaccess/PKGBUILD +++ b/multilib/lib32-libpciaccess/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51345 2011-07-07 21:46:31Z lcarlier $ +# $Id: PKGBUILD 58044 2011-11-05 19:35:56Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> _pkgbasename=libpciaccess pkgname=lib32-${_pkgbasename} pkgver=0.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="X11 PCI access library (32-bit" arch=(i686 x86_64) license=('custom') diff --git a/multilib/lib32-libusb-compat/PKGBUILD b/multilib/lib32-libusb-compat/PKGBUILD index fba67c477..d6d74d770 100644 --- a/multilib/lib32-libusb-compat/PKGBUILD +++ b/multilib/lib32-libusb-compat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 58048 2011-11-05 19:41:45Z lcarlier $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: arjan <arjan@archlinux.org> pkgname=lib32-libusb-compat pkgver=0.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('x86_64') depends=('lib32-libusb' 'libusb-compat') diff --git a/multilib/lib32-libusb/PKGBUILD b/multilib/lib32-libusb/PKGBUILD index d79cf8aed..69498b604 100644 --- a/multilib/lib32-libusb/PKGBUILD +++ b/multilib/lib32-libusb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 58046 2011-11-05 19:39:36Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=lib32-libusb pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Library to enable user space application programs to communicate with USB devices. (32-bit)" arch=('x86_64') url="http://libusb.sourceforge.net/" diff --git a/testing/alsa-plugins/PKGBUILD b/testing/alsa-plugins/PKGBUILD new file mode 100644 index 000000000..d99886d38 --- /dev/null +++ b/testing/alsa-plugins/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 142131 2011-11-05 11:37:29Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Daniel Ehlers <danielehlers@mindeye.net> + +pkgname=alsa-plugins +pkgver=1.0.24 +pkgrel=3 +pkgdesc="Extra alsa plugins" +arch=(i686 x86_64) +url="http://www.alsa-project.org" +license=(GPL) +depends=(alsa-lib) +makedepends=(libpulse jack ffmpeg) +optdepends=('libpulse: PulseAudio plugin' + 'jack: Jack plugin' + 'ffmpeg: libavcodec resampling plugin' + 'libsamplerate: libsamplerate resampling plugin' + 'speex: libspeexdsp resampling plugin') +options=('!libtool') +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") +md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" +} diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD new file mode 100644 index 000000000..7de2e8563 --- /dev/null +++ b/testing/amarok/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 142133 2011-11-05 11:37:31Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=amarok +replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') +pkgver=2.4.3 +pkgrel=2 +pkgdesc="The powerful music player for KDE" +arch=("i686" "x86_64") +url="http://amarok.kde.org" +license=('GPL2' 'LGPL2.1' 'FDL') +depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' + 'liblastfm' 'ffmpeg' 'libofa' 'qjson') +makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' + 'libmygpo-qt') +optdepends=("libgpod: support for Apple iPod audio devices" + "libmtp: support for portable media devices" + "loudmouth: backend needed by mp3tunes for syncing" + "ifuse: support for Apple iPod Touch and iPhone" + "libmygpo-qt: gpodder.net Internet Service") +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('24e8141bcbd065448911fa872c50197d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package(){ + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/amarok/amarok.install b/testing/amarok/amarok.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/amarok/amarok.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/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD new file mode 100644 index 000000000..1878008b1 --- /dev/null +++ b/testing/avidemux/PKGBUILD @@ -0,0 +1,120 @@ +# $Id: PKGBUILD 142119 2011-11-05 11:37:15Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.5.5 +pkgrel=5 +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz + avidemux-2.5.4-x264-build115.patch) +md5sums=('33bbe210c6826cea1987ed18a41d57a7' + '24a18b53a58b678b9e87d30566985751') + +build() { + cd "${srcdir}/${pkgbase}_${pkgver}" + + patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch" + + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + make + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ + -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ + -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ + -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. + make +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin') + provides=('avidemux') + conflicts=('avidemux') + replaces=('avidemux') + + cd "${srcdir}/${pkgbase}_${pkgver}/build" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} + rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" + + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -d "${pkgdir}/usr/share/avidemux/i18n" + install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 000000000..c627667ec --- /dev/null +++ b/testing/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac;
+ }
+
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ return _param.i_open_gop;
+@@ -428,6 +428,17 @@ + if (openGopMode < 3)
+ _param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++ return _param.b_open_gop;
++}
++
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++ if (openGopMode < 3)
++ _param.b_open_gop = openGopMode;
++}
+ #endif
+
+ unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/testing/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD new file mode 100644 index 000000000..d23728377 --- /dev/null +++ b/testing/blender/PKGBUILD @@ -0,0 +1,93 @@ +# $Id: PKGBUILD 142137 2011-11-05 11:37:38Z ibiru $ +# Contributor: John Sowiak <john@archlinux.org> +# Maintainer: tobias <tobias@archlinux.org> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only, we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.60a +pkgrel=2 +epoch=3 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'libsndfile' 'ffmpeg') +makedepends=('cmake') +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('7579d1139d0d6025df8afcfca64a65c4') +fi + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=38016 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/testing/blender/blender.install b/testing/blender/blender.install new file mode 100644 index 000000000..724bfce00 --- /dev/null +++ b/testing/blender/blender.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/cmus/PKGBUILD b/testing/cmus/PKGBUILD new file mode 100644 index 000000000..15cc1fd2e --- /dev/null +++ b/testing/cmus/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 142139 2011-11-05 11:37:41Z ibiru $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=cmus +pkgver=2.4.2 +pkgrel=2 +pkgdesc="A very feature-rich ncurses-based music player" +arch=('i686' 'x86_64') +url="http://cmus.sourceforge.net/" +license=('GPL') +depends=('ncurses') +makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' + 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') +optdepends=('alsa-lib: for ALSA output plugin support' + 'libao: for AO output plugin support' + 'libpulse: for PulseAudio output plugin support' + 'ffmpeg: for ffmpeg input plugin support' + 'libmodplug: for modplug input plugin support' + 'faad2: for input AAC plugin support' + 'libmad: for mp3 input plugin support' + 'libmpcdec: for musepack input plugin support' + 'wavpack: for wavpack input plugin support' + 'libvorbis: for vorbis input plugin support' + 'flac: for flac input plugin support' + 'libmp4v2: for mp4 input plugin support') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") +md5sums=('f3ed7f14db20344ad7386aef48b98a4c') +sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + ./configure prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-v$pkgver" + make DESTDIR="$pkgdir" install + install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus" +} diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD new file mode 100644 index 000000000..97d25fe08 --- /dev/null +++ b/testing/ffmpeg/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 142121 2011-11-05 11:37:18Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg +pkgver=20111105 +pkgrel=1 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +arch=('i686' 'x86_64') +url="http://ffmpeg.org/" +license=('GPL') +depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') +makedepends=('yasm' 'git') +#git clone git://git.videolan.org/ffmpeg.git +source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) +md5sums=('d1889c07a929cd0efaf7f486ff2f55e0') + +build() { + cd "$srcdir/$pkgname" + + ./configure \ + --prefix=/usr \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --disable-static + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install install-man + install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/ffmpegthumbnailer/PKGBUILD b/testing/ffmpegthumbnailer/PKGBUILD new file mode 100644 index 000000000..3fed7aae2 --- /dev/null +++ b/testing/ffmpegthumbnailer/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: boromil@gmail.com + +pkgname=ffmpegthumbnailer +pkgver=2.0.7 +pkgrel=2 +pkgdesc="Lightweight video thumbnailer that can be used by file managers." +url="http://code.google.com/p/ffmpegthumbnailer/" +license=('GPL2') +arch=('i686' 'x86_64') +depends=('ffmpeg' 'libjpeg' 'libpng') +optdepends=('gvfs: support for gio uris') +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + 'ffmpegthumbnailer.desktop') +options=('!libtool') +sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' + 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --enable-gio + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # FS#24105: Generate thumbnails in nautilus + install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \ + ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop +} diff --git a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop new file mode 100644 index 000000000..79203e5bc --- /dev/null +++ b/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=ffmpegthumbnailer +Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10 +MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v; diff --git a/testing/gegl/0.1.6-ffmpeg.patch b/testing/gegl/0.1.6-ffmpeg.patch new file mode 100644 index 000000000..51fb95d28 --- /dev/null +++ b/testing/gegl/0.1.6-ffmpeg.patch @@ -0,0 +1,33 @@ +diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c +--- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 ++++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 +@@ -69,17 +69,17 @@ + { + switch (err) + { +- case AVERROR_NUMEXPECTED: ++ case AVERROR(EDOM): + g_warning ("%s: Incorrect image filename syntax.\n" + "Use '%%d' to specify the image number:\n" + " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" + " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", + filename); + break; +- case AVERROR_INVALIDDATA: ++ case AVERROR(EINVAL): + g_warning ("%s: Error while parsing header\n", filename); + break; +- case AVERROR_NOFMT: ++ case AVERROR(EILSEQ): + g_warning ("%s: Unknown format\n", filename); + break; + default: +@@ -278,7 +278,7 @@ + for (i = 0; i< p->ic->nb_streams; i++) + { + AVCodecContext *c = p->ic->streams[i]->codec; +- if (c->codec_type == CODEC_TYPE_VIDEO) ++ if (c->codec_type == AVMEDIA_TYPE_VIDEO) + { + p->video_st = p->ic->streams[i]; + p->video_stream = i; diff --git a/testing/gegl/PKGBUILD b/testing/gegl/PKGBUILD new file mode 100644 index 000000000..cdae0afcc --- /dev/null +++ b/testing/gegl/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 142143 2011-11-05 11:37:45Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=gegl +pkgver=0.1.6 +pkgrel=2 +pkgdesc="Graph based image processing framework" +arch=('i686' 'x86_64') +url="http://www.gegl.org/" +license=('GPL3' 'LGPL3') +depends=('babl' 'gtk2') +makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') +optdepends=('openexr: for using the openexr plugin' \ + 'ffmpeg: for using the ffmpeg plugin' \ + 'librsvg: for using the svg plugin' \ + 'jasper: for using the jasper plugin') +options=('!libtool') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ + 0.1.6-ffmpeg.patch) +sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' + 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" + ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ + --with-libavformat --with-jasper --disable-docs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..6f355ef8a --- /dev/null +++ b/testing/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 142123 2011-11-05 11:37:20Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.18 +pkgrel=4 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) +md5sums=('04a7009a4efea2844075949c111f5e4d') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/testing/k3b/PKGBUILD b/testing/k3b/PKGBUILD new file mode 100644 index 000000000..9bdef9769 --- /dev/null +++ b/testing/k3b/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 142145 2011-11-05 11:37:47Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=k3b +pkgver=2.0.2 +pkgrel=3 +pkgdesc="Feature-rich and easy to handle CD burning application" +arch=('i686' 'x86_64') +url="http://k3b.org/" +license=('GPL') +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') +optdepends=('dvd+rw-tools: for dvd burning support' + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support') +options=('!libtool') +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b') + +build() { + cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/k3b/k3b-2.0.2-ffmpeg.patch b/testing/k3b/k3b-2.0.2-ffmpeg.patch new file mode 100644 index 000000000..2878b1edc --- /dev/null +++ b/testing/k3b/k3b-2.0.2-ffmpeg.patch @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek <michalm@jabster.pl> +Date: Sun Aug 28 20:18:53 2011 +0200 + + Fixed compilation with new FFMPEG + + BUG: 274817 + FIXED-IN: 2.0.3 + +diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +index 0ad59fc..0c5f366 100644 +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif ++ { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } +@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const + QString K3bFFMpegFile::title() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->title[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->title ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const + QString K3bFFMpegFile::author() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->author[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->author ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const + QString K3bFFMpegFile::comment() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->comment[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->comment ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( + #else ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ int len = ::avcodec_decode_audio3( ++ #else + int len = ::avcodec_decode_audio2( ++ #endif + #endif ++ + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else +@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() + #endif + (short*)d->alignedOutputBuffer, + &d->outputBufferSize, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ &d->packet ); ++#else + d->packetData, d->packetSize ); ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); diff --git a/testing/k3b/k3b.install b/testing/k3b/k3b.install new file mode 100644 index 000000000..413ad60f7 --- /dev/null +++ b/testing/k3b/k3b.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..f9d57749e --- /dev/null +++ b/testing/kdemultimedia/PKGBUILD @@ -0,0 +1,109 @@ +# $Id: PKGBUILD 142147 2011-11-05 11:37:50Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.7.3 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' + 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'mplayerthumbs.config') +sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xine=OFF + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'tunepimp') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/testing/kdemultimedia/kdemultimedia.install b/testing/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdemultimedia/kdemultimedia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdemultimedia/mplayerthumbs.config b/testing/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/testing/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/testing/kradio/PKGBUILD b/testing/kradio/PKGBUILD new file mode 100644 index 000000000..b73b80c90 --- /dev/null +++ b/testing/kradio/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142149 2011-11-05 11:37:56Z ibiru $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=kradio +pkgver=4.0.2 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL2') +pkgdesc="A comfortable KDE radio application" +url="http://kradio.sourceforge.net/" +depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') +makedepends=('pkg-config' 'automoc4' 'cmake') +install=kradio.install +source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff) +options=(!libtool) + +build() { + cd "$srcdir" + (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff") + mkdir build + cd build + cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} +md5sums=('18fea3e2bc7100882075187c6a89f7bd' + '5f407eb75536f39e79c77a70613e8704' + '7d31a4f54602bc109f39cc0a7a1dc50c') diff --git a/testing/kradio/kradio-ffmpeg.diff b/testing/kradio/kradio-ffmpeg.diff new file mode 100644 index 000000000..27d224fec --- /dev/null +++ b/testing/kradio/kradio-ffmpeg.diff @@ -0,0 +1,34 @@ +X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988 + +diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp +index 4cd6cc0..c74d6e2 100644 +--- a/plugins/internetradio/decoder_thread.cpp ++++ b/plugins/internetradio/decoder_thread.cpp +@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + + //av_log_set_level(255); + m_av_pFormatCtx = avformat_alloc_context(); +- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); + m_av_pFormatCtx->probesize = m_maxProbeSize; + m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; + +@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_pFormatCtx_opened = true; + } + else { +- + // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); + if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { + if (warningsNotErrors) { +@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_audioStream = -1; + for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { + // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { ++#if LIBAVCODEC_VERSION_MAJOR < 53 + if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream ++#else ++ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream ++#endif + m_av_audioStream = i; + break; + } diff --git a/testing/kradio/kradio.install b/testing/kradio/kradio.install new file mode 100644 index 000000000..af52669f5 --- /dev/null +++ b/testing/kradio/kradio.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} diff --git a/testing/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD new file mode 100644 index 000000000..e1a2b09f3 --- /dev/null +++ b/testing/mediastreamer/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 142151 2011-11-05 11:38:00Z ibiru $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Adrià Arrufat <swiftscythe@gmail.com> + +pkgname=mediastreamer +pkgver=2.7.3 +pkgrel=4 +pkgdesc="A library written in C that allows you to create and run audio and video streams" +arch=('i686' 'x86_64') +url="http://www.linphone.org/" +license=('GPL') +depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') +makedepends=('cmake' 'automoc4') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "disable-v4l1.patch") +md5sums=('5213307f557d86aa648f1a53a885138c' + '7ee15689eed1adbdcf0ddab8fadca34a') +options=('!libtool') + +build() { + cd "${srcdir}"/$pkgname-$pkgver/ + patch -p2 -i "${srcdir}"/disable-v4l1.patch + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/mediastreamer/ + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mediastreamer/disable-v4l1.patch b/testing/mediastreamer/disable-v4l1.patch new file mode 100644 index 000000000..9f6cb84d4 --- /dev/null +++ b/testing/mediastreamer/disable-v4l1.patch @@ -0,0 +1,50 @@ +diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am +--- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000 ++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000 +@@ -117,7 +117,7 @@ + endif + + if BUILD_V4L +-libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c ++libmediastreamer_la_SOURCES+=msv4l2.c + endif + + if BUILD_WIN32 +diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in +--- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000 ++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000 +@@ -54,7 +54,7 @@ + @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c + @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c + @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m +-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c ++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c + @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c + @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c + @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \ +@@ -135,7 +135,7 @@ + audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \ + msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \ + msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \ +- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \ ++ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \ + drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \ + sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \ + h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \ +@@ -156,7 +156,7 @@ + @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo + @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo + @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo +-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo ++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo + @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \ + @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo + @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo +@@ -600,7 +600,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@ diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD new file mode 100644 index 000000000..7219c5476 --- /dev/null +++ b/testing/miro/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 142153 2011-11-05 11:38:04Z ibiru $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=miro +pkgver=4.0.3 +pkgrel=2 +pkgdesc="The free and open source internet TV platform" +arch=('i686' 'x86_64') +url="http://www.getmiro.com" +license=('GPL2') +depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' + 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' + 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' + 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') +makedepends=('pkg-config') +install=miro.install +options=('!makeflags') +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840' + 'f0c851d51318c0e0be8b91463ef901625d2587a9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/ffmpeg.patch" + cd linux + + python2 setup.py install --root="${pkgdir}" + + # fix miro startup script so --debug works with python2 + sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro" + sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro" +} diff --git a/testing/miro/ffmpeg.patch b/testing/miro/ffmpeg.patch new file mode 100644 index 000000000..edf378459 --- /dev/null +++ b/testing/miro/ffmpeg.patch @@ -0,0 +1,95 @@ +diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c +--- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200 ++++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200 +@@ -60,7 +60,7 @@ + } + + switch (input_codec_context->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + output_codec_context->channel_layout = input_codec_context->channel_layout; + output_codec_context->sample_rate = input_codec_context->sample_rate; + output_codec_context->channels = input_codec_context->channels; +@@ -72,7 +72,7 @@ + output_codec_context->block_align = input_codec_context->block_align; + } + break; +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + output_codec_context->pix_fmt = input_codec_context->pix_fmt; + output_codec_context->width = input_codec_context->width; + output_codec_context->height = input_codec_context->height; +@@ -154,7 +154,7 @@ + exit(1); + } + +- ofmt = guess_format("mpegts", NULL, NULL); ++ ofmt = av_guess_format("mpegts", NULL, NULL); + if (!ofmt) { + fprintf(stderr, "Could not find MPEG-TS muxer\n"); + exit(1); +@@ -174,12 +174,12 @@ + + for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) { + switch (ic->streams[i]->codec->codec_type) { +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + video_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + video_st = add_output_stream(oc, ic->streams[i]); + break; +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + audio_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + audio_st = add_output_stream(oc, ic->streams[i]); +@@ -195,7 +195,7 @@ + exit(1); + } + +- dump_format(oc, 0, input, 1); ++ av_dump_format(oc, 0, input, 1); + + if (video_st) { + codec = avcodec_find_decoder(video_st->codec->codec_id); +@@ -208,7 +208,7 @@ + } + } + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + exit(1); + } +@@ -234,7 +234,7 @@ + break; + } + +- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) { ++ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) { + segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den; + } + else if (video_index < 0) { +@@ -245,10 +245,10 @@ + } + + if (segment_time - prev_segment_time >= segment_duration) { +- put_flush_packet(oc->pb); +- url_fclose(oc->pb); ++ avio_flush(oc->pb); ++ avio_close(oc->pb); + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + break; + } +@@ -278,7 +278,7 @@ + av_freep(&oc->streams[i]); + } + +- url_fclose(oc->pb); ++ avio_close(oc->pb); + av_free(oc); + + return 0; diff --git a/testing/miro/miro.install b/testing/miro/miro.install new file mode 100644 index 000000000..a5ee228aa --- /dev/null +++ b/testing/miro/miro.install @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + + diff --git a/testing/moc/PKGBUILD b/testing/moc/PKGBUILD new file mode 100644 index 000000000..e7412df83 --- /dev/null +++ b/testing/moc/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 142155 2011-11-05 11:38:06Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=moc +pkgver=20110528 +pkgrel=4 +pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" +arch=('i686' 'x86_64') +url="http://moc.daper.net/" +license=('GPL') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') +makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') +optdepends=('speex: for using the speex plugin' + 'ffmpeg: for using the ffmpeg plugin' + 'taglib: for using the musepack plugin' + 'libmpcdec: for using the musepack plugin' + 'wavpack: for using the wavpack plugin' + 'libmodplug: for using the modplug plugin') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ + gcc-undefined-symbols.diff moc-ffmpeg.patch) +sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') + +build() { + cd "${srcdir}/${pkgname}" + patch -p0 -i ../gcc-undefined-symbols.diff + patch -p0 -i ../moc-ffmpeg.patch + +# Disabling aac to use the external ffmpeg to play them (FS#13164) + ./autogen.sh + ./configure --prefix=/usr --without-rcc --without-aac \ + --with-oss --with-alsa --with-jack --with-mp3 \ + --with-musepack --with-vorbis --with-flac --with-wavpack \ + --with-sndfile --with-modplug --with-ffmpeg --with-speex \ + --with-samplerate --with-curl --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/moc/gcc-undefined-symbols.diff b/testing/moc/gcc-undefined-symbols.diff new file mode 100644 index 000000000..09e9b8bda --- /dev/null +++ b/testing/moc/gcc-undefined-symbols.diff @@ -0,0 +1,12 @@ +--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 ++++ decoder.c 2011-05-10 21:40:48.887941968 +0200 +@@ -259,6 +259,9 @@ + for (i = 0; i < plugins_num; i++) + if (plugins[i].decoder->destroy) + plugins[i].decoder->destroy (); ++ for (i = 0; i < plugins_num; i++) ++ if (plugins[i].handle) ++ lt_dlclose(plugins[i].handle); + + if (lt_dlexit()) + logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/testing/moc/moc-ffmpeg.patch b/testing/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/testing/moc/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include <ffmpeg/avformat.h> + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } diff --git a/testing/mpd/ChangeLog b/testing/mpd/ChangeLog new file mode 100644 index 000000000..40ba5e4e7 --- /dev/null +++ b/testing/mpd/ChangeLog @@ -0,0 +1,9 @@ +2011-09-03 Angel Velasquez <angvp@archlinux.org> + * Version bump to 0.16.4 + * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream + +2011-06-25 Angel Velasquez <angvp@archlinux.org> + * Added a patch for bug with ffmpeg FS#24839 + + +# vim: set ft=changelog ts=4 sw=4 et: diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD new file mode 100644 index 000000000..5621f15db --- /dev/null +++ b/testing/mpd/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 142157 2011-11-05 11:38:08Z ibiru $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Ben <ben@benmazer.net> + +pkgname=mpd +pkgver=0.16.5 +pkgrel=2 +pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" +arch=('i686' 'x86_64') +license=('GPL') +url="http://mpd.wikia.com/wiki/Server" +depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' + 'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag' + 'libpulse') +makedepends=('pkgconfig' 'doxygen') +install=${pkgname}.install +changelog=ChangeLog +source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" +'mpd') +md5sums=('f7564cff12035f6a1112cce770655df7' + 'e5669c2bff4031928531e52475addeb1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-lastfm \ + --enable-jack \ + --enable-pulse \ + --enable-documentation \ + --disable-libwrap \ + --disable-cue \ + --disable-sidplay \ + --with-systemdsystemunitdir=/lib/systemd/system + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # set our dirs in mpd.conf file + sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example + sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example + sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example + sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example + sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example + sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example + sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example + sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example + + install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example" + + install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd" + install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd} +} diff --git a/testing/mpd/mpd b/testing/mpd/mpd new file mode 100755 index 000000000..6134e2ed4 --- /dev/null +++ b/testing/mpd/mpd @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting Music Player Daemon" + [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd + /usr/bin/mpd /etc/mpd.conf &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon mpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Music Player Daemon" + /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/mpd/mpd.install b/testing/mpd/mpd.install new file mode 100644 index 000000000..885505a07 --- /dev/null +++ b/testing/mpd/mpd.install @@ -0,0 +1,18 @@ +post_install() { + post_upgrade + echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)" +} + +post_upgrade() { + getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null + getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null + for dir in /var/{lib,log}/mpd; do + chown -R mpd:mpd "$dir" 1>/dev/null + done +} + +post_remove() { + getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null + getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null + [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null +} diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD new file mode 100644 index 000000000..3adf672a4 --- /dev/null +++ b/testing/opal/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 142127 2011-11-05 11:37:25Z ibiru $ +# Maintainer: Jan de Groot <jan@archlinux.org> +# Contributor: Tom K <tomk@runbox.com> +pkgname=opal +pkgver=3.10.2 +pkgrel=3 +pkgdesc="Open Phone Abstraction Library" +arch=(i686 x86_64) +url="http://www.ekiga.org" +license=('GPL') +depends=('ptlib' 'libtheora' 'x264' 'speex') +makedepends=('ffmpeg') +options=(!makeflags) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205') + +build() { + cd "${srcdir}/opal-${pkgver}" + CXXFLAGS="$CXXFLAGS -fpermissive" \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/opal-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD new file mode 100644 index 000000000..6ffc4a7a5 --- /dev/null +++ b/testing/opencv/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 142159 2011-11-05 11:38:11Z ibiru $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.1 +pkgrel=2 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('python2-numpy: Python 2.x interface' + 'eigen2') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2") +md5sums=('827c9f8aa14384c531c73aa165f9b777') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + install=$pkgname.install + + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + if [ -d OpenCV ]; then + mv opencv/samples OpenCV/ + rm -r opencv + mv OpenCV opencv + fi + + # separate docs package; also be -R friendly + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + depends=() + optdepends=() + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=() + optdepends=() + options=() + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/opencv/opencv.install b/testing/opencv/opencv.install new file mode 100644 index 000000000..ae3f50d5c --- /dev/null +++ b/testing/opencv/opencv.install @@ -0,0 +1,11 @@ +post_install() { + echo " Documentation and samples are in separate packages:" + echo " * opencv-docs" + echo " * opencv-samples" +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/pptpclient/PKGBUILD b/testing/pptpclient/PKGBUILD new file mode 100644 index 000000000..1cb05b6f8 --- /dev/null +++ b/testing/pptpclient/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142106 2011-11-05 10:12:06Z pierre $ +# Maintainer: Daniel Isenmann <daniel @ archlinux.org> +# Contributor: Mark Nikkel <mnikkel@gmail.com> + +pkgname=pptpclient +pkgver=1.7.2 +pkgrel=4 +pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." +arch=('i686' 'x86_64') +url="http://pptpclient.sourceforge.net/" +license=('GPL') +depends=('ppp' 'iproute2') +backup=('etc/ppp/options.pptp') +source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz") +md5sums=('4c3d19286a37459a632c7128c92a9857') + +build() { + cd $srcdir/pptp-$pkgver + + # use our CFLAGS and LDFLAGS + sed -i -e "/CFLAGS =/ c\CFLAGS = ${CFLAGS}" Makefile + sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile + + # adjust ip path + sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c + + make +} + +package() { + cd $srcdir/pptp-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/testing/reiserfsprogs/PKGBUILD b/testing/reiserfsprogs/PKGBUILD new file mode 100644 index 000000000..0caddd355 --- /dev/null +++ b/testing/reiserfsprogs/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 142096 2011-11-05 09:21:11Z pierre $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=reiserfsprogs +pkgver=3.6.21 +pkgrel=4 +pkgdesc="Reiserfs utilities" +arch=('i686' 'x86_64') +url="http://www.kernel.org/" +license=('GPL') +groups=('base') +depends=('util-linux-ng') +source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2") +md5sums=('0639cefac8f8150536cfa7531c2aa2d2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sbindir=/sbin + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + ln -s reiserfsck "${pkgdir}/sbin/fsck.reiserfs" + ln -s mkreiserfs "${pkgdir}/sbin/mkfs.reiserfs" +} diff --git a/testing/sox/PKGBUILD b/testing/sox/PKGBUILD new file mode 100644 index 000000000..ebe832d53 --- /dev/null +++ b/testing/sox/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 142161 2011-11-05 11:38:13Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=sox +pkgver=14.3.2 +pkgrel=4 +pkgdesc="The Swiss Army knife of sound processing tools" +arch=('i686' 'x86_64') +url="http://sox.sourceforge.net/" +license=('GPL' 'LGPL') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') +makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') +optdepends=('libao: for ao plugin' + 'ffmpeg: for ffmpeg plugin' + 'libmad: for mp3 plugin' + 'libid3tag: for mp3 plugin' + 'wavpack: for wavpack plugin' + 'libpulse: for pulse plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + sox-14.3.2-ffmpeg.patch) +sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' + '86caa6aa86a0bf7a048522114d4efd11acbbda70') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" + sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-dyn-default --with-distro="Arch Linux" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/sox/sox-14.3.2-ffmpeg.patch b/testing/sox/sox-14.3.2-ffmpeg.patch new file mode 100644 index 000000000..5289b9b47 --- /dev/null +++ b/testing/sox/sox-14.3.2-ffmpeg.patch @@ -0,0 +1,40 @@ +Index: sox-14.3.2/src/ffmpeg.c +=================================================================== +--- sox-14.3.2.orig/src/ffmpeg.c ++++ sox-14.3.2/src/ffmpeg.c +@@ -91,7 +91,7 @@ static int stream_component_open(priv_t + + if (!codec || avcodec_open(enc, codec) < 0) + return -1; +- if (enc->codec_type != CODEC_TYPE_AUDIO) { ++ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); + return -1; + } +@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) + /* Find audio stream (FIXME: allow different stream to be selected) */ + for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { + AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; +- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { ++ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { + ffmpeg->audio_index = i; + break; + } +@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo + + c = st->codec; + c->codec_id = codec_id; +- c->codec_type = CODEC_TYPE_AUDIO; ++ c->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + c->bit_rate = 256000; /* FIXME: allow specification */ +@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t + av_init_packet(&pkt); + pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); + pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ffmpeg->audio_st->index; + pkt.data = ffmpeg->audio_buf_aligned; + diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD new file mode 100644 index 000000000..e0ef88386 --- /dev/null +++ b/testing/transcode/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 142163 2011-11-05 11:38:15Z ibiru $ +# 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/testing/transcode/transcode-1.1.5-ffmpeg.patch b/testing/transcode/transcode-1.1.5-ffmpeg.patch new file mode 100644 index 000000000..86e8272e9 --- /dev/null +++ b/testing/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/testing/transcode/transcode-1.1.5-jpeg-7.patch b/testing/transcode/transcode-1.1.5-jpeg-7.patch new file mode 100644 index 000000000..288932a61 --- /dev/null +++ b/testing/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/testing/transcode/transcode-1.1.5-mpa.patch b/testing/transcode/transcode-1.1.5-mpa.patch new file mode 100644 index 000000000..e7fb0fc1c --- /dev/null +++ b/testing/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; diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD new file mode 100644 index 000000000..eb810befb --- /dev/null +++ b/testing/vlc/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 142129 2011-11-05 11:37:27Z ibiru $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> + +pkgname=vlc +pkgver=1.1.12 +pkgrel=2 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/http/.hosts' + 'usr/share/vlc/http/dialogs/.hosts' + 'usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('91de1ad308c947e35380f9d747ff5713') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install new file mode 100644 index 000000000..4a1091bc5 --- /dev/null +++ b/testing/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD new file mode 100644 index 000000000..a823788f5 --- /dev/null +++ b/testing/x264/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 142171 2011-11-05 11:41:36Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=x264 +pkgver=20111030 +pkgrel=1 +pkgdesc="free library for encoding H264/AVC video streams" +arch=('i686' 'x86_64') +url="http://www.videolan.org/developers/x264.html" +license=('GPL') +depends=('glibc') +makedepends=('yasm') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) +md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc') + +build() { + cd "$srcdir/$pkgname-snapshot-$pkgver-2245" + + ./configure --enable-shared + + make + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD new file mode 100644 index 000000000..e3cb8d8a5 --- /dev/null +++ b/testing/xine-lib/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 142165 2011-11-05 11:38:18Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-lib +pkgver=1.1.19 +pkgrel=6 +pkgdesc="A multimedia playback engine" +arch=('i686' 'x86_64') +url="http://www.xine-project.org" +license=('LGPL' 'GPL') +depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' + 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') +optdepends=('imagemagick: for using the imagemagick plugin' \ + 'smbclient: for using the smb plugin' \ + 'jack: for using the jack plugin' \ + 'vcdimager: for using the vcd plugin' \ + 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \ + 'mesa: for using the opengl plugin' \ + 'libpulse: for using the pulseaudio plugin' \ + 'speex: for using the speex plugin' \ + 'v4l-utils: for using the v4l plugin' \ + 'wavpack: for using the wavpack plugin' \ + 'faad2: for using the faad plugin' \ + 'libmng: for using the mng plugin' \ + 'aalib: for using the aalib plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz + xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch + xine-lib-1.1.19-ffmpeg.patch) +sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d' + '121a8358d7919b2e51067412373f52848290338a' + '920bf27e6e3523dfe4cc9c802ff713e9688a3f34' + 'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch" + patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch" + patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch" + sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ + configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h + + libtoolize --force --copy + aclocal -I m4 + autoconf + automake --add-missing + + ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch new file mode 100644 index 000000000..4b6ba9e35 --- /dev/null +++ b/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch @@ -0,0 +1,13 @@ +--- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 ++++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 +@@ -161,10 +161,6 @@ + ;; + + esac +- if test x"$archopt_val" != x; then +- CFLAGS="$sarchopt=$archopt_val $CFLAGS" +- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" +- fi + fi + else + dnl we have the Intel compiler diff --git a/testing/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/testing/xine-lib/xine-lib-1.1.19-ffmpeg.patch new file mode 100644 index 000000000..6817aa989 --- /dev/null +++ b/testing/xine-lib/xine-lib-1.1.19-ffmpeg.patch @@ -0,0 +1,380 @@ +diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c +--- a/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 19:46:49 2011 -0400 +@@ -46,6 +46,12 @@ + + #define AUDIOBUFSIZE (64 * 1024) + ++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++# define AVAUDIO 3 ++#else ++# define AVAUDIO 2 ++#endif ++ + typedef struct { + audio_decoder_class_t decoder_class; + } ff_audio_class_t; +@@ -255,6 +261,9 @@ + buf->decoder_info[2]); + + } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { ++#if AVAUDIO > 2 ++ AVPacket avpkt; ++#endif + + if( !this->decoder_ok ) { + if ( ! this->context || ! this->codec ) { +@@ -286,11 +295,21 @@ + if (!this->output_open) { + if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++#if AVAUDIO > 2 ++ av_init_packet (&avpkt); ++ avpkt.data = (uint8_t *)&this->buf[0]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ avcodec_decode_audio3 (this->context, ++ (int16_t *)this->decode_buffer, ++ &decode_buffer_size, &avpkt); ++#else + avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[0], + this->size); ++#endif + this->audio_bits = this->context->bits_per_sample; + this->audio_sample_rate = this->context->sample_rate; + this->audio_channels = this->context->channels; +@@ -311,12 +330,21 @@ + offset = 0; + while (this->size>0) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++#if AVAUDIO > 2 ++ av_init_packet (&avpkt); ++ avpkt.data = (uint8_t *)&this->buf[offset]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ bytes_consumed = avcodec_decode_audio3 (this->context, ++ (int16_t *)this->decode_buffer, ++ &decode_buffer_size, &avpkt); ++#else + bytes_consumed = avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[offset], + this->size); +- ++#endif + if (bytes_consumed<0) { + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "ffmpeg_audio_dec: error decompressing audio frame\n"); +diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c +--- a/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 19:46:49 2011 -0400 +@@ -58,6 +58,14 @@ + + #define ENABLE_DIRECT_RENDERING + ++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++# define AVVIDEO 2 ++#else ++# define AVVIDEO 1 ++# define pp_context pp_context_t ++# define pp_mode pp_mode_t ++#endif ++ + /* reordered_opaque appeared in libavcodec 51.68.0 */ + #define AVCODEC_HAS_REORDERED_OPAQUE + #if LIBAVCODEC_VERSION_INT < 0x334400 +@@ -116,8 +124,8 @@ + + int pp_quality; + int pp_flags; +- pp_context_t *pp_context; +- pp_mode_t *pp_mode; ++ pp_context *our_context; ++ pp_mode *our_mode; + + /* mpeg-es parsing */ + mpeg_parser_t *mpeg_parser; +@@ -444,23 +452,23 @@ + this->pp_quality = this->class->pp_quality; + + if(this->pp_available && this->pp_quality) { +- if(!this->pp_context && this->context) +- this->pp_context = pp_get_context(this->context->width, this->context->height, ++ if(!this->our_context && this->context) ++ this->our_context = pp_get_context(this->context->width, this->context->height, + this->pp_flags); +- if(this->pp_mode) +- pp_free_mode(this->pp_mode); ++ if(this->our_mode) ++ pp_free_mode(this->our_mode); + +- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", ++ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", + this->pp_quality); + } else { +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } + +- if(this->pp_context) { +- pp_free_context(this->pp_context); +- this->pp_context = NULL; ++ if(this->our_context) { ++ pp_free_context(this->our_context); ++ this->our_context = NULL; + } + } + } +@@ -1055,12 +1063,26 @@ + } + + /* skip decoding b frames if too late */ ++#if AVVIDEO > 1 ++ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; ++#else + this->context->hurry_up = (this->skipframes > 0); ++#endif + + lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); ++#if AVVIDEO > 1 ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; ++ avpkt.size = this->mpeg_parser->buffer_size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ len = avcodec_decode_video2 (this->context, this->av_frame, ++ &got_picture, &avpkt); ++#else + len = avcodec_decode_video (this->context, this->av_frame, + &got_picture, this->mpeg_parser->chunk_buffer, + this->mpeg_parser->buffer_size); ++#endif + lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", + len, got_picture); + len = current - buf->content - offset; +@@ -1112,7 +1134,13 @@ + + } else { + +- if (this->context->hurry_up) { ++ if ( ++#if AVVIDEO > 1 ++ this->context->skip_frame != AVDISCARD_DEFAULT ++#else ++ this->context->hurry_up ++#endif ++ ) { + /* skipped frame, output a bad frame */ + img = this->stream->video_out->get_frame (this->stream->video_out, + this->bih.biWidth, +@@ -1304,13 +1332,25 @@ + got_picture = 0; + } else { + /* skip decoding b frames if too late */ ++#if AVVIDEO > 1 ++ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; ++#else + this->context->hurry_up = (this->skipframes > 0); +- ++#endif + lprintf("buffer size: %d\n", this->size); ++#if AVVIDEO > 1 ++ AVPacket avpkt; ++ av_init_packet(&avpkt); ++ avpkt.data = (uint8_t *)&chunk_buf[offset]; ++ avpkt.size = this->size; ++ avpkt.flags = AV_PKT_FLAG_KEY; ++ len = avcodec_decode_video2 (this->context, this->av_frame, ++ &got_picture, &avpkt); ++#else + len = avcodec_decode_video (this->context, this->av_frame, + &got_picture, &chunk_buf[offset], + this->size); +- ++#endif + #ifdef AVCODEC_HAS_REORDERED_OPAQUE + /* reset consumed pts value */ + this->context->reordered_opaque = ff_tag_pts(this, 0); +@@ -1432,7 +1472,7 @@ + img->base, img->pitches, + img->width, img->height, + this->av_frame->qscale_table, this->av_frame->qstride, +- this->pp_mode, this->pp_context, ++ this->our_mode, this->our_context, + this->av_frame->pict_type); + + } else if (!this->av_frame->opaque) { +@@ -1676,11 +1716,11 @@ + free(this->buf); + this->buf = NULL; + +- if(this->pp_context) +- pp_free_context(this->pp_context); ++ if(this->our_context) ++ pp_free_context(this->our_context); + +- if(this->pp_mode) +- pp_free_mode(this->pp_mode); ++ if(this->our_mode) ++ pp_free_mode(this->our_mode); + + mpeg_parser_dispose(this->mpeg_parser); + +@@ -1721,8 +1761,8 @@ + this->aspect_ratio = 0; + + this->pp_quality = 0; +- this->pp_context = NULL; +- this->pp_mode = NULL; ++ this->our_context = NULL; ++ this->our_mode = NULL; + + this->mpeg_parser = NULL; + +diff -r 717450d734f7 src/post/planar/pp.c +--- a/src/post/planar/pp.c Mon May 16 15:49:02 2011 +0100 ++++ b/src/post/planar/pp.c Mon May 16 19:46:49 2011 -0400 +@@ -35,6 +35,12 @@ + # include <libpostproc/postprocess.h> + #endif + ++#if LIBPOSTPROC_VERSION_MAJOR < 52 ++# define pp_context pp_context_t ++# define pp_mode pp_mode_t ++# define PP_PARAMETERS_T ++#endif ++ + #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ + + /* plugin class initialization function */ +@@ -76,14 +82,15 @@ + + /* libpostproc specific stuff */ + int pp_flags; +- pp_context_t *pp_context; +- pp_mode_t *pp_mode; ++ pp_context *our_context; ++ pp_mode *our_mode; + + pthread_mutex_t lock; + }; + + + static int set_parameters (xine_post_t *this_gen, void *param_gen) { ++#ifdef PP_PARAMETERS_T + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + pp_parameters_t *param = (pp_parameters_t *)param_gen; + +@@ -92,17 +99,18 @@ + memcpy( &this->params, param, sizeof(pp_parameters_t) ); + + pthread_mutex_unlock (&this->lock); +- ++#endif + return 1; + } + + static int get_parameters (xine_post_t *this_gen, void *param_gen) { ++#ifdef PP_PARAMETERS_T + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + pp_parameters_t *param = (pp_parameters_t *)param_gen; + + + memcpy( param, &this->params, sizeof(pp_parameters_t) ); +- ++#endif + return 1; + } + +@@ -202,8 +210,8 @@ + if(cpu_caps & MM_ACCEL_X86_3DNOW) + this->pp_flags |= PP_CPU_CAPS_3DNOW; + +- this->pp_mode = NULL; +- this->pp_context = NULL; ++ this->our_mode = NULL; ++ this->our_context = NULL; + + pthread_mutex_init (&this->lock, NULL); + +@@ -248,13 +256,13 @@ + post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; + + if (_x_post_dispose(this_gen)) { +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } +- if(this->pp_context) { +- pp_free_context(this->pp_context); +- this->pp_context = NULL; ++ if(this->our_context) { ++ pp_free_context(this->our_context); ++ this->our_context = NULL; + } + free(this); + } +@@ -304,7 +312,7 @@ + + pthread_mutex_lock (&this->lock); + +- if( !this->pp_context || ++ if( !this->our_context || + this->frame_width != yv12_frame->width || + this->frame_height != yv12_frame->height ) { + +@@ -312,32 +320,32 @@ + this->frame_height = yv12_frame->height; + pp_flags = this->pp_flags; + +- if(this->pp_context) +- pp_free_context(this->pp_context); ++ if(this->our_context) ++ pp_free_context(this->our_context); + +- this->pp_context = pp_get_context(frame->width, frame->height, pp_flags); ++ this->our_context = pp_get_context(frame->width, frame->height, pp_flags); + +- if(this->pp_mode) { +- pp_free_mode(this->pp_mode); +- this->pp_mode = NULL; ++ if(this->our_mode) { ++ pp_free_mode(this->our_mode); ++ this->our_mode = NULL; + } + } + +- if(!this->pp_mode) +- this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode, ++ if(!this->our_mode) ++ this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode, + this->params.quality); + +- if(this->pp_mode) ++ if(this->our_mode) + pp_postprocess(yv12_frame->base, yv12_frame->pitches, + out_frame->base, out_frame->pitches, + (frame->width+7)&(~7), frame->height, + NULL, 0, +- this->pp_mode, this->pp_context, ++ this->our_mode, this->our_context, + 0 /*this->av_frame->pict_type*/); + + pthread_mutex_unlock (&this->lock); + +- if(this->pp_mode) { ++ if(this->our_mode) { + skip = out_frame->draw(out_frame, stream); + _x_post_frame_copy_up(frame, out_frame); + } else { diff --git a/testing/xine-lib/xine-lib-1.1.19-xvmc.patch b/testing/xine-lib/xine-lib-1.1.19-xvmc.patch new file mode 100644 index 000000000..bef8b0bac --- /dev/null +++ b/testing/xine-lib/xine-lib-1.1.19-xvmc.patch @@ -0,0 +1,17 @@ +Quoting ChangeLog of X11's videoproto package: +vldXvMC.h: stop uselessly including XvMClib.h + +--- src/video_out/xxmc.h ++++ src/video_out/xxmc.h +@@ -77,10 +77,10 @@ + #include <X11/extensions/XShm.h> + #include <X11/extensions/Xv.h> + #include <X11/extensions/Xvlib.h> ++#include <X11/extensions/XvMClib.h> + #ifdef HAVE_VLDXVMC + #include <X11/extensions/vldXvMC.h> + #else +- #include <X11/extensions/XvMClib.h> + #include <X11/extensions/XvMC.h> + #endif + |