From b470014a08c22d26a750da82becca1a999d57f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 11 Apr 2020 16:52:43 -0300 Subject: [PATCH] mesa: remove dummy transitional packages --- srcpkgs/mesa-ati-dri | 1 - srcpkgs/mesa-etnaviv-dri | 1 - srcpkgs/mesa-freedreno-dri | 1 - srcpkgs/mesa-intel-dri | 1 - srcpkgs/mesa-kmsro-dri | 1 - srcpkgs/mesa-lima-dri | 1 - srcpkgs/mesa-nouveau-dri | 1 - srcpkgs/mesa-panfrost-dri | 1 - srcpkgs/mesa-tegra-dri | 1 - srcpkgs/mesa-v3d-dri | 1 - srcpkgs/mesa-vc4-dri | 1 - srcpkgs/mesa-vmwgfx-dri | 1 - srcpkgs/mesa/template | 95 +------------------------------------- 13 files changed, 1 insertion(+), 106 deletions(-) delete mode 120000 srcpkgs/mesa-ati-dri delete mode 120000 srcpkgs/mesa-etnaviv-dri delete mode 120000 srcpkgs/mesa-freedreno-dri delete mode 120000 srcpkgs/mesa-intel-dri delete mode 120000 srcpkgs/mesa-kmsro-dri delete mode 120000 srcpkgs/mesa-lima-dri delete mode 120000 srcpkgs/mesa-nouveau-dri delete mode 120000 srcpkgs/mesa-panfrost-dri delete mode 120000 srcpkgs/mesa-tegra-dri delete mode 120000 srcpkgs/mesa-v3d-dri delete mode 120000 srcpkgs/mesa-vc4-dri delete mode 120000 srcpkgs/mesa-vmwgfx-dri diff --git a/srcpkgs/mesa-ati-dri b/srcpkgs/mesa-ati-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-ati-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-etnaviv-dri b/srcpkgs/mesa-etnaviv-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-etnaviv-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-freedreno-dri b/srcpkgs/mesa-freedreno-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-freedreno-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-intel-dri b/srcpkgs/mesa-intel-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-intel-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-kmsro-dri b/srcpkgs/mesa-kmsro-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-kmsro-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-lima-dri b/srcpkgs/mesa-lima-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-lima-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-nouveau-dri b/srcpkgs/mesa-nouveau-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-nouveau-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-panfrost-dri b/srcpkgs/mesa-panfrost-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-panfrost-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-tegra-dri b/srcpkgs/mesa-tegra-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-tegra-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-v3d-dri b/srcpkgs/mesa-v3d-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-v3d-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-vc4-dri b/srcpkgs/mesa-vc4-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-vc4-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa-vmwgfx-dri b/srcpkgs/mesa-vmwgfx-dri deleted file mode 120000 index 1ad1bbec7ab..00000000000 --- a/srcpkgs/mesa-vmwgfx-dri +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 508cb8d6684..5bf754668f8 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,7 +1,7 @@ # Template file for 'mesa' pkgname=mesa version=20.0.4 -revision=1 +revision=2 wrksrc="mesa-${version}" build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true @@ -48,8 +48,6 @@ i686*|x86_64*) makedepends+=" libclc-git" subpackages+=" libxatracker mesa-opencl mesa-dri mesa-vaapi mesa-vdpau" subpackages+=" mesa-XvMC mesa-vulkan-intel mesa-vulkan-radeon mesa-vulkan-overlay-layer" - # Transitional dummy packages - subpackages+=" mesa-ati-dri mesa-intel-dri mesa-nouveau-dri mesa-vmwgfx-dri" ;; ppc*) # Enable all ppc drivers. @@ -67,8 +65,6 @@ ppc*) makedepends+=" libclc-git" subpackages+=" mesa-opencl mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon" subpackages+=" mesa-vulkan-overlay-layer" - # Transitional dummy packages - subpackages+=" mesa-ati-dri mesa-nouveau-dri" ;; aarch64*) # Enable all ARM drivers @@ -76,17 +72,12 @@ aarch64*) configure_args+=" -Dvulkan-drivers= -Ddri-drivers=" configure_args+=" -Dgallium-xa=false -Ddri3=true" subpackages+=" mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC" - # Transitional dummy packages - subpackages+=" mesa-kmsro-dri mesa-tegra-dri mesa-nouveau-dri mesa-v3d-dri mesa-vc4-dri" - subpackages+=" mesa-etnaviv-dri mesa-freedreno-dri mesa-lima-dri mesa-panfrost-dri" ;; armv7l*) configure_args+=" -Dgallium-drivers=auto" configure_args+=" -Dvulkan-drivers= -Ddri-drivers= -Dgallium-xvmc=false" configure_args+=" -Dgallium-xa=false -Dgallium-vdpau=false -Dgallium-va=false" subpackages+=" mesa-dri" - # Transitional dummy packages - subpackages+=" mesa-etnaviv-dri mesa-freedreno-dri mesa-kmsro-dri mesa-lima-dri mesa-panfrost-dri mesa-vc4-dri" ;; *) # Enable swrast driver. @@ -257,87 +248,3 @@ mesa-vulkan-overlay-layer_package() { vmove usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json } } - -mesa-ati-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)" - depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon" -} - -mesa-etnaviv-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)" - depends="mesa-dri" -} - -mesa-freedreno-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)" - depends="mesa-dri" -} - -mesa-intel-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)" - depends="mesa-dri mesa-vulkan-intel" -} - -mesa-kmsro-dri_package() { - build_style=meta - lib32mode=full - short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)" - depends="mesa-dri" -} - -mesa-lima-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)" - depends="mesa-dri" -} - -mesa-nouveau-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)" - depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC" -} - -mesa-panfrost-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)" - depends="mesa-dri" -} - -mesa-tegra-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)" - depends="mesa-dri" -} - -mesa-v3d-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)" - depends="mesa-dri" -} - -mesa-vmwgfx-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for VMware (transitional dummy package)" - depends="mesa-dri" -} - -mesa-vc4-dri_package() { - build_style=meta - lib32mode=full - short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)" - depends="mesa-dri" -}