From d8d01f046925ffee8c164bcd20364551cd1db6a2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 3 Nov 2011 09:34:26 +0100 Subject: [PATCH] ffmpeg: enable vdpau support, disable faac to build without nonfree stuff. --- srcpkgs/ffmpeg/ffmpeg-devel.template | 25 ++++++++++++++----------- srcpkgs/ffmpeg/libavcodec.template | 3 ++- srcpkgs/ffmpeg/libavdevice.template | 2 ++ srcpkgs/ffmpeg/libavfilter.template | 2 ++ srcpkgs/ffmpeg/libavformat.template | 2 ++ srcpkgs/ffmpeg/libavutil.template | 2 ++ srcpkgs/ffmpeg/libpostproc.template | 2 ++ srcpkgs/ffmpeg/libswscale.template | 2 ++ srcpkgs/ffmpeg/template | 12 +++++++----- 9 files changed, 35 insertions(+), 17 deletions(-) diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template index 57f01b171bd..0ca86e6d1d8 100644 --- a/srcpkgs/ffmpeg/ffmpeg-devel.template +++ b/srcpkgs/ffmpeg/ffmpeg-devel.template @@ -5,23 +5,26 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run glibc-devel -Add_dependency run SDL-devel -Add_dependency run zlib-devel -Add_dependency run faac-devel +revision=1 + +Add_dependency run alsa-lib-devel +Add_dependency run libXext-devel Add_dependency run faad2-devel Add_dependency run lame-devel Add_dependency run libtheora-devel Add_dependency run libvorbis-devel Add_dependency run x264-devel Add_dependency run xvidcore-devel -Add_dependency run bzip2-devel -Add_dependency run alsa-lib-devel -Add_dependency run libX11-devel -Add_dependency run libXext-devel -Add_dependency run libXfixes-devel -Add_dependency run ffmpeg +Add_dependency run SDL-devel +Add_dependency run libvpx-devel +Add_dependency run libva-devel +Add_dependency run libavcodec +Add_dependency run libavdevice +Add_dependency run libavformat +Add_dependency run libavutil +Add_dependency run libavfilter +Add_dependency run libpostproc +Add_dependency run libswscale do_install() { diff --git a/srcpkgs/ffmpeg/libavcodec.template b/srcpkgs/ffmpeg/libavcodec.template index 98ccf9c1033..5da34c3dbd4 100644 --- a/srcpkgs/ffmpeg/libavcodec.template +++ b/srcpkgs/ffmpeg/libavcodec.template @@ -6,9 +6,10 @@ long_desc=" It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...)." +revision=1 + Add_dependency run zlib Add_dependency run glibc -Add_dependency run faac Add_dependency run faad2 Add_dependency run lame Add_dependency run libtheora diff --git a/srcpkgs/ffmpeg/libavdevice.template b/srcpkgs/ffmpeg/libavdevice.template index d58232d4a1d..0d0a05d3967 100644 --- a/srcpkgs/ffmpeg/libavdevice.template +++ b/srcpkgs/ffmpeg/libavdevice.template @@ -4,6 +4,8 @@ short_desc="FFmpeg device handling library" long_desc=" This is the device handling library from FFmpeg." +revision=1 + Add_dependency run libavformat Add_dependency run libavcodec Add_dependency run libavutil diff --git a/srcpkgs/ffmpeg/libavfilter.template b/srcpkgs/ffmpeg/libavfilter.template index 6c62bededfb..014fdb7733a 100644 --- a/srcpkgs/ffmpeg/libavfilter.template +++ b/srcpkgs/ffmpeg/libavfilter.template @@ -4,6 +4,8 @@ short_desc="FFmpeg audio/video filter library" long_desc=" This is the audio/video filter library from FFmpeg." +revision=1 + Add_dependency run glibc Add_dependency run libavformat Add_dependency run libavcodec diff --git a/srcpkgs/ffmpeg/libavformat.template b/srcpkgs/ffmpeg/libavformat.template index 1c3a450e3f3..63d59426293 100644 --- a/srcpkgs/ffmpeg/libavformat.template +++ b/srcpkgs/ffmpeg/libavformat.template @@ -6,6 +6,8 @@ long_desc=" It supports most existing file formats (AVI, MPEG, OGG, Matroska, ASF...)." +revision=1 + Add_dependency run libavcodec Add_dependency run libavutil Add_dependency run zlib diff --git a/srcpkgs/ffmpeg/libavutil.template b/srcpkgs/ffmpeg/libavutil.template index 367ab3779be..abd59798aaf 100644 --- a/srcpkgs/ffmpeg/libavutil.template +++ b/srcpkgs/ffmpeg/libavutil.template @@ -5,6 +5,8 @@ long_desc=" This is the common utility library from FFmpeg. It contains shared code used by all other ffmpeg libraries." +revision=1 + Add_dependency run glibc do_install() diff --git a/srcpkgs/ffmpeg/libpostproc.template b/srcpkgs/ffmpeg/libpostproc.template index 52fd74f6bcb..2f5e8fb465b 100644 --- a/srcpkgs/ffmpeg/libpostproc.template +++ b/srcpkgs/ffmpeg/libpostproc.template @@ -4,6 +4,8 @@ short_desc="FFmpeg video postprocessing library" long_desc=" This is the video postprocessing library from FFmpeg." +revision=1 + Add_dependency run libavutil Add_dependency run glibc diff --git a/srcpkgs/ffmpeg/libswscale.template b/srcpkgs/ffmpeg/libswscale.template index 01a17296360..90b65b15b31 100644 --- a/srcpkgs/ffmpeg/libswscale.template +++ b/srcpkgs/ffmpeg/libswscale.template @@ -4,6 +4,8 @@ short_desc="FFmpeg video scaling library" long_desc=" This is the video software scaling library from FFmpeg." +revision=1 + Add_dependency run libavutil Add_dependency run glibc diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index ba5d6f8fb74..49d340e1c47 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,6 +1,7 @@ # Template file for 'ffmpeg' pkgname=ffmpeg version=0.7.6 +revision=1 homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" short_desc="Decoding, encoding and streaming software" @@ -46,6 +47,7 @@ Add_dependency run libavfilter Add_dependency run SDL Add_dependency run libvpx Add_dependency run libva +Add_dependency run libvdpau Add_dependency build pkg-config Add_dependency build coreutils @@ -53,7 +55,6 @@ Add_dependency build perl ">=0" Add_dependency build yasm Add_dependency build alsa-lib-devel Add_dependency build libXext-devel -Add_dependency build faac-devel Add_dependency build faad2-devel Add_dependency build lame-devel Add_dependency build libtheora-devel @@ -63,19 +64,20 @@ Add_dependency build xvidcore-devel Add_dependency build SDL-devel Add_dependency build libvpx-devel Add_dependency build libva-devel +Add_dependency build libvdpau-devel do_configure() { ./configure \ --prefix=/usr \ - --enable-gpl \ --enable-libmp3lame \ --enable-libvorbis \ - --enable-libfaac \ --enable-libxvid \ --enable-libx264 \ --enable-libvpx \ --enable-libtheora \ + --enable-vdpau \ + --enable-vaapi \ --enable-postproc \ --enable-shared \ --enable-x11grab \ @@ -83,10 +85,10 @@ do_configure() --disable-libopencore_amrwb \ --disable-libschroedinger \ --disable-libopenjpeg \ + --enable-gpl \ --enable-version3 \ - --enable-nonfree \ --enable-runtime-cpudetect \ - --disable-debug # libfaac is nonfree + --disable-debug } do_build()