From 57bdb1fa3c7a51a6abe99300a47a31f5f76c3f11 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Mon, 8 Feb 2021 03:47:37 +0300 Subject: mesa: move to extra --- extra/mesa/build | 42 ++++++++++++++++++++++++++++++++++++++++++ extra/mesa/checksums | 2 ++ extra/mesa/depends | 18 ++++++++++++++++++ extra/mesa/sources | 2 ++ extra/mesa/version | 1 + xorg/mesa/build | 42 ------------------------------------------ xorg/mesa/checksums | 2 -- xorg/mesa/depends | 18 ------------------ xorg/mesa/sources | 2 -- xorg/mesa/version | 1 - 10 files changed, 65 insertions(+), 65 deletions(-) create mode 100755 extra/mesa/build create mode 100644 extra/mesa/checksums create mode 100644 extra/mesa/depends create mode 100644 extra/mesa/sources create mode 100644 extra/mesa/version delete mode 100755 xorg/mesa/build delete mode 100644 xorg/mesa/checksums delete mode 100644 xorg/mesa/depends delete mode 100644 xorg/mesa/sources delete mode 100644 xorg/mesa/version diff --git a/extra/mesa/build b/extra/mesa/build new file mode 100755 index 00000000..62c7a81b --- /dev/null +++ b/extra/mesa/build @@ -0,0 +1,42 @@ +#!/bin/sh -e + +# Temporarily install python-mako to build mesa +( + cd mako + + python3 setup.py build + python3 setup.py install \ + --prefix=/usr \ + --root="$PWD/dist" + +) + +read -r _ pyver <<-EOF +$(python3 --version) +EOF + +PYTHONPATH="$PWD/mako/dist/usr/lib/python${pyver%.*}/site-packages:$(python -c "import sys; print(':'.join(sys.path))")" + +export PYTHONPATH +export DESTDIR="$1" +export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS" + +# Fix issues with musl and firefox. +# https://bugs.freedesktop.org/show_bug.cgi?id=35268 +# https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2 +sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build >_ +cat _ > meson.build; rm -f _ + +python3 bin/git_sha1_gen.py --output include/git_sha1.h + +meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + -Dplatforms=x11 \ + . output + +ninja -C output +ninja -C output install diff --git a/extra/mesa/checksums b/extra/mesa/checksums new file mode 100644 index 00000000..ebfd6ca7 --- /dev/null +++ b/extra/mesa/checksums @@ -0,0 +1,2 @@ +9c899b165497ccf816042a271ec9931d548c0a7734fb08e9945f0e9c31188b15 mesa-20.3.4.tar.gz +2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz diff --git a/extra/mesa/depends b/extra/mesa/depends new file mode 100644 index 00000000..07eef570 --- /dev/null +++ b/extra/mesa/depends @@ -0,0 +1,18 @@ +bison make +expat +flex make +libX11 +libXdamage +libXext +libXrandr +libXrender +libXxf86vm +libdrm +libelf +libxcb +libxshmfence +llvm +meson make +python make +xorgproto +zlib diff --git a/extra/mesa/sources b/extra/mesa/sources new file mode 100644 index 00000000..c5d4df2f --- /dev/null +++ b/extra/mesa/sources @@ -0,0 +1,2 @@ +https://github.com/mesa3d/mesa/archive/mesa-20.3.4.tar.gz +https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako diff --git a/extra/mesa/version b/extra/mesa/version new file mode 100644 index 00000000..971bebb1 --- /dev/null +++ b/extra/mesa/version @@ -0,0 +1 @@ +20.3.4 1 diff --git a/xorg/mesa/build b/xorg/mesa/build deleted file mode 100755 index 62c7a81b..00000000 --- a/xorg/mesa/build +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -e - -# Temporarily install python-mako to build mesa -( - cd mako - - python3 setup.py build - python3 setup.py install \ - --prefix=/usr \ - --root="$PWD/dist" - -) - -read -r _ pyver <<-EOF -$(python3 --version) -EOF - -PYTHONPATH="$PWD/mako/dist/usr/lib/python${pyver%.*}/site-packages:$(python -c "import sys; print(':'.join(sys.path))")" - -export PYTHONPATH -export DESTDIR="$1" -export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS" - -# Fix issues with musl and firefox. -# https://bugs.freedesktop.org/show_bug.cgi?id=35268 -# https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2 -sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build >_ -cat _ > meson.build; rm -f _ - -python3 bin/git_sha1_gen.py --output include/git_sha1.h - -meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --buildtype=release \ - -Dplatforms=x11 \ - . output - -ninja -C output -ninja -C output install diff --git a/xorg/mesa/checksums b/xorg/mesa/checksums deleted file mode 100644 index ebfd6ca7..00000000 --- a/xorg/mesa/checksums +++ /dev/null @@ -1,2 +0,0 @@ -9c899b165497ccf816042a271ec9931d548c0a7734fb08e9945f0e9c31188b15 mesa-20.3.4.tar.gz -2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz diff --git a/xorg/mesa/depends b/xorg/mesa/depends deleted file mode 100644 index 07eef570..00000000 --- a/xorg/mesa/depends +++ /dev/null @@ -1,18 +0,0 @@ -bison make -expat -flex make -libX11 -libXdamage -libXext -libXrandr -libXrender -libXxf86vm -libdrm -libelf -libxcb -libxshmfence -llvm -meson make -python make -xorgproto -zlib diff --git a/xorg/mesa/sources b/xorg/mesa/sources deleted file mode 100644 index c5d4df2f..00000000 --- a/xorg/mesa/sources +++ /dev/null @@ -1,2 +0,0 @@ -https://github.com/mesa3d/mesa/archive/mesa-20.3.4.tar.gz -https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako diff --git a/xorg/mesa/version b/xorg/mesa/version deleted file mode 100644 index 971bebb1..00000000 --- a/xorg/mesa/version +++ /dev/null @@ -1 +0,0 @@ -20.3.4 1 -- cgit v1.2.3