diff options
| author | Adam Jackson <ajax@fedoraproject.org> | 2006-12-12 23:48:34 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@fedoraproject.org> | 2006-12-12 23:48:34 +0000 |
| commit | 847d598bdb19ba47aabca21c38feee51d8270ec5 (patch) | |
| tree | 4e9dd7cb80a19c73004c6631a8a52d73fd60a532 | |
| parent | fbb11edd09107a7dd0ded4b7c5310a87bbea200e (diff) | |
| download | mesa-847d598bdb19ba47aabca21c38feee51d8270ec5.tar.gz mesa-847d598bdb19ba47aabca21c38feee51d8270ec5.tar.xz mesa-847d598bdb19ba47aabca21c38feee51d8270ec5.zip | |
- mesa-6.5.2-xserver-1.1-source-compat.patch: Add some source-compatibilitymesa-6_5_2-3_fc7
defines to dispatch.h so the X server will continue to build.
| -rw-r--r-- | mesa-6.5.2-xserver-1.1-source-compat.patch | 12 | ||||
| -rw-r--r-- | mesa.spec | 9 |
2 files changed, 19 insertions, 2 deletions
diff --git a/mesa-6.5.2-xserver-1.1-source-compat.patch b/mesa-6.5.2-xserver-1.1-source-compat.patch new file mode 100644 index 0000000..b01384b --- /dev/null +++ b/mesa-6.5.2-xserver-1.1-source-compat.patch @@ -0,0 +1,12 @@ +--- Mesa-6.5.2/src/mesa/glapi/dispatch.h.jx 2006-12-12 18:02:22.000000000 -0500 ++++ Mesa-6.5.2/src/mesa/glapi/dispatch.h 2006-12-12 18:03:04.000000000 -0500 +@@ -3840,4 +3840,9 @@ + + #endif /* !defined(IN_DRI_DRIVER) */ + ++/* backwards compatibility for X server 1.1.1 */ ++#define CALL_IsTextureEXT(a, b) CALL_IsTexture(a, b) ++#define CALL_GenTexturesEXT(a, b) CALL_GenTextures(a, b) ++#define CALL_AreTexturesResidentEXT(a, b) CALL_AreTexturesResident(a, b) ++ + #endif /* !defined( _DISPATCH_H_ ) */ @@ -47,7 +47,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 6.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -62,7 +62,7 @@ Source12: redhat-mesa-source-filelist-generator # Patches 0-9 reserved for mesa Makefiles/config fixes Patch0: mesa-6.5.1-build-config.patch Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch - +Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch Patch18: mesa-6.5.1-selinux-awareness.patch BuildRequires: pkgconfig @@ -241,6 +241,7 @@ install -m 755 %{SOURCE12} ./ %patch0 -p1 -b .build-config %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye +%patch5 -p1 -b .xserver-1.1-compat %patch18 -p1 -b .selinux-awareness # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT @@ -410,6 +411,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/glxinfo %changelog +* Tue Dec 12 2006 Adam Jackson <ajax@redhat.com> 6.5.2-3 +- mesa-6.5.2-xserver-1.1-source-compat.patch: Add some source-compatibility + defines to dispatch.h so the X server will continue to build. + * Mon Dec 4 2006 Adam Jackson <ajax@redhat.com> 6.5.2-2.fc6 - Fix OSMesa file listing to use %%version for DSO number. Note that this will still break on Mesa 7; oh well. |