summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2014-01-26 20:30:04 +0000
committerMatt Turner <mattst88@gentoo.org>2014-01-26 20:30:04 +0000
commitc2af02ce7997549ff770f5e1713fe0fec6e8acdc (patch)
treecdaff0cc032550252bc56d290d646c15ad0b1547 /media-libs/mesa
parentFix repoman warnings. (diff)
downloadgentoo-2-c2af02ce7997549ff770f5e1713fe0fec6e8acdc.tar.gz
gentoo-2-c2af02ce7997549ff770f5e1713fe0fec6e8acdc.tar.bz2
gentoo-2-c2af02ce7997549ff770f5e1713fe0fec6e8acdc.zip
Remove hunk from patch that CVS insists on changing on commit.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch13
2 files changed, 5 insertions, 14 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index df396ca87829..1218360c6de7 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.534 2014/01/26 20:28:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.535 2014/01/26 20:30:04 mattst88 Exp $
+
+ 26 Jan 2014; Matt Turner <mattst88@gentoo.org>
+ files/mesa-10.0.2-update-glxext.h.patch:
+ Remove hunk from patch that CVS insists on changing on commit.
26 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
mesa-7.10.3.ebuild, mesa-7.11.2.ebuild, mesa-8.0.4-r1.ebuild,
diff --git a/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch b/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch
index 1247a179d507..b4dfb8ab5d99 100644
--- a/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch
+++ b/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch
@@ -1,19 +1,6 @@
diff -ur Mesa-10.0.2.orig/include/GL/glxext.h Mesa-10.0.2/include/GL/glxext.h
--- Mesa-10.0.2.orig/include/GL/glxext.h 2014-01-26 10:43:47.082996517 -0800
+++ Mesa-10.0.2/include/GL/glxext.h 2014-01-26 10:44:19.378000149 -0800
-@@ -33,10 +33,10 @@
- ** used to make the header, and the header can be found at
- ** http://www.opengl.org/registry/
- **
--** Khronos $Revision: 1.4 $ on $Date: 2014/01/26 20:24:03 $
-+** Khronos $Revision: 1.4 $ on $Date: 2014/01/26 20:24:03 $
- */
-
--#define GLX_GLXEXT_VERSION 20131008
-+#define GLX_GLXEXT_VERSION 20140114
-
- /* Generated C header for:
- * API: glx
@@ -49,6 +49,7 @@
#ifndef GLX_VERSION_1_3