Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

4 files changed, 59 insertions, 12 deletions

diff --git a/abs/core-testing/lirc-utils/PKGBUILD b/abs/core-testing/lirc-utils/PKGBUILD
index 8ba80d4..e35db01 100644
--- a/abs/core-testing/lirc-utils/PKGBUILD
+++ b/abs/core-testing/lirc-utils/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=lirc-utils
-pkgver=0.8.4
-pkgrel=5
+pkgver=0.8.5CVS
+pkgrel=2
 pkgdesc="Linux Infrared Remote Control utils"
 arch=(i686 x86_64)
 url="http://www.lirc.org/"
@@ -15,16 +15,19 @@ replaces=('lirc+pctv')
 backup=('etc/lircd.conf' 'etc/lircmd.conf'\
         'etc/conf.d/lircd')
 options=('!libtool' '!makeflags')
-source=(http://umn.dl.sf.net/sourceforge/lirc/lirc-$pkgver.tar.bz2 \
-	lircd lircmd lirc.logrotate lircd.conf.d kernel-2.6.26.patch)
-md5sums=('8f3ba7eb57529992f3991d6981a3feb6' '909ad968afa10e4511e1da277bb23c3b'\
+source=(http://www.blushingpenguin.com/mark/lmilk/lirc-0.8.5-CVS-pvr150.tar.bz2 \
+	lircd lircmd lirc.logrotate lircd.conf.d \
+	kernel-2.6.26.patch lirc_atiusb.patch) 
+md5sums=('b96dae91b566143b3af433fa2714ec9a' '909ad968afa10e4511e1da277bb23c3b'\
          '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3'\
-         '5b1f8c9cd788a39a6283f93302ce5c6e' '1753acd774f50b638e6173d364de53fd')
+         '5b1f8c9cd788a39a6283f93302ce5c6e' '1753acd774f50b638e6173d364de53fd'\
+	 '7eccd7826ab99e5cf1b9154171c8b927')
 
 build() {
 	# configure
-	cd $startdir/src/lirc-$pkgver || return 1
+	cd $startdir/src/lirc-0.8.5-CVS-pvr150 || return 1
 #	patch -Np1 -i ../kernel-2.6.26.patch || return 1
+	patch -Np1 -i ../lirc_atiusb.patch || return 1
 
       # Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+
 	sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am || return 1
diff --git a/abs/core-testing/lirc-utils/lirc_atiusb.patch b/abs/core-testing/lirc-utils/lirc_atiusb.patch
new file mode 100644
index 0000000..2f0c61e
--- /dev/null
+++ b/abs/core-testing/lirc-utils/lirc_atiusb.patch
@@ -0,0 +1,27 @@
+diff -ruaN lirc-0.8.4.orig/drivers/lirc_atiusb/lirc_atiusb.c lirc-0.8.4/drivers/lirc_atiusb/lirc_atiusb.c
+--- lirc-0.8.4.orig/drivers/lirc_atiusb/lirc_atiusb.c	2008-05-19 08:10:35.000000000 +0000
++++ lirc-0.8.4/drivers/lirc_atiusb/lirc_atiusb.c	2009-02-14 22:35:44.000000000 +0000
+@@ -192,8 +192,9 @@
+ /* init strings */
+ #define USB_OUTLEN		7
+ 
+-static char init1[] = {0x01, 0x00, 0x20, 0x14};
+-static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
++static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
++static char init2[] = {0x83, 0x03};
++static char init3[] = {0x84, 0xd7, 0x020};
+ 
+ struct in_endpt {
+ 	/* inner link in list of endpoints for the remote specified by ir */
+@@ -1183,8 +1184,9 @@
+ 			oep->buf, USB_OUTLEN, usb_remote_send,
+ 			oep, oep->ep->bInterval);
+ 
+-		send_packet(oep, 0x8004, init1);
+-		send_packet(oep, 0x8007, init2);
++               send_packet(oep, 0x8007, init1);
++               send_packet(oep, 0x8002, init2);
++               send_packet(oep, 0x8003, init3);
+ 	}
+ }
+ 
diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index 5604fa8..ef2359b 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -2,26 +2,26 @@
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=lirc
-pkgver=0.8.4
-pkgrel=8
+pkgver=0.8.5CVS
+pkgrel=1
 _kernver=2.6.28-LinHES
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
 url="http://www.lirc.org/"
 license=('GPL')
-depends=('lirc-utils=0.8.4' 'kernel26>=2.6.27' 'kernel26<2.6.29')
+depends=('lirc-utils=0.8.5CVS' 'kernel26>=2.6.27' 'kernel26<2.6.29')
 #makedepends=('help2man')
 replaces=('lirc+pctv')
 options=('!makeflags')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
+source=(http://www.blushingpenguin.com/mark/lmilk/lirc-0.8.5-CVS-pvr150.tar.bz2 \
 	kernel-2.6.26.patch
 	kernel-2.6.27.patch
 	lirc_atiusb.patch)
 
 build() {
 	# configure
-	cd $startdir/src/lirc-$pkgver || return 1
+	cd $startdir/src/lirc-0.8.5-CVS-pvr150 || return 1
 #	patch -Np1 -i ../kernel-2.6.26.patch || return 1
 #	patch -Np1 -i ../kernel-2.6.27.patch || return 1
 	patch -Np1 -i ../lirc_atiusb.patch || return 1
diff --git a/abs/core-testing/pvr150-firmware/PKGBUILD b/abs/core-testing/pvr150-firmware/PKGBUILD
new file mode 100644
index 0000000..a7f621f
--- /dev/null
+++ b/abs/core-testing/pvr150-firmware/PKGBUILD
@@ -0,0 +1,17 @@
+# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
+# Maintainer: Cecil Watson<knoppmyth@gmail.com>
+
+pkgname=pvr150-firmware
+pkgver=1
+pkgrel=1
+pkgdesc="Firmware for PVR-150 IR-Blaster"
+arch=('i586' 'i686' 'x86_64')
+url="http://www.blushingpenguin.com/mark/blog/?p=24"
+source=(http://www.blushingpenguin.com/mark/lmilk/haup-ir-blaster.bin)
+md5sums=('1c117d591bbcb733690e1b7b36202490')
+
+build() {
+  cd $startdir/src/
+  mkdir -p $startdir/pkg/lib/firmware
+  cp -a *.bin $startdir/pkg/lib/firmware
+}