[arch-commits] CVS update of extra/system/irda-utils (PKGBUILD irda.patch)

Aaron Griffin aaron at archlinux.org
Mon Dec 17 02:03:04 EST 2007


    Date: Monday, December 17, 2007 @ 02:03:04
  Author: aaron
    Path: /home/cvs-extra/extra/system/irda-utils

Modified: PKGBUILD (1.12 -> 1.13) irda.patch (1.1 -> 1.2)

upgpkg: irda-utils 0.9.18-1
    Upgrade, close FS#5169


------------+
 PKGBUILD   |   23 +++++---
 irda.patch |  152 +++++++++++++++++++----------------------------------------
 2 files changed, 64 insertions(+), 111 deletions(-)


Index: extra/system/irda-utils/PKGBUILD
diff -u extra/system/irda-utils/PKGBUILD:1.12 extra/system/irda-utils/PKGBUILD:1.13
--- extra/system/irda-utils/PKGBUILD:1.12	Fri Jul 14 18:24:19 2006
+++ extra/system/irda-utils/PKGBUILD	Mon Dec 17 02:03:04 2007
@@ -1,18 +1,24 @@
-# $Id: PKGBUILD,v 1.12 2006/07/14 22:24:19 andyrtr Exp $
-# Maintainer: aurelien <aurelien at archlinux.org>
+# $Id: PKGBUILD,v 1.13 2007/12/17 07:03:04 aaron Exp $
+#Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Contributor: Aurelien Foret <orelien at chez.com>
+
 pkgname=irda-utils
-pkgver=0.9.17
+pkgver=0.9.18
 pkgrel=1
 pkgdesc="Utilities for infrared communication between devices"
+url="http://irda.sourceforge.net/"
 arch=(i686 x86_64)
+license=(GPL)
 backup=(etc/conf.d/irda)
 makedepends=('pciutils')
 depends=('glib2')
