diff options
author | kevall474 | 2020-11-24 19:48:00 -0500 |
---|---|---|
committer | kevall474 | 2020-11-24 19:48:00 -0500 |
commit | 26c72e044fb361b0719072b131778cb91a5b4419 (patch) | |
tree | 7d0e8c49ee03cc9a08252258d806e7e57b6ea69c | |
parent | c12218ddbed5dbd7a45a8726f9317bbee2ea0b05 (diff) | |
download | aur-26c72e044fb361b0719072b131778cb91a5b4419.tar.gz |
split package
-rw-r--r-- | .SRCINFO | 80 | ||||
-rw-r--r-- | 0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch | 27 | ||||
-rw-r--r-- | 0003-evergreen-big-endian.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 153 |
4 files changed, 201 insertions, 85 deletions
@@ -1,5 +1,4 @@ pkgbase = mesa-aco-rc - pkgdesc = Mesa rc release. ACO enable by default. More options are enable than the standard mesa package. pkgver = 20.3.0_rc2 pkgrel = 1 url = https://mesa3d.org/ @@ -32,6 +31,26 @@ pkgbase = mesa-aco-rc makedepends = gtk3 makedepends = wayland-protocols makedepends = xorgproto + makedepends = lib32-flex + makedepends = lib32-clang + makedepends = lib32-libxvmc + makedepends = lib32-elfutils + makedepends = lib32-libva + makedepends = lib32-libepoxy + makedepends = lib32-libxv + makedepends = lib32-libvdpau + makedepends = lib32-libx11 + makedepends = lib32-libxml2 + makedepends = lib32-libxrandr + makedepends = lib32-llvm + makedepends = lib32-gtk3 + source = https://archive.mesa3d.org/mesa-20.3.0-rc2.tar.xz + source = LICENSE + md5sums = SKIP + md5sums = SKIP + +pkgname = mesa-aco-rc + pkgdesc = Mesa rc release. ACO enable by default. More options are enable than the standard mesa package. depends = libdrm depends = libelf depends = libglvnd @@ -80,14 +99,55 @@ pkgbase = mesa-aco-rc replaces = mesa-llvm replaces = mesa-llvm-rc replaces = mesa-git - source = https://archive.mesa3d.org/mesa-20.3.0-rc2.tar.xz - source = 0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch - source = 0003-evergreen-big-endian.patch - source = LICENSE - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP -pkgname = mesa-aco-rc +pkgname = lib32-mesa-aco-rc + pkgdesc = Mesa rc release. ACO enable by default. More options are enable than the standard mesa package. (32-bit) + depends = lib32-libdrm + depends = lib32-libelf + depends = lib32-libglvnd + depends = libomxil-bellagio + depends = lib32-libunwind + depends = lib32-libxdamage + depends = lib32-libxxf86vm + depends = lib32-llvm-libs + depends = lib32-lm_sensors + depends = lib32-wayland + depends = lib32-zstd + depends = lib32-libxshmfence + depends = libclc + depends = lib32-expat + depends = lib32-vulkan-icd-loader + provides = lib32-mesa + provides = lib32-opencl-mesa + provides = lib32-vulkan-intel + provides = lib32-vulkan-radeon + provides = lib32-vulkan-driver + provides = lib32-vulkan-mesa-layer + provides = lib32-libva-mesa-driver + provides = lib32-mesa-vdpau + provides = lib32-opengl-driver + provides = lib32-opencl-driver + provides = lib32-mesa-libgl + conflicts = lib32-mesa + conflicts = lib32-opencl-mesa + conflicts = lib32-vulkan-intel + conflicts = lib32-vulkan-radeon + conflicts = lib32-vulkan-mesa-layer + conflicts = lib32-libva-mesa-driver + conflicts = lib32-mesa-vdpau + conflicts = lib32-mesa-aco + conflicts = lib32-mesa-llvm + conflicts = lib32-mesa-llvm-rc + conflicts = lib32-mesa-git + replaces = lib32-mesa + replaces = lib32-opencl-mesa + replaces = lib32-vulkan-intel + replaces = lib32-vulkan-radeon + replaces = lib32-vulkan-mesa-layer + replaces = lib32-libva-mesa-driver + replaces = lib32-mesa-vdpau + replaces = lib32-mesa-aco + replaces = lib32-mesa-llvm + replaces = lib32-mesa-llvm-rc + replaces = lib32-mesa-git diff --git a/0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch b/0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch deleted file mode 100644 index 7bccc532b088..000000000000 --- a/0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ddb159f7b8ead04b8ebfda0796bea8e9c6aee788 Mon Sep 17 00:00:00 2001 -From: Thomas Crider <gloriouseggroll@gmail.com> -Date: Thu, 16 Jul 2020 21:43:19 -0600 -Subject: [PATCH] util: workaround LTO compilation break since 18cb8f23 -To: wine-devel <wine-devel@winehq.org> - -Signed-off-by: Thomas Crider <gloriouseggroll@gmail.com> ---- - src/util/format/u_format.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h -index 4b182ff558d..1d7e50d5bc9 100644 ---- a/src/util/format/u_format.h -+++ b/src/util/format/u_format.h -@@ -406,7 +406,7 @@ struct util_format_description - - - const struct util_format_description * --util_format_description(enum pipe_format format) ATTRIBUTE_CONST; -+util_format_description(enum pipe_format format); - - - /* --- -2.26.2 - diff --git a/0003-evergreen-big-endian.patch b/0003-evergreen-big-endian.patch deleted file mode 100644 index ccf1717c7153..000000000000 --- a/0003-evergreen-big-endian.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0ec3bdb2264b491fd3f5dc4e638b4c12611ef219 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko <i.gnatenko.brain@gmail.com> -Date: Sun, 20 Mar 2016 13:27:45 +0100 -Subject: [PATCH 3/4] evergreen big endian - -Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> ---- - src/gallium/drivers/r600/r600_state_common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c -index cac240e..4b620a1 100644 ---- a/src/gallium/drivers/r600/r600_state_common.c -+++ b/src/gallium/drivers/r600/r600_state_common.c -@@ -2716,7 +2716,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma - - uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap) - { -- if (R600_BIG_ENDIAN) { -+ if (0 && R600_BIG_ENDIAN) { - switch(colorformat) { - /* 8-bit buffers. */ - case V_0280A0_COLOR_4_4: --- -2.7.4 - @@ -2,36 +2,26 @@ #Credits: Lone_Wolf <lone_wolf@klaas-de-kat.nl> ---> For the base PKGBULD #Credits: Laurent Carlier <lordheavym@gmail.com> ---> For the base PKGBUILD -pkgname=mesa-aco-rc +pkgbase=mesa-aco-rc +pkgname=("${pkgbase}" "lib32-${pkgbase}") pkgver=20.3.0_rc2 pkgrel=1 versiontag=20.3.0-rc2 -pkgdesc="Mesa rc release. ACO enable by default. More options are enable than the standard mesa package." arch=(x86_64) url="https://mesa3d.org/" license=('MIT') -depends=("libdrm" "libelf" "libglvnd" "libomxil-bellagio" "libunwind" "libxdamage" "libxxf86vm" "llvm-libs" "lm_sensors" "wayland" "zstd" "libxshmfence" - "libclc" "expat" "vulkan-icd-loader") makedepends=("bison" "flex" "valgrind" "meson" "ninja" "git" "ninjas2" "clang" "libxvmc" "python" "python-appdirs" "python-mako" "python-evdev" "elfutils" - "glslang" "libva" "libepoxy" "libxv" "libvdpau" "libx11" "libxml2" "libxrandr" "llvm" "libconfig" "gtk3" "wayland-protocols" "xorgproto") -conflicts=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco" "mesa-llvm" "mesa-llvm-rc" - "mesa-git") -replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco" "mesa-llvm" "mesa-llvm-rc" - "mesa-git") -provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" "opencl-driver" - "mesa-libgl") + "glslang" "libva" "libepoxy" "libxv" "libvdpau" "libx11" "libxml2" "libxrandr" "llvm" "libconfig" "gtk3" "wayland-protocols" "xorgproto" "lib32-flex" + "lib32-clang" "lib32-libxvmc" "lib32-elfutils" "lib32-libva" "lib32-libepoxy" "lib32-libxv" "lib32-libvdpau" "lib32-libx11" "lib32-libxml2" + "lib32-libxrandr" "lib32-llvm" "lib32-gtk3") source=("https://archive.mesa3d.org/mesa-${versiontag}.tar.xz" - "0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch" - "0003-evergreen-big-endian.patch" "LICENSE") md5sums=("SKIP" - "SKIP" - "SKIP" "SKIP") prepare(){ cd mesa-${versiontag} - + # Apply any patch local src for src in "${source[@]}"; do @@ -43,7 +33,17 @@ prepare(){ done } -build(){ +package_mesa-aco-rc(){ + pkgdesc="Mesa rc release. ACO enable by default. More options are enable than the standard mesa package." + depends=("libdrm" "libelf" "libglvnd" "libomxil-bellagio" "libunwind" "libxdamage" "libxxf86vm" "llvm-libs" "lm_sensors" "wayland" "zstd" "libxshmfence" + "libclc" "expat" "vulkan-icd-loader") + conflicts=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco" "mesa-llvm" "mesa-llvm-rc" + "mesa-git") + replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco" "mesa-llvm" "mesa-llvm-rc" + "mesa-git") + provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" "opencl-driver" + "mesa-libgl") + cd mesa-${versiontag} # remove build dir if there is one @@ -54,7 +54,7 @@ build(){ # create build dir msg2 "Create build dir" - mkdir -p -v build + mkdir build # build with meson msg2 "Build with meson" @@ -103,12 +103,10 @@ build(){ -Dxlib-lease=enabled \ -Dglx-direct=true \ -Dzstd=enabled -} -package(){ # compiling mesa and installing to "$pkgdir" msg2 "Compiling mesa and installing to ${pkgdir}" - DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C mesa-${versiontag}/build/ install + DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C build/ install # remove script file from /usr/bin msg2 "Remove ${pkgdir}/usr/bin/mesa-overlay-control.py" @@ -121,5 +119,116 @@ package(){ # installing license install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/ - cp -v -r "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/ + cp "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/ +} + +package_lib32-mesa-aco-rc(){ + pkgdesc="Mesa rc release. ACO enable by default. More options are enable than the standard mesa package. (32-bit)" + depends=("lib32-libdrm" "lib32-libelf" "lib32-libglvnd" "libomxil-bellagio" "lib32-libunwind" "lib32-libxdamage" "lib32-libxxf86vm" "lib32-llvm-libs" + "lib32-lm_sensors" "lib32-wayland" "lib32-zstd" "lib32-libxshmfence" "libclc" "lib32-expat" "lib32-vulkan-icd-loader") + conflicts=("lib32-mesa" "lib32-opencl-mesa" "lib32-vulkan-intel" "lib32-vulkan-radeon" "lib32-vulkan-mesa-layer" "lib32-libva-mesa-driver" "lib32-mesa-vdpau" + "lib32-mesa-aco" "lib32-mesa-llvm" "lib32-mesa-llvm-rc" "lib32-mesa-git") + replaces=("lib32-mesa" "lib32-opencl-mesa" "lib32-vulkan-intel" "lib32-vulkan-radeon" "lib32-vulkan-mesa-layer" "lib32-libva-mesa-driver" "lib32-mesa-vdpau" + "lib32-mesa-aco" "lib32-mesa-llvm" "lib32-mesa-llvm-rc" "lib32-mesa-git") + provides=("lib32-mesa" "lib32-opencl-mesa" "lib32-vulkan-intel" "lib32-vulkan-radeon" "lib32-vulkan-driver" "lib32-vulkan-mesa-layer" "lib32-libva-mesa-driver" + "lib32-mesa-vdpau" "lib32-opengl-driver" "lib32-opencl-driver" "lib32-mesa-libgl") + +export CC="gcc -m32" +export CXX="g++ -m32" +export PKG_CONFIG=/usr/bin/i686-pc-linux-gnu-pkg-config +cat >crossfile.ini <<END +[binaries] +llvm-config = '/usr/bin/llvm-config32' +END + + cd mesa-${versiontag} + + # remove build dir if there is one + msg2 "remove build dir if there is one" + if dir build; then + rm -rf build + fi + + # create build dir + msg2 "Create build dir" + mkdir build + + # build with meson + msg2 "Build with meson" + meson build \ + --native-file ../crossfile.ini \ + --libdir=/usr/lib32 \ + -D b_ndebug=true \ + -D b_lto=true \ + -D buildtype=plain \ + --wrap-mode=nofallback \ + -D sysconfdir=/etc \ + -Dprefix=/usr \ + -Dplatforms=x11,wayland \ + -Ddri3=enabled \ + -Ddri-drviers=i915,i965,r100,r200,nouveau \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink,freedreno,v3d,vc4,etnaviv,tegra,kmsro \ + -Dgallium-extra-hud=true \ + -Dgallium-vdpau=enabled \ + -Dgallium-xvmc=enabled \ + -Dgallium-omx=auto \ + -Dgallium-va=enabled \ + -Dgallium-xa=enabled \ + -Dgallium-nine=true \ + -Dgallium-opencl=icd \ + -Dopencl-spirv=false \ + -Dvulkan-drivers=amd,intel \ + -Dshader-cache=enabled \ + -Dvulkan-overlay-layer=true \ + -Dvulkan-device-select-layer=true \ + -Dshared-glapi=enabled \ + -Dgles1=enabled \ + -Dgles2=enabled \ + -Dopengl=true \ + -Dgbm=enabled \ + -Dglx=dri \ + -Degl=enabled \ + -Dglvnd=true \ + -Dllvm=enabled \ + -Dshared-llvm=disabled \ + -Dvalgrind=disabled \ + -Dlibunwind=enabled \ + -Dlmsensors=enabled \ + -Dselinux=false \ + -Dosmesa=gallium \ + -Dswr-arches=avx,avx2,knl,skx \ + -Dshared-swr=true \ + -Dpower8=enabled \ + -Dxlib-lease=enabled \ + -Dglx-direct=true \ + -Dzstd=enabled + + # compiling mesa and installing to "$pkgdir" + msg2 "Compiling mesa and installing to ${pkgdir}" + DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C build/ install + + #Remove files provided by standard mesa build + msg2 "Remove files provided by standard mesa build" + rm -rf "$pkgdir"/etc + rm -rf "$pkgdir"/usr/include + rm -rf "$pkgdir"/usr/share/glvnd + rm -rf "$pkgdir"/usr/share/drirc.d + rm -rf "$pkgdir"/usr/share/freedreno + rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d + rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json + rm -rf "$pkgdir"/usr/share/vulkan/implicit_layer.d + rm -rf "$pkgdir"/usr/share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json + + # remove script file from /usr/bin + msg2 "Remove ${pkgdir}/usr/bin/mesa-overlay-control.py" + rm "${pkgdir}/usr/bin/mesa-overlay-control.py" + msg2 "Remove ${pkgdir}/usr/bin" + rm -rf "${pkgdir}/usr/bin" + + # indirect rendering + ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0" + + # installing license + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/ + cp "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/ } |