* [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos
@ 2016-01-28 12:13 Lucas Stach
2016-01-28 12:13 ` [ptxdist] [PATCH 2/2] mesalib: version bump 10.3.3 -> 11.1.1 Lucas Stach
2016-02-11 11:27 ` [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Lucas Stach @ 2016-01-28 12:13 UTC (permalink / raw)
To: ptxdist
Current MESA versions have dropped the VG state tracker, so
there is no way to provide OpenVG acceleration anymore.
Disable the respective demos unconditionally.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
rules/mesa-demos.in | 20 --------------------
rules/mesa-demos.make | 4 +---
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/rules/mesa-demos.in b/rules/mesa-demos.in
index 5ea2f87ce099..192bbd01d0e9 100644
--- a/rules/mesa-demos.in
+++ b/rules/mesa-demos.in
@@ -8,7 +8,6 @@ menuconfig MESA_DEMOS
select MESALIB_EGL if MESA_DEMOS_EGL
select MESALIB_GLES1 if MESA_DEMOS_GLES1
select MESALIB_GLES2 if MESA_DEMOS_GLES2
- select MESALIB_OPENVG if MESA_DEMOS_VG
select MESALIB_EGL_WAYLAND if MESA_DEMOS_WAYLAND
select XORG_LIB_X11 if MESA_DEMOS_X11
select XORG_LIB_XEXT if MESA_DEMOS_X11
@@ -177,23 +176,4 @@ config MESA_DEMOS_ES2GEARS_WAYLAND
endif
-menuconfig MESA_DEMOS_VG
- bool
- select MESA_DEMOS_GLES1
- select MESA_DEMOS_EGL
- select MESA_DEMOS_X11
- prompt "OpenVG demos"
-
-if MESA_DEMOS_VG
-
-config MESA_DEMOS_VGIMAGE2TEX
- bool
- prompt "vgimage2tex"
-
-config MESA_DEMOS_TEX2VGIMAGE
- bool
- prompt "tex2vgimage"
-
-endif
-
endif
diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
index a83d54e258e0..90ef9f9ac988 100644
--- a/rules/mesa-demos.make
+++ b/rules/mesa-demos.make
@@ -44,7 +44,7 @@ MESA_DEMOS_CONF_OPT := \
--$(call ptx/endis, PTXCONF_MESA_DEMOS_EGL)-egl \
--$(call ptx/endis, PTXCONF_MESA_DEMOS_GLES1)-gles1 \
--$(call ptx/endis, PTXCONF_MESA_DEMOS_GLES2)-gles2 \
- --$(call ptx/endis, PTXCONF_MESA_DEMOS_VG)-vg \
+ --disable-vg \
--disable-osmesa \
--disable-libdrm \
--$(call ptx/endis, PTXCONF_MESA_DEMOS_X11)-x11 \
@@ -90,8 +90,6 @@ MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_SCREEN) += es2gears_screen
MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_WAYLAND) += es2gears_wayland
MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_X11) += es2gears_x11
MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2TRI) += es2tri
-MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_TEX2VGIMAGE) += tex2vgimage
-MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_VGIMAGE2TEX) += vgimage2tex
$(STATEDIR)/mesa-demos.targetinstall:
@$(call targetinfo)
--
2.7.0.rc3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH 2/2] mesalib: version bump 10.3.3 -> 11.1.1
2016-01-28 12:13 [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos Lucas Stach
@ 2016-01-28 12:13 ` Lucas Stach
2016-02-11 11:27 ` [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Lucas Stach @ 2016-01-28 12:13 UTC (permalink / raw)
To: ptxdist
Update to latest stable versions.
Also switch over to OOT builds, which makes working on the source
much more comfortable as the source tree will not be cluttered
with confilcting objects from the -host and -target builds.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
rules/host-mesalib.make | 7 +++----
rules/mesalib.in | 4 ----
rules/mesalib.make | 26 +++++++-------------------
3 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 721fa677db76..20450012caa6 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -21,6 +21,7 @@ HOST_MESALIB_CONF_ENV := \
$(HOST_ENV) \
ac_cv_prog_PYTHON2=$(PTXDIST_TOPDIR)/bin/python
+HOST_MESALIB_BUILD_OOT := YES
HOST_MESALIB_CONF_TOOL := autoconf
HOST_MESALIB_CONF_OPT := \
$(HOST_AUTOCONF) \
@@ -34,7 +35,6 @@ HOST_MESALIB_CONF_OPT := \
--enable-opengl \
--disable-gles1 \
--disable-gles2 \
- --disable-openvg \
--disable-dri \
--disable-dri3 \
--disable-glx \
@@ -49,10 +49,9 @@ HOST_MESALIB_CONF_OPT := \
--disable-opencl \
--disable-opencl-icd \
--disable-xlib-glx \
- --disable-gallium-egl \
- --disable-gallium-gbm \
--disable-r600-llvm-compiler \
--disable-gallium-tests \
+ --disable-shader-cache \
--disable-shared-glapi \
--disable-sysfs \
--disable-driglx-direct \
@@ -64,7 +63,7 @@ HOST_MESALIB_CONF_OPT := \
$(STATEDIR)/host-mesalib.install:
@$(call targetinfo)
- install -D -m755 $(HOST_MESALIB_DIR)/src/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/bin/mesa/glsl_compiler
+ install -D -m755 $(HOST_MESALIB_DIR)-build/src/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/bin/mesa/glsl_compiler
@$(call touch)
# vim: syntax=make
diff --git a/rules/mesalib.in b/rules/mesalib.in
index d7975dbf919d..2acf69d5160d 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -110,10 +110,6 @@ config MESALIB_GLES2
select MESALIB_OPENGL
prompt "OpenGL ES2"
-config MESALIB_OPENVG
- bool
- prompt "OpenVG"
-
config MESALIB_EGL
bool
select MESALIB_UDEV
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 1da6ff5584b6..48ea162f294b 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,11 +19,11 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 10.3.3
-MESALIB_MD5 := 4fe6fc9e28fb2a88a2387e5d3a49ae8b
-MESALIB := MesaLib-$(MESALIB_VERSION)
-MESALIB_SUFFIX := tar.bz2
-MESALIB_URL := ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/$(subst .0,,$(MESALIB_VERSION))/$(MESALIB).$(MESALIB_SUFFIX)
+MESALIB_VERSION := 11.1.1
+MESALIB_MD5 := 1043dfb907beecb2a761272455960427
+MESALIB := mesa-$(MESALIB_VERSION)
+MESALIB_SUFFIX := tar.xz
+MESALIB_URL := ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX)
MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
MESALIB_LICENSE := MIT
@@ -65,23 +65,12 @@ MESALIB_DRI_LIBS-y += \
$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y)) \
$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y))
-ifeq ($(MESALIB_GALLIUM_DRIVERS-y),)
-MESALIB_GALLIUM_EGL :=
-MESALIB_GALLIUM_GBM :=
-else
-MESALIB_GALLIUM_EGL := $(PTXCONF_MESALIB_EGL)
-MESALIB_GALLIUM_GBM := $(PTXCONF_MESALIB_GBM)
-endif
-
MESALIB_LIBS-y := libglapi
MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL
MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM
MESALIB_LIBS-$(PTXCONF_MESALIB_GLES2) += libGLESv2
-MESALIB_LIBS-$(PTXCONF_MESALIB_OPENVG) += libOpenVG
MESALIB_LIBS-$(PTXCONF_MESALIB_EGL) += libEGL
-MESALIB_LIBS-$(MESALIB_GALLIUM_EGL) += egl/egl_gallium
MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm
-MESALIB_LIBS-$(MESALIB_GALLIUM_GBM) += gbm/gbm_gallium_drm
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_DRM) += drm
@@ -89,6 +78,7 @@ MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland
MESALIB_LIBS-$(PTXCONF_MESALIB_EGL_WAYLAND) += libwayland-egl
+MESALIB_BUILD_OOT := YES
MESALIB_CONF_TOOL := autoconf
MESALIB_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
@@ -102,7 +92,6 @@ MESALIB_CONF_OPT := \
--$(call ptx/endis, PTXCONF_MESALIB_OPENGL)-opengl \
--$(call ptx/endis, PTXCONF_MESALIB_GLES1)-gles1 \
--$(call ptx/endis, PTXCONF_MESALIB_GLES2)-gles2 \
- --$(call ptx/endis, PTXCONF_MESALIB_OPENVG)-openvg \
--enable-dri \
--disable-dri3 \
--$(call ptx/endis, PTXCONF_MESALIB_GLX)-glx \
@@ -117,10 +106,9 @@ MESALIB_CONF_OPT := \
--disable-opencl \
--disable-opencl-icd \
--disable-xlib-glx \
- --$(call ptx/endis, MESALIB_GALLIUM_EGL)-gallium-egl \
- --$(call ptx/endis, MESALIB_GALLIUM_GBM)-gallium-gbm \
--disable-r600-llvm-compiler \
--disable-gallium-tests \
+ --disable-shader-cache \
--enable-shared-glapi \
--disable-sysfs \
--enable-driglx-direct \
--
2.7.0.rc3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos
2016-01-28 12:13 [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos Lucas Stach
2016-01-28 12:13 ` [ptxdist] [PATCH 2/2] mesalib: version bump 10.3.3 -> 11.1.1 Lucas Stach
@ 2016-02-11 11:27 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2016-02-11 11:27 UTC (permalink / raw)
To: ptxdist
On Thu, Jan 28, 2016 at 01:13:43PM +0100, Lucas Stach wrote:
> Current MESA versions have dropped the VG state tracker, so
> there is no way to provide OpenVG acceleration anymore.
> Disable the respective demos unconditionally.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Thanks, both applied.
Michael
> ---
> rules/mesa-demos.in | 20 --------------------
> rules/mesa-demos.make | 4 +---
> 2 files changed, 1 insertion(+), 23 deletions(-)
>
> diff --git a/rules/mesa-demos.in b/rules/mesa-demos.in
> index 5ea2f87ce099..192bbd01d0e9 100644
> --- a/rules/mesa-demos.in
> +++ b/rules/mesa-demos.in
> @@ -8,7 +8,6 @@ menuconfig MESA_DEMOS
> select MESALIB_EGL if MESA_DEMOS_EGL
> select MESALIB_GLES1 if MESA_DEMOS_GLES1
> select MESALIB_GLES2 if MESA_DEMOS_GLES2
> - select MESALIB_OPENVG if MESA_DEMOS_VG
> select MESALIB_EGL_WAYLAND if MESA_DEMOS_WAYLAND
> select XORG_LIB_X11 if MESA_DEMOS_X11
> select XORG_LIB_XEXT if MESA_DEMOS_X11
> @@ -177,23 +176,4 @@ config MESA_DEMOS_ES2GEARS_WAYLAND
>
> endif
>
> -menuconfig MESA_DEMOS_VG
> - bool
> - select MESA_DEMOS_GLES1
> - select MESA_DEMOS_EGL
> - select MESA_DEMOS_X11
> - prompt "OpenVG demos"
> -
> -if MESA_DEMOS_VG
> -
> -config MESA_DEMOS_VGIMAGE2TEX
> - bool
> - prompt "vgimage2tex"
> -
> -config MESA_DEMOS_TEX2VGIMAGE
> - bool
> - prompt "tex2vgimage"
> -
> -endif
> -
> endif
> diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
> index a83d54e258e0..90ef9f9ac988 100644
> --- a/rules/mesa-demos.make
> +++ b/rules/mesa-demos.make
> @@ -44,7 +44,7 @@ MESA_DEMOS_CONF_OPT := \
> --$(call ptx/endis, PTXCONF_MESA_DEMOS_EGL)-egl \
> --$(call ptx/endis, PTXCONF_MESA_DEMOS_GLES1)-gles1 \
> --$(call ptx/endis, PTXCONF_MESA_DEMOS_GLES2)-gles2 \
> - --$(call ptx/endis, PTXCONF_MESA_DEMOS_VG)-vg \
> + --disable-vg \
> --disable-osmesa \
> --disable-libdrm \
> --$(call ptx/endis, PTXCONF_MESA_DEMOS_X11)-x11 \
> @@ -90,8 +90,6 @@ MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_SCREEN) += es2gears_screen
> MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_WAYLAND) += es2gears_wayland
> MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_X11) += es2gears_x11
> MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2TRI) += es2tri
> -MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_TEX2VGIMAGE) += tex2vgimage
> -MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_VGIMAGE2TEX) += vgimage2tex
>
> $(STATEDIR)/mesa-demos.targetinstall:
> @$(call targetinfo)
> --
> 2.7.0.rc3
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-11 11:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-28 12:13 [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos Lucas Stach
2016-01-28 12:13 ` [ptxdist] [PATCH 2/2] mesalib: version bump 10.3.3 -> 11.1.1 Lucas Stach
2016-02-11 11:27 ` [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox