Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=69d579b96ed7d29ec73abd9139abdaf43e5930a9

commit 69d579b96ed7d29ec73abd9139abdaf43e5930a9
Author: crazy <[email protected]>
Date:   Mon Oct 31 23:39:32 2016 +0100

mesa-12.0.3-5-x86_64
* fix broken subprovides and subbackup for 32bit
* we cannot provide 64bit packages in 32bit subpackages
* also 32bit stuff should not backup or touch /etc
* not yet bumped since some broken depends from current .

diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild
index f96855a..2636fc4 100644
--- a/source/x11/mesa/FrugalBuild
+++ b/source/x11/mesa/FrugalBuild
@@ -117,7 +117,7 @@ subdepends=("${subdepends[@]}" "lib32-nettle>=3.2-2 
lib32-expat>=2.1.0-6 lib32-l
subrodepends=("${subrodepends[@]}" '')
subgroups=("${subgroups[@]}" 'lib32-extra')
subarchs=("${subarchs[@]}" "${archs[*]}")
-subbackup=("${subbackup[@]}" 'etc/drirc')
+subbackup=("${subbackup[@]}" '')

subpkgs+=('mesa-pipe-drivers')
subdescs+=('Mesa gallium pipe drivers.')
@@ -233,7 +233,7 @@ if Fuse EGL; then

subpkgs+=('lib32-libegl')
subdescs+=('Mesa OpenEGL library. (32-bit)')
-        subprovides+=('mesa-libegl')
+        subprovides+=('lib32-mesa-libegl')
subreplaces+=('')
subconflicts+=('')
subdepends+=('lib32-libx11>=1.6.4 lib32-libxshmfence>=1.2-3 
lib32-wayland>=1.11.0-3 lib32-libdrm>=2.4.70-2')
@@ -366,7 +366,7 @@ if Fuse WAYLAND_EGL; then

subpkgs=("${subpkgs[@]}" 'lib32-libwayland-egl')
subdescs=("${subdescs[@]}" 'Mesa Wayland EGL library. (32-bit)')
-        subprovides=("${subprovides[@]}" 'mesa-libwayland-egl')
+        subprovides=("${subprovides[@]}" 'lib32-mesa-libwayland-egl')
subreplaces=("${subreplaces[@]}" '')
subconflicts=("${subconflicts[@]}" '')
subdepends=("${subdepends[@]}" '')
@@ -450,7 +450,7 @@ if Fuse VULKAN; then
fi

if Fuse DETECTDEPENDS; then
-       makedepends=("${makedepends[@]}" "$pkgname=$pkgver" "${subpkgs[@]}")
+       makedepends=("${makedepends[@]}" "$pkgname>=$pkgver" "${subpkgs[@]}")
fi

Fconfopts="     --with-sha1=libgcrypt \
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to