[arch-commits] CVS update of extra/system/ddcxinfo-arch (PKGBUILD lrmi-vm86.patch)

[Eric Belanger]

    Date: Monday, July 2, 2007 @ 22:18:49
  Author: eric
    Path: /home/cvs-extra/extra/system/ddcxinfo-arch

   Added: lrmi-vm86.patch (1.1)
Modified: PKGBUILD (1.1 -> 1.2)

upgpkg: ddcxinfo-arch 0.8-1
patched for x86_64


-----------------+
 PKGBUILD        |   12 +++--
 lrmi-vm86.patch |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 5 deletions(-)


Index: extra/system/ddcxinfo-arch/PKGBUILD
diff -u extra/system/ddcxinfo-arch/PKGBUILD:1.1 extra/system/ddcxinfo-arch/PKGBUILD:1.2
--- extra/system/ddcxinfo-arch/PKGBUILD:1.1	Tue Mar 29 19:22:45 2005
+++ extra/system/ddcxinfo-arch/PKGBUILD	Mon Jul  2 22:18:49 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.1 2005/03/30 00:22:45 damir Exp $
+# $Id: PKGBUILD,v 1.2 2007/07/03 02:18:49 eric Exp $
 # Maintainer: damir <damir at archlinux.org>
 # TUR: Ben <ben at benmazer.net>
 # Contributor: Elia Yehuda <z4ziggy at user-contributions.org>
@@ -7,15 +7,17 @@
 pkgver=0.8
 pkgrel=1
 pkgdesc="utility to probe non/ddc monitors - used by hwd"
+arch=('i686' 'x86_64')
 url="http://user-contributions.org/projects/ddcxinfo-arch/"
+license=('GPL')
 depends=('glibc')
