Skip to content

Commit

Permalink
fix wayland pacdeps breaks KDE
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xdavius
Xdavius committed Sep 15, 2024
1 parent b302051 commit 6477e3d
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 75 deletions.
62 changes: 30 additions & 32 deletions packages/mesa-kisak-fresh/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = mesa-kisak-fresh
gives = mesa-kisak-fresh
pkgver = 24.2.1
pkgver = 24.2.2
pkgdesc = Mesa Fresh from Kisak PPA Sources - No opencl
url = https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa
arch = amd64
Expand Down Expand Up @@ -75,6 +75,7 @@ pkgbase = mesa-kisak-fresh
makedepends = libudev-dev
makedepends = libxatracker-dev
makedepends = libwayland-dev
makedepends = libwayland-egl-backend-dev
makedepends = libclc-15-dev
makedepends = libclc-15
makedepends = libclang-15-dev
Expand All @@ -90,7 +91,6 @@ pkgbase = mesa-kisak-fresh
pacdeps = meson-git
pacdeps = directx-headers-git
pacdeps = rust-bindgen-git
pacdeps = wayland
replaces = libxatracker2
replaces = libxatracker-dev
replaces = libd3dadapter9-mesa
Expand Down Expand Up @@ -118,39 +118,37 @@ pkgbase = mesa-kisak-fresh
replaces = mesa-vulkan-drivers
replaces = mesa-opencl-icd
replaces = mesa-drm-shim
replaces = wayland-protocols
provides = libxatracker2=24.2.1
provides = libxatracker-dev=24.2.1
provides = libd3dadapter9-mesa=24.2.1
provides = libd3dadapter9-mesa-dev=24.2.1
provides = libgbm1=24.2.1
provides = libgbm-dev=24.2.1
provides = libegl-mesa0=24.2.1
provides = libegl1-mesa=24.2.1
provides = libegl1-mesa-dev=24.2.1
provides = libwayland-egl1-mesa=24.2.1
provides = libgles2-mesa=24.2.1
provides = libgles2-mesa-dev=24.2.1
provides = libglapi-mesa=24.2.1
provides = libglx-mesa0=24.2.1
provides = libgl1-mesa-glx=24.2.1
provides = libgl1-mesa-dri=24.2.1
provides = libgl1-mesa-dev=24.2.1
provides = mesa-common-dev=24.2.1
provides = mesa-libgallium=24.2.1
provides = libosmesa6=24.2.1
provides = libosmesa6-dev=24.2.1
provides = mesa-teflon-delegate=24.2.1
provides = mesa-va-drivers=24.2.1
provides = mesa-vdpau-drivers=24.2.1
provides = mesa-vulkan-drivers=24.2.1
provides = mesa-opencl-icd=24.2.1
provides = mesa-drm-shim=24.2.1
provides = wayland-protocols=24.2.1
provides = libxatracker2=24.2.2
provides = libxatracker-dev=24.2.2
provides = libd3dadapter9-mesa=24.2.2
provides = libd3dadapter9-mesa-dev=24.2.2
provides = libgbm1=24.2.2
provides = libgbm-dev=24.2.2
provides = libegl-mesa0=24.2.2
provides = libegl1-mesa=24.2.2
provides = libegl1-mesa-dev=24.2.2
provides = libwayland-egl1-mesa=24.2.2
provides = libgles2-mesa=24.2.2
provides = libgles2-mesa-dev=24.2.2
provides = libglapi-mesa=24.2.2
provides = libglx-mesa0=24.2.2
provides = libgl1-mesa-glx=24.2.2
provides = libgl1-mesa-dri=24.2.2
provides = libgl1-mesa-dev=24.2.2
provides = mesa-common-dev=24.2.2
provides = mesa-libgallium=24.2.2
provides = libosmesa6=24.2.2
provides = libosmesa6-dev=24.2.2
provides = mesa-teflon-delegate=24.2.2
provides = mesa-va-drivers=24.2.2
provides = mesa-vdpau-drivers=24.2.2
provides = mesa-vulkan-drivers=24.2.2
provides = mesa-opencl-icd=24.2.2
provides = mesa-drm-shim=24.2.2
compatible = debian:bookworm
compatible = ubuntu:jammy
maintainer = xdavius <[email protected]>
repology = project: mesa
source = https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa/+sourcefiles/mesa/24.2.1~kisak1~j/mesa_24.2.1~kisak1~j.tar.xz
source = https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa/+sourcefiles/mesa/24.2.2~kisak1~j/mesa_24.2.2~kisak1~j.tar.xz

