rpms/beryl-core/devel beryl-core.spec, NONE, 1.1 mesa-6.4.1-x86_64-fixes-1.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-core.spec mesa-6.4.1-x86_64-fixes-1.patch 
Log Message:
auto-import beryl-core-0.1.2-3.fc6 on branch devel from beryl-core-0.1.2-3.fc6.src.rpm


--- NEW FILE beryl-core.spec ---
Name:           beryl-core
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?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
Patch0:         mesa-6.4.1-x86_64-fixes-1.patch

# libdrm is not avaliable on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       mesa-libGL >= 6.5-9
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

Provides:       beryl = %{name}-%{version}

BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
BuildRequires:  startup-notification-devel >= 0.7
BuildRequires:  gettext-devel, libtool, intltool
BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel

%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.


%package devel
Summary: Development packages for beryl
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The beryl-core-devel package includes the header
and library files for the beryl-core
package.


%prep
%setup -q
%patch0 -p0 -b .mesa64
#autoreconf -v --install


%build
%configure --enable-librsvg --enable-libsvg-cairo
ln -s %{_includedir}/X11 mesa/include/
ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Kill static lib and libtool lib
rm -f $RPM_BUILD_ROOT%{_libdir}/libberylsettings.{a,la}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/beryl*
%dir %{_datadir}/beryl
%{_datadir}/beryl/*.png
%{_mandir}/man1/beryl*
%{_libdir}/libberylsettings.so.0
%{_libdir}/libberylsettings.so.0.0.0


%files devel
%defattr(-,root,root,-)
%{_libdir}/libberylsettings.so
%{_libdir}/pkgconfig/*.pc
%dir %{_includedir}/beryl
%{_includedir}/beryl/*.h
%{_mandir}/man3/beryl*


%changelog
* Tue Nov 14 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-3
- Put man3 in -devel, remove dead libsvg-cairo-devel BR

* Tue Nov 14 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-2
- Use upstream tarballs, now that they finally exist
- Add proper ldconfig bits

* Thu Nov 09 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson <jwilson at redhat.com> 0.1.1-3
- Trim Requires: down a bit

* Thu Oct 26 2006 Jarod Wilson <jwilson at redhat.com> 0.1.1-2
- BR cleanups, should allow building on FC5 - devel

* Thu Oct 26 2006 Jarod Wilson <jwilson at redhat.com> 0.1.1-1
- New upstream release
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson <jwilson at redhat.com> 0.1.0-1
- Initial Fedora build

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

--- NEW FILE mesa-6.4.1-x86_64-fixes-1.patch ---
--- 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
@@ -123,10 +123,10 @@
     struct array_state_vector * arrays;
 
     unsigned array_count;
-    unsigned texture_units = 1;
+    int texture_units = 1;
     unsigned i;
     unsigned j;
-    unsigned vertex_program_attribs = 0;
+    int vertex_program_attribs = 0;
 
     GLboolean got_fog = GL_FALSE;
     GLboolean got_secondary_color = GL_FALSE;
@@ -643,11 +643,10 @@
 
     GLubyte * pc;
     size_t elements_per_request;
-    unsigned total_requests = 0;
+    size_t total_requests = 0;
     unsigned i;
     size_t total_sent = 0;
 
-
     pc = emit_DrawArrays_header_old( gc, arrays, & elements_per_request,
 				     & total_requests, mode, count);
 
@@ -773,7 +772,7 @@
 
     GLubyte * pc;
     size_t elements_per_request;
-    unsigned total_requests = 0;
+    size_t total_requests = 0;
     unsigned i;
     unsigned req;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 20:31:10 -0000	1.1
+++ .cvsignore	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+beryl-core-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 20:31:10 -0000	1.1
+++ sources	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+045aceb6e48e997c952d942fbe841e76  beryl-core-0.1.2.tar.bz2