[arch-commits] Commit in vbetool/trunk (PKGBUILD no_x86_check.patch)

[Connor Behan]

    Date: Saturday, July 5, 2014 @ 03:31:14
  Author: cbehan
Revision: 114948

upgpkg: vbetool 1.2.2-1

Update to 1.2.2-1

Added:
  vbetool/trunk/no_x86_check.patch
Modified:
  vbetool/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   22 +++++++++++-----------
 no_x86_check.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-04 20:21:33 UTC (rev 114947)
+++ PKGBUILD	2014-07-05 01:31:14 UTC (rev 114948)
@@ -1,28 +1,28 @@
 # $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Maintainer: Connor Behan <connor.behan at gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Christian Storm <Christian.Storm at gmx.DE>
 # Contributor: James Rayner <james at archlinux.org>
 # Contributor: Thayer Williams <thayer at archlinux.org>
 
 pkgname=vbetool
-pkgver=1.1
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="Uses lrmi in order to run code from the video BIOS"
 url="http://www.srcf.ucam.org/~mjg59/vbetool/"
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('zlib' 'libx86')
+depends=('zlib' 'libx86' 'libpciaccess')
 makedepends=('pciutils')
-source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ffb03b118867a02296d7449019ad8846')
+source=("http://cgit.freedesktop.org/~airlied/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz"
+        'no_x86_check.patch')
+md5sums=('SKIP'
+         'f4abc1181c0cda966626cbe5872d678f')
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
-  if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --sbindir=/usr/bin --without-x86emu
-  else
-    ./configure --prefix=/usr --sbindir=/usr/bin
-  fi
+  patch -Np1 -i ../no_x86_check.patch
+  ./autogen.sh --prefix=/usr --sbindir=/usr/bin
   make LIBS=-lpci
 }
 

Added: no_x86_check.patch
===================================================================
--- no_x86_check.patch	                        (rev 0)
+++ no_x86_check.patch	2014-07-05 01:31:14 UTC (rev 114948)
@@ -0,0 +1,24 @@
+diff -u vbetool-vbetool-1.2.2.orig/configure.ac vbetool-vbetool-1.2.2/configure.ac
+--- vbetool-vbetool-1.2.2.orig/configure.ac	2014-07-04 18:05:58.478398712 -0700
++++ vbetool-vbetool-1.2.2/configure.ac	2014-07-04 18:07:06.496117460 -0700
+@@ -35,9 +35,6 @@
+ 
+ PKG_CHECK_MODULES(LIBPCIACCESS, pciaccess)
+ 
+-# Checks for pkg-config packages
+-PKG_CHECK_MODULES(LIBX86, x86)
+-
+ SAVE_CFLAGS=$CFLAGS
+ CFLAGS=$LIBPCIACCESS_CFLAGS
+ LIBS=$LIBPCIACCESS_LIBS
+@@ -45,8 +42,8 @@
+ LIBS=$SAVE_LIBS
+ CFLAGS=$SAVE_CFLAGS
+ 
+-VBETOOL_LIBS="$LIBPCIACCESS_LIBS $LIBX86_LIBS"
+-VBETOOL_CFLAGS="$LIBPCIACCESS_CFLAGS $LIBX86_CFLAGS"
++VBETOOL_LIBS="$LIBPCIACCESS_LIBS -lx86"
++VBETOOL_CFLAGS="$LIBPCIACCESS_CFLAGS"
+ AC_SUBST(VBETOOL_CFLAGS)
+ AC_SUBST(VBETOOL_LIBS)
+