diff --git a/debian/control b/debian/control index 9b24da6..70a0f15 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: libva-dev (>= 1.6.0) [linux-any kfreebsd-any] , libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any], libvulkan-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + vulkan-headers [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], x11proto-dev, linux-libc-dev (>= 2.6.31) [linux-any], libx11-xcb-dev, @@ -41,23 +42,24 @@ Build-Depends: python3-ply, python3-setuptools, flex, + spirv-tools, bison, libelf-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], libwayland-dev (>= 1.15.0) [linux-any], libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-cpp15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-17-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-17-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-cpp17-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-17-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], wayland-protocols (>= 1.24), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x], rustc [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x], bindgen [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x], - llvm-spirv-15 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x], - libclc-15 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x], - libllvmspirvlib-15-dev, + llvm-spirv-17 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x], + libclc-17 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x], + libllvmspirvlib-17-dev, Rules-Requires-Root: no Vcs: https://salsa.debian.org/xorg-team/lib/mesa.git Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa @@ -563,7 +565,7 @@ Section: libs Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 Pre-Depends: ${misc:Pre-Depends} Depends: libmesa-git, - libclc-15, + libclc-17, ocl-icd-libopencl1 | libopencl1, ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/control.in b/debian/control.in index 2ba8753..892af5d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -22,6 +22,7 @@ Build-Depends: libva-dev (>= 1.6.0) [linux-any kfreebsd-any] , libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any], libvulkan-dev [@LLVM_ARCHS@], + vulkan-headers [@LLVM_ARCHS@], x11proto-dev, linux-libc-dev (>= 2.6.31) [linux-any], libx11-xcb-dev, @@ -41,6 +42,7 @@ Build-Depends: python3-ply, python3-setuptools, flex, + spirv-tools, bison, libelf-dev [@LLVM_ARCHS@], libwayland-dev (>= 1.15.0) [linux-any], diff --git a/debian/rules b/debian/rules index 23ba3fa..52309f1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) # for finding the correct llvm-config when meson doesn't know about it yet -LLVM_VERSION = 15 +LLVM_VERSION = 17 export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH) export DEB_BUILD_MAINT_OPTIONS=optimize=-lto @@ -54,7 +54,7 @@ LLVM_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc6 RUSTICL_ARCHS = amd64 arm64 armel armhf mips64el mipsel ppc64el s390x #ifeq ($(DEB_DISTRIBUTION), jammy) # RUSTICL_ARCHS = arm64 -#else +#endif VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x WINE_ARCHS = amd64 arm64 armel armhf i386 powerpc @@ -90,7 +90,8 @@ else # Freedreno requires arm in addition ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU))) - GALLIUM_DRIVERS += freedreno asahi +# GALLIUM_DRIVERS += freedreno asahi #9697 + GALLIUM_DRIVERS += freedreno endif # etnaviv, tegra, vc4 and v3d kernel support are only available on armhf and arm64 @@ -170,9 +171,10 @@ else endif endif -ifeq ($(DEB_HOST_ARCH), i386) - confflags_SSE2 = -Dsse2=false -endif +# bug #9762 +#ifeq ($(DEB_HOST_ARCH), i386) +# confflags_SSE2 = -Dsse2=false +#endif empty:= space := $(empty) $(empty) diff --git a/main.sh b/main.sh index 51f6509..db219de 100755 --- a/main.sh +++ b/main.sh @@ -8,7 +8,7 @@ cd ./mesa-git git submodule update --init sed -i ' 1 s/.*/& - PikaOS YellowBirb Mesa Git /' ./VERSION touch debian/changelog -echo -e "mesa-git (23.3-99pika"$(date '+%Y%m%d')".git.1."$(git rev-parse --short HEAD)") lunar; urgency=medium\n\n * New GIT Release\n\n -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog +echo -e "mesa-git (23.3-100pika"$(date '+%Y%m%d')".git.1."$(git rev-parse --short HEAD)") lunar; urgency=medium\n\n * New GIT Release\n\n -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog # Get build deps apt-get build-dep ./ -y diff --git a/main32.sh b/main32.sh index 51f6509..db219de 100755 --- a/main32.sh +++ b/main32.sh @@ -8,7 +8,7 @@ cd ./mesa-git git submodule update --init sed -i ' 1 s/.*/& - PikaOS YellowBirb Mesa Git /' ./VERSION touch debian/changelog -echo -e "mesa-git (23.3-99pika"$(date '+%Y%m%d')".git.1."$(git rev-parse --short HEAD)") lunar; urgency=medium\n\n * New GIT Release\n\n -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog +echo -e "mesa-git (23.3-100pika"$(date '+%Y%m%d')".git.1."$(git rev-parse --short HEAD)") lunar; urgency=medium\n\n * New GIT Release\n\n -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog # Get build deps apt-get build-dep ./ -y diff --git a/release.sh b/release.sh index 5c59923..1575255 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,7 @@ rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ # add debs to repo -ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-main /srv/www/incoming/' +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/' # publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:' \ No newline at end of file