Wed Nov 2 23:14:55 UTC 2011

11 files changed, 304 insertions, 5 deletions

diff --git a/community-staging/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD
new file mode 100644
index 000000000..4b49c0602
--- /dev/null
+++ b/community-staging/deadbeef/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 57696 2011-11-01 10:47:22Z jelle $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
+
+pkgname=deadbeef
+pkgver=0.5.1
+pkgrel=3
+pkgdesc='An audio player for GNU/Linux based on GTK2.'
+arch=('i686' 'x86_64')
+url='http://deadbeef.sourceforge.net'
+license=('GPL2')
+depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
+             'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
+             'libsamplerate')
+optdepends=('libsamplerate: for Resampler plugin'
+            'libvorbis: for Ogg Vorbis playback'
+            'libmad: for MP1/MP2/MP3 playback'
+            'flac: for FLAC playback'
+            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
+            'imlib2: for artwork plugin'
+            'wavpack: for WavPack playback'
+            'libsndfile: for Wave playback'
+            'libcdio: audio cd plugin'
+            'libcddb: audio cd plugin'
+            'ffmpeg: for WMA, AA, OMA, AC, etc.'
+            'faad2: for AAC/MP4 support'
+            'dbus: for OSD notifications support'
+            'pulseaudio: for PulseAudio output plugin'
+            'libx11: for global hotkeys plugin'
+            'zlib: for Audio Overload plugin'
+            'libzip: for vfs_zip plugin')
+options=('!libtool')
+install='deadbeef.install'
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch")
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/ffmpeg.patch
+
+  ./configure --prefix=/usr
+  make
+}
+
+package () {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}/usr" install
+}
+md5sums=('be8359d1bd9cf7679cf2ca748996e726'
+         '6cc7623734af310095534c361c9f64e8')
diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install
new file mode 100644
index 000000000..eaf1b9a69
--- /dev/null
+++ b/community-staging/deadbeef/deadbeef.install
@@ -0,0 +1,14 @@
+pkgname=deadbeef
+
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-staging/deadbeef/ffmpeg.patch b/community-staging/deadbeef/ffmpeg.patch
new file mode 100644
index 000000000..925b84408
--- /dev/null
+++ b/community-staging/deadbeef/ffmpeg.patch
@@ -0,0 +1,45 @@
+diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c
+--- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c	2011-05-22 13:58:53.000000000 +0000
++++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c	2011-11-01 10:38:11.447669741 +0000
+@@ -140,7 +140,12 @@
+     for (i = 0; i < info->fctx->nb_streams; i++)
+     {
+         info->ctx = info->fctx->streams[i]->codec;
+-        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (info->ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++		            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             info->codec = avcodec_find_decoder (info->ctx->codec_id);
+             if (info->codec != NULL) {
+@@ -490,7 +495,12 @@
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++		            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
+@@ -745,7 +755,12 @@
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++			            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL)
diff --git a/community-staging/dvdstyler/PKGBUILD b/community-staging/dvdstyler/PKGBUILD
new file mode 100644
index 000000000..f0d8ccc70
--- /dev/null
+++ b/community-staging/dvdstyler/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 57687 2011-11-01 09:55:55Z ebelanger $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=dvdstyler
+pkgver=2.0
+pkgrel=2
+pkgdesc="Cross-platform DVD authoring application"
+arch=('i686' 'x86_64')
+url="http://www.dvdstyler.de/"
+license=('GPL')
+depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui')
+makedepends=('zip' 'xmlto' 'docbook-xsl')
+optdepends=('dvdisaster: ECC support')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2)
+sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6')
+
+build() {
+  cd "${srcdir}/DVDStyler-${pkgver}"
+  sed -i 's/rmdir "$$t"//' docs/Makefile.in
+  sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/DVDStyler-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-staging/electricsheep/PKGBUILD b/community-staging/electricsheep/PKGBUILD
new file mode 100644
index 000000000..7becdf2ba
--- /dev/null
+++ b/community-staging/electricsheep/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 57681 2011-11-01 05:04:13Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=electricsheep
+pkgver=2.7b12
+pkgrel=4
+pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
+arch=('i686' 'x86_64')
+url="http://community.electricsheep.org/"
+license=('GPL')
+depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
+makedepends=('xscreensaver')
+optdepends=('xscreensaver: to use electricsheep with xscreensaver')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        electricsheep-ffmpeg.patch)
+sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
+          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/share/applications/screensavers"
+  install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver"
+  make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \
+    GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install
+  install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
+  install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml"
+  install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver"
+}
diff --git a/community-staging/electricsheep/electricsheep-ffmpeg.patch b/community-staging/electricsheep/electricsheep-ffmpeg.patch
new file mode 100644
index 000000000..b04cf41b0
--- /dev/null
+++ b/community-staging/electricsheep/electricsheep-ffmpeg.patch
@@ -0,0 +1,36 @@
+diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
+--- electricsheep-2.7b12.orig/electricsheep.c	2011-10-31 22:36:30.000000000 -0400
++++ electricsheep-2.7b12/electricsheep.c	2011-10-31 22:40:04.000000000 -0400
+@@ -662,7 +662,7 @@
+     input_stream_index = -1;
+     for (j = 0; j < ictx->nb_streams; j++) {
+ 	AVCodecContext *enc = ictx->streams[j]->codec;
+-	if (CODEC_TYPE_VIDEO == enc->codec_type) {
++	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
+ 	    input_stream_index = j;
+ 	    break;
+ 	}
+@@ -730,7 +730,7 @@
+ 	av_init_packet(&opkt);
+ 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
+ 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
+-			     ipkt.flags & PKT_FLAG_KEY))
++			     ipkt.flags & AV_PKT_FLAG_KEY))
+ 	    opkt.destruct= av_destruct_packet;
+ 		
+ 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
+diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
+--- electricsheep-2.7b12.orig/electricsheep.c	2011-11-01 00:21:51.000000000 -0400
++++ electricsheep-2.7b12/electricsheep.c	2011-11-01 00:25:10.000000000 -0400
+@@ -686,9 +686,9 @@
+ 	    }
+ 	}
+ 
+-	output_ctx = av_alloc_format_context();
++	output_ctx = avformat_alloc_context();
+ 
+-	ofmt = guess_format(NULL, fname, NULL);
++	ofmt = av_guess_format(NULL, fname, NULL);
+ 	if (!ofmt) {
+ 	    fprintf(logout, "could not determine format from %s.\n", fname);
+ 	    exit(1);
diff --git a/community-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD
new file mode 100644
index 000000000..2e1960eee
--- /dev/null
+++ b/community-staging/gpac/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 57689 2011-11-01 10:02:30Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=gpac
+pkgver=0.4.5
+pkgrel=9
+pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
+arch=('i686' 'x86_64')
+url="http://gpac.sourceforge.net"
+depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut')
+license=('LGPL')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        libpng14-infopp-null.patch openjpeg14.patch)
+sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8'
+          '00ba08808ec46ef6b8301ede26e500b3449253c1'
+          '95747ca98cdf0efc33ec776764401f5a83818ab5')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  chmod +x configure
+  sed -i 's|--warn-common||' configure
+  sed -i 's#lib64#lib#g' configure
+  patch -p1 -i "${srcdir}/libpng14-infopp-null.patch"
+  patch -p1 -i "${srcdir}/openjpeg14.patch"
+	
+  export LDFLAGS=${LDFLAGS/,--as-needed/}
+  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" install install-lib
+}
diff --git a/community-staging/gpac/libpng14-infopp-null.patch b/community-staging/gpac/libpng14-infopp-null.patch
new file mode 100644
index 000000000..b02456557
--- /dev/null
+++ b/community-staging/gpac/libpng14-infopp-null.patch
@@ -0,0 +1,12 @@
+diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c
+--- gpac.orig/src/media_tools/img.c	2010-01-24 19:03:28.000000000 +0200
++++ gpac/src/media_tools/img.c	2010-01-24 19:04:07.000000000 +0200
+@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
+ 	/* Allocate/initialize the image information data.  REQUIRED */
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if (info_ptr == NULL) {
+-		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++		png_destroy_write_struct(&png_ptr, NULL);
+ 		return GF_IO_ERR;
+ 	}
+ 	
diff --git a/community-staging/gpac/openjpeg14.patch b/community-staging/gpac/openjpeg14.patch
new file mode 100644
index 000000000..68a625eeb
--- /dev/null
+++ b/community-staging/gpac/openjpeg14.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/show_bug.cgi?id=361359
+
+Index: gpac/modules/img_in/jp2_dec.c
+===================================================================
+--- gpac.orig/modules/img_in/jp2_dec.c
++++ gpac/modules/img_in/jp2_dec.c
+@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
+ 	return GF_OK;
+ }
+ 
++char opj_version_buffer[500];
++
+ static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
+ {
++#ifndef OPENJPEG_VERSION
++	snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
++	return opj_version_buffer;
++#else
+ 	return "OpenJPEG "OPENJPEG_VERSION ;
++#endif
+ }
+ 
+ 
diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD
index 32785be10..cff8dd04a 100644
--- a/community-staging/lightspark/PKGBUILD
+++ b/community-staging/lightspark/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=lightspark
-pkgver=0.5.1
-pkgrel=3
+pkgver=0.5.2.1
+pkgrel=2
 pkgdesc='An alternative Flash Player for Linux.'
 arch=('i686' 'x86_64')
 url='http://lightspark.sourceforge.net'
