mesa: Update unfuckage.

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5e6785a2a6a2b38df511f951c4e0d5bbf13f06c3..ac5daf89650e56e353529d8a5527e67387f8e7c5 100644 (file)
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,6 @@
-AUX 0001-glx-Only-call-DRI2-invalidate-when-necessary.patch 2068 RMD160 7ca8f567409ab67d5548ac7ecf308e49511dac7b SHA1 dbed1e762b74cad17d724f3349ab20053a53836c SHA256 9525f46f0a0a65af64dfc143da68f9bdafaf1453be3543f568851559d2d227f3
 AUX 0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch 2137 RMD160 08118ad35fec06fa5aeb7ca828cf763178158fb5 SHA1 40f5a8767d87244880544a26c6b1cdbd02edef22 SHA256 7a9ab83d98fced49ae2668b7e1f9a01a3a865246e0599bba61a4288af5e92773
+AUX unfuck-mesa-78.patch 507 RMD160 6029da8fb23561fae9caeed320d3692649a94168 SHA1 47db42b1cab0a87349a91e7fcf28cefe04f6da3c SHA256 2c537e36af2ac8877266bede05c3a108a60b4864d4e067c1828e6e606864c0e3
 DIST MesaLib-7.7.1.tar.bz2 4990250 RMD160 2f0dcc017aa97c364538a9fd29d5cdb247ab7880 SHA1 31500d7e3e3bbf9288b3bee4fbddd26a5e0b7782 SHA256 dc44f73e50d2ccdb96e7b72cc71e56024c198a228112c69c5e86dbc610fd4e84
 DIST MesaLib-7.8.1.tar.bz2 5137426 RMD160 b7b989342dc80a2a12456c17882e652db7bd86cd SHA1 1c15c62f845ef9b648366aa804410f68f7f79172 SHA256 b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3b1764cfa0907fa
 EBUILD mesa-7.7.1.ebuild 6042 RMD160 1a975d055edfae21b0deb19a06a09c1fbc3f4299 SHA1 b6c204b0d760184d9028fe3adc6d86e91d71ed48 SHA256 84deea5a48d4c11981523fe8d2e63defc33b1cfe6ee81d5b447074d4797fc0ca
-EBUILD mesa-7.8.1.ebuild 6026 RMD160 ccdbe5f9022a846fb6bc82ffdb0354c6f5a63987 SHA1 f9175fe1849af10bb78e481a51e164f43d5f67e4 SHA256 e73796475a0294d479af7fa8b19037e30112118d9bf4f1186721d71194120984
+EBUILD mesa-7.8.1.ebuild 5991 RMD160 cf9d70a3b9b5e9aacf8f9d2c669582f9312f8219 SHA1 d724dd115204cc302a3a6763e834df116fd58504 SHA256 1160432d9f7948bb35a4e3cd7d11dcd99564ae7ca62ed300a821168f1e5f7816

diff --git a/media-libs/mesa/files/0001-glx-Only-call-DRI2-invalidate-when-necessary.patch b/media-libs/mesa/files/0001-glx-Only-call-DRI2-invalidate-when-necessary.patch
deleted file mode 100644 (file)
index 3ea35d7..0000000
--- a/media-libs/mesa/files/0001-glx-Only-call-DRI2-invalidate-when-necessary.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2d00d16da7f5d2255cb37b48edaf4cbb9ca7e930 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
-Date: Mon, 10 May 2010 15:51:31 -0400
-Subject: [PATCH] glx: Only call DRI2 invalidate when necessary
-
-We only need this when the server may have swapped the buffers or
-when we receive an invalidate event from the server.  The default
-behaviour is still that the DRI driver will invalidate its own buffers
-when glViewport is called.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=27277
----
- src/glx/dri2_glx.c |   16 ++++------------
- 1 files changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
-index 6058c72..ca2a753 100644
---- a/src/glx/dri2_glx.c
-+++ b/src/glx/dri2_glx.c
-@@ -359,14 +359,6 @@ dri2WaitGL(__GLXDRIdrawable * pdraw)
- static void
- dri2FlushFrontBuffer(__DRIdrawable *driDrawable, void *loaderPrivate)
- {
--   __GLXDRIdrawablePrivate *pdraw = loaderPrivate;
--   __GLXdisplayPrivate *priv = __glXInitialize(pdraw->base.psc->dpy);
--   __GLXDRIdisplayPrivate *pdp = (__GLXDRIdisplayPrivate *)priv->dri2Display;
--
--   /* Old servers don't send invalidate events */
--   if (!pdp->invalidateAvailable)
--       dri2InvalidateBuffers(priv->dpy, pdraw->base.drawable);
--
-    dri2WaitGL(loaderPrivate);
- }
- 
-@@ -427,16 +419,16 @@ dri2SwapBuffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
-       (*pdraw->psc->f->flush)(pdraw->driDrawable);
- #endif
- 
--    /* Old servers don't send invalidate events */
--    if (!pdp->invalidateAvailable)
--       dri2InvalidateBuffers(dpyPriv->dpy, pdraw->drawable);
--
-     /* Old servers can't handle swapbuffers */
-     if (!pdp->swapAvailable) {
-        dri2CopySubBuffer(pdraw, 0, 0, priv->width, priv->height);
-        return 0;
-     }
- 
-+    /* Old servers don't send invalidate events */
-+    if (!pdp->invalidateAvailable)
-+       dri2InvalidateBuffers(dpyPriv->dpy, pdraw->drawable);
-+
- #ifdef X_DRI2SwapBuffers
-     DRI2SwapBuffers(pdraw->psc->dpy, pdraw->xDrawable, target_msc, divisor,
-                   remainder, &ret);
--- 
-1.6.4.4
-

diff --git a/media-libs/mesa/files/unfuck-mesa-78.patch b/media-libs/mesa/files/unfuck-mesa-78.patch
new file mode 100644 (file)
index 0000000..bd5043c
--- /dev/null
+++ b/media-libs/mesa/files/unfuck-mesa-78.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 3aed253..e92ab97 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -126,7 +126,7 @@ intelDRI2Invalidate(__DRIdrawable *drawable)
+ static const struct __DRI2flushExtensionRec intelFlushExtension = {
+     { __DRI2_FLUSH, __DRI2_FLUSH_VERSION },
+     intelDRI2Flush,
+-    intelDRI2Invalidate,
++    dri2InvalidateDrawable,
+ };
+ 
+ static __DRIimage *

diff --git a/media-libs/mesa/mesa-7.8.1.ebuild b/media-libs/mesa/mesa-7.8.1.ebuild
index d91985260aae55ad09c5acffd55ee88cdfe59252..8f4d90d35f6a5f6b0997062953763743d6212244 100644 (file)
--- a/media-libs/mesa/mesa-7.8.1.ebuild
+++ b/media-libs/mesa/mesa-7.8.1.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
        [[ ${CHOST} == *-freebsd6.* ]] && \
                sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
 
-       epatch "${FILESDIR}/0001-glx-Only-call-DRI2-invalidate-when-necessary.patch"
+       epatch "${FILESDIR}/unfuck-mesa-78.patch"
 
        eautoreconf
 }