================================
compiz:source=060906-0.1 (previous: 060904-0.1)
cvc rdiff compiz -1 /[EMAIL PROTECTED]:devel//1-devel-xgl/060906-0.1
================================
060906-0.1 Antonio Meireles aka doniphon ([EMAIL PROTECTED]) Wed Sep 6
07:30:30 2006
bump. faster and slimmer. doesn't need to be cooked/linked against an
internal mesa anymore. on the way to be aiglx compatible (not there yet)
compiz.recipe: changed
Index: compiz.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- compiz.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/060904-0.1
+++ compiz.recipe /[EMAIL PROTECTED]:devel//1-devel-xgl/060906-0.1
@@ -6,7 +6,7 @@
name = "compiz"
- version= "060904"
+ version= "060906"
buildRequires = ['GConf:devel', 'GConf:runtime', 'ORBit2:devel',
'atk:devel', 'cairo:devel', 'control-center:devel', 'dbus:devel',
'fontconfig:devel', 'freetype:devel', 'glib:devel', 'gnome-desktop:devel',
'gnome-keyring:devel', 'gnome-python-extras:python', 'gnome-vfs:devel',
'gtk:devel', 'libICE:devel', 'libSM:devel', 'libX11:devel', 'libXau:devel',
'libXcomposite:devel', 'libXdamage:devel', 'libXdmcp:devel', 'libXext:devel',
'libXfixes:devel', 'libXinerama:devellib', 'libXrandr:devel',
'libXrender:devel', 'libXxf86vm:devel', 'libart_lgpl:devel', 'libbonobo:devel',
'libbonoboui:devel', 'libdrm:devel', 'libgnome:devel', 'libgnomecanvas:devel',
'libgnomeui:devel', 'libpng:devel', 'libwnck:devel', 'libxml2:devel',
'pango:devel', 'pkgconfig:devel', 'popt:devel', 'pygobject:python',
'pygtk:python', 'startup-notification:devel', 'zlib:devel']
@@ -20,9 +20,8 @@
def setup(r):
- srpm =
'http://software.opensuse.org/download/Compiz-Quinn/SUSE_Linux_10.1/src/%(name)s-quinncvs_%(version)s-7.1.src.rpm'
- srpm2 =
'http://software.opensuse.org/download/Compiz-Quinn/SUSE_Linux_10.1/src/%(name)s-plugins-%(version)s-6.1.src.rpm'
- srpm3 =
'http://software.opensuse.org/download/Compiz-Quinn/SUSE_Linux_10.1/src/csm-%(version)s-9.1.src.rpm'
+ srpm =
'http://software.opensuse.org/download/Compiz-Quinn/SUSE_Linux_10.1/src/%(name)s-quinncvs_%(version)s-4.1.src.rpm'
+
r.addArchive(srpm)
# r.addSource('reboot.png')
@@ -31,13 +30,12 @@
r.addArchive('compiz-quinn.tar.bz2', rpm=srpm,
dir='%(name)s-%(version)s')
r.addArchive('cgwd.tar.bz2', rpm=srpm, dir='%(name)s-%(version)s')
r.addArchive('compiz-start.tar.bz2', rpm=srpm,
dir='%(name)s-%(version)s')
- r.addArchive('mesa.tar.bz2', rpm=srpm, dir='%(name)s-%(version)s')
r.addArchive('gnome-xgl-settings-0.6.tar.gz', rpm=srpm,
dir='%(name)s-%(version)s')
- r.addArchive('%(name)s-plugins.tar.bz2', rpm=srpm2,
dir='%(name)s-%(version)s')
- r.addArchive('csm.tar.bz2', rpm=srpm3, dir='%(name)s-%(version)s')
+ r.addArchive('%(name)s-plugins.tar.bz2', rpm=srpm,
dir='%(name)s-%(version)s')
+ r.addArchive('csm.tar.bz2', rpm=srpm, dir='%(name)s-%(version)s')
- r.addPatch('Mesa-6.4.1-x86_64-fixes-1.patch', rpm=srpm, dir='Mesa')
- r.addPatch('Mesa-configs.diff', rpm=srpm, dir='Mesa')
+ r.addPatch('Mesa-6.4.1-x86_64-fixes-1.patch', rpm=srpm,
dir='compiz/mesa')
+ r.addPatch('Mesa-configs.diff', rpm=srpm, dir='compiz/mesa')
r.addPatch('gnome-xgl-settings-install.patch', rpm=srpm,
dir='gnome-xgl-settings-0.6')
r.addPatch('mesadec.patch', rpm=srpm, dir='compiz', level=0)
r.addPatch('gnome-xgl-settings-i18n.patch', rpm=srpm,
dir='gnome-xgl-settings-0.6')
@@ -47,13 +45,12 @@
r.Run("""
- cd Mesa
- ln -snf linux-indirect-x86-static configs/current
- cd src
-
- sed -i ../configs/* * -e
"s,/usr/X11R6/bin/makedepend,/usr/bin/makedepend,g"
-
- make ARCH_FLAGS="-fno-strict-aliasing %(cflags)s"
+ cd compiz/mesa/include
+ ln -s /usr/include/X11
+ cd ../../
+ ln -s ./include/compiz.h
+ cd ../compiz-plugins
+ ln -s ../compiz/include/compiz.h
""")
# r.Run("""
@@ -63,12 +60,16 @@
if Use.bootstrap:
- r.Configure(' --prefix=/usr/ --libdir=/usr/lib --prefix=/usr
--enable-gnome=yes --enable-libsvg-cairo
--with-gl-libs="%(builddir)s/Mesa/lib/libGL.a -L/usr/lib -lX11 -lXext -lXxf86vm
-pthread -ldrm" --sysconfdir=/etc/ --with-scale-corner=TopLeft ',
configureName='./autogen.sh',dir='compiz' )
+
+ r.Configure(' --prefix=/usr/ --libdir=/usr/lib --prefix=/usr
--enable-gnome=yes'
+ ' --enable-libsvg-cairo --sysconfdir=/etc/
--with-scale-corner=TopLeft',
+ configureName='./autogen.sh',dir='compiz' )
r.Make('', dir='compiz')
r.MakeInstall(dir='compiz', package='compiz-base')
r.Remove('/usr/lib/debug', recursive = True)
+ r.Remove('/usr/lib/compiz/*.a', recursive = True)
r.Strip(exceptions="%(libdir)s/*.*")
@@ -105,4 +106,6 @@
r.Remove('/usr/lib/debug', recursive = True)
+ r.Remove('/usr/lib/compiz/*.a', recursive = True)
+
r.Strip(exceptions="%(libdir)s/*.*")
compiz-quinncvs_060906-4.1.src.rpm: new
compiz-plugins-060904-6.1.src.rpm: removed
compiz-quinncvs_060904-7.1.src.rpm: removed
csm-060904-9.1.src.rpm: removed
Committed by: antonio.meireles
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
