================================
xgl:source=cvs_060729-1.4 (previous: cvs_060729-1.3)
cvc rdiff xgl -1 /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.4
================================
cvs_060729-1.4 Antonio Meireles aka doniphon ([EMAIL PROTECTED]) Fri Aug 18
16:26:00 2006
xgl.recipe: changed
Index: xgl.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- xgl.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.3
+++ xgl.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.4
@@ -66,63 +66,64 @@
#r.MakeDirs('/usr/lib')
#r.MakeDirs('/usr/lib/xgl')
- r.Configure(' --prefix=/usr/lib/xgl --includedir=/usr/include/xgl
--libdir=/usr/lib/xgl', configureName='./autogen.sh',dir='fixesproto')
- r.Make('', dir='fixesproto')
- r.MakeInstall(dir='fixesproto', package='fixesproto-xgl')
+ if Use.bootstrap:
+ r.Configure(' --prefix=/usr/lib/xgl
--includedir=/usr/include/xgl --libdir=/usr/lib/xgl',
configureName='./autogen.sh',dir='fixesproto')
+ r.Make('', dir='fixesproto')
+ r.MakeInstall(dir='fixesproto', package='xgl-private')
- r.Configure(' --prefix=/usr/lib/xgl --includedir=/usr/include/xgl
--libdir=/usr/lib/xgl', configureName='./autogen.sh',dir='compositeproto')
- r.Make('', dir='compositeproto')
- r.MakeInstall(dir='compositeproto', package='compositeproto-xgl')
+ r.Configure(' --prefix=/usr/lib/xgl
--includedir=/usr/include/xgl --libdir=/usr/lib/xgl',
configureName='./autogen.sh',dir='compositeproto')
+ r.Make('', dir='compositeproto')
+ r.MakeInstall(dir='compositeproto', package='xgl-private')
- r.Configure(' --prefix=/usr/lib/xgl --includedir=/usr/include/xgl
--libdir=/usr/lib/xgl ', configureName='./autogen.sh',dir='scrnsaverproto')
- r.Make('', dir='scrnsaverproto')
- r.MakeInstall(dir='scrnsaverproto', package='scrnsaverproto-xgl')
+ r.Configure(' --prefix=/usr/lib/xgl
--includedir=/usr/include/xgl --libdir=/usr/lib/xgl ',
configureName='./autogen.sh',dir='scrnsaverproto')
+ r.Make('', dir='scrnsaverproto')
+ r.MakeInstall(dir='scrnsaverproto', package='xgl-private')
- r.Configure(' --prefix=/usr/lib/xgl --includedir=/usr/include/xgl
--libdir=/usr/lib/xgl', configureName='./autogen.sh',dir='glproto')
- r.Make('', dir='glproto')
- r.MakeInstall(dir='glproto', package='glproto-xgl')
+ r.Configure(' --prefix=/usr/lib/xgl
--includedir=/usr/include/xgl --libdir=/usr/lib/xgl',
configureName='./autogen.sh',dir='glproto')
+ r.Make('', dir='glproto')
+ r.MakeInstall(dir='glproto', package='xgl-private')
- r.Configure(' --prefix=/usr/lib/xgl --includedir=/usr/include/xgl
--libdir=/usr/lib/xgl ',
configureName='./autogen.sh',dir='glitz',preConfigure=' CC=%(cc)s CFLAGS="
-fPIC %(cflags)s"')
+ r.Configure(' --prefix=/usr/lib/xgl
--includedir=/usr/include/xgl --libdir=/usr/lib/xgl ',
configureName='./autogen.sh',dir='glitz',preConfigure=' CC=%(cc)s CFLAGS="
-fPIC %(cflags)s"')
- r.Make( dir='glitz', preMake='CFLAGS="-fPIC %(cflags)s" ')
- r.MakeInstall(dir='glitz', package='glitz')
+ r.Make( dir='glitz', preMake='CFLAGS="-fPIC %(cflags)s" ')
+ r.MakeInstall(dir='glitz', package='xgl-private')
+ r.SharedLibrary(subtrees='/usr/lib/xgl')
+ else:
- r.Configure(
- ' --enable-xglserver'
- ' --enable-xgl'
- ' --enable-xglx'
- ' --enable-glx'
- ' --enable-dri'
- ' --enable-xkb'
- ' --disable-kdriveserver'
- ' --disable-xorg'
- ' --disable-aiglx'
- ' --disable-dmx'
- ' --disable-xvfb'
- ' --disable-xnest'
- ' --disable-xprint'
- ' --with-mesa-source=%(builddir)s/xserver/Mesa'
- ' --with-release-snap=1'
- ' --sysconfdir=/etc/X11'
- '
--with-default-font-path=/usr/share/X11/fonts/misc,/usr/share/X11/fonts/truetype,/usr/share/fonts/default/Type1,/usr/share/X11/fonts/100dpi,/usr/share/X11/fonts/75dpi'
- ' --localstatedir=/var'
- ' --with-rgb-path=/usr/share/X11'
- ' --with-xkb-path=/usr/share/X11/xkb'
- ' --with-xkb-output=/var/lib/xkb/compiled',
- dir='xserver',
-
preConfigure='PKG_CONFIG_PATH=/usr/lib/xgl/pkgconfig:$PKG_CONFIG_PATH',
-# XGLMODULES_LIBS="-L/usr/lib/xgl/ -lglitz" \
-# XGLXMODULES_LIBS="-L/usr/lib/xgl/ -lglitz-glx"',
- configureName='./autogen.sh')
+ r.Configure(
+ ' --enable-xglserver'
+ ' --enable-xgl'
+ ' --enable-xglx'
+ ' --enable-glx'
+ ' --enable-dri'
+ ' --enable-xkb'
+ ' --disable-kdriveserver'
+ ' --disable-xorg'
+ ' --disable-aiglx'
+ ' --disable-dmx'
+ ' --disable-xvfb'
+ ' --disable-xnest'
+ ' --disable-xprint'
+ ' --with-mesa-source=%(builddir)s/xserver/Mesa'
+ ' --with-release-snap=1'
+ ' --sysconfdir=/etc/X11'
+ '
--with-default-font-path=/usr/share/X11/fonts/misc,/usr/share/X11/fonts/truetype,/usr/share/fonts/default/Type1,/usr/share/X11/fonts/100dpi,/usr/share/X11/fonts/75dpi'
+ ' --localstatedir=/var'
+ ' --with-rgb-path=/usr/share/X11'
+ ' --with-xkb-path=/usr/share/X11/xkb'
+ ' --with-xkb-output=/var/lib/xkb/compiled',
+ dir='xserver',
+
preConfigure='PKG_CONFIG_PATH=/usr/lib/xgl/pkgconfig:$PKG_CONFIG_PATH',
+ configureName='./autogen.sh')
- r.Make( dir='xserver')
+ r.Make( dir='xserver')
- r.MakeInstall(dir='xserver' )
+ r.MakeInstall(dir='xserver' )
- r.Remove('/usr/lib/pkgconfig/xorg-server.pc')
- r.Remove('/usr/share/man/man1/Xserver.1x.gz')
-
- r.SharedLibrary(subtrees='/usr/lib/xgl')
+ r.Remove('/usr/lib/pkgconfig/xorg-server.pc')
+ r.Remove('/usr/share/man/man1/Xserver.1x.gz')
+
+ r.Requires('xgl-private','%(bindir)s/Xgl')
Committed by: antonio.meireles
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