@@ -13,10 +13,16 @@ depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpul
 makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
 optdepends=('gnash-gtk: fallback support')
 install="lightspark.install"
-source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tgz")
-md5sums=('aa0daa22646c2a663ec5045074451d45')
+source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz"
+        'llvm29.diff')
+md5sums=('ac2233a83e8bf0b305563bbce322cd76'
+         '5f717d1d9ead478184ca68f6ac068099')
 
 build() {
+  cd lightspark-${pkgver}
+  patch -Np0 -i ${srcdir}/llvm29.diff
+  cd ${srcdir}
+
   rm -rf build
   mkdir build
   cd build
@@ -26,7 +32,7 @@ build() {
     -DCOMPILE_PLUGIN=1 \
     -DCMAKE_BUILD_TYPE=Release \
     -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \
-    ..
+    ../lightspark-${pkgver}
 
   make
 }
diff --git a/community-staging/lightspark/llvm29.diff b/community-staging/lightspark/llvm29.diff
new file mode 100644
index 000000000..f859852af
--- /dev/null
+++ b/community-staging/lightspark/llvm29.diff
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.old	2011-11-01 22:07:52.475608726 +0000
++++ CMakeLists.txt	2011-11-01 22:08:52.046241925 +0000
+@@ -152,7 +152,8 @@
+ 	MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!")
+ ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8)
+ IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
+-	MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
++	#MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
++	ADD_DEFINITIONS(-DLLVM_29)
+ ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
+ IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8)
+ 	ADD_DEFINITIONS(-DLLVM_28)