[arch-commits] Commit in ddcxinfo-arch/repos (3 files)

Eric Bélanger eric at archlinux.org
Mon Mar 2 05:13:16 UTC 2009 

    Date: Monday, March 2, 2009 @ 00:13:16
  Author: eric
Revision: 28781

Merged revisions 356,2304,28779 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ddcxinfo-arch/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2304 | paul | 2008-05-31 01:00:40 -0400 (Sat, 31 May 2008) | 2 lines
  
  Added licenses for 64 packages.
........
  r28779 | eric | 2009-03-02 00:09:11 -0500 (Mon, 02 Mar 2009) | 2 lines
  
  upgpkg: ddcxinfo-arch 0.8-2
      Corrected license, fixed build patch
........

Added:
  ddcxinfo-arch/repos/extra-i686/lrmi-vm86.patch
    (from rev 28779, ddcxinfo-arch/trunk/lrmi-vm86.patch)
Modified:
  ddcxinfo-arch/repos/extra-i686/	(properties)
  ddcxinfo-arch/repos/extra-i686/PKGBUILD

-----------------+
 PKGBUILD        |   15 +++----
 lrmi-vm86.patch |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 7 deletions(-)


Property changes on: ddcxinfo-arch/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /ddcxinfo-arch/trunk:1
   + /ddcxinfo-arch/trunk:1-28780

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-02 05:11:08 UTC (rev 28780)
+++ extra-i686/PKGBUILD	2009-03-02 05:13:16 UTC (rev 28781)
@@ -5,17 +5,18 @@
 
 pkgname=ddcxinfo-arch
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="utility to probe non/ddc monitors - used by hwd"
+arch=('i686' 'x86_64')
 url="http://user-contributions.org/projects/ddcxinfo-arch/"
-depends=('glibc')
+license=('LGPL2')
+depends=('glibc' 'libx86')
+source=(http://user-contributions.org/projects/ddcxinfo-arch/source/$pkgname-$pkgver.tar.gz lrmi-vm86.patch)
+md5sums=('ca734d958a54bef03a543479f7ab8b00' '64a4a142daf8491be4cf4075f2086e87')
 
-source=(http://user-contributions.org/projects/ddcxinfo-arch/source/$pkgname-$pkgver.tar.gz)
-
-md5sums=('ca734d958a54bef03a543479f7ab8b00')
-
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -p1 < ../lrmi-vm86.patch || return 1
   make ddcxinfo-arch || return 1
-  install -D -m755 ddcxinfo-arch $startdir/pkg/usr/sbin/ddcxinfo-arch
+  install -D -m755 ddcxinfo-arch $startdir/pkg/usr/sbin/ddcxinfo-arch || return 1
 }

Copied: ddcxinfo-arch/repos/extra-i686/lrmi-vm86.patch (from rev 28779, ddcxinfo-arch/trunk/lrmi-vm86.patch)
===================================================================
--- extra-i686/lrmi-vm86.patch	                        (rev 0)
+++ extra-i686/lrmi-vm86.patch	2009-03-02 05:13:16 UTC (rev 28781)
@@ -0,0 +1,114 @@
+diff -Naur ddcxinfo-arch-0.8/Makefile ddcxinfo-arch-0.8-new/Makefile
+--- ddcxinfo-arch-0.8/Makefile	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8-new/Makefile	2009-03-02 00:01:28.000000000 -0500
+@@ -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/bioscall.c ddcxinfo-arch-0.8-new/bioscall.c
+--- ddcxinfo-arch-0.8/bioscall.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8-new/bioscall.c	2009-03-02 00:01:28.000000000 -0500
+@@ -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/ddcprobe.c ddcxinfo-arch-0.8-new/ddcprobe.c
+--- ddcxinfo-arch-0.8/ddcprobe.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8-new/ddcprobe.c	2009-03-02 00:02:29.000000000 -0500
+@@ -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: ddcprobe.c,v 1.10 2000/08/09 15:13:37 notting Exp $"
+ 
+ char *snip(char *string)
+diff -Naur ddcxinfo-arch-0.8/ddcxinfo-arch.c ddcxinfo-arch-0.8-new/ddcxinfo-arch.c
+--- ddcxinfo-arch-0.8/ddcxinfo-arch.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8-new/ddcxinfo-arch.c	2009-03-02 00:01:28.000000000 -0500
+@@ -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: ddcxinfo.c,v 1.7 1999/08/24 01:08:47 nalin Exp $"
+ modified by Klaus Knopper <knoppix at knopper.net> for KNOPPIX Feb. 2003
+diff -Naur ddcxinfo-arch-0.8/svgamodes.c ddcxinfo-arch-0.8-new/svgamodes.c
+--- ddcxinfo-arch-0.8/svgamodes.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8-new/svgamodes.c	2009-03-02 00:03:45.000000000 -0500
+@@ -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: svgamodes.c,v 1.5 1999/08/24 01:08:47 nalin Exp $"
+ 
+ /*
+diff -Naur ddcxinfo-arch-0.8/vbe.c ddcxinfo-arch-0.8-new/vbe.c
+--- ddcxinfo-arch-0.8/vbe.c	2004-12-01 01:29:20.000000000 -0500
++++ ddcxinfo-arch-0.8-new/vbe.c	2009-03-02 00:01:28.000000000 -0500
+@@ -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: vbe.c,v 1.9 2002/01/04 02:29:30 notting Exp $"

More information about the arch-commits mailing list