correct pkgbuild

2 files changed, 87 insertions, 176 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c8695038c46..eebfabab8074 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mesa-aco-rc
-	pkgdesc = Mesa rc release. ACO enable by default. More options are enable than the standard mesa package. Provides ocl-icd and libglvnd.
+	pkgdesc = Mesa rc release. ACO enable by default. More options are enable than the standard mesa package.
 	pkgver = 20.3.0_rc2
 	pkgrel = 1
 	url = https://mesa3d.org/
@@ -32,10 +32,6 @@ pkgbase = mesa-aco-rc
 	makedepends = gtk3
 	makedepends = wayland-protocols
 	makedepends = xorgproto
-	makedepends = patch
-	makedepends = libxv
-	makedepends = libxvmc
-	makedepends = libepoxy
 	depends = libdrm
 	depends = libelf
 	depends = libglvnd
@@ -62,12 +58,6 @@ pkgbase = mesa-aco-rc
 	provides = opengl-driver
 	provides = opencl-driver
 	provides = mesa-libgl
-	provides = libglvnd
-	provides = libgl
-	provides = libegl
-	provides = libgles
-	provides = ocl-icd
-	provides = opencl-icd-loader
 	conflicts = mesa
 	conflicts = opencl-mesa
 	conflicts = vulkan-intel
@@ -75,8 +65,6 @@ pkgbase = mesa-aco-rc
 	conflicts = vulkan-mesa-layer
 	conflicts = libva-mesa-driver
 	conflicts = mesa-vdpau
-	conflicts = libglvnd
-	conflicts = ocl-icd
 	conflicts = mesa-aco
 	conflicts = mesa-llvm
 	conflicts = mesa-llvm-rc
@@ -88,8 +76,6 @@ pkgbase = mesa-aco-rc
 	replaces = vulkan-mesa-layer
 	replaces = libva-mesa-driver
 	replaces = mesa-vdpau
-	replaces = libglvnd
-	replaces = ocl-icd
 	replaces = mesa-aco
 	replaces = mesa-llvm
 	replaces = mesa-llvm-rc
diff --git a/PKGBUILD b/PKGBUILD
index 99e840fcd439..7d758e49de37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,177 +6,102 @@ pkgname=mesa-aco-rc
 pkgver=20.3.0_rc2
 pkgrel=1
 versiontag=20.3.0-rc2
-pkgdesc="Mesa rc release. ACO enable by default. More options are enable than the standard mesa package. Provides ocl-icd and libglvnd."
+pkgdesc="Mesa rc release. ACO enable by default. More options are enable than the standard mesa package."
 arch=(x86_64)
 url="https://mesa3d.org/"
 license=('MIT')
-depends=("libdrm" "libelf" "libglvnd" "libomxil-bellagio" "libunwind" "libxdamage" "libxxf86vm" "llvm-libs"
-	 "lm_sensors" "wayland" "zstd" "libxshmfence" "libclc" "expat" "vulkan-icd-loader")
-makedepends=("bison" "flex" "valgrind" "meson" "ninja" "git" "ninjas2" "clang" "libxvmc"
-             "python" "python-appdirs" "python-mako" "python-evdev" "elfutils" "glslang" "libva" "libepoxy" "libxv" "libvdpau"
-	     "libx11" "libxml2" "libxrandr"  "llvm" "libconfig" "gtk3" "wayland-protocols" "xorgproto" "patch" "libxv" "libxvmc"
-	     "libepoxy")
-conflicts=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "libglvnd" "ocl-icd" 
-	   "mesa-aco" "mesa-llvm" "mesa-llvm-rc" "mesa-git")
-replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "libglvnd" "ocl-icd" 
-	  "mesa-aco" "mesa-llvm" "mesa-llvm-rc" "mesa-git")
-provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" 
-	  "opencl-driver" "mesa-libgl" "libglvnd" "libgl" "libegl" "libgles" "ocl-icd" "opencl-icd-loader")
+depends=("libdrm" "libelf" "libglvnd" "libomxil-bellagio" "libunwind" "libxdamage" "libxxf86vm" "llvm-libs" "lm_sensors" "wayland" "zstd" "libxshmfence"
+         "libclc" "expat" "vulkan-icd-loader")
+makedepends=("bison" "flex" "valgrind" "meson" "ninja" "git" "ninjas2" "clang" "libxvmc" "python" "python-appdirs" "python-mako" "python-evdev" "elfutils"
+             "glslang" "libva" "libepoxy" "libxv" "libvdpau" "libx11" "libxml2" "libxrandr" "llvm" "libconfig" "gtk3" "wayland-protocols" "xorgproto")
+conflicts=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco" "mesa-llvm" "mesa-llvm-rc"
+           "mesa-git")
+replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco" "mesa-llvm" "mesa-llvm-rc"
+          "mesa-git")
+provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" "opencl-driver"
+          "mesa-libgl")
 source=("https://archive.mesa3d.org/mesa-${versiontag}.tar.xz"
         "LICENSE")
 md5sums=("SKIP"
          "SKIP")
 
