debian/patches: refresh all patches.

Removes some fuzziness and adds the -p diff option to show the C
function name in hunk headers.

1 files changed, 14 insertions, 21 deletions

diff --git a/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch b/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch
index af577aaa9..6681c7460 100644
--- a/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch
+++ b/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch
@@ -24,11 +24,9 @@ Signed-off-by: Dave Airlie <airlied@redhat.com>
  nx-X11/programs/Xserver/GL/glx/singlepixswap.c | 14 +++++++-------
  2 files changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/nx-X11/programs/Xserver/GL/glx/singlepix.c b/nx-X11/programs/Xserver/GL/glx/singlepix.c
-index 845c46a..be804d8 100644
 --- a/nx-X11/programs/Xserver/GL/glx/singlepix.c
 +++ b/nx-X11/programs/Xserver/GL/glx/singlepix.c
-@@ -70,7 +70,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
+@@ -70,7 +70,7 @@ int __glXDisp_ReadPixels(__GLXclientStat
      swapBytes = *(GLboolean *)(pc + 24);
      lsbFirst = *(GLboolean *)(pc + 25);
      compsize = __glReadPixels_size(format,type,width,height);
@@ -37,7 +35,7 @@ index 845c46a..be804d8 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
-@@ -130,7 +130,7 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
+@@ -130,7 +130,7 @@ int __glXDisp_GetTexImage(__GLXclientSta
       * are illegal, but then width, height, and depth would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,level,format,type,width,height,depth);
@@ -46,7 +44,7 @@ index 845c46a..be804d8 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -227,7 +227,7 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+@@ -227,7 +227,7 @@ int __glXDisp_GetSeparableFilter(__GLXcl
      compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
      compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1);
  
@@ -55,7 +53,7 @@ index 845c46a..be804d8 100644
      if (compsize2 < 0) compsize2 = 0;
      compsize = __GLX_PAD(compsize);
      compsize2 = __GLX_PAD(compsize2);
-@@ -291,7 +291,7 @@ int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+@@ -291,7 +291,7 @@ int __glXDisp_GetConvolutionFilter(__GLX
       * are illegal, but then width and height would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,1,format,type,width,height,1);
@@ -64,7 +62,7 @@ index 845c46a..be804d8 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -346,7 +346,7 @@ int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+@@ -346,7 +346,7 @@ int __glXDisp_GetHistogram(__GLXclientSt
       * are illegal, but then width would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
@@ -73,7 +71,7 @@ index 845c46a..be804d8 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -389,7 +389,7 @@ int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+@@ -389,7 +389,7 @@ int __glXDisp_GetMinmax(__GLXclientState
      reset = *(GLboolean *)(pc + 13);
  
      compsize = __glGetTexImage_size(target,1,format,type,2,1,1);
@@ -82,7 +80,7 @@ index 845c46a..be804d8 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -436,7 +436,7 @@ int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+@@ -436,7 +436,7 @@ int __glXDisp_GetColorTable(__GLXclientS
       * are illegal, but then width would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
@@ -91,11 +89,9 @@ index 845c46a..be804d8 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-diff --git a/nx-X11/programs/Xserver/GL/glx/singlepixswap.c b/nx-X11/programs/Xserver/GL/glx/singlepixswap.c
-index ff68ece..cdc6f16 100644
 --- a/nx-X11/programs/Xserver/GL/glx/singlepixswap.c
 +++ b/nx-X11/programs/Xserver/GL/glx/singlepixswap.c
-@@ -79,7 +79,7 @@ int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
+@@ -79,7 +79,7 @@ int __glXDispSwap_ReadPixels(__GLXclient
      swapBytes = *(GLboolean *)(pc + 24);
      lsbFirst = *(GLboolean *)(pc + 25);
      compsize = __glReadPixels_size(format,type,width,height);
@@ -104,7 +100,7 @@ index ff68ece..cdc6f16 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
-@@ -148,7 +148,7 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
+@@ -148,7 +148,7 @@ int __glXDispSwap_GetTexImage(__GLXclien
       * are illegal, but then width, height, and depth would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,level,format,type,width,height,depth);
@@ -113,7 +109,7 @@ index ff68ece..cdc6f16 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -257,7 +257,7 @@ int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+@@ -257,7 +257,7 @@ int __glXDispSwap_GetSeparableFilter(__G
      compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
      compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1);
  
@@ -122,7 +118,7 @@ index ff68ece..cdc6f16 100644
      if (compsize2 < 0) compsize2 = 0;
      compsize = __GLX_PAD(compsize);
      compsize2 = __GLX_PAD(compsize2);
-@@ -328,7 +328,7 @@ int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+@@ -328,7 +328,7 @@ int __glXDispSwap_GetConvolutionFilter(_
       * are illegal, but then width and height would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,1,format,type,width,height,1);
@@ -131,7 +127,7 @@ index ff68ece..cdc6f16 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -390,7 +390,7 @@ int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+@@ -390,7 +390,7 @@ int __glXDispSwap_GetHistogram(__GLXclie
       * are illegal, but then width would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
@@ -140,7 +136,7 @@ index ff68ece..cdc6f16 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -439,7 +439,7 @@ int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+@@ -439,7 +439,7 @@ int __glXDispSwap_GetMinmax(__GLXclientS
      reset = *(GLboolean *)(pc + 13);
  
      compsize = __glGetTexImage_size(target,1,format,type,2,1,1);
@@ -149,7 +145,7 @@ index ff68ece..cdc6f16 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-@@ -491,7 +491,7 @@ int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+@@ -491,7 +491,7 @@ int __glXDispSwap_GetColorTable(__GLXcli
       * are illegal, but then width would still be zero anyway.
       */
      compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
@@ -158,6 +154,3 @@ index ff68ece..cdc6f16 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
--- 
-2.1.4
-