================================
xgl:source=cvs_060729-1.2 (previous: cvs_060729-1.1)
cvc rdiff xgl -1 /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.2
================================
cvs_060729-1.2 Antonio Meireles aka doniphon ([EMAIL PROTECTED]) Mon Aug 7
07:47:51 2006
fixes
xgl.recipe: changed
Index: xgl.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- xgl.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.1
+++ xgl.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.2
@@ -7,7 +7,7 @@
name = "xgl"
version = "cvs_060729"
- buildRequires = ['espgs:runtime', 'flex:runtime', 'pkgconfig:devel']
+ buildRequires = [ 'libX11:devel', 'Mesa:devel','espgs:runtime',
'flex:runtime', 'pkgconfig:devel']
def setup(r):
@@ -57,47 +57,47 @@
# r.addPatch('178214.diff', rpm=srpm, dir='xorg-server')
- r.MakeDirs('/usr/X11R6')
- r.MakeDirs('/usr/X11R6/lib')
- r.MakeDirs('/usr/X11R6/lib/xgl')
+ r.MakeDirs('/usr/')
+ r.MakeDirs('/usr/lib')
+ r.MakeDirs('/usr/lib/xgl')
- r.Configure(' --prefix=/usr/X11R6/lib/xgl
--libdir=/usr/X11R6/lib/xgl/lib ',
configureName='./autogen.sh',subDir='fixesproto')
+ r.Configure(' --prefix=/usr/lib/xgl --libdir=/usr/lib/xgl/lib ',
configureName='./autogen.sh',subDir='fixesproto')
r.Make('', subDir='fixesproto')
r.MakeInstall(subDir='fixesproto', package='fixesproto-xgl')
- r.Configure(' --prefix=/usr/X11R6/lib/xgl
--libdir=/usr/X11R6/lib/xgl/lib ',
configureName='./autogen.sh',subDir='compositeproto')
+ r.Configure(' --prefix=/usr/lib/xgl --libdir=/usr/lib/xgl/lib ',
configureName='./autogen.sh',subDir='compositeproto')
r.Make('', subDir='compositeproto')
r.MakeInstall(subDir='compositeproto', package='compositeproto-xgl')
- r.Configure(' --prefix=/usr/X11R6/lib/xgl
--libdir=/usr/X11R6/lib/xgl/lib ',
configureName='./autogen.sh',subDir='scrnsaverproto')
+ r.Configure(' --prefix=/usr/lib/xgl --libdir=/usr/lib/xgl/lib ',
configureName='./autogen.sh',subDir='scrnsaverproto')
r.Make('', subDir='scrnsaverproto')
r.MakeInstall(subDir='scrnsaverproto', package='scrnsaverproto-xgl')
- r.Configure(' --prefix=/usr/X11R6/lib/xgl
--libdir=/usr/X11R6/lib/xgl/lib ',
configureName='./autogen.sh',subDir='glproto')
+ r.Configure(' --prefix=/usr/lib/xgl --libdir=/usr/lib/xgl/lib ',
configureName='./autogen.sh',subDir='glproto')
r.Make('', subDir='glproto')
r.MakeInstall(subDir='glproto', package='glproto-xgl')
#--disable-shared
# r.Configure('--prefix=/usr/X11R6/lib/xgl
--libdir=/usr/X11R6/lib/xgl/lib',
configureName='./autogen.sh',subDir='glitz',preConfigure=' CC=%(cc)s
CFLAGS="-fPIC %(cflags)s"
PKG_CONFIG_PATH="%(destdir)s/usr/X11R6/lib/pkgconfig/":$PKG_CONFIG_PATH')
- r.Configure('--disable-shared --prefix=/usr/X11R6/lib/xgl
--libdir=/usr/X11R6/lib/xgl/lib',
configureName='./autogen.sh',subDir='glitz',preConfigure=' CC=%(cc)s CFLAGS="
-fPIC %(cflags)s"')
+ r.Configure(' --prefix=/usr/lib/xgl --libdir=/usr/lib/xgl/lib',
configureName='./autogen.sh',subDir='glitz',preConfigure=' CC=%(cc)s CFLAGS="
-fPIC %(cflags)s"')
r.Make( subDir='glitz', preMake='CFLAGS="-fPIC %(cflags)s" ')
r.MakeInstall(subDir='glitz', package='glitz')
- r.Configure('--prefix=/usr/X11R6 --libdir=/usr/X11R6/lib --enable-xgl
--enable-xglx --disable-xorg --disable-xprint --enable-glx --enable-dri
--with-mesa-source=%(builddir)s/xserver/Mesa/ --with-release-snap=1
--disable-dmx --disable-xvfb --disable-xnest --enable-xkb
--disable-kdriveserver --sysconfdir=/etc/X11 --disable-aiglx
--with-xkb-path=/etc/X11/xkb --with-xkb-output=/etc/X11/xkb/compiled',
subDir='xserver', preConfigure='
PKG_CONFIG_PATH="/usr/X11R6/lib/xgl/pkgconfig/":$PKG_CONFIG_PATH
XORGCFG_DEP_CFLAGS="-DXTHREADS -DXUSE_MTSAFE_API -I/usr/X11R6/include
-I/usr/include" XORGCFG_DEP_LIBS="-L/usr/lib -lXaw" ')
+ r.Configure('--prefix=/usr/ --libdir=/usr/lib --enable-xgl --enable-xglx
--disable-xorg --disable-xprint --enable-glx --enable-dri
--with-mesa-source=%(builddir)s/xserver/Mesa/ --with-release-snap=1
--disable-dmx --disable-xvfb --disable-xnest --enable-xkb
--disable-kdriveserver --sysconfdir=/etc/X11 --disable-aiglx
--with-xkb-path=/etc/X11/xkb --with-xkb-output=/etc/X11/xkb/compiled',
subDir='xserver', preConfigure='
PKG_CONFIG_PATH="/usr/lib/xgl/pkgconfig/":$PKG_CONFIG_PATH
XORGCFG_DEP_CFLAGS="-DXTHREADS -DXUSE_MTSAFE_API -I/usr/X11R6/include
-I/usr/include" XORGCFG_DEP_LIBS="-L/usr/lib -lXaw" ')
- r.Make( subDir='xserver',
preMake='PKG_CONFIG_PATH="/usr/X11R6/lib/xgl/pkgconfig/":$PKG_CONFIG_PATH')
+ r.Make( subDir='xserver',
preMake='PKG_CONFIG_PATH="/usr/lib/xgl/pkgconfig/":$PKG_CONFIG_PATH')
r.MakeInstall(subDir='xserver')
- r.SharedLibrary(subtrees='/usr/X11R6/lib/xgl/lib')
- r.SharedLibrary(subtrees='/usr/X11R6/lib')
- r.SharedLibrary(subtrees='/usr/X11R6/lib/xorg/modules/xgl')
+ r.SharedLibrary(subtrees='/usr/lib/xgl/lib')
+ r.SharedLibrary(subtrees='/usr/lib')
+ r.SharedLibrary(subtrees='/usr/lib/xorg/modules/xgl')
-
+ r.Remove('%(datadir)s/X11/xkb/compiled/README.compiled')
Committed by: antonio.meireles
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
