mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Markus Niebel <niebelm@tqsc.de>
To: ptxdist@pengutronix.de
Cc: m.olbrich@pengutronix.de, Markus Niebel <Markus.Niebel@tq-group.com>
Subject: [ptxdist]  [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1
Date: Thu,  9 Mar 2017 11:05:51 +0100	[thread overview]
Message-ID: <1489053954-17566-3-git-send-email-niebelm@tqsc.de> (raw)
In-Reply-To: <1489053954-17566-1-git-send-email-niebelm@tqsc.de>

From: Markus Niebel <Markus.Niebel@tq-group.com>

- add support for etnaviv
- update config opts
- add fallback download URL (newest mesalib seems to live there)

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
 rules/host-mesalib.in   |  1 +
 rules/host-mesalib.make |  2 --
 rules/mesalib.in        | 20 ++++++++++++++++++++
 rules/mesalib.make      | 25 ++++++++++++++++++-------
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
index 1bf56ae..29a6a22 100644
--- a/rules/host-mesalib.in
+++ b/rules/host-mesalib.in
@@ -6,4 +6,5 @@ config HOST_MESALIB
 	select HOST_MAKEDEPEND
 	select HOST_SYSTEM_PYTHON
 	select HOST_SYSTEM_PYTHON_XML2
+	select HOST_SYSTEM_PYTHON_MAKO
 	select HOST_LIBPTHREAD_STUBS
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 1619d20..48702ac 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	--disable-opencl \
 	--disable-opencl-icd \
 	--disable-gallium-tests \
-	--disable-shader-cache \
 	--enable-shared-glapi \
 	--disable-glx-read-only-text \
 	--disable-driglx-direct \
@@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	--disable-llvm-shared-libs \
 	--disable-gallium-llvm \
 	--disable-libglvnd \
-	--with-sha1= \
 	--with-gallium-drivers= \
 	--with-dri-drivers= \
 	--without-vulkan-drivers
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 430c94e..a4daf2d 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -7,6 +7,10 @@ menuconfig MESALIB
 	select HOST_MAKEDEPEND
 	select HOST_SYSTEM_PYTHON
 	select HOST_SYSTEM_PYTHON_XML2
+<<<<<<< HEAD
+=======
+	select HOST_SYSTEM_PYTHON_MAKO
+>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
 	select GCCLIBS
 	select GCCLIBS_CXX
 	select LIBDRM
@@ -19,6 +23,10 @@ menuconfig MESALIB
 	select LIBDRM_RADEON		if MESALIB_DRI_RADEONSI
 	select LIBDRM_NOUVEAU		if MESALIB_DRI_NOUVEAU || MESALIB_DRI_NOUVEAU_VIEUX
 	select LIBDRM_FREEDRENO		if MESALIB_DRI_FREEDRENO
+<<<<<<< HEAD
+=======
+	select LIBDRM_ETNAVIV		if MESALIB_DRI_ETNAVIV
+>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
 	select XORG_PROTO_DRI2		if MESALIB_GLX
 	select XORG_LIB_X11		if MESALIB_GLX
 	select XORG_LIB_XEXT		if MESALIB_GLX
@@ -91,6 +99,18 @@ config MESALIB_DRI_FREEDRENO
 	bool
 	prompt "Freedreno"
 
+<<<<<<< HEAD
+=======
+config MESALIB_DRI_ETNAVIV
+	bool
+	prompt "Etnaviv"
+
+config MESALIB_DRI_IMX
+	bool
+	depends on MESALIB_DRI_ETNAVIV
+	prompt "imx"
+
+>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
 config MESALIB_DRI_VC4
 	bool
 	prompt "vc4"
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 2c7389b..5299a0c 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,11 +19,13 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 13.0.2
-MESALIB_MD5	:= 9442c2dee914cde3d1f090371ab04113
+MESALIB_VERSION	:= 17.0.1
+MESALIB_MD5	:= 6a7e768241846c8c69bbadbf904dcc58
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
-MESALIB_URL	:= ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX)
+MESALIB_URL	:= \
+	ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX) \
+	ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_DIR	:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
 MESALIB_LICENSE	:= MIT
@@ -55,6 +57,10 @@ endif
 
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_FREEDRENO)+= freedreno
+
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETNAVIV)+= etnaviv
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IMX)+= imx
+
 ifdef PTXCONF_ARCH_ARM
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC4)	+= vc4
 endif
@@ -62,8 +68,15 @@ endif
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
 
 MESALIB_DRI_LIBS-y += \
-	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y)) \
-	$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y))
+	$(MESALIB_DRI_DRIVERS-y) \
+	$(MESALIB_GALLIUM_DRIVERS-y)
+
+MESALIB_DRI_LIBS-y := \
+	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_LIBS-y))
+MESALIB_DRI_LIBS-y := \
+	$(subst imx,imx-drm,$(MESALIB_DRI_LIBS-y))
+MESALIB_DRI_LIBS-y := \
+	$(subst freedreno,kgsl,$(MESALIB_DRI_LIBS-y))
 
 MESALIB_LIBS-y				:= libglapi
 MESALIB_LIBS-$(PTXCONF_MESALIB_GLX)	+= libGL
@@ -111,7 +124,6 @@ MESALIB_CONF_OPT	:= \
 	--disable-opencl \
 	--disable-opencl-icd \
 	--disable-gallium-tests \
-	--disable-shader-cache \
 	--enable-shared-glapi \
 	--disable-glx-read-only-text \
 	--enable-driglx-direct \
@@ -119,7 +131,6 @@ MESALIB_CONF_OPT	:= \
 	--disable-gallium-llvm \
 	--enable-llvm-shared-libs \
 	--disable-libglvnd \
-	--with-sha1= \
 	--with-gallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
 	--with-dri-driverdir=/usr/lib/dri \
 	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  parent reply	other threads:[~2017-03-09 10:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-09 10:05 [ptxdist] [PATCH 0/5] update drm / mesa support and add testtools Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 1/5] host-system-python: add check for mako Markus Niebel
2017-03-09 10:05 ` Markus Niebel [this message]
2017-03-09 10:39   ` [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1 Marc Kleine-Budde
2017-03-09 11:27     ` Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 3/5] libdrm: version bump 2.7.74 -> 2.7.75 Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 4/5] kmscube: add new package Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 5/5] glmark2: " Markus Niebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1489053954-17566-3-git-send-email-niebelm@tqsc.de \
    --to=niebelm@tqsc.de \
    --cc=Markus.Niebel@tq-group.com \
    --cc=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox