Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=5c88146ee19cfeec0cea0deb762e40a503d0773b
commit 5c88146ee19cfeec0cea0deb762e40a503d0773b Author: DeX77 <[email protected]> Date: Sun Jan 3 17:00:46 2016 +0100 xorg-server-1.18.0-1-x86_64 * version bump * cleanup depends diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 6ab611a..2683346 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -9,20 +9,15 @@ : ${USE_SERVERDMX="y"} pkgname=xorg-server -pkgver=1.17.3 -pkgrel=2 +pkgver=1.18.0 +pkgrel=1 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'arm') -depends=('libxfont>=1.4.0' 'libx11>=1.3' 'xtrans>=1.2.3' 'libxau>=1.0.5' \ - 'libxext>=1.0.99.4-1' 'libxkbfile>=1.0.5' 'libxdmcp>=1.0.2-2' 'libxmu>=1.0.4-2' 'libxrender>=0.9.4-3' \ - 'libxi>=1.2.1' 'freetype2' 'libgl' 'font-cursor-misc>=1.0.0-3' 'font-misc-misc>=1.0.0-3' \ - 'xbitmaps' 'xkeyboard-config>=1.6' 'iceauth>=1.0.2-3' 'rgb>=1.0.3' 'xauth>=1.0.3' 'xinit>=1.1.1' 'libxaw>=1.0.5' \ - 'libxpm>=3.5.7-2' 'libxxf86misc>=1.0.1-3' 'libxxf86vm>=1.0.1-3' 'libxkbui>=1.0.2-2' \ - 'xorg-cf-files' 'libxtst>=1.0.3-3' 'font-alias' 'libxcb>=1.4' 'pixman>=0.15.8' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' \ - 'libgcrypt>=1.6.1' 'xcb-util' 'libepoxy' 'libdmx') -makedepends=('evieext' 'libdrm>=2.4.39' 'mkfontdir>=1.0.4' 'mkfontscale>=1.0.6-1' \ - 'xorg-sgml-doctools>=1.4' 'util-macros>=1.8.0' 'libxres>=1.0.3-3' 'libxinerama>=1.0.3' 'font-util' 'mesa-libgl' 'xproto=7.0.27-2') +depends=('pixman>=0.32.8-2' 'libepoxy>=1.3.1-2' 'libsystemd>=227-13' \ + 'libdmx>=1.1.3-2' 'libxfont>=1.5.1-2' 'libgl>=11.1.0-2') +makedepends=('libxkbfile>=1.0.9-2' 'libxtst>=1.2.2-2' 'libxres>=1.0.7-3' \ + 'font-util>=1.3.1-2' 'doxygen' 'xmlto' 'fop' 'libxslt') rodepends=('libglx' 'xf86-video-vesa') provides=('libdri' 'xf86-video-modesetting' 'glamor') replaces=('libdri' 'xf86-video-modesetting' 'glamor') @@ -30,9 +25,12 @@ conflicts=('libdri' 'xf86-video-modesetting' 'glamor') _F_archive_grepv="99" Finclude xorg -source=(${source[@]} v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch) -sha1sums=('78c33555d267fe0feda945d02f627cbc5aacbba5' \ - '1affbe761ff160e31ae9f200758a3079228027ec') +source=(${source[@]} \ + v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch \ + v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch) +sha1sums=('f37f9ca17d211552c775c3ce78ff03385026bf3a' \ + '1affbe761ff160e31ae9f200758a3079228027ec' \ + 'bf93f1f0f7736d088d634cb0151f5f4496ef289f') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a @@ -62,10 +60,15 @@ Fconfopts="${Fconfopts[@]} --enable-xwayland \ --disable-systemd-logind \ --disable-suid-wrapper \ - --with-sha1=libgcrypt" + --with-sha1=libgcrypt \ + --with-vendor-web=https://www.frugalware.org \ + --with-os-name=Frugalware_Linux \ + --with-os-vendor=Frugalware.org-Development-Team \ + [email protected] " + if Fuse $USE_UDEV; then - depends=(${depends[@]} 'systemd>=188') + depends=(${depends[@]} 'libsystemd>=227-13') rodepends=(${rodepends[@]} 'xf86-input-evdev') Fconfopts="${Fconfopts[@]} \ --disable-config-hal \ @@ -80,13 +83,13 @@ fi subpkgs=('libglx') subdescs=('Glx library for XOrg.') -subdepends=('libgl') +subdepends=('libgl>=11.1.0-2') subgroups=('x11 xorg-core') subarchs=('i686 x86_64 arm') subpkgs=("${subpkgs[@]}" 'xorg-server-xwayland') subdescs=("${subdescs[@]}" 'run X clients under wayland.') -subdepends=("${subdepends[@]}" 'libgl libepoxy') +subdepends=("${subdepends[@]}" 'libgl>=11.1.0-2 libepoxy>=1.3.1-2 pixman>=0.32.8-2 libsystemd>=227-13 libxfont>=1.5.1-2') subgroups=("${subgroups[@]}" 'x11-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') @@ -98,9 +101,8 @@ if Fuse $USE_KDRIVE; then subdescs=("${subdescs[@]}" \ 'KDrive xephyr X server' \ 'KDrive fbdev X server') - subdepends=("${subdepends[@]}" \ - 'libxext libxfont>=1.3.1-2 pixman libgcrypt>=1.6.1 libgl libepoxy xcb-util xcb-util-image xcb-util-wm' \ - 'libxfont>=1.3.1-2 libxau pixman libxdmcp libgcrypt>=1.6.1 bzip2') + subdepends=("${subdepends[@]}" 'libepoxy>=1.3.1-2 pixman>=0.32.8-2 libxfont>=1.5.1-2 libsystemd>=227-13 libgl>=11.1.0-2 xcb-util-image>=0.4.0-2 xcb-util-wm>=0.4.1-2') + subdepends=("${subdepends[@]}" 'pixman>=0.32.8-2 libxfont>=1.5.1-2 libxau>=1.0.8-2 libsystemd>=227-13 libxdmcp>=1.1.2-2') subgroups=("${subgroups[@]}" 'x11' 'x11-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 arm' 'i686 x86_64 arm') Fconfopts="${Fconfopts[@]} @@ -125,7 +127,7 @@ fi if Fuse $USE_SERVERDMX; then subpkgs=("${subpkgs[@]}" "$pkgname-dmx") subdescs=("${subdescs[@]}" 'Distributed Multi-Head X server.') - subdepends=("${subdepends[@]}" 'libdmx libxcb libsm libxaw libxrender libxfixes libxfont>=1.3.1-2 libxi pixman libxres libgcrypt>=1.6.1 libuuid bzip2') + subdepends=("${subdepends[@]}" 'libdmx>=1.1.3-2 libxaw>=1.0.13-2 libxrender>=0.9.9-4 libxi>=1.7.6 pixman>=0.32.8-2 libxfont>=1.5.1-2 libsystemd>=227-13') subgroups=("${subgroups[@]}" 'x11-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') Fconfopts="${Fconfopts[@]} @@ -136,7 +138,7 @@ else fi if Fuse $USE_DGA; then - makedepends=("${makedepends[@]}" 'xf86dgaproto') + makedepends=("${makedepends[@]}" 'xf86dgaproto>=2.1-2') Fconfopts="${Fconfopts[@]} --enable-dga" else @@ -153,14 +155,7 @@ build() { Fcd $_F_xorg_name-$pkgver fi - Fconf \ - --with-vendor-web="http://www.frugalware.org"; \ - --with-os-name="Frugalware Linux" \ - --with-os-vendor="Frugalware.org Development Team" \ - --with-builder-addr="[email protected]" - - make V=1 || Fdie - Fmakeinstall + Fbuild Frm usr/share/X11/xorg.conf.d/10-evdev.conf diff --git a/source/x11/xorg-server/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch b/source/x11/xorg-server/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch new file mode 100644 index 0000000..220c5bb --- /dev/null +++ b/source/x11/xorg-server/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch @@ -0,0 +1,12 @@ +diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c +index 4c37cfc..d930962 100644 +--- a/hw/xfree86/xorg-wrapper.c ++++ b/hw/xfree86/xorg-wrapper.c +@@ -24,6 +24,7 @@ + */ + + #include "dix-config.h" ++#include "xorg-config.h" + + #include <errno.h> + #include <fcntl.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
