Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=7a83a96f46dc64f86534082baf6c5d7ba02ba894
commit 7a83a96f46dc64f86534082baf6c5d7ba02ba894 Author: DeX77 <[email protected]> Date: Wed Nov 2 15:44:50 2016 +0100 xorg-server-1.18.4-7-x86_64 + add cross32 * fix some deps while at it diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 1f720f4..279d149 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -10,10 +10,10 @@ pkgname=xorg-server pkgver=1.18.4 -pkgrel=6 +pkgrel=7 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') -archs=('i686' 'x86_64') +archs=('x86_64') depends=('pixman>=0.32.8-3' 'libepoxy>=1.3.1-6' 'libsystemd>=231-6' \ 'libdmx>=1.1.3-3' 'libxfont>=1.5.2' 'libgl>=12.0.3-4') makedepends=('libxkbfile>=1.0.9-3' 'libxtst>=1.2.2-3' 'libxres>=1.0.7-4' \ @@ -28,7 +28,7 @@ replaces=('libdri' 'xf86-video-modesetting' 'glamor' 'xf86-video-cirrus' \ conflicts=("${replaces[@]}") _F_archive_grepv="99" -Finclude xorg +Finclude xorg cross32 sha1sums=('ff088ee29dee46a2d68925c8df3f0515ef15ec52') if Fuse $USE_DEVEL; then @@ -84,26 +84,42 @@ subpkgs=('libglx') subdescs=('Glx library for XOrg.') subdepends=('libgl>=12.0.3-2') subgroups=('x11 xorg-core') -subarchs=('i686 x86_64') +subarchs=('x86_64') + +subpkgs=("${subpkgs[@]}" 'lib32-libglx') +subdescs=("${subdescs[@]}" 'Glx library for XOrg. (32-bit)') +subdepends=("${subdepends[@]}" 'lib32-libgl') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" 'x86_64') subpkgs=("${subpkgs[@]}" 'xorg-server-xwayland') subdescs=("${subdescs[@]}" 'run X clients under wayland.') subdepends=("${subdepends[@]}" 'libgl>=12.0.3-3 libepoxy>=1.3.1-6 pixman>=0.32.8-3 libsystemd>=231-6 libxfont>=1.5.2') subgroups=("${subgroups[@]}" 'x11-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') +subarchs=("${subarchs[@]}" 'x86_64') +subpkgs=("${subpkgs[@]}" 'lib32-xorg-server-xwayland') +subdescs=("${subdescs[@]}" 'run X clients under wayland.') +subdepends=("${subdepends[@]}" 'lib32-libgl>=12.0.3-3 lib32-libepoxy>=1.3.1-6 lib32-pixman>=0.32.8-3 lib32-libsystemd>=231-6 lib32-libxfont>=1.5.2') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" 'x86_64') if Fuse $USE_KDRIVE; then - subpkgs=("${subpkgs[@]}" "$pkgname-xephyr" \ - "$pkgname-fbdev") - subdescs=("${subdescs[@]}" \ - 'KDrive xephyr X server' \ - 'KDrive fbdev X server') - subdepends=("${subdepends[@]}" 'libepoxy>=1.3.1-6 pixman>=0.32.8-3 libxfont>=1.5.1-2 libsystemd>=231-6 libgl>=12.0.3-3 xcb-util-image>=0.4.0-3 xcb-util-wm>=0.4.1-3') + subpkgs=("${subpkgs[@]}" "$pkgname-xephyr" "$pkgname-fbdev") + subdescs=("${subdescs[@]}" 'KDrive xephyr X server' 'KDrive fbdev X server') + subdepends=("${subdepends[@]}" 'libepoxy>=1.3.1-6 pixman>=0.32.8-3 libxfont>=1.5.1-2 libsystemd>=231-6 libgl>=12.0.3-3 xcb-util-image>=0.4.0-3 xcb-util-wm>=0.4.1-3 xcb-util-renderutil xcb-util-keysyms') subdepends=("${subdepends[@]}" 'pixman>=0.32.8-3 libxfont>=1.5.1-3 libxau>=1.0.8-2 libsystemd>=231-6 libxdmcp>=1.1.2-3') subgroups=("${subgroups[@]}" 'x11' 'x11-extra') - subarchs=("${subarchs[@]}" 'i686 x86_64' 'i686 x86_64') + subarchs=("${subarchs[@]}" 'x86_64' 'x86_64') + + subpkgs=("${subpkgs[@]}" "lib32-$pkgname-xephyr" "lib32-$pkgname-fbdev") + subdescs=("${subdescs[@]}" 'KDrive xephyr X server (32-bit)' 'KDrive fbdev X server (32-bit)') + subdepends=("${subdepends[@]}" 'lib32-libepoxy>=1.3.1-6 lib32-pixman>=0.32.8-3 lib32-libxfont>=1.5.1-2 lib32-libsystemd>=231-6 lib32-libgl>=12.0.3-3 lib32-xcb-util-image>=0.4.0-3 lib32-xcb-util-wm>=0.4.1-3 lib32-xcb-util-renderutil lib32-xcb-util-keysyms') + subdepends=("${subdepends[@]}" 'lib32-pixman>=0.32.8-3 lib32-libxfont>=1.5.1-3 lib32-libxau>=1.0.8-2 lib32-libsystemd>=231-6 lib32-libxdmcp>=1.1.2-3') + subgroups=("${subgroups[@]}" 'lib32-extra' 'lib32-extra') + subarchs=("${subarchs[@]}" 'x86_64' 'x86_64') + Fconfopts="${Fconfopts[@]} --enable-xephyr \ --enable-xvfb \ @@ -126,9 +142,16 @@ fi if Fuse $USE_SERVERDMX; then subpkgs=("${subpkgs[@]}" "$pkgname-dmx") subdescs=("${subdescs[@]}" 'Distributed Multi-Head X server.') - subdepends=("${subdepends[@]}" 'libdmx>=1.1.3-3 libxaw>=1.0.13-3 libxrender>=0.9.10 libxi>=1.7.6-2 pixman>=0.32.8-3 libxfont>=1.5.2 libsystemd>=231-6') + subdepends=("${subdepends[@]}" 'libdmx>=1.1.3-3 libxaw>=1.0.13-3 libxrender>=0.9.10 libxi>=1.7.6-2 pixman>=0.32.8-3 libxfont>=1.5.2 libsystemd>=231-6 libxtst libxres') subgroups=("${subgroups[@]}" 'x11-extra') - subarchs=("${subarchs[@]}" 'i686 x86_64') + subarchs=("${subarchs[@]}" 'x86_64') + + subpkgs=("${subpkgs[@]}" "lib32-$pkgname-dmx") + subdescs=("${subdescs[@]}" 'Distributed Multi-Head X server. (32-bit)') + subdepends=("${subdepends[@]}" 'lib32-libdmx>=1.1.3-3 lib32-libxaw>=1.0.13-3 lib32-libxrender>=0.9.10 lib32-libxi>=1.7.6-2 lib32-pixman>=0.32.8-3 lib32-libxfont>=1.5.2 lib32-libsystemd>=231-6 lib32-libxtst lib32-libxres') + subgroups=("${subgroups[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" 'x86_64') + Fconfopts="${Fconfopts[@]} --enable-dmx" else @@ -145,22 +168,26 @@ else --disable-dga" fi +subpkgs=("${subpkgs[@]}" "lib32-$pkgname") +subdescs=("${subdescs[@]}" "Modular X.Org X Server (32-bit)") +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" 'x86_64') +subdepends=("${subdepends[@]}" 'lib32-pixman>=0.32.8-3 lib32-libepoxy>=1.3.1-6 lib32-libsystemd>=231-6 lib32-libdmx>=1.1.3-3 lib32-libxfont>=1.5.2 lib32-libgl>=12.0.3-4') build() { if Fuse $USE_DEVEL; then Funpack_scm - Fcd $_F_xorg_name - else - Fcd $_F_xorg_name-$pkgver fi - Fbuild + Fbuild_cross32 Frm usr/share/X11/xorg.conf.d/10-evdev.conf Fsplit libglx usr/lib/xorg/modules/extensions/libglx.* + Fsplit lib32-libglx usr/lib32/xorg/modules/extensions/libglx.* Fsplit xorg-server-xwayland usr/bin/Xwayland + Fsplit lib32-xorg-server-xwayland usr/i686-frugalware-linux/bin/Xwayland ## the servers =) if Fuse $USE_SERVERDMX; then @@ -168,14 +195,23 @@ build() { Fsplit $pkgname-dmx \ usr/bin/{Xdmx,dmxaddinput,dmxaddscreen,dmxreconfig,dmxresize,dmxrminput,dmxrmscreen,dmxtodmx,dmxwininfo,vdltodmx,xdmxconfig} Fsplit $pkgname-dmx usr/share/man/man1/*dmx* + + Fsplit lib32-$pkgname-dmx \ + usr/i686-frugalware-linux/bin/{Xdmx,dmxaddinput,dmxaddscreen,dmxreconfig,dmxresize,dmxrminput,dmxrmscreen,dmxtodmx,dmxwininfo,vdltodmx,xdmxconfig} + fi if Fuse $USE_KDRIVE; then ## -xephyr Fsplit $pkgname-xephyr usr/bin/Xephyr + Fsplit lib32-$pkgname-xephyr usr/i686-frugalware-linux/bin/Xephyr ## -fbdev Fsplit $pkgname-fbdev usr/bin/Xfbdev + Fsplit lib32-$pkgname-fbdev usr/i686-frugalware-linux/bin/Xfbdev fi + + Fsplit lib32-$pkgname usr/lib32/ + Fsplit lib32-$pkgname usr/i686-frugalware-linux/ } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
