Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=4439a4a1d847b112e3a733b46a3cc0ecb675f958

commit 4439a4a1d847b112e3a733b46a3cc0ecb675f958
Merge: 60f7bd7 55f0265
Author: Baste <[email protected]>
Date:   Wed Feb 15 21:16:10 2012 +0100

Merge ../current

Conflicts:
source/xlib-extra/libvirt/FrugalBuild

diff --cc source/xlib-extra/libvirt/FrugalBuild
index 663b0eb,84175dd..ddbf5c1
--- a/source/xlib-extra/libvirt/FrugalBuild
+++ b/source/xlib-extra/libvirt/FrugalBuild
@@@ -2,12 -2,11 +2,12 @@@
# Maintainer: jercel <[email protected]>

pkgname=libvirt
- pkgver=0.9.9
- pkgrel=1
+ pkgver=0.9.10
-pkgrel=1
++pkgrel=2
pkgdesc="libvirt is a library providing access to information from various 
virtualization tools"
url="http://libvirt.org";
-depends=('libxml2' 'gnutls>=2.12.12' 'cyrus-sasl' 'parted>=3.0' 'lvm2' 'libnl' 
'systemd' 'polkit')
+depends=('libxml2' 'gnutls>=2.12.12' 'cyrus-sasl' 'parted>=3.0' \
+       'lvm2' 'libnl' 'systemd' 'polkit' 'udev' 'avahi' 'libpciaccess')
rodepends=('dnsmasq' 'bridge-utils' 'iproute2')
makedepends=('python' 'gtk-doc')
groups=('xlib-extra')
diff --cc source/xlib/xine-lib/FrugalBuild
index d7be01d,ced8fb8..2baf86a
--- a/source/xlib/xine-lib/FrugalBuild
+++ b/source/xlib/xine-lib/FrugalBuild
@@@ -13,10 -13,10 +13,10 @@@ url="http://xinehq.de
depends=('libxml2>=2.7.8' 'imagemagick>=6.6.8_5-3' 'aalib' 'libmng' 'libtheora' 
'libvorbis' \
'faad2>=2.7' 'flac>=1.1.4' 'libxvmc' 'libxv' \
'speex' 'wavpack' 'libmpcdec' 'freetype2>=2.3.4' 'fontconfig' \
-       'mesa' 'libx11' 'libxxf86vm' 'ffmpeg>=0.8' 'x264>=20110729' 'libtool' \
+       'mesa' 'libx11' 'libxxf86vm' 'ffmpeg>=0.10' 'x264>=20120213' 'libtool' \
'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff' 'libraw1394>=2.0.0-1')
options=('scriptlet')
-makedepends=('esd' 'sdl>=1.2.14-2' 'jack>=0.118.0')
+makedepends=('esd>=0.2.41' 'sdl>=1.2.14-2' 'jack>=0.118.0')
groups=('xlib')
archs=('i686' 'x86_64' 'ppc')
sha1sums=('60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to