Fri Jun 22 00:01:45 UTC 2012

8 files changed, 440 insertions, 45 deletions

diff --git a/community-staging/ffmpeg-compat/PKGBUILD b/community-staging/ffmpeg-compat/PKGBUILD
new file mode 100644
index 000000000..19336feeb
--- /dev/null
+++ b/community-staging/ffmpeg-compat/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=ffmpeg-compat
+pkgver=20120509
+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=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('yasm' 'git' 'libvdpau')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz)
+md5sums=('a35359e424608f369d380f03e4dc9966')
+
+build() {
+  cd "ffmpeg"
+
+  ./configure \
+    --prefix=/usr \
+    --incdir=/usr/include/ffmpeg-compat \
+    --libdir=/usr/lib/ffmpeg-compat \
+    --shlibdir=/usr/lib/ffmpeg-compat \
+    --enable-libmp3lame \
+    --enable-libvorbis \
+    --enable-libxvid \
+    --enable-libx264 \
+    --enable-libvpx \
+    --enable-libtheora \
+    --enable-libgsm \
+    --enable-libspeex \
+    --enable-postproc \
+    --enable-shared \
+    --enable-x11grab \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libschroedinger \
+    --enable-libopenjpeg \
+    --enable-librtmp \
+    --enable-libpulse \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-runtime-cpudetect \
+    --disable-debug \
+    --disable-static
+
+  make
+}
+
+package() {
+  cd "ffmpeg"
+  make DESTDIR="$pkgdir" install
+  rm -rf $pkgdir/usr/{bin,share}
+}
diff --git a/community-staging/motion/PKGBUILD b/community-staging/motion/PKGBUILD
index 8387624c0..00edf7064 100644
--- a/community-staging/motion/PKGBUILD
+++ b/community-staging/motion/PKGBUILD
@@ -1,75 +1,39 @@
-# $Id: PKGBUILD 72669 2012-06-18 22:08:51Z spupykin $
+# $Id: PKGBUILD 72698 2012-06-20 10:30:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=5
+pkgrel=6
 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=('libjpeg' 'v4l-utils')
-
-# ffmpeg workaround
-depends=(${depends[@]} speex libpulse bzip2 lame xvidcore opencore-amr libvpx libva sdl openjpeg rtmpdump gsm schroedinger libtheora x264)
-makedepends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg
-	     rtmpdump schroedinger sdl speex x264 xvidcore zlib yasm libvdpau)
-
+depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
 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
-	ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-20120509.tar.xz)
+	ffmpeg-compat.patch)
 md5sums=('1ba0065ed50509aaffb171594c689f46'
          '2e8c53c4980edddd420f08fdd572c9be'
          'd36687710837d69fbce4608b1345fa34'
          'd8c3c4fdded5cfbd729710475559a21d'
-         'a35359e424608f369d380f03e4dc9966')
+         'e85c596292aceb425fcf17e5072e2fff')
 
 build() {
-  cd $srcdir/ffmpeg
-  ./configure \
-    --prefix=$srcdir/ffmpeg \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static \
-    --disable-shared
-  make
-  make install
-
-
   cd "${srcdir}/${pkgname}-${pkgver}"
+  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
   patch -Np1 -i $srcdir/ffmpeg-0.8.patch
   patch -Np1 -i $srcdir/linux-headers.patch
-
-  # ffmpeg workaround
-  export LDFLAGS="-ldl -lX11 -lXext -lXfixes -lva -lasound -lSDL -lpthread -lxvidcore -lx264 -lvpx -lvpx -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lspeex -lschroedinger-1.0 -lrtmp -lz -lssl -lcrypto -lpulse-simple -lpulse -lopenjpeg -lopencore-amrwb -lopencore-amrnb -lmp3lame -lgsm -lm -pthread -lbz2 -lz"
-
+  patch -Np1 -i $srcdir/ffmpeg-compat.patch
+  autoreconf
   ./configure --prefix=/usr \
     --without-pgsql \
     --without-mysql \
     --sysconfdir=/etc/motion \
-    --with-ffmpeg=$srcdir/ffmpeg
+    --with-ffmpeg
   make
 }
 