-source=(http://dl.sourceforge.net/sourceforge/irda/$pkgname-$pkgver.tar.gz irda irda.conf.d irda.patch)
-url="http://irda.sourceforge.net/"
-md5sums=('65f9be306d2367996e27264ef0b70bd4' '8f7d38590d089041e5246eb0ee3c8291'\
-         '1a9c76b74faa993cc900152361798c50' '1a9d89a4b72679cc76bfe8e405c6457c')
+source=(http://downloads.sourceforge.net/sourceforge/irda/$pkgname-$pkgver.tar.gz
+        irda irda.conf.d irda.patch)
+options=(!emptydirs)
+md5sums=('84dc12aa4c3f61fccb8d8919bf4079bb'
+         '8f7d38590d089041e5246eb0ee3c8291'
+         '1a9c76b74faa993cc900152361798c50'
+         'f9e0ba20e1047ee82af17698cb115a7d')
 
 build()
 {
@@ -25,7 +31,4 @@
   make ROOT=$startdir/pkg PREFIX=$startdir/pkg install || return 1
   install -D -m755 ../irda $startdir/pkg/etc/rc.d/irda
   install -D -m644 ../irda.conf.d $startdir/pkg/etc/conf.d/irda
-
-  #this is still needed... it makes an empty dir
-  rm -rf $startdir/pkg/usr/X11R6
 }
Index: extra/system/irda-utils/irda.patch
diff -u extra/system/irda-utils/irda.patch:1.1 extra/system/irda-utils/irda.patch:1.2
--- extra/system/irda-utils/irda.patch:1.1	Sun Jul 16 12:50:32 2006
+++ extra/system/irda-utils/irda.patch	Mon Dec 17 02:03:04 2007
@@ -1,6 +1,5 @@
-diff -ur irda-utils-0.9.17.orig/irnetd/Makefile irda-utils-0.9.17/irnetd/Makefile
---- irda-utils-0.9.17.orig/irnetd/Makefile	2006-03-09 07:25:19.000000000 +0100
-+++ irda-utils-0.9.17/irnetd/Makefile	2006-05-16 11:52:18.000000000 +0200
+--- irda-utils-0.9.18-orig/irnetd/Makefile	2006-07-11 08:16:06.000000000 +0200
++++ irda-utils-0.9.18/irnetd/Makefile	2007-09-25 01:38:13.000000000 +0200
 @@ -55,7 +55,7 @@
  
  install: irnetd
@@ -10,101 +9,52 @@
  
  
  clean:
-diff -ur irda-utils-0.9.17.orig/smcinit/smcinit.c irda-utils-0.9.17/smcinit/smcinit.c
---- irda-utils-0.9.17.orig/smcinit/smcinit.c	2006-03-09 07:25:24.000000000 +0100
-+++ irda-utils-0.9.17/smcinit/smcinit.c	2006-05-16 11:53:32.000000000 +0200
-@@ -262,7 +262,7 @@
- 	 */
- 	struct pci_access *acc;
- 	struct pci_dev *dev;
--	word twobyte;
-+	u16 twobyte;
- 	int i = 0, chip = 0;
- 	int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma;
- 	unsigned int *address, SMC_BASE = 0;
-@@ -279,7 +279,7 @@
- 	}
- 	acc = pci_alloc();
- 	pci_init(acc);
--	dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC);	/* 5100 also dev
-+	dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC);	/* 5100 also dev
- 								 * 1f */
- 	twobyte = pci_read_word(dev, VID);
- 	if (twobyte != 0x8086) {
-diff -ur irda-utils-0.9.17.orig/smcinit/tosh1800-smcinit.c irda-utils-0.9.17/smcinit/tosh1800-smcinit.c
---- irda-utils-0.9.17.orig/smcinit/tosh1800-smcinit.c	2006-03-09 07:25:24.000000000 +0100
-+++ irda-utils-0.9.17/smcinit/tosh1800-smcinit.c	2006-05-16 11:54:20.000000000 +0200
-@@ -53,8 +53,8 @@
-  */
- struct port_decoding_access_info {
-     int port;
--    byte reg;
--    byte or_mask;
-+    u8 reg;
-+    u8 or_mask;
- };
- 
- struct port_decoding_access_info ali1533_ports[] = {
-@@ -100,7 +100,7 @@
- 
- struct smc_chip_model {
-     char *name;
--    byte version_id;
-+    u8 version_id;
-     int (*config_function) (int revision, int cfgbase, int sirbase,
-                             int firbase, int dma, int irq);
- };
-@@ -257,7 +257,7 @@
- static int print_ali1533_port_status(struct pci_dev *dev)
- {
-     struct port_decoding_access_info *p;
--    byte onebyte;
-+    u8 onebyte;
-     int i;
- 
-     DEBUG("printing port status");
-@@ -283,7 +283,7 @@
- static int set_ali1533_port(struct pci_dev *dev, int port, int decode)
- {
-     struct port_decoding_access_info info;
--    byte previousval, onebyte, and_mask;
-+    u8 previousval, onebyte, and_mask;
-     int retval;
- 
-     DEBUG_VAL("looking for port", port);
-@@ -405,7 +405,7 @@
- 
- static int configure_47N227_smc_ircc(int revision, int cfgbase, int sirbase, int firbase, int dma, int irq)
- {
--    byte onebyte;
-+    u8 onebyte;
-     int retval;
- 
-     /* claudiuc: revision is not used yet */
-@@ -504,7 +504,7 @@
- static int
- configure_smc_ircc(int cfgbase, int sirbase, int firbase, int dma, int irq)
- {
--    byte version_id, revision_id;
-+    u8 version_id, revision_id;
-     struct smc_chip_model *chip_model;
-     int retval;
- 
-diff -ur irda-utils-0.9.17.orig/smcinit/tosh2450-smcinit.c irda-utils-0.9.17/smcinit/tosh2450-smcinit.c
---- irda-utils-0.9.17.orig/smcinit/tosh2450-smcinit.c	2006-03-09 07:25:24.000000000 +0100
-+++ irda-utils-0.9.17/smcinit/tosh2450-smcinit.c	2006-05-16 11:55:42.000000000 +0200
-@@ -59,12 +59,12 @@
- 	/* setpci.c */
- 	struct pci_access *acc;
- 	struct pci_dev *dev;
--	word twobyte;
-+	u16 twobyte;
- 	
- 	acc = pci_alloc();
- 	pci_init(acc);
- 	
--	dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC);
-+	dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC);
- 	
- 	twobyte = pci_read_word(dev,VID);
- 	if (twobyte != INTEL_VID){ 
+ 
+diff -Naur irda-utils-0.9.18-orig/findchip/nsc.c irda-utils-0.9.18/findchip/nsc.c
+--- irda-utils-0.9.18-orig/findchip/nsc.c	2006-07-11 08:16:06.000000000 +0200
++++ irda-utils-0.9.18/findchip/nsc.c	2007-09-25 01:34:32.000000000 +0200
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <asm/io.h>
++#include <sys/io.h>
+ 
+ #include "findchip.h"
+ 
+diff -Naur irda-utils-0.9.18-orig/findchip/smc.c irda-utils-0.9.18/findchip/smc.c
+--- irda-utils-0.9.18-orig/findchip/smc.c	2006-07-11 08:16:06.000000000 +0200
++++ irda-utils-0.9.18/findchip/smc.c	2007-09-25 01:34:32.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <asm/io.h>
++#include <sys/io.h>
+ 
+ #include "findchip.h"
+ 
+diff -Naur irda-utils-0.9.18-orig/findchip/winbond.c irda-utils-0.9.18/findchip/winbond.c
+--- irda-utils-0.9.18-orig/findchip/winbond.c	2006-07-11 08:16:06.000000000 +0200
++++ irda-utils-0.9.18/findchip/winbond.c	2007-09-25 01:34:32.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <asm/io.h>
++#include <sys/io.h>
+ 
+ #include "findchip.h"
+ 
+diff -Naur irda-utils-0.9.18-orig/pcmcia/ircard_cs.c irda-utils-0.9.18/pcmcia/ircard_cs.c
+--- irda-utils-0.9.18-orig/pcmcia/ircard_cs.c	2006-07-11 08:16:06.000000000 +0200
++++ irda-utils-0.9.18/pcmcia/ircard_cs.c	2007-09-25 01:34:32.000000000 +0200
+@@ -41,7 +41,7 @@
+ #include <linux/timer.h>
+ #include <linux/delay.h>
+ #include <linux/ioport.h>
+-#include <asm/io.h>
++#include <sys/io.h>
+ #include <asm/system.h>
+ 
+ #include <net/irda/irda.h>




More information about the arch-commits mailing list