Skip to content

Commit

Permalink
Merge pull request #3146 from mariux64/update-to-clang-18.1.8-and-mes…
Browse files Browse the repository at this point in the history
…a-24.1.5

Update to clang 18.1.8 and Mesa 24.1.5
  • Loading branch information
pmenzel authored Aug 16, 2024
2 parents cd4ca02 + 9b05cbe commit 65695e8
Show file tree
Hide file tree
Showing 12 changed files with 180 additions and 23 deletions.
7 changes: 4 additions & 3 deletions clang.be0
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env beesh

# BEE_VERSION clang-14.0.6-0
# BEE_VERSION clang-18.1.8-0

#SRCURL[0]="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PKGVERSION}/clang-${PKGVERSION}.src.tar.xz"
#SRCURL[0]="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PKGVERSION}/llvm-project-${PKGVERSION}.src.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/0b3373eded268dc27e2e874872fed4eb/llvm-project-14.0.6.src.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/81cd0be5ae6f1ad8961746116d426a96/llvm-project-18.1.8.src.tar.xz"

# build_in_sourcedir

Expand All @@ -27,7 +27,8 @@ sourcesubdir_append clang
mee_configure() {
bee_configure \
-DCLANG_PATH_TO_LLVM_BUILD=$(llvm-config --prefix) \
-DLLVM_MAIN_SRC_DIR=$(llvm-config --prefix)
-DLLVM_MAIN_SRC_DIR=$(llvm-config --prefix) \
-DLLVM_INCLUDE_TESTS=OFF
}

#mee_build() {
Expand Down
39 changes: 39 additions & 0 deletions glslang.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/usr/bin/env beesh

# BEE_VERSION glslang-14.3.0-0

#SRCURL[0]="https://github.com/KhronosGroup/glslang/archive/${PKGVERSION}/glslang-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/90eec8d14a8d1002389e00ab449c7ca8/glslang-14.3.0.tar.gz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure \
-D ALLOW_EXTERNAL_SPIRV_TOOLS=ON \
-D BUILD_SHARED_LIBS=ON \
-D GLSLANG_TESTS=ON
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}
2 changes: 1 addition & 1 deletion libclc.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION libclc-12.0.1-0
# BEE_VERSION libclc-18.1.8-0

SRCURL[0]="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PKGVERSION}/libclc-${PKGVERSION}.src.tar.xz"

Expand Down
4 changes: 2 additions & 2 deletions libdrm.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION libdrm-2.4.116-0
# BEE_VERSION libdrm-2.4.122-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand All @@ -10,7 +10,7 @@
## downloaded. Version variables may be used to simplify reuse of this bee-file.

#SRCURL[0]="https://dri.freedesktop.org/libdrm/libdrm-${PKGVERSION}.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/1e4e75070b8c5cb1e828cef1d704f734/libdrm-2.4.116.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/143c8df50e09cd1eeb1fb53f05ecb64a/libdrm-2.4.122.tar.xz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand Down
8 changes: 4 additions & 4 deletions libvdpau.be0
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION libvdpau-1.1.1-1
# BEE_VERSION libvdpau-1.5-0

#RCURL[0]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/ac8b21012035c04fd1ec8a9ae6934264/libvdpau-1.1.1.tar.gz"
SRCURL[0]="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.5/libvdpau-1.5.tar.bz2"
#SRCURL[0]="https://beehive.molgen.mpg.de/ac8b21012035c04fd1ec8a9ae6934264/libvdpau-1.1.1.tar.gz"

# PATCHURL+=()

Expand All @@ -23,7 +23,7 @@ SRCURL[0]="https://beehive.molgen.mpg.de/ac8b21012035c04fd1ec8a9ae6934264/libvdp
#}

#mee_configure() {
# bee_configure
# bee_configure
#}

#mee_build() {
Expand Down
4 changes: 2 additions & 2 deletions llvm.be0
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION llvm-14.0.6-0
# BEE_VERSION llvm-18.1.8-0

#SRCURL[0]="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PKGVERSION}/llvm-project-${PKGVERSION}.src.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/0b3373eded268dc27e2e874872fed4eb/llvm-project-14.0.6.src.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/81cd0be5ae6f1ad8961746116d426a96/llvm-project-18.1.8.src.tar.xz"