pkgname = mesa-kisak-fresh
15 changes: 4 additions & 11 deletions packages/mesa-kisak-fresh/mesa-kisak-fresh.pacscript
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
pkgname="mesa-kisak-fresh"
gives="mesa-kisak-fresh"
pkgver="24.2.1"
pkgver="24.2.2"
pkgdesc="Mesa Fresh from Kisak PPA Sources - No opencl"
arch=('amd64')
external_connection=true
url='https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa'
source=("https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa/+sourcefiles/mesa/${pkgver}~kisak1~j/mesa_${pkgver}~kisak1~j.tar.xz")
sha256sum=("a84852fa3e791713600d3f6fd0c26e1ab00c9efe75ff880ff616ff5100df8b49")
Expand Down Expand Up @@ -71,7 +70,6 @@ provides=(
"mesa-vulkan-drivers=${pkgver}"
"mesa-opencl-icd=${pkgver}"
"mesa-drm-shim=${pkgver}"
"wayland-protocols=${pkgver}"
)

replaces=(
Expand Down Expand Up @@ -102,7 +100,6 @@ replaces=(
"mesa-vulkan-drivers"
"mesa-opencl-icd"
"mesa-drm-shim"
"wayland-protocols"
)

makedepends=(
Expand Down Expand Up @@ -145,6 +142,7 @@ makedepends=(
"libudev-dev"
"libxatracker-dev"
"libwayland-dev"
"libwayland-egl-backend-dev"
"libclc-15-dev"
"libclc-15"
"libclang-15-dev"
Expand All @@ -158,19 +156,14 @@ makedepends=(
"glslang-tools"
)

# Packages replaced by pacdeps : "rustc" "rustfmt" "bindgen" "directx-headers-dev" "meson" "libwayland-dev" "libwayland-egl-backend-dev"
# Provided by subprojects : "wayland-protocols"

pacdeps=("libdrm" "meson-git" "directx-headers-git" "rust-bindgen-git" "wayland")

# Packages replaced by pacdeps : "rustc" "rustfmt" "bindgen" "directx-headers-dev" "meson"
pacdeps=("libdrm" "meson-git" "directx-headers-git" "rust-bindgen-git")
repology=("project: mesa")
maintainer=("xdavius <[email protected]>")

compatible=("debian:bookworm" "ubuntu:jammy")

prepare() {

cp "${srcdir}"/llvm.native "${srcdir}"/mesa-j/llvm.native
cd "mesa-j"
cp debian/patches/* ./
for patch in *.patch; do
Expand Down
62 changes: 30 additions & 32 deletions srclist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6028,7 +6028,7 @@ pkgname = megasync-deb
---
pkgbase = mesa-kisak-fresh
gives = mesa-kisak-fresh
pkgver = 24.2.1
pkgver = 24.2.2
pkgdesc = Mesa Fresh from Kisak PPA Sources - No opencl
url = https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa
arch = amd64
Expand Down Expand Up @@ -6103,6 +6103,7 @@ pkgbase = mesa-kisak-fresh
makedepends = libudev-dev
makedepends = libxatracker-dev
makedepends = libwayland-dev
makedepends = libwayland-egl-backend-dev
makedepends = libclc-15-dev
makedepends = libclc-15
makedepends = libclang-15-dev
Expand All @@ -6118,7 +6119,6 @@ pkgbase = mesa-kisak-fresh
pacdeps = meson-git
pacdeps = directx-headers-git
pacdeps = rust-bindgen-git
pacdeps = wayland
replaces = libxatracker2
replaces = libxatracker-dev
replaces = libd3dadapter9-mesa
Expand Down Expand Up @@ -6146,40 +6146,38 @@ pkgbase = mesa-kisak-fresh
replaces = mesa-vulkan-drivers
replaces = mesa-opencl-icd
replaces = mesa-drm-shim
replaces = wayland-protocols
provides = libxatracker2=24.2.1
provides = libxatracker-dev=24.2.1
provides = libd3dadapter9-mesa=24.2.1
provides = libd3dadapter9-mesa-dev=24.2.1
provides = libgbm1=24.2.1
provides = libgbm-dev=24.2.1
provides = libegl-mesa0=24.2.1
provides = libegl1-mesa=24.2.1
provides = libegl1-mesa-dev=24.2.1
provides = libwayland-egl1-mesa=24.2.1
provides = libgles2-mesa=24.2.1
provides = libgles2-mesa-dev=24.2.1
provides = libglapi-mesa=24.2.1
provides = libglx-mesa0=24.2.1
provides = libgl1-mesa-glx=24.2.1
provides = libgl1-mesa-dri=24.2.1
provides = libgl1-mesa-dev=24.2.1
provides = mesa-common-dev=24.2.1
provides = mesa-libgallium=24.2.1
provides = libosmesa6=24.2.1
provides = libosmesa6-dev=24.2.1
provides = mesa-teflon-delegate=24.2.1
provides = mesa-va-drivers=24.2.1
provides = mesa-vdpau-drivers=24.2.1
provides = mesa-vulkan-drivers=24.2.1
provides = mesa-opencl-icd=24.2.1
provides = mesa-drm-shim=24.2.1
provides = wayland-protocols=24.2.1
provides = libxatracker2=24.2.2
provides = libxatracker-dev=24.2.2
provides = libd3dadapter9-mesa=24.2.2
provides = libd3dadapter9-mesa-dev=24.2.2
provides = libgbm1=24.2.2
provides = libgbm-dev=24.2.2
provides = libegl-mesa0=24.2.2
provides = libegl1-mesa=24.2.2
provides = libegl1-mesa-dev=24.2.2
provides = libwayland-egl1-mesa=24.2.2
provides = libgles2-mesa=24.2.2
provides = libgles2-mesa-dev=24.2.2
provides = libglapi-mesa=24.2.2
provides = libglx-mesa0=24.2.2
provides = libgl1-mesa-glx=24.2.2
provides = libgl1-mesa-dri=24.2.2
provides = libgl1-mesa-dev=24.2.2
provides = mesa-common-dev=24.2.2
provides = mesa-libgallium=24.2.2
provides = libosmesa6=24.2.2
provides = libosmesa6-dev=24.2.2
provides = mesa-teflon-delegate=24.2.2
provides = mesa-va-drivers=24.2.2
provides = mesa-vdpau-drivers=24.2.2
provides = mesa-vulkan-drivers=24.2.2
provides = mesa-opencl-icd=24.2.2
provides = mesa-drm-shim=24.2.2
compatible = debian:bookworm
compatible = ubuntu:jammy
maintainer = xdavius <[email protected]>
repology = project: mesa
source = https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa/+sourcefiles/mesa/24.2.1~kisak1~j/mesa_24.2.1~kisak1~j.tar.xz
source = https://launchpad.net/~kisak/+archive/ubuntu/kisak-mesa/+sourcefiles/mesa/24.2.2~kisak1~j/mesa_24.2.2~kisak1~j.tar.xz

pkgname = mesa-kisak-fresh
---
Expand Down

0 comments on commit 6477e3d

Please sign in to comment.