diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2022-12-31 14:13:38 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2022-12-31 14:13:38 +0100 |
| commit | f77ac933d9a0d3155b1c19c38d8ac29ebbbd9d8f (patch) | |
| tree | 8c1519c6ff8849e63b6629bc6b20b6f7dd5655e1 /package/mesa | |
| parent | 54e3687418a9471d6059cfd7a64604619b3d6f04 (diff) | |
mesa: update to 22.3.2
Diffstat (limited to 'package/mesa')
| -rw-r--r-- | package/mesa/Makefile | 30 | ||||
| -rw-r--r-- | package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c | 14 |
2 files changed, 14 insertions, 30 deletions
diff --git a/package/mesa/Makefile b/package/mesa/Makefile index 74a176301..024a11ff6 100644 --- a/package/mesa/Makefile +++ b/package/mesa/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mesa -PKG_VERSION:= 18.3.6 -PKG_RELEASE:= 2 -PKG_HASH:= aaf17638dcf5a90b93b6389e152fdc9ef147768b09598f24d2c5cf482fcfc705 +PKG_VERSION:= 22.3.2 +PKG_RELEASE:= 1 +PKG_HASH:= c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b PKG_DESCR:= 3d graphics library PKG_SECTION:= libs/video PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat @@ -14,7 +14,7 @@ PKG_DEPENDS+= libxml2 libxml2-python PKG_BUILDDEP:= python2 libxml2 libXdamage libXfixes libXrandr PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb -PKG_BUILDDEP+= libxshmfence +PKG_BUILDDEP+= libxshmfence python-mako-host PKG_NEEDS:= c++ PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/ @@ -27,18 +27,16 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESA,mesa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -DRI_DRIVERS:= swrast - -CONFIGURE_ARGS+= --disable-static \ - --disable-gallium-llvm \ - --without-gallium-drivers \ - --enable-dri \ - --enable-dri3 \ - --enable-glx=dri \ - --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=${DRI_DRIVERS} -CONFIGURE_ENV+= MISSING="echo" -XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dllvm=disabled \ + -Dgallium-drivers=swrast,panfrost,vc4,v3d \ + -Dvulkan-drivers= \ + -Dgbm=enabled \ + -Dplatforms=x11 mesa-install: $(INSTALL_DIR) $(IDIR_MESA)/usr/lib/dri diff --git a/package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c b/package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c deleted file mode 100644 index af6a53aa7..000000000 --- a/package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c +++ /dev/null @@ -1,14 +0,0 @@ ---- mesa-11.0.6.orig/src/mapi/glapi/glapi_gentable.c 2015-11-21 12:45:27.000000000 +0100 -+++ mesa-11.0.6/src/mapi/glapi/glapi_gentable.c 2016-01-05 22:36:19.266092512 +0100 -@@ -35,11 +35,6 @@ - #include <dix-config.h> - #endif - --#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \ -- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) --#define USE_BACKTRACE --#endif -- - #ifdef USE_BACKTRACE - #include <execinfo.h> - #endif |