# PATCHURL+=()

Expand Down
10 changes: 6 additions & 4 deletions mesalib.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION mesalib-22.1.7-0
# BEE_VERSION mesalib-24.1.5-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand All @@ -9,7 +9,8 @@
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

SRCURL[0]="https://mesa.freedesktop.org/archive/mesa-${PKGVERSION}.tar.xz"
#SRCURL[0]="https://mesa.freedesktop.org/archive/mesa-${PKGVERSION}.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/0f4de2192e63b438637b98937ac85a10/mesa-24.1.5.tar.xz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand Down Expand Up @@ -61,8 +62,9 @@ mee_configure() {
-Dgallium-va=enabled \
-Dvulkan-drivers="amd,intel" \
-Dosmesa=true \
-Dvalgrind=false \
-Dglvnd=true
-Dvalgrind=disabled \
-Dglvnd=enabled \
-Dintel-rt=disabled
}

#mee_build() {
Expand Down
36 changes: 36 additions & 0 deletions spirv-headers.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env beesh

# BEE_VERSION spirv-headers-1.3.290.0-0

#SRCURL[0]="https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-${PKGVERSION}/SPIRV-Headers-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/e9da8c949d89084b8a0a6b128ca6a30d/SPIRV-Headers-1.3.290.0.tar.gz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}
39 changes: 39 additions & 0 deletions spirv-llvm-translator.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/usr/bin/env beesh

# BEE_VERSION spirv-llvm-translator-18.1.3-0

#SRCURL[0]="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v${PKGVERSION}/SPIRV-LLVM-Translator-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/094ff60909ada1e76e87da90df053be6/SPIRV-LLVM-Translator-18.1.3.tar.gz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure \
-D BUILD_SHARED_LIBS=ON \
-D CMAKE_SKIP_INSTALL_RPATH=ON \
-D LLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}
40 changes: 40 additions & 0 deletions spirv-tools.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/usr/bin/env beesh

# BEE_VERSION spirv-tools-1.3.290.0-0

#SRCURL[0]="https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-${PKGVERSION}/SPIRV-Tools-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/4a3f873a07f33cffd70890e17a34fe8b/SPIRV-Tools-1.3.290.0.tar.gz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure \
-D SPIRV_WERROR=OFF \
-D BUILD_SHARED_LIBS=ON \
-D SPIRV_TOOLS_BUILD_STATIC=OFF \
-D SPIRV-Headers_SOURCE_DIR=${PREFIX}
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}
6 changes: 3 additions & 3 deletions wayland-protocols.be0
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION wayland-protocols-1.25-0
# BEE_VERSION wayland-protocols-1.35-0

# SRCURL[0]="https://wayland.freedesktop.org/releases/wayland-protocols-${PKGVERSION}.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/0c192bf32de09ec30de4a82d1c65329c/wayland-protocols-1.25.tar.xz"
#SRCURL[0]="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PKGVERSION}/downloads/wayland-protocols-${PKGVERSION}.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/cd0f2a1ab6e54568e4f856f140dedca9/wayland-protocols-1.35.tar.xz"

# PATCHURL+=()

Expand Down
8 changes: 4 additions & 4 deletions wayland.be0
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION wayland-1.19.0-1
# BEE_VERSION wayland-1.23.0-0

# SRCURL[0]="https://wayland.freedesktop.org/releases/wayland-${PKGVERSION}.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/5d59ac3d8a8f4e42de2ceb8bb19dfca9/wayland-1.19.0.tar.xz"
#SRCURL[0]="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PKGVERSION}/downloads/wayland-${PKGVERSION}.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/23ad991e776ec8cf7e58b34cbd2efa75/wayland-1.23.0.tar.xz"

# PATCHURL+=()

Expand All @@ -21,7 +21,7 @@ SRCURL[0]="https://beehive.molgen.mpg.de/5d59ac3d8a8f4e42de2ceb8bb19dfca9/waylan

mee_configure() {
bee_configure \
--disable-static
-Ddocumentation=false
}

#mee_build() {
Expand Down

0 comments on commit 65695e8

Please sign in to comment.