[arch-commits] Commit in vbetool/repos (6 files)
Connor Behan
cbehan at nymeria.archlinux.org
Sat Jul 5 01:31:54 UTC 2014
Date: Saturday, July 5, 2014 @ 03:31:53
Author: cbehan
Revision: 114949
archrelease: copy trunk to community-i686, community-x86_64
Added:
vbetool/repos/community-i686/PKGBUILD
(from rev 114948, vbetool/trunk/PKGBUILD)
vbetool/repos/community-i686/no_x86_check.patch
(from rev 114948, vbetool/trunk/no_x86_check.patch)
vbetool/repos/community-x86_64/PKGBUILD
(from rev 114948, vbetool/trunk/PKGBUILD)
vbetool/repos/community-x86_64/no_x86_check.patch
(from rev 114948, vbetool/trunk/no_x86_check.patch)
Deleted:
vbetool/repos/community-i686/PKGBUILD
vbetool/repos/community-x86_64/PKGBUILD
-------------------------------------+
/PKGBUILD | 64 ++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 32 -----------------
community-i686/no_x86_check.patch | 24 ++++++++++++
community-x86_64/PKGBUILD | 32 -----------------
community-x86_64/no_x86_check.patch | 24 ++++++++++++
5 files changed, 112 insertions(+), 64 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-07-05 01:31:14 UTC (rev 114948)
+++ community-i686/PKGBUILD 2014-07-05 01:31:53 UTC (rev 114949)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: 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
-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')
-makedepends=('pciutils')
-source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ffb03b118867a02296d7449019ad8846')
-
-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
- make LIBS=-lpci
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-}
Copied: vbetool/repos/community-i686/PKGBUILD (from rev 114948, vbetool/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-07-05 01:31:53 UTC (rev 114949)
@@ -0,0 +1,32 @@
+# $Id$
+# 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.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' 'libpciaccess')
+makedepends=('pciutils')
+source=("http://cgit.freedesktop.org/~airlied/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz"
+ 'no_x86_check.patch')
+md5sums=('SKIP'
+ 'f4abc1181c0cda966626cbe5872d678f')
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ patch -Np1 -i ../no_x86_check.patch
+ ./autogen.sh --prefix=/usr --sbindir=/usr/bin
+ make LIBS=-lpci
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
Copied: vbetool/repos/community-i686/no_x86_check.patch (from rev 114948, vbetool/trunk/no_x86_check.patch)
===================================================================
--- community-i686/no_x86_check.patch (rev 0)
+++ community-i686/no_x86_check.patch 2014-07-05 01:31:53 UTC (rev 114949)
@@ -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)
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-07-05 01:31:14 UTC (rev 114948)
+++ community-x86_64/PKGBUILD 2014-07-05 01:31:53 UTC (rev 114949)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: 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
-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')
-makedepends=('pciutils')
-source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ffb03b118867a02296d7449019ad8846')
-
-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
- make LIBS=-lpci
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-}
Copied: vbetool/repos/community-x86_64/PKGBUILD (from rev 114948, vbetool/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-07-05 01:31:53 UTC (rev 114949)
@@ -0,0 +1,32 @@
+# $Id$
+# 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.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' 'libpciaccess')
+makedepends=('pciutils')
+source=("http://cgit.freedesktop.org/~airlied/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz"
+ 'no_x86_check.patch')
+md5sums=('SKIP'
+ 'f4abc1181c0cda966626cbe5872d678f')
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ patch -Np1 -i ../no_x86_check.patch
+ ./autogen.sh --prefix=/usr --sbindir=/usr/bin
+ make LIBS=-lpci
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
Copied: vbetool/repos/community-x86_64/no_x86_check.patch (from rev 114948, vbetool/trunk/no_x86_check.patch)
===================================================================
--- community-x86_64/no_x86_check.patch (rev 0)
+++ community-x86_64/no_x86_check.patch 2014-07-05 01:31:53 UTC (rev 114949)
@@ -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)
+
More information about the arch-commits
mailing list