-package() {
-	cd mesa-${versiontag}
-
-	# remove build dir if there is one
-	msg2 "Remove build dir if there is one"
-	if dir build; then
-	rm -rf build
-	fi
-
-	# create build dir
-	msg2 "Create build dir"
-	mkdir -p -v build
-
-	# build
-	msg2 "Build with meson"
-	meson build/ \
-       	-D b_ndebug=true \
-       	-D b_lto=true \
-	-Dprefix=/usr \
-	-Dplatforms=x11,wayland \
-	-Ddri3=enabled \
-	-Ddri-drivers=i915,i965,r100,r200,nouveau \
-	-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink,freedreno,v3d,vc4,etnaviv,tegra,kmsro \
-	-Dgallium-extra-hud=true \
-	-Dgallium-vdpau=enabled \
-	-Dgallium-xvmc=enabled \
-	-Dgallium-omx=auto \
-	-Dgallium-va=enabled \
-	-Dgallium-xa=enabled \
-	-Dgallium-nine=true \
-	-Dgallium-opencl=standalone \
-	-Dopencl-spirv=false \
-	-Dvulkan-drivers=amd,intel \
-	-Dshader-cache=enabled \
-	-Dvulkan-overlay-layer=true \
-	-Dvulkan-device-select-layer=true \
-	-Dshared-glapi=enabled \
-	-Dgles1=enabled \
-	-Dgles2=enabled \
-	-Dopengl=true \
-	-Dgbm=enabled \
-	-Dglx=auto \
-	-Degl=enabled \
-	-Dglvnd=false \
-	-Dllvm=enabled \
-	-Dshared-llvm=disabled \
-	-Dvalgrind=enabled \
-	-Dlibunwind=enabled \
-	-Dlmsensors=enabled \
-	-Dselinux=false \
-	-Dosmesa=gallium \
-	-Dswr-arches=avx,avx2,knl,skx \
-	-Dshared-swr=true \
-	-Dpower8=enabled \
-	-Dxlib-lease=enabled \
-	-Dglx-direct=true \
-	-Dzstd=enabled
-
-	# compiling mesa and installing to "$pkgdir"
-	msg2 "Compiling mesa and installing to "$pkgdir""
-	DESTDIR="$pkgdir" ninja $NINJAFLAGS -C build/ install
-
-	# remove script file from /usr/bin
-	# https://gitlab.freedesktop.org/mesa/mesa/issues/2230
-	rm "${pkgdir}/usr/bin/mesa-overlay-control.py"
-	rm -rf "${pkgdir}/usr/bin"
-
-	#Recompile for libEGL_mesa libGLX_mesa libMesaOpenCL
-	msg2 "Recompile mesa for libEGL_mesa libGLX_mesa libMesaOpenCL"
-
-	# remove build dir if there is one
-	msg2 "Remove build dir if there is one"
-	if dir build; then
-	rm -rf build
-	fi
-
-	# create build dir
-	msg2 "Create build dir"
-	mkdir -p -v build
-
-	msg2 "Create fakeinstall dir"
-	mkdir -p -v "${srcdir}"/fakeinstall
-
-	# build
-	msg2 "Build with meson"
-	meson build/ \
-       	-D b_ndebug=true \
-       	-D b_lto=true \
-	-Dprefix=/usr \
-	-Dplatforms=x11,wayland \
-	-Ddri3=enabled \
-	-Ddri-drivers=i915,i965,r100,r200,nouveau \
-	-Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink,freedreno,v3d,vc4,etnaviv,tegra,kmsro \
-	-Dgallium-extra-hud=true \
-	-Dgallium-vdpau=enabled \
-	-Dgallium-xvmc=enabled \
-	-Dgallium-omx=auto \
-	-Dgallium-va=enabled \
-	-Dgallium-xa=enabled \
-	-Dgallium-nine=true \
-	-Dgallium-opencl=icd \
-	-Dopencl-spirv=false \
-	-Dvulkan-drivers=amd,intel \
-	-Dshader-cache=enabled \
-	-Dvulkan-overlay-layer=true \
-	-Dvulkan-device-select-layer=true \
-	-Dshared-glapi=enabled \
-	-Dgles1=enabled \
-	-Dgles2=enabled \
-	-Dopengl=true \
-	-Dgbm=enabled \
-	-Dglx=dri \
-	-Degl=enabled \
-	-Dglvnd=true \
-	-Dllvm=enabled \
-	-Dshared-llvm=disabled \
-	-Dvalgrind=enabled \
-	-Dlibunwind=enabled \
-	-Dlmsensors=enabled \
-	-Dselinux=false \
-	-Dosmesa=gallium \
-	-Dswr-arches=avx,avx2,knl,skx \
-	-Dshared-swr=true \
-	-Dpower8=enabled \
-	-Dxlib-lease=enabled \
-	-Dglx-direct=true \
-	-Dzstd=enabled
-
-	# compiling mesa and installing to "$pkgdir"
-	msg2 "Recompiling mesa and installing to fakeinstall"
-	DESTDIR="${srcdir}"/fakeinstall ninja $NINJAFLAGS -C build/ install
-
-	#Copy *libEGL_mesa* to "${pkgdir}"/usr/lib/
-	cp -v -r "${srcdir}"/fakeinstall/usr/lib/*libEGL_mesa* "${pkgdir}"/usr/lib/
+build(){
+  cd mesa-${versiontag}
+
+  # remove build dir if there is one
+  msg2 "remove build dir if there is one"
+  if dir build; then
+  rm -rf build
+  fi
+
+  # create build dir
+  msg2 "Create build dir"
+  mkdir -p -v build
+
+  # build with meson
+  msg2 "Build with meson"
+  meson build \
+  -D b_ndebug=true \
+  -D b_lto=true \
+  -D buildtype=plain \
+  --wrap-mode=nofallback \
+  -D sysconfdir=/etc \
+  -Dprefix=/usr \
+  -Dplatforms=x11,wayland \
+  -Ddri3=enabled \
+  -Ddri-drviers=i915,i965,r100,r200,nouveau \
+  -Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink,freedreno,v3d,vc4,etnaviv,tegra,kmsro \
+  -Dgallium-extra-hud=true \
+  -Dgallium-vdpau=enabled \
+  -Dgallium-xvmc=enabled \
+  -Dgallium-omx=auto \
+  -Dgallium-va=enabled \
+  -Dgallium-xa=enabled \
+  -Dgallium-nine=true \
+  -Dgallium-opencl=icd \
+  -Dopencl-spirv=false \
+  -Dvulkan-drivers=amd,intel \
+  -Dshader-cache=enabled \
+  -Dvulkan-overlay-layer=true \
+  -Dvulkan-device-select-layer=true \
+  -Dshared-glapi=enabled \
+  -Dgles1=enabled \
+  -Dgles2=enabled \
+  -Dopengl=true \
+  -Dgbm=enabled \
+  -Dglx=dri \
+  -Degl=enabled \
+  -Dglvnd=true \
+  -Dllvm=enabled \
+  -Dshared-llvm=disabled \
+  -Dvalgrind=enabled \
+  -Dlibunwind=enabled \
+  -Dlmsensors=enabled \
+  -Dselinux=false \
+  -Dosmesa=gallium \
+  -Dswr-arches=avx,avx2,knl,skx \
+  -Dshared-swr=true \
+  -Dpower8=enabled \
+  -Dxlib-lease=enabled \
+  -Dglx-direct=true \
+  -Dzstd=enabled
+}
 
-	#Copy to *libGLX_mesa* "${pkgdir}"/usr/lib/
-	cp -v -r "${srcdir}"/fakeinstall/usr/lib/*libGLX_mesa* "${pkgdir}"/usr/lib/
+package(){
+  # compiling mesa and installing to "$pkgdir"
+  msg2 "Compiling mesa and installing to ${pkgdir}"
+  DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C mesa-${versiontag}/build/ install
 
-	#Copy to *libMesaOpenCL* "${pkgdir}"/usr/lib/
-	cp -v -r "${srcdir}"/fakeinstall/usr/lib/*libMesaOpenCL* "${pkgdir}"/usr/lib/
-	
-	#Copy etc/ to ${pkgdir}
-	msg2 "Copy etc/ to ${pkgdir}"
-	cp -v -r "${srcdir}"/fakeinstall/etc "${pkgdir}"
+  # remove script file from /usr/bin
+  msg2 "Remove ${pkgdir}/usr/bin/mesa-overlay-control.py"
+  rm "${pkgdir}/usr/bin/mesa-overlay-control.py"
+  msg2 "Remove ${pkgdir}/usr/bin"
+  rm -rf "${pkgdir}/usr/bin"
 
-  	# indirect rendering
-  	ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
+  # indirect rendering
+  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
-	# installing licencse
-	msg2 "installing license"
-	install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
-	cp -v -r "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
+  # installing license
+  install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/
+  cp -v -r "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${versiontag}/
 }