rpms/beryl-core/FC-6 .cvsignore, 1.3, 1.4 beryl-core.spec, 1.5, 1.6 mesa-6.4.1-x86_64-fixes-1.patch, 1.1, 1.2 sources, 1.3, 1.4

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27609

Modified Files:
	.cvsignore beryl-core.spec mesa-6.4.1-x86_64-fixes-1.patch 
	sources 
Log Message:
Turn beryl-xgl bits back on (#219566)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2006 17:55:00 -0000	1.3
+++ .cvsignore	14 Dec 2006 04:24:58 -0000	1.4
@@ -1,2 +1,3 @@
 beryl-core-0.1.2.tar.bz2
 beryl-core-0.1.3.tar.bz2
+beryl-mesa-0.1.3.tar.bz2


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- beryl-core.spec	13 Dec 2006 17:55:00 -0000	1.5
+++ beryl-core.spec	14 Dec 2006 04:24:58 -0000	1.6
@@ -3,11 +3,12 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
+Source1:        http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2
 Patch0:         mesa-6.4.1-x86_64-fixes-1.patch
 
 # libdrm is not avaliable on these arches
@@ -96,12 +97,15 @@
 users to install all the beryl bits for KDE.
 
 %prep
-%setup -q
+%setup -q -a 1
 
 
 %build
-# --disable-berylmesa == don't build beryl-xgl
-%configure --disable-berylmesa \
+pushd beryl-mesa/src
+make %{?_smp_mflags}
+popd
+%configure --enable-berylmesa \
+    --with-berylmesadir=./beryl-mesa \
     --x-includes=%{_includedir}/X11/ \
     --x-libraries=%{_libdir}/X11/
 make %{?_smp_mflags}
@@ -112,8 +116,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 # Kill static and libtool libs
 find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
-# --disable-berylmesa should have made this not install...
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/beryl-xgl.1*
 %find_lang %{name}
 
 %clean
@@ -154,6 +156,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Dec 13 2006 Jarod Wilson <jwilson at redhat.com> 0.1.3-2
+- Turn beryl-xgl bits back on (#219566)
+
 * Tue Dec 12 2006 Jarod Wilson <jwilson at redhat.com> 0.1.3-1
 - New upstream release
 

mesa-6.4.1-x86_64-fixes-1.patch:

Index: mesa-6.4.1-x86_64-fixes-1.patch
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/mesa-6.4.1-x86_64-fixes-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.4.1-x86_64-fixes-1.patch	14 Nov 2006 20:31:35 -0000	1.1
+++ mesa-6.4.1-x86_64-fixes-1.patch	14 Dec 2006 04:24:58 -0000	1.2
@@ -1,5 +1,5 @@
 --- Mesa-6.4.1/src/glx/x11/indirect_vertex_array.c	2005-08-19 20:53:26.000000000 +0200
-+++ mesa/src/glx/x11/indirect_vertex_array.c	2005-12-14 12:28:02.000000000 +0100
++++ beryl-mesa/src/glx/x11/indirect_vertex_array.c	2005-12-14 12:28:02.000000000 +0100
 @@ -123,10 +123,10 @@
      struct array_state_vector * arrays;
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2006 17:55:00 -0000	1.3
+++ sources	14 Dec 2006 04:24:58 -0000	1.4
@@ -1 +1,2 @@
 24caed8a8cb50fd30823a9ee182f85f4  beryl-core-0.1.3.tar.bz2
+c22765c2637846907ee6154b548151e9  beryl-mesa-0.1.3.tar.bz2