From patchwork Sat Feb 24 11:12:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 877405 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QSKY3lhG"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zpQRM0gyyz9sWD for ; Sat, 24 Feb 2018 22:12:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C9715220A4; Sat, 24 Feb 2018 11:12:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fuIZ7zvBWBa8; Sat, 24 Feb 2018 11:12:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 24A24220C7; Sat, 24 Feb 2018 11:12:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7BC371CF028 for ; Sat, 24 Feb 2018 11:12:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 781D5220C7 for ; Sat, 24 Feb 2018 11:12:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pqF4w91uQ3in for ; Sat, 24 Feb 2018 11:12:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by silver.osuosl.org (Postfix) with ESMTPS id B01D1220A4 for ; Sat, 24 Feb 2018 11:12:21 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id u49so16535665wrc.10 for ; Sat, 24 Feb 2018 03:12:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KfCG+pzOc/MnXcoxpqfhJkCtWeF4I1rWBSyuJkhj5bU=; b=QSKY3lhGzZ9OlB1/palaIl1M8Kw4DFLzsCR1SymYpHXvm8Yiig+zSnAqlQiOYHzm3A tp29Wg12e+aVQSWOmhd+bwbm7s7S1pLGXL8fJQvmEIqop25NDa1W6Rt8cjjdkwVt8EYq KklmgSEMbhIVD+R6GnatMcIy+gcY2TbG53rb/+CblLTMO6T4oFFq3WBZH9Talnrg5WCs NOw5S8oLRmDTcIZZGLjK4MfIv8tbwUFy4sWlbaaFF27a5LTPsRM/FhHtMZyOmcIXt/8+ kEWDkI1RAqC9TP88N+5vTYVDyD7vd5UZ2HbNlGkKvTYg+mJhEyB1IOBUQse3CTb1KSJS WZcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KfCG+pzOc/MnXcoxpqfhJkCtWeF4I1rWBSyuJkhj5bU=; b=M9QunTaEjgDLU4SaiSVKGVPQwkKIWXMTfsmwul4qZ2qaIlM7m+x+1xpk098+PIQgmW iBkshjlnGYdhpBEw/hmGhnbRKIU21mUGHOShJC8b6s892EaPRhoWWSh31iPzLYa/v+kA txYKFEpNjwNJYX+AkYQFX7WfkPrslixfsw71L1gel9NXxur0yHTMR3QzUE1Imspjvwk6 RCE7Dv/DoEH5rAz3CLzK3UFutByK3h9eBCOImZ8iqWmcXRZMHB+w1+DlLBQemVY/4t6y c5oO4hPh3110/qgnx3GuQpv4uKzakViHT/zMPgn6vfEOt4ToesxdbRAmoo8ljpT0yaEH p7Wg== X-Gm-Message-State: APf1xPARQW9El/z6SfJhz/kk56okq8H0BxoEtqx8T5BNXG/+P05l5sBl ehbN7EFW8/MdDnbCp7tXaXnvQisG X-Google-Smtp-Source: AH8x225iaoDS9WbmbtR4hCm3B5Z550XBEsrEooOxqACdnA4mb1D26z8wR2w0xmfKOCWekzEHLtNzhg== X-Received: by 10.223.195.67 with SMTP id e3mr4615148wrg.233.1519470739726; Sat, 24 Feb 2018 03:12:19 -0800 (PST) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id k133sm231019wmk.35.2018.02.24.03.12.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 24 Feb 2018 03:12:19 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 24 Feb 2018 12:12:14 +0100 Message-Id: <20180224111214.20071-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH for-next] package/mesa3d-demos: bump to 8.4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use the new upstream url. Added all hashes provided by upstream. Rebase patch on top of 8.4.0 and convert it to git formated patch. Add a comment above "MESA3D_DEMOS_AUTORECONF = YES" See https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html Signed-off-by: Romain Naour --- ...demos-makes-opengl-an-optional-component.patch} | 56 ++++++++++++++-------- package/mesa3d-demos/mesa3d-demos.hash | 7 ++- package/mesa3d-demos/mesa3d-demos.mk | 5 +- 3 files changed, 43 insertions(+), 25 deletions(-) rename package/mesa3d-demos/{0001-demos-optional-gl.patch => 0001-demos-makes-opengl-an-optional-component.patch} (52%) diff --git a/package/mesa3d-demos/0001-demos-optional-gl.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch similarity index 52% rename from package/mesa3d-demos/0001-demos-optional-gl.patch rename to package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index 6470e9d8d9..b328fca810 100644 --- a/package/mesa3d-demos/0001-demos-optional-gl.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,12 +1,22 @@ -This patches makes opengl an optional component. +From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 +From: Spenser Gilliland +Date: Sat, 24 Feb 2018 11:36:17 +0100 +Subject: [PATCH] demos: makes opengl an optional component Signed-off-by: Spenser Gilliland +[Romain: convert to git patch, rebase on 8.4.0] +Signed-off-by: Romain Naour --- -Index: mesa3d-demos-8.1.0/configure.ac -=================================================================== ---- mesa3d-demos-8.1.0.orig/configure.ac -+++ mesa3d-demos-8.1.0/configure.ac -@@ -51,6 +51,14 @@ + configure.ac | 12 +++++++++++- + src/egl/opengl/Makefile.am | 2 ++ + src/util/Makefile.am | 2 ++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0b5e9a76..24298c44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) PKG_PROG_PKG_CONFIG() @@ -21,7 +31,7 @@ Index: mesa3d-demos-8.1.0/configure.ac dnl Get the pkg-config definitions for libGL. We include a fallback dnl path for GL implementation that don't provide a .pc file PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -113,6 +121,8 @@ +@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" @@ -30,7 +40,7 @@ Index: mesa3d-demos-8.1.0/configure.ac AC_ARG_ENABLE([egl], [AS_HELP_STRING([--enable-egl], [enable EGL library @<:@default=auto@:>@])], -@@ -303,7 +313,7 @@ +@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) AC_SUBST([WAYLAND_CFLAGS]) AC_SUBST([WAYLAND_LIBS]) @@ -39,29 +49,30 @@ Index: mesa3d-demos-8.1.0/configure.ac AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -Index: mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am -=================================================================== ---- mesa3d-demos-8.1.0.orig/src/egl/opengl/Makefile.am -+++ mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am -@@ -50,12 +50,14 @@ +diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am +index 6d184ff6..219ab850 100644 +--- a/src/egl/opengl/Makefile.am ++++ b/src/egl/opengl/Makefile.am +@@ -56,6 +56,7 @@ endif endif if HAVE_EGL +if HAVE_GL + bin_PROGRAMS = \ + eglinfo noinst_PROGRAMS = \ - eglinfo \ - peglgears \ - $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) +@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ + $(EGL_X11_DEMOS) \ + $(EGL_WL_DEMOS) endif +endif egltri_x11_SOURCES = egltri.c eglgears_x11_SOURCES = eglgears.c -Index: mesa3d-demos-8.1.0/src/util/Makefile.am -=================================================================== ---- mesa3d-demos-8.1.0.orig/src/util/Makefile.am -+++ mesa3d-demos-8.1.0/src/util/Makefile.am +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index 759a293a..012b9c75 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am @@ -27,7 +27,9 @@ AM_CFLAGS = \ AM_LDFLAGS = \ $(DEMO_LIBS) @@ -72,3 +83,6 @@ Index: mesa3d-demos-8.1.0/src/util/Makefile.am if HAVE_GLUT AM_CFLAGS += \ +-- +2.14.3 + diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index a50a3a1e0c..8a771df2f8 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,2 +1,5 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2015-December/000191.html -sha256 c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef mesa-demos-8.3.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html +md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 +sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 +sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 +sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index cbc15c3b69..52a1e2420a 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,9 +4,10 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.3.0 +MESA3D_DEMOS_VERSION = 8.4.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA3D_DEMOS_VERSION) +MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos +# 0001-demos-makes-opengl-an-optional-component.patch MESA3D_DEMOS_AUTORECONF = YES MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT