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

[Ionut Biru]

    Date: Saturday, May 7, 2011 @ 07:51:04
  Author: ibiru
Revision: 122938

drop nonfree stuff, fix headers

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

---------------------------------------+
 PKGBUILD                              |   18 ++++++++-------
 avutils-make-aes-and-sha-public.patch |   37 ++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-07 11:29:11 UTC (rev 122937)
+++ PKGBUILD	2011-05-07 11:51:04 UTC (rev 122938)
@@ -5,26 +5,28 @@
 
 pkgname=ffmpeg
 pkgver=20110330
-pkgrel=1
+pkgrel=2
 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' 'faac' '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')
 makedepends=('yasm' 'git')
 #git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz
+        avutils-make-aes-and-sha-public.patch)
+md5sums=('dd682a876a496b9f9ae8afb3b3b70389'
+         '06eb45335669cb742fdcbea48f0605ce')
 
 build() {
   cd "$srcdir/$pkgname"
 
+  patch -Np1 -i "$srcdir/avutils-make-aes-and-sha-public.patch"
+
   ./configure \
     --prefix=/usr \
-    --enable-gpl \
     --enable-libmp3lame \
     --enable-libvorbis \
-    --enable-libfaac \
     --enable-libxvid \
     --enable-libx264 \
     --enable-libvpx \
@@ -36,10 +38,10 @@
     --enable-libopencore_amrwb \
     --enable-libschroedinger \
     --enable-libopenjpeg \
+    --enable-gpl \
     --enable-version3 \
-    --enable-nonfree \
     --enable-runtime-cpudetect \
-    --disable-debug  # libfaac is nonfree
+    --disable-debug
 
   make
   make tools/qt-faststart

Added: avutils-make-aes-and-sha-public.patch
===================================================================
--- avutils-make-aes-and-sha-public.patch	                        (rev 0)
+++ avutils-make-aes-and-sha-public.patch	2011-05-07 11:51:04 UTC (rev 122938)
@@ -0,0 +1,37 @@
+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
+