Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=34a005ae799c13d47575414e7bd1aefabee296e9

commit 34a005ae799c13d47575414e7bd1aefabee296e9
Merge: 3f14352 e825b12
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sun Apr 17 19:32:05 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/x11/libxfixes/FrugalBuild
source/x11/libxt/FrugalBuild
source/x11/mesa/FrugalBuild
source/x11/xkbcomp/FrugalBuild
source/x11/xterm/FrugalBuild

diff --cc source/x11/libdrm/FrugalBuild
index 2d48903,d1c4dc3..d2f78fe
--- a/source/x11/libdrm/FrugalBuild
+++ b/source/x11/libdrm/FrugalBuild
@@@ -9,10 -9,10 +9,10 @@@ pkgrel=
pkgdesc="X.Org Userspace interface to kernel DRM services"
url="http://xorg.freedesktop.org/";
depends=('libpthread-stubs' 'udev')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
groups=('x11' 'xorg-core' 'xorg-libs')
if Fuse $USE_DEVEL; then
-       pkgver=$pkgver.g2d9990c
+       pkgver=$pkgver.gba11501
_F_scm_type="git"
_F_scm_url="git://anongit.freedesktop.org/mesa/drm"
Finclude scm
diff --cc source/x11/libxfixes/FrugalBuild
index 4b133f7,5c856bf..050379a
--- a/source/x11/libxfixes/FrugalBuild
+++ b/source/x11/libxfixes/FrugalBuild
@@@ -8,10 -8,10 +8,10 @@@ pkgrel=
pkgdesc="X.Org Xfixes library"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-libs')
- archs=('i686' 'x86_64' 'ppc')
+depends=('libx11>=1.4.3' 'fixesproto>=4.0' 'xproto>=7.0.15' 'xextproto>=7.0.5')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
-depends=('libx11>=1.3.4' 'fixesproto>=4.0' 'xproto>=7.0.15' 'xextproto>=7.0.5')
makedepends=('pkgconfig' 'inputproto>=1.5')
Finclude xorg
-sha1sums=('255dfb9a8c50d795c60711ec4764f76cd0620cbf')
+sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0')

# optimization OK
diff --cc source/x11/libxt/FrugalBuild
index f571a8c,41ad47a..4ee9369
--- a/source/x11/libxt/FrugalBuild
+++ b/source/x11/libxt/FrugalBuild
@@@ -8,8 -8,8 +8,8 @@@ pkgrel=
pkgdesc="X Toolkit Library"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-libs')
- archs=('i686' 'x86_64' 'ppc')
+depends=('libx11>=1.3' 'libsm>=1.1.0' 'xproto>=7.0.21')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
-depends=('libx11>=1.3' 'libsm>=1.1.0' 'xproto>=7.0.15')
makedepends=('pkgconfig' 'inputproto>=2.0')
_F_xorg_ind=1
Finclude xorg
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to