Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=3561f9e18ce5265b210a4d47c70404ff4e2ca711
commit 3561f9e18ce5265b210a4d47c70404ff4e2ca711 Author: James Buren <[email protected]> Date: Sun Oct 28 02:41:29 2012 -0500 ffmpeg-1.0-1-x86_64 * version bump * enable libva/libvdpau/libcrystalhd for video acceleration * enable other libraries for more supported features * remove subpkgs (overkill as the compiletime stuff is < 1 MB) diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index f8c08f7..02d9ece 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -3,42 +3,31 @@ # Contributor: Cedrick Hannier alias Cedynamix <[email protected]> pkgname=ffmpeg -pkgver=0.11.1 -#rev=22893 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix." url="http://ffmpeg.sourceforge.net/"; depends=('alsa-lib' 'a52dec' 'amrnb' 'amrwb' 'faac>=1.28' 'lame' 'libtheora' 'libvorbis' \ 'x264>=20120904' 'xvidcore' 'libdc1394' 'imlib2' 'sdl>=1.2.13-2' 'faad2>=2.7' 'gsm' \ - 'opencore-amr>=0.1.2' 'libxfixes' 'libvpx' 'libva') + 'opencore-amr>=0.1.2' 'libxfixes' 'libvpx' 'libva' 'libvdpau' 'libcrystalhd' \ + 'speex' 'v4l-utils' 'rtmpdump' 'openjpeg' 'libpulse') makedepends=('freetype2' 'yasm') -rodepends=("$pkgname-compiletime" "$pkgname-presets") groups=('xmultimedia') archs=('i686' 'x86_64') up2date="Flasttar http://www.ffmpeg.org/releases/"; -source="http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2"; -#source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver-$rev.tar.bz2) -sha1sums=('bf01742be60c2e6280371fc4189d5d28933f1a56') -#signatures=("${source[0]}.asc") - -subpkgs=("$pkgname-compiletime") -subdescs=("FFmpeg compiletime required files.") -subrodepends=("$pkgname=$pkgver") -subgroups=("${groups[@]}") -subarchs=("${archs[*]}") - -subpkgs=("${subpkgs[@]}" "$pkgname-presets") -subdescs=("${subdescs[@]}" "FFmpeg predetermined configurations presets.") -subrodepends=("${subrodepends[@]}" '') -subgroups=("${subgroups[@]}" "${groups[@]}") -subarchs=("${subarchs[@]}" "${archs[*]}") +source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 openjpeg-fixes.patch) +signatures=("${source[0]}.asc" '') +conflicts=('ffmpeg-compiletime' 'ffmpeg-presets') +replaces==('ffmpeg-compiletime' 'ffmpeg-presets') +provides=('ffmpeg-compiletime' 'ffmpeg-presets') build() { - unset MAKEFLAGS + Fpatchall Fconf \ --enable-gpl \ --enable-nonfree \ --enable-postproc \ + --enable-runtime-cpudetect \ --enable-libmp3lame \ --enable-libvorbis \ --enable-libtheora \ @@ -49,21 +38,22 @@ build() { --enable-libdc1394 \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ + --enable-libspeex \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libv4l2 \ + --enable-libpulse \ --enable-version3 \ --enable-libgsm \ --enable-shared \ --disable-static \ --enable-pthreads \ --enable-vaapi \ + --enable-vdpau \ + --enable-crystalhd \ --enable-x11grab make SHARED_PP="yes" || Fdie make DESTDIR=$Fdestdir install || Fdie - - Fsplit "$pkgname-compiletime" /usr/include/ - Fsplit "$pkgname-compiletime" /usr/lib/\*.so - Fsplit "$pkgname-compiletime" /usr/lib/pkgconfig/ - - Fsplit "$pkgname-presets" /usr/share/ffmpeg/\*.ffpreset } # optimization OK diff --git a/source/xmultimedia/ffmpeg/openjpeg-fixes.patch b/source/xmultimedia/ffmpeg/openjpeg-fixes.patch new file mode 100644 index 0000000..1180b28 --- /dev/null +++ b/source/xmultimedia/ffmpeg/openjpeg-fixes.patch @@ -0,0 +1,36 @@ +diff -ur a/configure b/configure +--- a/configure 2012-10-28 01:49:39.900620584 -0500 ++++ b/configure 2012-10-28 01:50:17.131630614 -0500 +@@ -3654,7 +3654,7 @@ + enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb + enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb + enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader +-enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg ++enabled libopenjpeg && require libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg + enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create + enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new + enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket +diff -ur a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c +--- a/libavcodec/libopenjpegdec.c 2012-10-28 01:49:39.879620563 -0500 ++++ b/libavcodec/libopenjpegdec.c 2012-10-28 02:01:57.172098456 -0500 +@@ -25,7 +25,7 @@ + */ + + #define OPJ_STATIC +-#include <openjpeg.h> ++#include <openjpeg-1.5/openjpeg.h> + + #include "libavutil/common.h" + #include "libavutil/intreadwrite.h" +diff -ur a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c +--- a/libavcodec/libopenjpegenc.c 2012-10-28 01:49:39.872620557 -0500 ++++ b/libavcodec/libopenjpegenc.c 2012-10-28 02:01:40.564093722 -0500 +@@ -25,7 +25,7 @@ + */ + + #define OPJ_STATIC +-#include <openjpeg.h> ++#include <openjpeg-1.5/openjpeg.h> + + #include "libavutil/avassert.h" + #include "libavutil/common.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
