[pkg-remote-commits] [nx-libs] 05/08: debian/patches: Don't use Mesa.patches patch 4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch. It patches a file, we don't find in the released tarball.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository nx-libs.

commit 828db7b242bf0bd202ca4adef20f75b3b72473ca
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 30 23:26:14 2017 +0200

    debian/patches: Don't use Mesa.patches patch 4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch. It patches a file, we don't find in the released tarball.
---
 debian/patches/1001_dont-use-mesa-patch-4001.patch | 67 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 68 insertions(+)

diff --git a/debian/patches/1001_dont-use-mesa-patch-4001.patch b/debian/patches/1001_dont-use-mesa-patch-4001.patch
new file mode 100644
index 0000000..c34891f
--- /dev/null
+++ b/debian/patches/1001_dont-use-mesa-patch-4001.patch
@@ -0,0 +1,67 @@
+Description: It seems, Mesa patch 4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch is not required
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/nx-X11/extras/Mesa.patches/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch
++++ /dev/null
+@@ -1,54 +0,0 @@
+-From 44518d07398d663448d79e4f546736b40752630c Mon Sep 17 00:00:00 2001
+-From: Ulrich Sibiller <uli42 at gmx.de>
+-Date: Wed, 16 Mar 2016 14:40:08 +0100
+-Subject: [PATCH] Fix non-working GLX in 64bit Xorg 7.0
+-
+-Found the needed patch in debian bugtracker at
+-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=364233
+----
+- src/glx/x11/indirect_vertex_array.c          | 2 +-
+- src/mesa/drivers/dri/common/glcontextmodes.c | 3 +++
+- src/mesa/main/glheader.h                     | 3 +++
+- 3 files changed, 7 insertions(+), 1 deletion(-)
+-
+-Index: Mesa/src/glx/x11/indirect_vertex_array.c
+-===================================================================
+---- Mesa.orig/src/glx/x11/indirect_vertex_array.c
+-+++ Mesa/src/glx/x11/indirect_vertex_array.c
+-@@ -530,7 +530,7 @@ static GLubyte *
+- emit_DrawArrays_header_old( __GLXcontext * gc,
+- 			    struct array_state_vector * arrays,
+- 			    size_t * elements_per_request,
+--			    size_t * total_requests,
+-+			    unsigned int * total_requests,
+- 			    GLenum mode, GLsizei count )
+- {
+-     size_t command_size;
+-Index: Mesa/src/mesa/main/glheader.h
+-===================================================================
+---- Mesa.orig/src/mesa/main/glheader.h
+-+++ Mesa/src/mesa/main/glheader.h
+-@@ -46,6 +46,9 @@
+- #ifndef GLHEADER_H
+- #define GLHEADER_H
+- 
+-+#ifdef HAVE_DIX_CONFIG_H
+-+#include "dix-config.h"
+-+#endif
+- 
+- #if defined(XFree86LOADER) && defined(IN_MODULE)
+- #include "xf86_ansic.h"
+-Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+-===================================================================
+---- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c
+-+++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+-@@ -39,6 +39,9 @@
+- # include "imports.h"
+- # define __glXMemset  memset
+- #else
+-+# if defined (HAVE_DIX_CONFIG_H)
+-+#  include <dix-config.h>
+-+# endif
+- # include <X11/X.h>
+- # include <GL/glx.h>
+- # include "GL/glxint.h"
+--- a/nx-X11/extras/Mesa.patches/series
++++ b/nx-X11/extras/Mesa.patches/series
+@@ -1,4 +1,3 @@
+-4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch
+ 4002_no-special-glx-memfunctions.patch
+ 4003_CreatePixmap-AllocationHints.patch
+ 4004_define-USE_IEEE-macro-for-more-platforms.patch
diff --git a/debian/patches/series b/debian/patches/series
index 79df365..d6d076a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 2001_nx-X11_install-location.debian.patch
 2002_xserver-xext_set-securitypolicy-path.debian.patch
+1001_dont-use-mesa-patch-4001.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/nx-libs.git