diff --git a/common/shlibs b/common/shlibs index 8aa95e103d7..6f9f14954a7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -951,6 +951,7 @@ libkeyutils.so.1 libkeyutils-1.5.5_1 libiptcdata.so.0 libiptcdata-1.0.4_1 libutempter.so.0 libutempter-1.1.5_1 libxatracker.so.1 MesaLib-7.11_1 +libdricore9.0.1.so.1 MesaLib-9.0.1_1 libtumbler-1.so.0 tumbler-4.9.2_1 libwebrtc_audio_processing.so.0 webrtc-audio-processing-0.1_1 libcupsmime.so.1 libcups-1.5.3_1 diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template index b6be2e0149d..3457ef7e4de 100644 --- a/srcpkgs/MesaLib/MesaLib-devel.template +++ b/srcpkgs/MesaLib/MesaLib-devel.template @@ -5,7 +5,8 @@ depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel libXt-devel libGL-${version}_${revision} libOpenVG-${version}_${revision} libGLES-${version}_${revision} libEGL-${version}_${revision} - libOSMesa-${version}_${revision} libgbm-${version}_${revision}" + libOSMesa-${version}_${revision} libgbm-${version}_${revision} + ${sourcepkg}-${version}_${revision}" short_desc="${short_desc} - development files" long_desc="${long_desc} diff --git a/srcpkgs/MesaLib/MesaLib.rshlibs b/srcpkgs/MesaLib/MesaLib.rshlibs index eb349022b92..d2b712aef4f 100644 --- a/srcpkgs/MesaLib/MesaLib.rshlibs +++ b/srcpkgs/MesaLib/MesaLib.rshlibs @@ -2,13 +2,3 @@ libstdc++.so.6 libm.so.6 libc.so.6 libgcc_s.so.1 -libexpat.so.1 -libpthread.so.0 -libdl.so.2 -libdrm_intel.so.1 -libdrm.so.2 -libdrm_nouveau.so.2 -libdrm_radeon.so.1 -libX11-xcb.so.1 -libxcb-dri2.so.0 -libXv.so.1 diff --git a/srcpkgs/MesaLib/libEGL.rshlibs b/srcpkgs/MesaLib/libEGL.rshlibs index 97f3aba27d1..0704a3d5cec 100644 --- a/srcpkgs/MesaLib/libEGL.rshlibs +++ b/srcpkgs/MesaLib/libEGL.rshlibs @@ -1,7 +1,5 @@ -libX11-xcb.so.1 -libxcb-dri2.so.0 -libxcb-xfixes.so.0 -libxcb.so.1 +libwayland-client.so.0 +libwayland-server.so.0 libX11.so.6 libpthread.so.0 libudev.so.1 @@ -9,8 +7,6 @@ libdl.so.2 libdrm.so.2 libc.so.6 libOpenVG.so.1 -libXext.so.6 -libXfixes.so.3 libdrm_nouveau.so.2 libdrm_radeon.so.1 libglapi.so.0 diff --git a/srcpkgs/MesaLib/libEGL.template b/srcpkgs/MesaLib/libEGL.template index e5232c5b8f5..420e93ac8ea 100644 --- a/srcpkgs/MesaLib/libEGL.template +++ b/srcpkgs/MesaLib/libEGL.template @@ -15,4 +15,5 @@ replaces="MesaLib<7.11_2" do_install() { vmove "usr/lib/libEGL*.so*" usr/lib vmove usr/lib/egl usr/lib + vmove "usr/lib/libwayland-egl.*" usr/lib } diff --git a/srcpkgs/MesaLib/libGL.INSTALL b/srcpkgs/MesaLib/libGL.INSTALL index 90cecd43fb7..b63bcbdca04 100644 --- a/srcpkgs/MesaLib/libGL.INSTALL +++ b/srcpkgs/MesaLib/libGL.INSTALL @@ -1,7 +1,7 @@ # Create libGL.so symlinks. case ${ACTION} in post) - if [ ! -e usr/lib/libGL-nvidia.so* ]; then + if [ ! -h usr/lib/libGL.so -a -h usr/lib/libGL.so.1 ]; then cd usr/lib ln -sf libGL-mesa.so* libGL.so ln -sf libGL-mesa.so* libGL.so.1 diff --git a/srcpkgs/MesaLib/libgbm.rshlibs b/srcpkgs/MesaLib/libgbm.rshlibs index 01d3d41f407..72164b73781 100644 --- a/srcpkgs/MesaLib/libgbm.rshlibs +++ b/srcpkgs/MesaLib/libgbm.rshlibs @@ -1,5 +1,4 @@ libudev.so.1 -libkms.so.1 libdl.so.2 libpthread.so.0 libc.so.6 diff --git a/srcpkgs/MesaLib/mesa-ati-dri.rshlibs b/srcpkgs/MesaLib/mesa-ati-dri.rshlibs new file mode 100644 index 00000000000..bddd9fd5e67 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-ati-dri.rshlibs @@ -0,0 +1,13 @@ +libdrm.so.2 +libdrm_radeon.so.1 +libX11-xcb.so.1 +libxcb-dri2.so.0 +libm.so.6 +libgcc_s.so.1 +libc.so.6 +libstdc++.so.6 +libXv.so.1 +libdricore9.0.1.so.1 +libexpat.so.1 +libpthread.so.0 +libdl.so.2 diff --git a/srcpkgs/MesaLib/mesa-ati-dri.template b/srcpkgs/MesaLib/mesa-ati-dri.template new file mode 100644 index 00000000000..c6f84f14be9 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-ati-dri.template @@ -0,0 +1,13 @@ +# Template file for 'mesa-ati-dri'. +# +short_desc="Mesa DRI drivers for ATI GPUs" +long_desc=" + This package contains the ${short_desc}." + +do_install() { + vmove "usr/lib/libXvMCr[36]00.so*" usr/lib + vmove "usr/lib/vdpau/libvdpau_r[36]00.so*" usr/lib/vdpau + vmove "usr/lib/vdpau/libvdpau_radeon*.so*" usr/lib/vdpau + vmove "usr/lib/xorg/modules/dri/radeon*" usr/lib/xorg/modules/dri + vmove "usr/lib/xorg/modules/dri/r[236]00*" usr/lib/xorg/modules/dri +} diff --git a/srcpkgs/MesaLib/mesa-intel-dri.rshlibs b/srcpkgs/MesaLib/mesa-intel-dri.rshlibs new file mode 100644 index 00000000000..25732f6af11 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-intel-dri.rshlibs @@ -0,0 +1,10 @@ +libdricore9.0.1.so.1 +libexpat.so.1 +libm.so.6 +libpthread.so.0 +libdl.so.2 +libdrm_intel.so.1 +libdrm.so.2 +libc.so.6 +libstdc++.so.6 +libgcc_s.so.1 diff --git a/srcpkgs/MesaLib/mesa-intel-dri.template b/srcpkgs/MesaLib/mesa-intel-dri.template new file mode 100644 index 00000000000..3efcc730819 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-intel-dri.template @@ -0,0 +1,9 @@ +# Template file for 'mesa-intel-dri'. +# +short_desc="Mesa DRI drivers for Intel GPUs" +long_desc=" + This package contains the ${short_desc}." + +do_install() { + vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*" usr/lib/xorg/modules/dri +} diff --git a/srcpkgs/MesaLib/mesa-nouveau-dri.rshlibs b/srcpkgs/MesaLib/mesa-nouveau-dri.rshlibs new file mode 100644 index 00000000000..61ac7295fc7 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-nouveau-dri.rshlibs @@ -0,0 +1,13 @@ +libdrm_nouveau.so.2 +libX11-xcb.so.1 +libxcb-dri2.so.0 +libm.so.6 +libstdc++.so.6 +libgcc_s.so.1 +libc.so.6 +libdricore9.0.1.so.1 +libdrm.so.2 +libexpat.so.1 +libpthread.so.0 +libdl.so.2 +libXv.so.1 diff --git a/srcpkgs/MesaLib/mesa-nouveau-dri.template b/srcpkgs/MesaLib/mesa-nouveau-dri.template new file mode 100644 index 00000000000..674f5a4d9c5 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-nouveau-dri.template @@ -0,0 +1,11 @@ +# Template file for 'mesa-nouveau-dri'. +# +short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)" +long_desc=" + This package contains the ${short_desc}." + +do_install() { + vmove "usr/lib/libXvMCnouveau.so*" usr/lib + vmove "usr/lib/vdpau/libvdpau_nouveau.so*" usr/lib/vdpau + vmove "usr/lib/xorg/modules/dri/nouveau*" usr/lib/xorg/modules/dri +} diff --git a/srcpkgs/MesaLib/mesa-swraster-dri.rshlibs b/srcpkgs/MesaLib/mesa-swraster-dri.rshlibs new file mode 100644 index 00000000000..df073f220ac --- /dev/null +++ b/srcpkgs/MesaLib/mesa-swraster-dri.rshlibs @@ -0,0 +1,8 @@ +libm.so.6 +libstdc++.so.6 +libgcc_s.so.1 +libc.so.6 +libXv.so.1 +libexpat.so.1 +libpthread.so.0 +libdl.so.2 diff --git a/srcpkgs/MesaLib/mesa-swraster-dri.template b/srcpkgs/MesaLib/mesa-swraster-dri.template new file mode 100644 index 00000000000..839a3c3c232 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-swraster-dri.template @@ -0,0 +1,11 @@ +# Template file for 'mesa-swraster-dri'. +# +short_desc="Mesa DRI drivers for the Software Rasterizer" +long_desc=" + This package contains the ${short_desc}." + +do_install() { + vmove "usr/lib/libXvMCsoftpipe.so*" usr/lib + vmove "usr/lib/vdpau/libvdpau_softpipe.so*" usr/lib/vdpau + vmove "usr/lib/xorg/modules/dri/swrast*" usr/lib/xorg/modules/dri +} diff --git a/srcpkgs/MesaLib/mesa-vmwgfx-dri.rshlibs b/srcpkgs/MesaLib/mesa-vmwgfx-dri.rshlibs new file mode 100644 index 00000000000..0af54f4a480 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-vmwgfx-dri.rshlibs @@ -0,0 +1,8 @@ +libdrm.so.2 +libexpat.so.1 +libm.so.6 +libpthread.so.0 +libdl.so.2 +libstdc++.so.6 +libgcc_s.so.1 +libc.so.6 diff --git a/srcpkgs/MesaLib/mesa-vmwgfx-dri.template b/srcpkgs/MesaLib/mesa-vmwgfx-dri.template new file mode 100644 index 00000000000..a2504a80438 --- /dev/null +++ b/srcpkgs/MesaLib/mesa-vmwgfx-dri.template @@ -0,0 +1,9 @@ +# Template file for 'mesa-vmwgfx-dri'. +# +short_desc="Mesa DRI drivers for VMware" +long_desc=" + This package contains the ${short_desc}." + +do_install() { + vmove "usr/lib/xorg/modules/dri/vmwgfx*" usr/lib/xorg/modules/dri +} diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 47e017d24d2..0dfca035b39 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib -version=9.0 -revision=2 +version=9.0.1 +revision=1 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl @@ -9,14 +9,14 @@ configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl --with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-vdpau --enable-xa --enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast --enable-gbm" -subpackages="libgbm libEGL libglapi libGLES libGL libOpenVG libOSMesa MesaLib-devel" + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast --enable-gbm + --with-egl-platforms=wayland" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2" -checksum=0b7d206a2721d1c843f3decb71e10f86941cb4ddfd4c8a48cee75e7f0aabc3b5 +checksum=57a7ba83bace3f3a7dc0929fe026ef5f0ad454234ec4ad8a3e0d31650a75db6f long_desc=" MesaLib is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax @@ -24,10 +24,16 @@ long_desc=" Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc." -makedepends="perl flex pkg-config glproto dri2proto>=2.1 makedepend +conf_files="/etc/drirc" + +makedepends="automake perl flex pkg-config glproto dri2proto>=2.1 makedepend libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel libudev-devel>=183 libdrm-devel expat-devel libXt-devel talloc-devel - libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6 automake" + libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel" + +subpackages="libgbm libEGL libglapi libGLES libGL libOpenVG libOSMesa + MesaLib-devel mesa-ati-dri mesa-intel-dri mesa-nouveau-dri mesa-swraster-dri + mesa-vmwgfx-dri" pre_configure() { ./autogen.sh diff --git a/srcpkgs/mesa-ati-dri b/srcpkgs/mesa-ati-dri new file mode 120000 index 00000000000..8bf5fbea217 --- /dev/null +++ b/srcpkgs/mesa-ati-dri @@ -0,0 +1 @@ +MesaLib \ No newline at end of file diff --git a/srcpkgs/mesa-intel-dri b/srcpkgs/mesa-intel-dri new file mode 120000 index 00000000000..8bf5fbea217 --- /dev/null +++ b/srcpkgs/mesa-intel-dri @@ -0,0 +1 @@ +MesaLib \ No newline at end of file diff --git a/srcpkgs/mesa-nouveau-dri b/srcpkgs/mesa-nouveau-dri new file mode 120000 index 00000000000..8bf5fbea217 --- /dev/null +++ b/srcpkgs/mesa-nouveau-dri @@ -0,0 +1 @@ +MesaLib \ No newline at end of file diff --git a/srcpkgs/mesa-swraster-dri b/srcpkgs/mesa-swraster-dri new file mode 120000 index 00000000000..8bf5fbea217 --- /dev/null +++ b/srcpkgs/mesa-swraster-dri @@ -0,0 +1 @@ +MesaLib \ No newline at end of file diff --git a/srcpkgs/mesa-vmwgfx-dri b/srcpkgs/mesa-vmwgfx-dri new file mode 120000 index 00000000000..8bf5fbea217 --- /dev/null +++ b/srcpkgs/mesa-vmwgfx-dri @@ -0,0 +1 @@ +MesaLib \ No newline at end of file