[arch-commits] Commit in xorg-server/repos (7 files)

2018-05-11 Thread Andreas Radke via arch-commits 
Date: Friday, May 11, 2018 @ 14:11:42
  Author: andyrtr
Revision: 323946

archrelease: copy trunk to staging-x86_64

Added:
  xorg-server/repos/staging-x86_64/
  xorg-server/repos/staging-x86_64/PKGBUILD
(from rev 323945, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/staging-x86_64/xorg-server.install
(from rev 323945, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/staging-x86_64/xserver-autobind-hotplug.patch
(from rev 323945, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/staging-x86_64/xvfb-run
(from rev 323945, xorg-server/trunk/xvfb-run)
  xorg-server/repos/staging-x86_64/xvfb-run.1
(from rev 323945, xorg-server/trunk/xvfb-run.1)
  xorg-server/repos/staging-x86_64/xwayland-config.h.meson.in
(from rev 323945, xorg-server/trunk/xwayland-config.h.meson.in)

+
 PKGBUILD   |  218 +
 xorg-server.install|   18 ++
 xserver-autobind-hotplug.patch |  293 +++
 xvfb-run   |  200 ++
 xvfb-run.1 |  282 +
 xwayland-config.h.meson.in |8 +
 6 files changed, 1019 insertions(+)

Copied: xorg-server/repos/staging-x86_64/PKGBUILD (from rev 323945, 
xorg-server/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-11 14:11:42 UTC (rev 323946)
@@ -0,0 +1,218 @@
+# $Id$
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgbase=xorg-server
+pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 
+ 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
+pkgver=1.20.0
+pkgrel=1
+arch=('x86_64')
+license=('custom')
+groups=('xorg')
+url="http://xorg.freedesktop.org;
+makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
+ 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
+ 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 
'libxres'
+ 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
+ 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms'
+ 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'meson') 
# 'git')
+#_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19
+
+#source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit;
+source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+xwayland-config.h.meson.in # missing from tarball
+xserver-autobind-hotplug.patch
+xvfb-run # with updates from FC master
+xvfb-run.1)
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
+  'C383B778255613DFDB409D91DB221A690011'
+  'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
+  '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
+sha512sums=('1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde'
+'SKIP'
+
'4ed2a66dd98697accef34f84d44490594bf071232fa74640d514a170f1fbe760b292a0b53fe47080b73acf6083cea57e35f11cfd42ba9dc211b8e8dcac343dfc'
+
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
+
'55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
+
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
+
+#pkgver() {
+#  cd xserver
+#  git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g'
+#}
+
+prepare() {
+  cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
+
+  #cd xserver
+  cd "${pkgbase}-${pkgver}"
+
+  # patch from Fedora, not yet merged
+  patch -Np1 -i ../xserver-autobind-hotplug.patch
+}
+
+build() {
+  # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+  # With them, module fail to load with undefined symbol.
+  # See https://bugs.archlinux.org/task/55102 / 
https://bugs.archlinux.org/task/54845
+  export CFLAGS=${CFLAGS/-fno-plt}
+  export CXXFLAGS=${CXXFLAGS/-fno-plt}
+  export LDFLAGS=${LDFLAGS/,-z,now}
+
+  arch-meson ${pkgbase}-$pkgver build \
+-D os_vendor="Arch Linux" \
+-D ipv6=true \
+-D dmx=true \
+-D xvfb=true \
+-D xnest=true \
+-D xcsecurity=true \
+-D xorg=true \
+-D xephyr=true \
+-D xwayland=true \
+-D glamor=true \
+-D udev=true \
+-D systemd_logind=true \
+-D suid_wrapper=true \
+-D xkb_dir=/usr/share/X11/xkb \
+-D xkb_output_dir=/var/lib/xkb \
+-D

[arch-commits] Commit in xorg-server/repos (7 files)

2018-01-26 Thread Laurent Carlier via arch-commits 
Date: Friday, January 26, 2018 @ 10:35:06
  Author: lcarlier
Revision: 315464

archrelease: copy trunk to testing-x86_64

Added:
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 315463, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-x86_64/nvidia-add-modulepath-support.patch
(from rev 315463, xorg-server/trunk/nvidia-add-modulepath-support.patch)
  xorg-server/repos/testing-x86_64/xorg-server.install
(from rev 315463, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-x86_64/xserver-autobind-hotplug.patch
(from rev 315463, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 315463, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 315463, xorg-server/trunk/xvfb-run.1)

-+
 PKGBUILD|  248 +
 nvidia-add-modulepath-support.patch |  851 ++
 xorg-server.install |   18 
 xserver-autobind-hotplug.patch  |  302 
 xvfb-run|  180 +++
 xvfb-run.1  |  282 +++
 6 files changed, 1881 insertions(+)

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 315463, 
xorg-server/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-01-26 10:35:06 UTC (rev 315464)
@@ -0,0 +1,248 @@
+# $Id$
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgbase=xorg-server
+pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 
'xorg-server-common' 'xorg-server-devel')
+pkgver=1.19.6+13+gd0d1a694f
+pkgrel=1
+arch=('x86_64')
+license=('custom')
+groups=('xorg')
+url="http://xorg.freedesktop.org;
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 
'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
+ 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 
'compositeproto' 'recordproto' 'scrnsaverproto'
+ 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 
'renderproto' 'libpciaccess' 'libxv'
+ 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 
'libdmx' 'libxtst' 'libxres'
+ 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 
'dri2proto' 'libgcrypt' 'libepoxy'
+ 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms' 'dri3proto'
+ 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git')
+_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19
+#source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit;
+nvidia-add-modulepath-support.patch
+xserver-autobind-hotplug.patch
+xvfb-run
+xvfb-run.1)
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
+  'C383B778255613DFDB409D91DB221A690011'
+  'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
+  '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
+sha256sums=('SKIP'
+'914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
+'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
+'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+
+pkgver() {
+  cd xserver
+  git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd xserver
+  #cd "${pkgbase}-${pkgver}"
+
+  # merged upstream in trunk
+  patch -Np1 -i ../nvidia-add-modulepath-support.patch
+  # patch from Fedora, not yet merged
+  patch -Np1 -i ../xserver-autobind-hotplug.patch
+
+  autoreconf -vfi
+}
+
+build() {
+  # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+  # With them, module fail to load with undefined symbol.
+  # See https://bugs.archlinux.org/task/55102 / 
https://bugs.archlinux.org/task/54845
+  export CFLAGS=${CFLAGS/-fno-plt}
+  export CXXFLAGS=${CXXFLAGS/-fno-plt}
+  export LDFLAGS=${LDFLAGS/,-z,now}
+
+  cd xserver
+  #cd "${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr \
+  --enable-ipv6 \
+  --enable-dri \
+  --enable-dmx \
+  --enable-xvfb \
+  --enable-xnest \
+  --enable-composite \
+  --enable-xcsecurity \
+  --enable-libunwind \
+  --enable-xorg \
+  --enable-xephyr \
+  --enable-glamor \
+  --enable-xwayland \
+  --enable-kdrive \
+  --enable-kdrive-kbd \
+  --enable-kdrive-mouse \
+  --enable-config-udev \
+  --enable-systemd-logind \
+  --enable-suid-wrapper \
+

[arch-commits] Commit in xorg-server/repos (7 files)

2017-12-21 Thread Laurent Carlier via arch-commits 
Date: Thursday, December 21, 2017 @ 10:01:00
  Author: lcarlier
Revision: 313483

archrelease: copy trunk to testing-x86_64

Added:
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 313482, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-x86_64/nvidia-add-modulepath-support.patch
(from rev 313482, xorg-server/trunk/nvidia-add-modulepath-support.patch)
  xorg-server/repos/testing-x86_64/xorg-server.install
(from rev 313482, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-x86_64/xserver-autobind-hotplug.patch
(from rev 313482, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 313482, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 313482, xorg-server/trunk/xvfb-run.1)

-+
 PKGBUILD|  232 +
 nvidia-add-modulepath-support.patch |  851 ++
 xorg-server.install |   18 
 xserver-autobind-hotplug.patch  |  302 
 xvfb-run|  180 +++
 xvfb-run.1  |  282 +++
 6 files changed, 1865 insertions(+)

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 313482, 
xorg-server/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-12-21 10:01:00 UTC (rev 313483)
@@ -0,0 +1,232 @@
+# $Id$
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgbase=xorg-server
+pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 
'xorg-server-common' 'xorg-server-devel')
+pkgver=1.19.6
+pkgrel=1
+arch=('x86_64')
+license=('custom')
+groups=('xorg')
+url="http://xorg.freedesktop.org;
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 
'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
+ 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 
'compositeproto' 'recordproto' 'scrnsaverproto'
+ 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 
'renderproto' 'libpciaccess' 'libxv'
+ 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 
'libdmx' 'libxtst' 'libxres'
+ 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 
'dri2proto' 'libgcrypt' 'libepoxy'
+ 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms' 'dri3proto'
+ 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols')
+source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+nvidia-add-modulepath-support.patch
+xserver-autobind-hotplug.patch
+xvfb-run
+xvfb-run.1)
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
+  'C383B778255613DFDB409D91DB221A690011'
+  'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
+  '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
+sha256sums=('a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197'
+'SKIP'
+'914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
+'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
+'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+
+prepare() {
+  cd "${pkgbase}-${pkgver}"
+
+  # merged upstream in trunk
+  patch -Np1 -i ../nvidia-add-modulepath-support.patch
+  # patch from Fedora, not yet merged
+  patch -Np1 -i ../xserver-autobind-hotplug.patch
+
+  autoreconf -vfi
+}
+
+build() {
+  # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+  # With them, module fail to load with undefined symbol.
+  # See https://bugs.archlinux.org/task/55102 / 
https://bugs.archlinux.org/task/54845
+  export CFLAGS=${CFLAGS/-fno-plt}
+  export CXXFLAGS=${CXXFLAGS/-fno-plt}
+  export LDFLAGS=${LDFLAGS/,-z,now}
+
+  cd "${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr \
+  --enable-ipv6 \
+  --enable-dri \
+  --enable-dmx \
+  --enable-xvfb \
+  --enable-xnest \
+  --enable-composite \
+  --enable-xcsecurity \
+  --enable-libunwind \
+  --enable-xorg \
+  --enable-xephyr \
+  --enable-glamor \
+  --enable-xwayland \
+  --enable-kdrive \
+  --enable-kdrive-kbd \
+  --enable-kdrive-mouse \
+  --enable-config-udev \
+  --enable-systemd-logind \
+  --enable-suid-wrapper \
+  --disable-install-setuid \
+  --enable-record \
+  --disable-xfbdev \
+  --disable-xfake \
+  --disable-static \
+  --libexecdir=/usr/lib/xorg-server \
+  --sysconfdir=/etc \
+

[arch-commits] Commit in xorg-server/repos (7 files)

2011-08-30 Thread Jan de Groot 
Date: Tuesday, August 30, 2011 @ 04:44:29
  Author: jgc
Revision: 136478

db-move: moved xorg-server from [staging] to [testing] (i686)

Added:
  xorg-server/repos/testing-i686/
  xorg-server/repos/testing-i686/10-quirks.conf
(from rev 136477, xorg-server/repos/staging-i686/10-quirks.conf)
  xorg-server/repos/testing-i686/PKGBUILD
(from rev 136477, xorg-server/repos/staging-i686/PKGBUILD)
  xorg-server/repos/testing-i686/autoconfig-nvidia.patch
(from rev 136477, xorg-server/repos/staging-i686/autoconfig-nvidia.patch)
  xorg-server/repos/testing-i686/xvfb-run
(from rev 136477, xorg-server/repos/staging-i686/xvfb-run)
  xorg-server/repos/testing-i686/xvfb-run.1
(from rev 136477, xorg-server/repos/staging-i686/xvfb-run.1)
Deleted:
  xorg-server/repos/staging-i686/

-+
 10-quirks.conf  |   10 +
 PKGBUILD|  178 +
 autoconfig-nvidia.patch |   29 
 xvfb-run|  180 +
 xvfb-run.1  |  282 ++
 5 files changed, 679 insertions(+)

Copied: xorg-server/repos/testing-i686/10-quirks.conf (from rev 136477, 
xorg-server/repos/staging-i686/10-quirks.conf)
===
--- testing-i686/10-quirks.conf (rev 0)
+++ testing-i686/10-quirks.conf 2011-08-30 08:44:29 UTC (rev 136478)
@@ -0,0 +1,10 @@
+# Collection of quirks and blacklist/whitelists for specific devices.
+
+
+# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
+# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
+Section InputClass
+Identifier ThinkPad HDAPS accelerometer blacklist
+MatchProduct ThinkPad HDAPS accelerometer data
+Option Ignore on
+EndSection

Copied: xorg-server/repos/testing-i686/PKGBUILD (from rev 136477, 
xorg-server/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-08-30 08:44:29 UTC (rev 136478)
@@ -0,0 +1,178 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=xorg-server
+pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
+pkgver=1.11.0
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org;
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 
'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 
'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 
'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 
'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 
'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto')
+options=('!libtool')
+source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
+autoconfig-nvidia.patch
+xvfb-run
+xvfb-run.1
+10-quirks.conf)
+sha1sums=('5fa0c0a190fbe1030a14e435de2d5a3259ca70be'
+  '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
+  'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
+  '6838fc00ef4618c924a77e0fb03c05346080908a'
+  '993798f3d22ad672d769dae5f48d1fa068d5578f')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  # Use nouveau/nv/nvidia drivers for nvidia devices
+  patch -Np1 -i ${srcdir}/autoconfig-nvidia.patch
+
+  autoreconf
+  ./configure --prefix=/usr \
+  --enable-ipv6 \
+  --enable-dri \
+  --enable-dmx \
+  --enable-xvfb \
+  --enable-xnest \
+  --enable-composite \
+  --enable-xcsecurity \
+  --enable-xorg \
+  --enable-xephyr \
+  --enable-glx-tls \
+  --enable-kdrive \
+  --enable-install-setuid \
+  --enable-config-udev \
+  --disable-config-dbus \
+  --enable-record \
+  --disable-xfbdev \
+  --disable-xfake \
+  --disable-static \
+  --sysconfdir=/etc/X11 \
+  --localstatedir=/var \
+  --with-xkb-path=/usr/share/X11/xkb \
+  --with-xkb-output=/var/lib/xkb \
+  --with-fontrootdir=/usr/share/fonts
+  make
+
+  # Disable subdirs for make install rule to make splitting easier
+  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
+  -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
+  -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
+  -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
+  -i hw/Makefile
+}
+
+package_xorg-server-common() {
+  pkgdesc=Xorg server common files
+  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 
'xorg-fonts-misc')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -m755 -d ${pkgdir}/usr/share/licenses/xorg-server-common
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/xorg-server-common
+  
+  make -C xkb DESTDIR=${pkgdir} install-data
+
+  install

[arch-commits] Commit in xorg-server/repos (7 files)

2011-08-30 Thread Jan de Groot 
Date: Tuesday, August 30, 2011 @ 04:44:30
  Author: jgc
Revision: 136479

db-move: moved xorg-server from [staging] to [testing] (x86_64)

Added:
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/10-quirks.conf
(from rev 136477, xorg-server/repos/staging-x86_64/10-quirks.conf)
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 136477, xorg-server/repos/staging-x86_64/PKGBUILD)
  xorg-server/repos/testing-x86_64/autoconfig-nvidia.patch
(from rev 136477, xorg-server/repos/staging-x86_64/autoconfig-nvidia.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 136477, xorg-server/repos/staging-x86_64/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 136477, xorg-server/repos/staging-x86_64/xvfb-run.1)
Deleted:
  xorg-server/repos/staging-x86_64/

-+
 10-quirks.conf  |   10 +
 PKGBUILD|  178 +
 autoconfig-nvidia.patch |   29 
 xvfb-run|  180 +
 xvfb-run.1  |  282 ++
 5 files changed, 679 insertions(+)

Copied: xorg-server/repos/testing-x86_64/10-quirks.conf (from rev 136477, 
xorg-server/repos/staging-x86_64/10-quirks.conf)
===
--- testing-x86_64/10-quirks.conf   (rev 0)
+++ testing-x86_64/10-quirks.conf   2011-08-30 08:44:30 UTC (rev 136479)
@@ -0,0 +1,10 @@
+# Collection of quirks and blacklist/whitelists for specific devices.
+
+
+# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
+# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
+Section InputClass
+Identifier ThinkPad HDAPS accelerometer blacklist
+MatchProduct ThinkPad HDAPS accelerometer data
+Option Ignore on
+EndSection

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 136477, 
xorg-server/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-08-30 08:44:30 UTC (rev 136479)
@@ -0,0 +1,178 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=xorg-server
+pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
+pkgver=1.11.0
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org;
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 
'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 
'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 
'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 
'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 
'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto')
+options=('!libtool')
+source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
+autoconfig-nvidia.patch
+xvfb-run
+xvfb-run.1
+10-quirks.conf)
+sha1sums=('5fa0c0a190fbe1030a14e435de2d5a3259ca70be'
+  '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
+  'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
+  '6838fc00ef4618c924a77e0fb03c05346080908a'
+  '993798f3d22ad672d769dae5f48d1fa068d5578f')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  # Use nouveau/nv/nvidia drivers for nvidia devices
+  patch -Np1 -i ${srcdir}/autoconfig-nvidia.patch
+
+  autoreconf
+  ./configure --prefix=/usr \
+  --enable-ipv6 \
+  --enable-dri \
+  --enable-dmx \
+  --enable-xvfb \
+  --enable-xnest \
+  --enable-composite \
+  --enable-xcsecurity \
+  --enable-xorg \
+  --enable-xephyr \
+  --enable-glx-tls \
+  --enable-kdrive \
+  --enable-install-setuid \
+  --enable-config-udev \
+  --disable-config-dbus \
+  --enable-record \
+  --disable-xfbdev \
+  --disable-xfake \
+  --disable-static \
+  --sysconfdir=/etc/X11 \
+  --localstatedir=/var \
+  --with-xkb-path=/usr/share/X11/xkb \
+  --with-xkb-output=/var/lib/xkb \
+  --with-fontrootdir=/usr/share/fonts
+  make
+
+  # Disable subdirs for make install rule to make splitting easier
+  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
+  -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
+  -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
+  -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
+  -i hw/Makefile
+}
+
+package_xorg-server-common() {
+  pkgdesc=Xorg server common files
+  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 
'xorg-fonts-misc')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -m755 -d ${pkgdir}/usr/share/licenses/xorg-server-common
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/xorg-server-common
+  
+  make -C