[Frugalware-git] frugalware-current: Revert "ffmpeg-20080427-3-x86_64"

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c59616f040d5e62f6a5fceebff9cbb813b1361c

commit 9c59616f040d5e62f6a5fceebff9cbb813b1361c
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Aug 5 00:26:19 2008 +0200

Revert "ffmpeg-20080427-3-x86_64"

This reverts commit cdd1269fd89a9121661817be6a2625d39c994331.

If we really want to care about legal stuff _that much_, first please
fix fglrx, not this one, thanks.

diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild
index 146df51..ef31d1c 100644
--- a/source/xmultimedia/ffmpeg/FrugalBuild
+++ b/source/xmultimedia/ffmpeg/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=ffmpeg
pkgver=20080427
-pkgrel=6
+pkgrel=7
pkgdesc="FFMpeg is a complete and free Internet live audio and vide  broadcasting solution for Linux/Unix."
url="http://ffmpeg.sourceforge.net/"
-depends=('a52dec' 'faac' 'lame' 'libtheora' 'libvorbis' 'x264>=20080426' 'xvidcore' 'libdc1394' 'imlib2' 'sdl' 'faad2' 'gsm')
+depends=('a52dec' 'amrnb' 'amrwb' 'faac' 'lame' 'libtheora' 'libvorbis' 'x264>=20080426' 'xvidcore' 'libdc1394' 'imlib2' 'sdl' 'faad2' 'gsm')
makedepends=('freetype2')
groups=('xmultimedia')
archs=('i686' 'x86_64')
@@ -25,6 +25,7 @@ build() {
Fconf \
--enable-gpl \
--enable-swscale \
+		--enable-nonfree \
--enable-postproc \
--enable-libmp3lame \
--enable-libvorbis \
@@ -39,6 +40,8 @@ build() {
--enable-libdc1394 \
--enable-libtheora \
--enable-libvorbis \
+		--enable-libamr_nb \
+		--enable-libamr_wb \
--enable-libgsm \
--enable-shared \
--disable-static \