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

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

    Date: Monday, March 2, 2009 @ 00:11:08
  Author: eric
Revision: 28780

fixed svn conflict

Modified:
  ddcxinfo-arch/repos/extra-x86_64/	(properties)
  ddcxinfo-arch/repos/extra-x86_64/PKGBUILD
  ddcxinfo-arch/repos/extra-x86_64/lrmi-vm86.patch

-----------------+
 PKGBUILD        |   13 ++++++-------
 lrmi-vm86.patch |   44 ++++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 29 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-02 05:09:11 UTC (rev 28779)
+++ extra-x86_64/PKGBUILD	2009-03-02 05:11:08 UTC (rev 28780)
@@ -5,19 +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/"
-license=('GPL')
-depends=('glibc')
-[ "${CARCH}" = "x86_64" ] && depends=(${depends[@]} 'libx86')
+license=('LGPL2')
+depends=('glibc' 'libx86')
 source=(http://user-contributions.org/projects/ddcxinfo-arch/source/$pkgname-$pkgver.tar.gz lrmi-vm86.patch)
-md5sums=('ca734d958a54bef03a543479f7ab8b00' 'f3d45d217c54ef787063bcf6d325a200')
+md5sums=('ca734d958a54bef03a543479f7ab8b00' '64a4a142daf8491be4cf4075f2086e87')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  [ "$CARCH" = "x86_64" ] && (patch -Np1 -i ../lrmi-vm86.patch || return 1)
+  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
 }

Modified: extra-x86_64/lrmi-vm86.patch
===================================================================
--- extra-x86_64/lrmi-vm86.patch	2009-03-02 05:09:11 UTC (rev 28779)
+++ extra-x86_64/lrmi-vm86.patch	2009-03-02 05:11:08 UTC (rev 28780)
@@ -1,6 +1,6 @@
-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
+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
@@ -34,9 +34,9 @@
  	$(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
+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>
@@ -46,9 +46,9 @@
  #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
+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>
@@ -64,12 +64,12 @@
  #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 $"
+ //#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.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
+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>
@@ -77,11 +77,11 @@
 -#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 $"
+ #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.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
+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>
@@ -97,12 +97,12 @@
  #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 $"
+ #ident "$Id: svgamodes.c,v 1.5 1999/08/24 01:08:47 nalin 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
+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>
@@ -111,4 +111,4 @@
 +#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 $"
+ #ident "$Id: vbe.c,v 1.9 2002/01/04 02:29:30 notting Exp $"

More information about the arch-commits mailing list