-
-source=(http://user-contributions.org/projects/ddcxinfo-arch/source/$pkgname-$pkgver.tar.gz)
-
-md5sums=('ca734d958a54bef03a543479f7ab8b00')
+[ "${CARCH}" = "x86_64" ] && depends=(${depends[@]} 'libx86')
+source=(http://user-contributions.org/projects/ddcxinfo-arch/source/$pkgname-$pkgver.tar.gz lrmi-vm86.patch)
+md5sums=('ca734d958a54bef03a543479f7ab8b00' 'f3d45d217c54ef787063bcf6d325a200')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  [ "$CARCH" = "x86_64" ] && (patch -Np1 -i ../lrmi-vm86.patch || return 1)
   make ddcxinfo-arch || return 1
   install -D -m755 ddcxinfo-arch $startdir/pkg/usr/sbin/ddcxinfo-arch
 }
Index: extra/system/ddcxinfo-arch/lrmi-vm86.patch
diff -u /dev/null extra/system/ddcxinfo-arch/lrmi-vm86.patch:1.1
--- /dev/null	Mon Jul  2 22:18:49 2007
+++ extra/system/ddcxinfo-arch/lrmi-vm86.patch	Mon Jul  2 22:18:49 2007
@@ -0,0 +1,114 @@
+diff -Naur ddcxinfo-arch-0.8.orig/Makefile ddcxinfo-arch-0.8/Makefile
+--- ddcxinfo-arch-0.8.orig/Makefile	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8/Makefile	2007-06-26 00:14:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ CFLAGS=-Wall -O2 -g #-DDEBUG #-DORIGINAL_LRMI_CODE_THAT_GOT_IFDEFED_OUT
++LDFLAGS= -L/usr/lib -lx86
+ 
+ TARGETS=ddcprobe svgamodes ddcxinfo ddcxinfo-knoppix ddcxinfo-arch modetest libvbe.a
+ 
+@@ -15,19 +16,19 @@
+ install: $(TARGETS)
+ 	cp -a ddcprobe $(DESTDIR)/usr/sbin/ddcprobe
+ 
+-ddcprobe: lrmi.o vesamode.o vbe.o ddcprobe.o
++ddcprobe: vesamode.o vbe.o ddcprobe.o
+ 
+-svgamodes: lrmi.o vesamode.o vbe.o svgamodes.o
++svgamodes: vesamode.o vbe.o svgamodes.o
+ 
+-ddcxinfo: lrmi.o vesamode.o vbe.o ddcxinfo.o
++ddcxinfo: vesamode.o vbe.o ddcxinfo.o
+ 
+-ddcxinfo-knoppix: lrmi.o vesamode.o vbe.o ddcxinfo-knoppix.o
++ddcxinfo-knoppix: vesamode.o vbe.o ddcxinfo-knoppix.o
+ 
+-ddcxinfo-arch: lrmi.o vesamode.o vbe.o ddcxinfo-arch.o
++ddcxinfo-arch: vesamode.o vbe.o ddcxinfo-arch.o
+ 
+-modetest: lrmi.o vesamode.o vbe.o modetest.o
++modetest: vesamode.o vbe.o modetest.o
+ 
+-libvbe.a: lrmi.o vesamode.o vbe.o
++libvbe.a: vesamode.o vbe.o
+ 	$(AR) cru $@ $^
+ 
+ install-lib: $(prefix)/include/vbe.h $(prefix)/lib/libvbe.a
+diff -Naur ddcxinfo-arch-0.8.orig/bioscall.c ddcxinfo-arch-0.8/bioscall.c
+--- ddcxinfo-arch-0.8.orig/bioscall.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8/bioscall.c	2007-06-26 00:15:32.000000000 -0400
+@@ -1,7 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/io.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++//#include <sys/vm86.h>
+ #include <sys/syscall.h>
+ #include <sys/mman.h>
+ #include <ctype.h>
+diff -Naur ddcxinfo-arch-0.8.orig/ddcprobe.c ddcxinfo-arch-0.8/ddcprobe.c
+--- ddcxinfo-arch-0.8.orig/ddcprobe.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8/ddcprobe.c	2007-06-26 00:16:12.000000000 -0400
+@@ -2,7 +2,7 @@
+ #include <sys/types.h>
+ #include <sys/io.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++//#include <sys/vm86.h>
+ #include <sys/syscall.h>
+ #include <sys/mman.h>
+ #include <assert.h>
+@@ -16,7 +16,7 @@
+ #include <netinet/in.h>
+ #include "vbe.h"
+ #include "vesamode.h"
+-#include "lrmi.h"
++#include <libx86.h>
+ //#ident "$Id: lrmi-vm86.patch,v 1.1 2007/07/03 02:18:49 eric Exp $"
+ 
+ char *snip(char *string)
+diff -Naur ddcxinfo-arch-0.8.orig/ddcxinfo-arch.c ddcxinfo-arch-0.8/ddcxinfo-arch.c
+--- ddcxinfo-arch-0.8.orig/ddcxinfo-arch.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8/ddcxinfo-arch.c	2007-06-26 00:16:46.000000000 -0400
+@@ -2,7 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include "vbe.h"
+-#include "lrmi.h"
++#include <libx86.h>
+ /************* This is derived from ddcxinfo written by *****************\
+ #ident "$Id: lrmi-vm86.patch,v 1.1 2007/07/03 02:18:49 eric Exp $"
+ modified by Klaus Knopper <knoppix at knopper.net> for KNOPPIX Feb. 2003
+diff -Naur ddcxinfo-arch-0.8.orig/svgamodes.c ddcxinfo-arch-0.8/svgamodes.c
+--- ddcxinfo-arch-0.8.orig/svgamodes.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8/svgamodes.c	2007-06-26 00:18:06.000000000 -0400
+@@ -1,7 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/io.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++//#include <sys/vm86.h>
+ #include <sys/syscall.h>
+ #include <sys/mman.h>
+ #include <assert.h>
+@@ -15,7 +15,7 @@
+ #include <netinet/in.h>
+ #include "vbe.h"
+ #include "vesamode.h"
+-#include "lrmi.h"
++#include <libx86.h>
+ #ident "$Id: lrmi-vm86.patch,v 1.1 2007/07/03 02:18:49 eric Exp $"
+ 
+ /*
+diff -Naur ddcxinfo-arch-0.8.orig/vbe.c ddcxinfo-arch-0.8/vbe.c
+--- ddcxinfo-arch-0.8.orig/vbe.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8/vbe.c	2007-06-26 00:18:27.000000000 -0400
+@@ -8,7 +8,7 @@
+ #include <assert.h>
+ #include <limits.h>
+ #include <ctype.h>
+-#include "lrmi.h"
++#include <libx86.h>
+ #include "vesamode.h"
+ #include "vbe.h"
+ #ident "$Id: lrmi-vm86.patch,v 1.1 2007/07/03 02:18:49 eric Exp $"