Wed Feb 27 00:03:48 PST 2013

3 files changed, 27 insertions, 102 deletions

diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD
index e68395e82..33e864022 100755
--- a/community/ffmpegsource/PKGBUILD
+++ b/community/ffmpegsource/PKGBUILD
@@ -1,27 +1,41 @@
-# $Id: PKGBUILD 84674 2013-02-21 15:31:17Z alucryd $
+# $Id: PKGBUILD 84951 2013-02-26 15:11:09Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ffmpegsource
-pkgver=2.17
-pkgrel=9
+pkgver=743
+pkgrel=1
 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/ffmpegsource/"
 license=('MIT')
 depends=('ffmpeg')
+makedepends=('svn')
 options=('!libtool')
-source=("http://ffmpegsource.googlecode.com/files/ffms-${pkgver}-src.tar.bz2" 'autoconf.patch' 'ffmpeg.patch')
-sha256sums=('991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d'
-            '77e5185f91249b8d032958abb142827a5349b06ff1b4fbd4c5c87ccea811273d'
-            'adc08b58dec29b04be9d9eb2f12c2fa836565d363aafcfc3e785ae4692db6845')
+source=('autoconf.patch')
+sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
+
+_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/
+_svnmod=ffmpegsource
 
 build() {
-  cd "${srcdir}"/ffms-${pkgver}-src
+  cd "${srcdir}"
+  msg "Connecting to SVN server...."
+
+  if [[ -d ${_svnmod}/.svn ]]; then
+    (cd ${_svnmod} && svn up -r ${pkgver})
+  else
+    svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod}
+  fi
+
+  msg "SVN checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "${srcdir}"/${_svnmod}-build
+  svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
+  cd "${srcdir}"/${_svnmod}-build
 
 # Patch
   patch -Np1 -i "${srcdir}"/autoconf.patch
-  patch -Np1 -i "${srcdir}"/ffmpeg.patch
-  mv configure.in configure.ac
 
 # Build
   ./autogen.sh --prefix=/usr --enable-shared --disable-static
@@ -29,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/ffms-${pkgver}-src
+  cd "${srcdir}"/${_svnmod}-build
 
 # Install
   make DESTDIR="${pkgdir}" install
diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch
index 0420ad776..e15e4522c 100755
--- a/community/ffmpegsource/autoconf.patch
+++ b/community/ffmpegsource/autoconf.patch
@@ -9,8 +9,8 @@
  
  lib_LTLIBRARIES = src/core/libffms2.la
  src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
      CXXFLAGS="$OPT_FLAGS"
  fi
diff --git a/community/ffmpegsource/ffmpeg.patch b/community/ffmpegsource/ffmpeg.patch
deleted file mode 100755
index 71bf6aa2d..000000000
--- a/community/ffmpegsource/ffmpeg.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- ffms-2.17-src.orig/configure.in
-+++ ffms-2.17-src/configure.in
-@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV],
-             #include <libavcodec/avcodec.h>
-             #include <libswscale/swscale.h>
-             ]],[[
--                avcodec_init();
-+                av_register_all();
-                 swscale_version();
-                 #ifdef FFMS_USE_FFMPEG_COMPAT
-                 int bogus = CODEC_ID_G2M;
---- ffms-2.17-src.orig/include/ffmscompat.h
-+++ ffms-2.17-src/include/ffmscompat.h
-@@ -84,6 +84,14 @@
- #	else
- #		define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1))
- #	endif
-+#       if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100)
-+#               define FFMS_ID(x) (CODEC_ID_##x)
-+#               define FFMS_CodecID CodecID
-+#       else
-+#               define FFMS_ID(x) (AV_CODEC_ID_##x)
-+#               define FFMS_CodecID AVCodecID
-+#               undef CodecID
-+#       endif
- #endif
- 
- #ifdef LIBAVUTIL_VERSION_INT
---- ffms-2.17-src.orig/src/core/codectype.cpp
-+++ ffms-2.17-src/src/core/codectype.cpp
-@@ -25,7 +25,7 @@
- 
- typedef struct CodecTags {
- 	char str[20];
--	CodecID id;
-+	FFMS_CodecID id;
- } CodecTags;
- 
- static const CodecTags mkv_codec_tags[] = {
-@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[]
- };
- 
- typedef struct AVCodecTag {
--	enum CodecID id;
-+	enum FFMS_CodecID id;
- 	unsigned int tag;
- } AVCodecTag;
- 
-@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa
- 	}
- }
- 
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
- 	/* Look up native codecs */
- 	for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){
- 		if(!strncmp(mkv_codec_tags[i].str, Codec,
-@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec,
- 
- 				// Uncompressed and exotic format fixup
- 				// This list is incomplete
--				CodecID CID = mkv_codec_tags[i].id;
-+				FFMS_CodecID CID = mkv_codec_tags[i].id;
- 				switch (CID) {
- 					case CODEC_ID_PCM_S16LE:
- 						switch (BitsPerSample) {
---- ffms-2.17-src.orig/src/core/codectype.h
-+++ ffms-2.17-src/src/core/codectype.h
-@@ -27,5 +27,5 @@ extern "C" {
- #include "ffmscompat.h"
- 
- FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT);
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
- const char *GetLAVCSampleFormatName(AVSampleFormat s);
---- ffms-2.17-src.orig/src/core/matroskaparser.h
-+++ ffms-2.17-src/src/core/matroskaparser.h
-@@ -32,6 +32,11 @@
- #ifndef MATROSKA_PARSER_H
- #define	MATROSKA_PARSER_H
- 
-+/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */
-+#ifdef CodecID
-+#undef CodecID
-+#endif
-+
- /* Random notes:
-  *
-  * The parser does not process frame data in any way and does not read it into