================================
xgl:source=cvs_060729-1.6 (previous: cvs_060729-1.5)
cvc rdiff xgl -1 /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.6
================================
cvs_060729-1.6 Ken VanDine ([EMAIL PROTECTED]) Fri Sep 1 10:09:04 2006
Remove some conflicting files and make tabs into spaces
xgl.recipe: changed
Index: xgl.recipe
====================================================================
contents(size sha1)
inode(mtime owner group)
--- xgl.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.5
+++ xgl.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/cvs_060729-1.6
@@ -8,11 +8,11 @@
version = "cvs_060729"
buildRequires = [ 'libX11:devel', 'Mesa:devel','espgs:runtime',
- 'util-macros:devel', 'flex:runtime', 'pkgconfig:devel', 'perl:runtime',
- 'freetype:devel', 'libXau:devel', 'libXdmcp:devel', 'libXext:devel',
- 'libXfont:devel', 'libXinerama:devellib', 'libXrandr:devel',
- 'libXrender:devel', 'libfontenc:devel', 'libxkbfile:devel',
'zlib:devel',
- 'xgl-private:devel']
+ 'util-macros:devel', 'flex:runtime', 'pkgconfig:devel', 'perl:runtime',
+ 'freetype:devel', 'libXau:devel', 'libXdmcp:devel', 'libXext:devel',
+ 'libXfont:devel', 'libXinerama:devellib', 'libXrandr:devel',
+ 'libXrender:devel', 'libfontenc:devel', 'libxkbfile:devel',
'zlib:devel',
+ 'xgl-private:devel']
def setup(r):
@@ -68,63 +68,63 @@
#r.MakeDirs('/usr/lib/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='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='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='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='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='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='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='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='xgl-private')
- r.SharedLibrary(subtrees='/usr/lib/xgl')
+ 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',
- 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.Requires('xgl-private[bootstrap]','%(bindir)s/Xgl')
+ r.Remove('%(libdir)s/pkgconfig/xorg-server.pc')
+ r.Remove('%(datadir)s/man/man1/Xserver.1.gz')
+
+# r.Requires('xgl-private[bootstrap]','%(bindir)s/Xgl')
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
