Skip to content
Snippets Groups Projects
Commit e47955de authored by Brice Goglin's avatar Brice Goglin
Browse files

Refresh patches

parent 58c42a5b
No related merge requests found
......@@ -6,7 +6,7 @@ Index: mesa/src/mesa/main/compiler.h
===================================================================
--- mesa.orig/src/mesa/main/compiler.h
+++ mesa/src/mesa/main/compiler.h
@@ -345,8 +345,9 @@
@@ -347,8 +347,9 @@
* USE_IEEE: Determine if we're using IEEE floating point
*/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
......
......@@ -23,7 +23,7 @@ Index: mesa/progs/xdemos/Makefile
corender \
glsync \
glthreads \
@@ -62,6 +62,11 @@
@@ -63,6 +63,11 @@
extra: $(EXTRA_PROGS)
......
......@@ -3,8 +3,8 @@ Subject: Fix build on GNU/Hurd
Index: mesa/src/glx/x11/dri2.c
===================================================================
--- mesa.orig/src/glx/x11/dri2.c
+++ mesa/src/glx/x11/dri2.c
--- mesa.orig/src/glx/x11/dri2.c 2009-09-29 11:44:48.000000000 +0200
+++ mesa/src/glx/x11/dri2.c 2009-09-29 11:44:55.000000000 +0200
@@ -30,6 +30,7 @@
* Kristian Høgsberg (krh@redhat.com)
*/
......@@ -13,16 +13,16 @@ Index: mesa/src/glx/x11/dri2.c
#define NEED_REPLIES
#include <X11/Xlibint.h>
@@ -369,3 +370,4 @@
UnlockDisplay(dpy);
SyncHandle();
@@ -377,3 +378,4 @@
UnlockDisplay(dpy);
SyncHandle();
}
+#endif
Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
@@ -528,6 +528,13 @@
--- mesa.orig/configure.ac 2009-09-29 11:44:48.000000000 +0200
+++ mesa/configure.ac 2009-09-29 11:44:55.000000000 +0200
@@ -536,6 +536,13 @@
enable_xcb=no
fi
......@@ -36,7 +36,7 @@ Index: mesa/configure.ac
dnl
dnl libGL configuration per driver
dnl
@@ -561,11 +568,13 @@
@@ -569,11 +576,13 @@
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
......@@ -53,9 +53,9 @@ Index: mesa/configure.ac
+ DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
+ fi
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
@@ -632,12 +641,6 @@
PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no)
@@ -647,12 +656,6 @@
[DRI_DRIVER_INSTALL_DIR="$withval"],
[DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
AC_SUBST([DRI_DRIVER_INSTALL_DIR])
......
......@@ -6,9 +6,9 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690
Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
@@ -721,7 +721,7 @@
--- mesa.orig/configure.ac 2009-09-29 11:44:55.000000000 +0200
+++ mesa/configure.ac 2009-09-29 11:45:12.000000000 +0200
@@ -736,7 +736,7 @@
;;
esac
;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment