Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=d15953f139b924413265709a9408686ff3536d3d
commit d15953f139b924413265709a9408686ff3536d3d Author: kikadf <[email protected]> Date: Thu Feb 26 13:21:05 2015 +0100 Fix conflict in xine-lib diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild index 60c58b4..8d8c7f9 100644 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@ -4,21 +4,13 @@ pkgname=xine-lib pkgver=1.2.6 -<<<<<<< HEAD pkgrel=4 -======= -pkgrel=2 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="Xine multimedia playback engine libraries" _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.xz" Finclude sourceforge url="http://xinehq.de"; -<<<<<<< HEAD depends=('ffmpeg>=2.5.4' 'libmpcdec' 'libxinerama' 'libpulse>=6.0' 'libdvdnav' \ -======= -depends=('ffmpeg>=1.0' 'libmpcdec' 'libxinerama' 'libpulse>=6.0' 'libdvdnav' \ ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 'imagemagick>=6.8.9' 'libtool' 'jack' 'libmad' 'libxvmc' 'v4l-utils' \ 'vcdimager' 'aalib' 'libglu' 'libvdpau' 'libmodplug' 'wavpack' \ 'libbluray' 'libmng' 'libdca' 'speex') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
