Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=aad68f09defd59d16d66b283d63f65f24edd317a
commit aad68f09defd59d16d66b283d63f65f24edd317a Author: kikadf <[email protected]> Date: Thu Feb 26 13:10:59 2015 +0100 Fix conflict in ffmpeg diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index a9d06a6..e25a251 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -5,23 +5,14 @@ options+=('asneeded') pkgname=ffmpeg -<<<<<<< HEAD pkgver=2.5.4 pkgrel=2 -======= -pkgver=1.0.6 -pkgrel=8 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 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>=20141016' 'xvidcore' 'libdc1394' 'imlib2' 'sdl>=1.2.13-2' 'faad2>=2.7' 'gsm' \ 'opencore-amr>=0.1.2' 'libxfixes' 'libvpx' 'libva' 'libvdpau' 'libcrystalhd' \ -<<<<<<< HEAD 'speex' 'v4l-utils' 'rtmpdump' 'openjpeg' 'libpulse>=6.0' 'x265') -======= - 'speex' 'v4l-utils' 'rtmpdump' 'openjpeg' 'libpulse>=6.0') ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 makedepends=('freetype2' 'yasm') groups=('xmultimedia') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
