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

commit c5b3620f5b66f9373e155ef5b401297c41a34f4e
Merge: ae94117 8e630b0
Author: Baste <[email protected]>
Date:   Tue Apr 2 13:52:33 2013 +0200

Merge ../current

Conflicts:
source/xmultimedia/gst1-plugins-ugly/FrugalBuild

diff --cc source/xmultimedia/gst1-plugins-ugly/FrugalBuild
index aee4d9a,6d2ea88..e76ba68
--- a/source/xmultimedia/gst1-plugins-ugly/FrugalBuild
+++ b/source/xmultimedia/gst1-plugins-ugly/FrugalBuild
@@@ -3,17 -3,15 +3,17 @@@
# Contributor: bouleetbil <[email protected]>
# Contributor: AlexExtreme <[email protected]>

+options+=('asneeded')
+
pkgname=gst1-plugins-ugly
_F_archive_name="gst-plugins-ugly"
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
pkgdesc="Plugins for GStreamer (Ugly)"
url="http://gstreamer.freedesktop.org";
-depends=('gst1-plugins-base>=1.0.3' 'gstreamer1>=1.0.3' 'orc')
+depends=('gst1-plugins-base>=1.0.6' 'gstreamer1>=1.0.6' 'orc')
makedepends=('gtk-doc' 'pyxml' 'a52dec' 'liboil>=0.3.14' 'lame' 'libmad' \
-       'libdvdread>=4.1.3' 'libid3tag' 'mpeg2dec>=0.4.1' 'libsidplay' 
'libcdio>=0.83' 'x264>=20120904' 'libxcb' 'libxau' 'libxdmcp')
+       'libdvdread>=4.1.3' 'libid3tag' 'mpeg2dec>=0.4.1' 'libsidplay' 
'libcdio>=0.83' 'x264' 'libxcb' 'libxau' 'libxdmcp')
groups=('xmultimedia')
archs=('i686' 'x86_64')
options=('scriptlet')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to