[arch-commits] Commit in ffmpeg/trunk (PKGBUILD avutils-make-aes-and-sha-public.patch)

[Ionut Biru]

    Date: Saturday, June 18, 2011 @ 12:07:16
  Author: ibiru
Revision: 127807

upgpkg: ffmpeg 20110618-1
use oldapi branch for now, rebuild against x264

Modified:
  ffmpeg/trunk/PKGBUILD
Deleted:
  ffmpeg/trunk/avutils-make-aes-and-sha-public.patch

---------------------------------------+
 PKGBUILD                              |   15 +++++-------
 avutils-make-aes-and-sha-public.patch |   37 --------------------------------
 2 files changed, 6 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-18 16:05:28 UTC (rev 127806)
+++ PKGBUILD	2011-06-18 16:07:16 UTC (rev 127807)
@@ -4,25 +4,21 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20110330
-pkgrel=2
+pkgver=20110618
+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')
+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
-        avutils-make-aes-and-sha-public.patch)
-md5sums=('dd682a876a496b9f9ae8afb3b3b70389'
-         '06eb45335669cb742fdcbea48f0605ce')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
+md5sums=('ff3636c6601f68cdcc777fadaf0eba46')
 
 build() {
   cd "$srcdir/$pkgname"
 
-  patch -Np1 -i "$srcdir/avutils-make-aes-and-sha-public.patch"
-
   ./configure \
     --prefix=/usr \
     --enable-libmp3lame \
@@ -38,6 +34,7 @@
     --enable-libopencore_amrwb \
     --enable-libschroedinger \
     --enable-libopenjpeg \
+    --enable-librtmp \
     --enable-gpl \
     --enable-version3 \
     --enable-runtime-cpudetect \

Deleted: avutils-make-aes-and-sha-public.patch
===================================================================
--- avutils-make-aes-and-sha-public.patch	2011-06-18 16:05:28 UTC (rev 127806)
+++ avutils-make-aes-and-sha-public.patch	2011-06-18 16:07:16 UTC (rev 127807)
@@ -1,37 +0,0 @@
-From a3a0af4fb1237bed0af75868073f9a63db8b1864 Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier at gentoo.org>
-Date: Thu, 7 Apr 2011 10:19:23 -0300
-Subject: [PATCH] avutil: make aes and sha api public
-
-The functions are already av_ prefixed and sha1 header is already provided.
-Install libavutil/{aes,sha}.h
-
-Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
-Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
----
- libavutil/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libavutil/Makefile b/libavutil/Makefile
-index 300acb1..baee496 100644
---- a/libavutil/Makefile
-+++ b/libavutil/Makefile
-@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
- NAME = avutil
- 
- HEADERS = adler32.h                                                     \
-+          aes.h                                                         \
-           attributes.h                                                  \
-           audioconvert.h                                                \
-           avassert.h                                                    \
-@@ -33,6 +34,7 @@ HEADERS = adler32.h                                                     \
-           random_seed.h                                                 \
-           rational.h                                                    \
-           samplefmt.h                                                   \
-+          sha.h                                                         \
-           sha1.h                                                        \
- 
- BUILT_HEADERS = avconfig.h
--- 
-1.7.2.5
-