From 0af8429211a32b95cb258d2146cb9fd9c3a627e7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 2 Nov 2014 10:40:01 +0100 Subject: [PATCH] ffmpeg: update to 2.4.3. --- srcpkgs/ffmpeg/template | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index a96777fac29..0da7c84d002 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,13 +1,13 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=2.4.2 +version=2.4.3 revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" -checksum=974f90a9d7bde835213ab970c2190402e5d6566e47a7bb657d756ee92540fa7e +checksum=ca5c3e3c0e4f9e43b9dceafceb866acb1ea575cb9f2d94e0d959303e4fc4e602 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel @@ -17,12 +17,13 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) makedepends+=" libva-devel libvdpau-devel";; + # XXX x265 cannot be cross compiled + i686*|x86_64*) makedepends+=" x265-devel libva-devel libvdpau-devel";; esac do_configure() { case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) _args="--enable-vdpau --enable-vaapi";; + i686*|x86_64*) _args="--enable-libx265 --enable-vdpau --enable-vaapi";; esac if [ "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in @@ -48,12 +49,10 @@ do_configure() { --disable-libschroedinger --disable-libopenjpeg \ --disable-static --enable-postproc ${_args} } - do_build() { make ${makejobs} make doc/ff{mpeg,play,server}.1 } - do_install() { make DESTDIR=${DESTDIR} install install-man } @@ -64,56 +63,48 @@ libavcodec_package() { vmove "usr/lib/libavcodec.so.*" } } - libavdevice_package() { short_desc="FFmpeg device handling library" pkg_install() { vmove "usr/lib/libavdevice.so.*" } } - libavformat_package() { short_desc="FFmpeg file format library" pkg_install() { vmove "usr/lib/libavformat.so.*" } } - libavutil_package() { short_desc="FFmpeg utility library" pkg_install() { vmove "usr/lib/libavutil.so.*" } } - libavfilter_package() { short_desc="FFmpeg audio/video filter library" pkg_install() { vmove "usr/lib/libavfilter.so.*" } } - libpostproc_package() { short_desc="FFmpeg video postprocessing library" pkg_install() { vmove "usr/lib/libpostproc.so.*" } } - libswscale_package() { short_desc="FFmpeg video scaling library" pkg_install() { vmove "usr/lib/libswscale.so.*" } } - libswresample_package() { short_desc="FFmpeg video resampling library" pkg_install() { vmove "usr/lib/libswresample.so.*" } } - ffmpeg-devel_package() { depends=" libavcodec>=${version}_${revision}