From b464c2860e91a60ffce805697b504bfbf7715148 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Sun, 6 Jul 2014 03:43:28 +0000
Subject: Sun Jul  6 03:41:15 UTC 2014

---
 community/vbetool/PKGBUILD           | 24 ++++++++++++------------
 community/vbetool/no_x86_check.patch | 24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 community/vbetool/no_x86_check.patch

(limited to 'community/vbetool')

diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD
index de312a4f7..60c40c6d5 100644
--- a/community/vbetool/PKGBUILD
+++ b/community/vbetool/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 92026 2013-05-30 23:36:55Z seblu $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# $Id: PKGBUILD 114949 2014-07-05 01:31:53Z cbehan $
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Christian Storm <Christian.Storm@gmx.DE>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Thayer Williams <thayer@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
 }
 
diff --git a/community/vbetool/no_x86_check.patch b/community/vbetool/no_x86_check.patch
new file mode 100644
index 000000000..ff9403d06
--- /dev/null
+++ b/community/vbetool/no_x86_check.patch
@@ -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)
+ 
-- 
cgit v1.2.3-54-g00ecf