diff --git a/community-staging/motion/ffmpeg-compat.patch b/community-staging/motion/ffmpeg-compat.patch
new file mode 100644
index 000000000..278166e18
--- /dev/null
+++ b/community-staging/motion/ffmpeg-compat.patch
@@ -0,0 +1,172 @@
+diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in
+--- motion-3.2.12/configure.in	2010-06-01 10:48:23.000000000 +0400
++++ motion-3.2.12.q/configure.in	2012-06-20 13:51:42.000000000 +0400
+@@ -290,163 +290,11 @@
+ fi
+ 
+ 
+-#
+-# Check for libavcodec and libavformat from ffmpeg
+-#
+-FFMPEG_DIR="yes"
+-FFMPEG_OK="no_found"
+-FFMPEG_OBJ=""
+-AC_ARG_WITH(ffmpeg,
+-[  --with-ffmpeg[=DIR]       Specify the prefix for the install path for
+-                          libavcodec/libavformat (part of ffmpeg) be able to 
+-                          encode mpeg movies realtime.
+-                          If this is not specified motion will try to find
+-                          the libraries in /usr and /usr/local.
+-                          ],
+-FFMPEG_DIR="$withval"
+-)
+-#
+-# --without-ffmpeg or with-ffmpeg=no
+-#
+-if test "${FFMPEG_DIR}" = "no"; then
+-	AC_MSG_CHECKING(for ffmpeg)
+-	AC_MSG_RESULT(skipping)
+-#
+-# with-ffmpeg=<dir> or nothing
+-#
+-else if test "${FFMPEG_DIR}" = "yes"; then
+-	# AUTODETECT STATIC/SHARED LIB 
+-	AC_MSG_CHECKING(for ffmpeg autodetecting)
+-
+-	if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
+-		AC_MSG_RESULT(found in /usr/lib64)
+-		FFMPEG_OK="found"
+-		FFMPEG_LIB="/usr/lib64"
+-		FFMPEG_DIR="/usr"
+-	elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then
+-		AC_MSG_RESULT(found in /usr/lib)
+-		FFMPEG_OK="found"
+-		FFMPEG_LIB="/usr/lib"
+-		FFMPEG_DIR="/usr"
+-	elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then
+-		AC_MSG_RESULT(found in /usr/local/lib)
+-		FFMPEG_OK="found"
+-		FFMPEG_LIB="/usr/local/lib"
+-		FFMPEG_DIR="/usr/local"
+-	else
+-		AC_MSG_RESULT(not found)
+-		echo ""
+-		echo "**********************************************"
+-		echo "* libavcodec.a or libavcodec.so or           *"
+-		echo "* libavformat.a or libavformat.so not found: *"
+-		echo "*    ALL FFMPEG FEATURES DISABLED            *"
+-		echo "*                                            *"
+-		echo "* Please read the Motion Guide for help:     *"
+-		echo "* http://motion.sourceforge.net              *"
+-		echo "**********************************************"
+-		echo ""		
+-	fi 
+-else
+-	AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
+-	if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
+-		AC_MSG_RESULT(found)
+-		FFMPEG_OK="found"
+-		FFMPEG_LIB="${FFMPEG_DIR}/lib"
+-	elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then
+-		AC_MSG_RESULT(found)
+-		FFMPEG_LIB="${FFMPEG_DIR}"
+-		FFMPEG_OK="found"
+-	else
+-		AC_MSG_RESULT(not found)
+-		if test "${FFMPEG_OK}" != "found"; then
+-			echo ""
+-			echo "**********************************************"
+-			echo "* libavcodec.a or libavcodec.so or           *"
+-			echo "* libavformat.a or libavformat.so not found: *"
+-			echo "*    ALL FFMPEG FEATURES DISABLED            *"
+-			echo "*                                            *"
+-			echo "* Please read the Motion Guide for help:     *"
+-			echo "* http://motion.sourceforge.net              *"
+-			echo "**********************************************"
+-			echo ""
+-		fi
+-	fi
+-fi
+-
+-#
+-# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found
+-#
+-
+-if test "${FFMPEG_OK}" = "found"; then
+-	AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
+-	
+-	if test -f ${FFMPEG_DIR}/include/avformat.h; then
+-		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
+-		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
+-	elif test -f ${FFMPEG_DIR}/avformat.h; then
+-		AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
+-		FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
+-	elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
+-		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
+-		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
+-	elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
+-		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
+-		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
+-    elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
+-        AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
+-        FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" 
+-	else
+-		AC_MSG_RESULT(not found)
+-		FFMPEG_OK="no_found"
+-		echo "**********************************************"
+-		echo "*       avformat.h not found:                *"
+-		echo "*    ALL FFMPEG FEATURES DISABLED            *"
+-		echo "*                                            *"
+-		echo "* Please read the Motion Guide for help:     *"
+-		echo "* http://motion.sourceforge.net              *"
+-		echo "**********************************************"
+-		echo ""
+-	fi
+-
+-#
+-# If ffmpeg libs and headers have been found 
+-#
+-
+-	if  test "${FFMPEG_OK}" = "found"; then	
+-		TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
+-		TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
+-		TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
+-
+-		FFMPEG_OBJ="ffmpeg.o"
+-		AC_SUBST(FFMPEG_OBJ)
+-
+-		AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
+-		saved_CFLAGS=$CFLAGS
+-		saved_LIBS=$LIBS
+-		CFLAGS="${FFMPEG_CFLAGS}"
+-		LIBS="$TEMP_LIBS"
+-		
+-		AC_COMPILE_IFELSE(
+-			[
+-			#include <avformat.h>
+-			URLProtocol test_file_protocol;
+-			int main(void){
+-				test_file_protocol.url_read  = file_protocol.url_read;
+-				return 0;
+-			}
+-			],
+-			[AC_MSG_RESULT(yes)],
+-			[
+-				AC_MSG_RESULT(no)
+-				TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW"
+-			]
+-		)
+-		CFLAGS=$saved_CFLAGS
+-		LIBS=$saved_LIBS	
+-	fi
+-fi	
+-fi
+-
++TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW"
++TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat"
++FFMPEG_OK=found
++FFMPEG_OBJ="ffmpeg.o"
++AC_SUBST(FFMPEG_OBJ)
+ 
+ #
+ # Check Mysql
diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD
new file mode 100644
index 000000000..e9912ed4b
--- /dev/null
+++ b/community-staging/openscenegraph/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 72706 2012-06-20 12:38:43Z spupykin $
+# 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=6
+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' 'qt' 'ffmpeg-compat')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
+conflicts=('openthreads')
+provides=('openthreads')
+source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
+	osg-xine-1.2.patch)
+#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
+md5sums=('c43a25d023e635c3566b2083d8e6d956'
+         'b05a486fdc2aaf06b29efb5e0714672e')
+
+build() {
+  cd OpenSceneGraph-$pkgver
+  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+  LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
+  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
+  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
+  [ $NOEXTRACT -eq 1 ] || cmake . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+    -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \
+    -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+    -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \
+    -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+    -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \
+    -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+    -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \
+    -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+    -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so
+
+  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
+  patch -p1 <$srcdir/osg-xine-1.2.patch
+  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-staging/openscenegraph/osg-xine-1.2.patch b/community-staging/openscenegraph/osg-xine-1.2.patch
new file mode 100644
index 000000000..c73b588dc
--- /dev/null
+++ b/community-staging/openscenegraph/osg-xine-1.2.patch
@@ -0,0 +1,14 @@
+diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
+--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c	2009-11-20 14:46:20.000000000 +0300
++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c	2012-01-05 02:15:38.000000000 +0400
+@@ -2769,8 +2769,8 @@
+ 	clear(rgb_class, sizeof(rgbout_class_t));
+ 
+ 	rgb_class->driver_class.open_plugin     = open_plugin;
+-	rgb_class->driver_class.get_identifier  = get_identifier;
+-	rgb_class->driver_class.get_description = get_description;
++	rgb_class->driver_class.identifier  = get_identifier(NULL);
++	rgb_class->driver_class.description = get_description(NULL);
+ 	rgb_class->driver_class.dispose         = dispose_class;
+ 
+ 	return(rgb_class);
diff --git a/community-staging/synfig/PKGBUILD b/community-staging/synfig/PKGBUILD
new file mode 100644
index 000000000..6e6ad21fe
--- /dev/null
+++ b/community-staging/synfig/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 72702 2012-06-20 11:15:26Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Franco Iacomella <yaco@gnu.org>
+
+pkgname=synfig
+pkgver=0.63.05
+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-compat' '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=('8591cf17c26405d68d2cc050a2929292'
+         'b5568b06fae1a7ee465b5380b1139b83'
+         'ebf41046097cfd778dee9a9854561dae')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+  LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
+  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
+  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
+  [ -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
+}
diff --git a/community-staging/synfig/build-fix.patch b/community-staging/synfig/build-fix.patch
new file mode 100644
index 000000000..be45fdc68
--- /dev/null
+++ b/community-staging/synfig/build-fix.patch
@@ -0,0 +1,31 @@
+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 --git a/community-staging/synfig/ffmpeg-0.8.patch b/community-staging/synfig/ffmpeg-0.8.patch
new file mode 100644
index 000000000..4ba40fff2
--- /dev/null
+++ b/community-staging/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;