Skip to contentSkip to conversation

package/{mesa3d, mesa3d-headers}: bump version to 18.3.1

PATCH New james.hilliard1 at gmail.com 2 participants 2 messages Dec 16, 2018

lore
Share & tools
lore

james.hilliard1 at gmail.com

author
#0 lore raw

PATCH v2 1/1 package/{mesa3d, mesa3d-headers}: bump version to 18.3.1

From: James Hilliard <[email protected]>

Backport patch needed to fix error: ?NULL? undeclared

Signed-off-by James Hilliard <[email protected]>

---
Changes v1 -> v2:
- bump mesa3d-headers
- add notes to backported patch

Signed-off-by James Hilliard <[email protected]>
---
 package/mesa3d-headers/mesa3d-headers.mk           |  2 +-
 ...d-missing-include-stddef.h-in-egldevice.h.patch | 48 ++++++++++++++++++++++
 package/mesa3d/mesa3d.hash                         | 10 ++---
 package/mesa3d/mesa3d.mk                           |  2 +-
 4 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch
package/mesa3d-headers/mesa3d-headers.mk +1 -1
index eba9ee6..710cebe 100644
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 18.3.0
+MESA3D_HEADERS_VERSION = 18.3.1
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
 MESA3D_HEADERS_DL_SUBDIR = mesa3d
package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch new file +48 -0

48 lines not on this page · raw message

package/mesa3d/mesa3d.hash +5 -5
index 563ac62..68ec1ec 100644
@@ -1,7 +1,7 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2018-December/000482.html
-md5 2d69eff8fe0c6e89bb793d4fd69b750d  mesa-18.3.0.tar.xz
-sha1 d4ddc4e7aa8e11a41d35b5d51476f867e81056ca  mesa-18.3.0.tar.xz
-sha256 b63f947e735d6ef3dfaa30c789a9adfbae18aea671191eaacde95a18c17fc38a  mesa-18.3.0.tar.xz
-sha512 6643d8a100c50efee7178fe950e7cccad24c3a98538d3a13c7c6570add30a56776b4e5f279e2b0a20c4038e682e9461ca5a4fd4ac23a7f60d2f4a0c972525c42  mesa-18.3.0.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2018-December/000484.html
+md5 d60828056d77bfdbae0970f9b15fb1be  mesa-18.3.1.tar.xz
+sha1 50ba2d37647fea77ea19416e8a6ffed34c313330  mesa-18.3.1.tar.xz
+sha256 5b1f827d28684a25f6657289f8b7d47ac56395988c7ac23e0ec9a62b644bdc63  mesa-18.3.1.tar.xz
+sha512 a68d39158cf1e868d70730d0641a0cfe4c6e5b3cd1bc0c47f54022402aca03503933084f6ddc722bf88c9b6d1281ba5c847ec4fed8092a9b33f90527d08e12db  mesa-18.3.1.tar.xz
 # License
 sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c  docs/license.html
package/mesa3d/mesa3d.mk +1 -1
index f3ee69b..2fe46bd 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 18.3.0
+MESA3D_VERSION = 18.3.1
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = https://mesa.freedesktop.org/archive
 MESA3D_LICENSE = MIT, SGI, Khronos
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/1 package/{mesa3d, mesa3d-headers}: bump version to 18.3.1

Hello,

Quoted 20 lines · On Sun, 16 Dec 2018 16:58:34 +0800, james.hilliard1 at gmail.com wrote:
package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch new file +14 -0
new file mode 100644
index 0000000..56f94bc
@@ -0,0 +1,48 @@
+From eb44c36cf1729e7e200b77cf8ea755dff72d1639 Mon Sep 17 00:00:00 2001
+From: Gurchetan Singh <[email protected]>
+Date: Wed, 28 Nov 2018 08:39:34 -0800
+Subject: [PATCH] egl: add missing #include <stddef.h> in egldevice.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise, I get this error:
+
+main/egldevice.h:54:13: error: ?NULL? undeclared (first use in this function)
+       dev = NULL;
+             ^~~~
+with this config:

package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch line 24

Quoted 10 lines
package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch new file +10 -0
+
+./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless' --disable-glx
+             --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm
+
+v3: Use stddef.h (Matt)
+v4: Modify commit message (Eric)
+
+Reviewed-by: Matt Turner <[email protected]>
+Reviewed-by: Eric Engestrom <[email protected]>
+---

This separator here shouldn't be there, i.e the following two lines, should be right after the two Reviewed-by.

package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch line 26

Quoted 2 lines
package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch new file +2 -0
+Backported from upstream commit eb44c36cf1729e7e200b77cf8ea755dff72d1639
+Signed-off-by: James Hilliard <[email protected]>

I fixed that and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com