rpms/xorg-x11-proto-devel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Aug 04 2010 Adam Jackson <ajax@redhat.com> 7.4-38

Browse Source 
- glproto-1.4.11-hyperpipe.patch: Fix conflict with glxext.h
This commit is contained in:
Adam Jackson 2010-08-04 10:01:46 -04:00
parent 8a5563685f
commit c09722f7a3
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glproto-1.4.11-hyperpipe.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up glproto-1.4.11/glxproto.h.jx glproto-1.4.11/glxproto.h
--- glproto-1.4.11/glxproto.h.jx 2010-01-08 11:43:07.000000000 -0500
+++ glproto-1.4.11/glxproto.h 2010-08-04 09:59:21.000000000 -0400
@@ -1255,7 +1255,7 @@ typedef struct {
/*
** glXHyperpipeConfigSGIX request
*/
-typedef struct GLXHyperpipeConfigSGIX {
+typedef struct {
CARD8 reqType;
CARD8 glxCode;
CARD16 length B16;

8
xorg-x11-proto-devel.spec
View File

@ -7,7 +7,7 @@
Summary: X.Org X11 Protocol headers Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel Name: xorg-x11-proto-devel
Version: 7.4 Version: 7.4
Release: 37%{?dist} Release: 38%{?dist}
License: MIT License: MIT
Group: Development/System Group: Development/System
URL: http://www.x.org URL: http://www.x.org
@ -42,6 +42,8 @@ Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
Source29: http://www.x.org/pub/individual/proto/xproto-7.0.17.tar.bz2 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.17.tar.bz2
Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
Patch0: glproto-1.4.11-hyperpipe.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.0.2-1 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
@ -58,6 +60,7 @@ X.Org X11 Protocol headers
%prep %prep
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
%patch0 -p0
%build %build
@ -261,6 +264,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/xproxymngproto.pc %{_datadir}/pkgconfig/xproxymngproto.pc
%changelog %changelog
* Wed Aug 04 2010 Adam Jackson <ajax@redhat.com> 7.4-38
- glproto-1.4.11-hyperpipe.patch: Fix conflict with glxext.h
* Wed May 19 2010 Adam Jackson <ajax@redhat.com> 7.4-37 * Wed May 19 2010 Adam Jackson <ajax@redhat.com> 7.4-37
- xproto 7.0.17 - xproto 7.0.17