From 90f97c6f30af5c30599fab0b6d6c1f474ad15fe0 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 Feb 2013 00:49:03 -0800 Subject: Sun Feb 24 00:48:48 PST 2013 --- extra/ruby/PKGBUILD | 4 ++-- extra/xf86-video-intel/PKGBUILD | 6 +++--- extra/xorg-server/PKGBUILD | 23 +++++++++++--------- extra/xorg-server/bug59825.patch | 12 +++++++++++ .../xserver-1.6.0-less-acpi-brokenness.patch | 25 ++++++++++++++++++++++ 5 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 extra/xorg-server/bug59825.patch create mode 100644 extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch (limited to 'extra') diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index b960373e6..5f3c8a174 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p385 +pkgver=1.9.3_p392 pkgrel=1 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c' +md5sums=('a810d64e2255179d2f334eb61fb8519c' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 81beb4f8e..adaad515b 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178020 2013-02-13 16:45:46Z andyrtr $ +# $Id: PKGBUILD 178462 2013-02-23 11:12:21Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.21.2 +pkgver=2.21.3 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2e6890ecacc715caa5459581b00b63152e08646ea1b76330bf79b996a139d850') +sha256sums=('1ce672a042226dba776649e9067827c24fbb27383c78919a372265bb0d939dbb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 9e283b69d..ee2a949f0 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175947 2013-01-25 08:45:46Z andyrtr $ +# $Id: PKGBUILD 178463 2013-02-23 11:12:22Z 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-common' 'xorg-server-devel') -pkgver=1.13.2 +pkgver=1.13.2.901 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -16,14 +16,17 @@ options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch + xserver-1.6.0-less-acpi-brokenness.patch + bug59825.patch xvfb-run xvfb-run.1 10-quirks.conf - #git-fixes.patch use-pixman-glyph-cache.patch) -sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408' +sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' + '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' @@ -32,18 +35,18 @@ sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408' build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Apply upstream fixes from server-1.13 branch -# patch -Np1 -i "${srcdir}/git-fixes.patch" - - # Use pixman 0.28.0 glyph cache - backported from git master -# patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch" - # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo + patch -Np1 -i "${srcdir}/bug59825.patch" + + # From Fedora. Do not build acpid code, it is buggy and we do not need it + patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ diff --git a/extra/xorg-server/bug59825.patch b/extra/xorg-server/bug59825.patch new file mode 100644 index 000000000..b405d136d --- /dev/null +++ b/extra/xorg-server/bug59825.patch @@ -0,0 +1,12 @@ +diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c +--- a/glx/glxdri.c 2013-01-24 22:14:35.216092949 +0100 ++++ b/glx/glxdri.c 2013-01-24 22:13:48.499427991 +0100 +@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + size_t buffer_size; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + ++ framebuffer.base = NULL; ++ + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || + !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { + LogMessage(X_INFO, \ No newline at end of file diff --git a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch new file mode 100644 index 000000000..b42c2d7c8 --- /dev/null +++ b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch @@ -0,0 +1,25 @@ +From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 9 Nov 2011 11:52:06 +1000 +Subject: [PATCH 2/7] Don't build the ACPI code. + +No good can come of this. +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a12783c..54f4464 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then + linux_alpha=yes + ;; + i*86|amd64*|x86_64*|ia64*) +- linux_acpi="yes" + ;; + *) + ;; +-- +1.7.10.1 + -- cgit v1.2.3-54-g00ecf