Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing

6 files changed, 90 insertions, 18 deletions

diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD
index 73a4d15..bbe5031 100644
--- a/abs/core/dvb-firmware/PKGBUILD
+++ b/abs/core/dvb-firmware/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=dvb-firmware
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="Firmware for DVB cards"
 replaces=('hd3000firmware')
 arch=('i586' 'i686' 'x86_64')
@@ -18,4 +18,4 @@ build() {
   install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/"
 }
 md5sums=('32e19e3f9f849e667c6f7db1186180b9'
-         '34dcdb3465572ca8e77325260763daa5')
+         'e3e7c5da698fb79aee7a135bdb9b7c5c')
diff --git a/abs/core/dvb-firmware/xc5000.conf b/abs/core/dvb-firmware/xc5000.conf
index 5b5dfa9..b1cf373 100644
--- a/abs/core/dvb-firmware/xc5000.conf
+++ b/abs/core/dvb-firmware/xc5000.conf
@@ -1,4 +1,4 @@
-*   xc5000
-*   Disable power cycling and firmware reloads
-*
+#   xc5000
+#   Disable power cycling and firmware reloads
+#
 options xc5000 no_poweroff=1
diff --git a/abs/extra/sapphire/PKGBUILD b/abs/extra/sapphire/PKGBUILD
index c82d2ab..034bea2 100644
--- a/abs/extra/sapphire/PKGBUILD
+++ b/abs/extra/sapphire/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sapphire
 _kernver=`uname -r`
-pkgver=3.5
+pkgver=4.2
 pkgrel=1
 pkgdesc="Kernel module for Sapphire remote"
 arch=('i686' 'x86_64')
@@ -30,5 +30,5 @@ package() {
   install -m 644 keymap.default ${pkgdir}/usr/share/doc/sapphire
   rm -fr ${pkgdir}/lib/modules/$_kernver/modules*
 }
-md5sums=('b1c97f4328810f2dfbd6d8721d5950c5'
-         '90fcf01a3b96eb49a69d20bca74167a2')
+md5sums=('fe72676bc6b68b5f000a98eec3972887'
+         '3a69715829fe7cf450d0ec8410c7a4eb')
diff --git a/abs/extra/sapphire/sapphire.patch b/abs/extra/sapphire/sapphire.patch
index 93e4047..0305d91 100644
--- a/abs/extra/sapphire/sapphire.patch
+++ b/abs/extra/sapphire/sapphire.patch
@@ -1,6 +1,6 @@
-diff -ruaN sapphire-3.4.orig//Makefile sapphire-3.4/Makefile
---- sapphire-3.4.orig//Makefile	2012-04-23 02:33:11.000000000 +0000
-+++ sapphire-3.4/Makefile	2012-04-23 05:23:07.000000000 +0000
+diff -ruaN sapphire-4.2.orig//Makefile sapphire-4.2/Makefile
+--- sapphire-4.2.orig//Makefile	2012-05-06 02:51:36.000000000 +0000
++++ sapphire-4.2/Makefile	2012-05-14 02:12:57.000000000 +0000
 @@ -5,7 +5,7 @@
  MODNAME=sapphire
  MODSOURCE=$(MODNAME).c
@@ -10,7 +10,7 @@ diff -ruaN sapphire-3.4.orig//Makefile sapphire-3.4/Makefile
  KEYMAP_SCRIPT=sapphire_keymap.sh
  EXTRACT_KEYDEFS=extract_keydefs.sh
  INPUT_H=/usr/include/linux/input.h
-@@ -39,13 +39,13 @@
+@@ -39,12 +39,12 @@
  
  modinstall: $(MODNAME).ko $(KEYMAP_SCRIPT)
  	$(MAKE) -C $(KDIR)/build M=`pwd` modules_install
@@ -19,25 +19,97 @@ diff -ruaN sapphire-3.4.orig//Makefile sapphire-3.4/Makefile
 -		rmmod $(MODNAME)   2>/dev/null ;\
 -		rmmod $(CONFLICTS) 2>/dev/null ;\
 -		modprobe -v $(MODNAME) ;\
--		[ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap ;\
 -	fi
 +#	depmod $(KVER)
 +#	@if [ "$(KVER)" = "$$(uname -r)" ]; then \
 +#		rmmod $(MODNAME)   2>/dev/null ;\
 +#		rmmod $(CONFLICTS) 2>/dev/null ;\
 +#		modprobe -v $(MODNAME) ;\
-+#		[ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap ;\
 +#	fi
  
  clean:
  	$(MAKE) -C $(KDIR)/build M=`pwd` clean
-@@ -62,7 +62,7 @@
+@@ -61,8 +61,8 @@
  	depmod
  
  install: $(MODNAME).ko clean_modparms modinstall $(BLACKLIST) $(KEYMAP_SCRIPT)
 -	install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/
+-	[ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap || exit 0
 -	sync
 +#	install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/
++#	[ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap || exit 0
 +#	sync
  
  all: install
+diff -ruaN sapphire-4.2.orig//Makefile~ sapphire-4.2/Makefile~
+--- sapphire-4.2.orig//Makefile~	1970-01-01 00:00:00.000000000 +0000
++++ sapphire-4.2/Makefile~	2012-05-06 02:51:36.000000000 +0000
+@@ -0,0 +1,68 @@
++#
++# Makefile and (un-)Installer for Sapphire remote control driver,
++#    by Mark Lord 2012.
++#
++MODNAME=sapphire
++MODSOURCE=$(MODNAME).c
++CONFLICTS=hid_topseed
++BLACKLIST=/etc/modprobe.d/blacklist-$(CONFLICTS).conf
++KEYMAP_SCRIPT=sapphire_keymap.sh
++EXTRACT_KEYDEFS=extract_keydefs.sh
++INPUT_H=/usr/include/linux/input.h
++
++## MODPARMS is not used any more, but we have to nuke old copies to prevent issues:
++MODPARMS=/etc/modprobe.d/$(MODNAME).conf
++
++KVER  ?= `uname -r`
++KDIR  = /lib/modules/$(KVER)
++obj-m += $(MODNAME).o
++
++#EXTRA_CFLAGS += -Werror
++
++default: kmod $(KEYMAP_SCRIPT)
++
++kmod:
++	$(MAKE) -C $(KDIR)/build M=`pwd` modules
++
++$(MODNAME).ko: $(MODSOURCE) $(MODNAME).h
++	$(MAKE) kmod
++
++$(KEYMAP_SCRIPT): $(EXTRACT_KEYDEFS) $(KEYMAP_SCRIPT).part1 $(KEYMAP_SCRIPT).part3 $(MODNAME).h $(INPUT_H)
++	chmod 0755 $(EXTRACT_KEYDEFS)
++	./$(EXTRACT_KEYDEFS) $(INPUT_H) $(MODNAME).h | cat $(KEYMAP_SCRIPT).part1 - $(KEYMAP_SCRIPT).part3 > $(KEYMAP_SCRIPT)
++	chmod 0755 $(KEYMAP_SCRIPT)
++
++$(BLACKLIST):
++	@echo "Creating $(BLACKLIST)"
++	@echo "## $(CONFLICTS) Conflicts with $(MODNAME) driver" >  $(BLACKLIST)
++	@echo "blacklist $(CONFLICTS)"                           >> $(BLACKLIST)
++
++modinstall: $(MODNAME).ko $(KEYMAP_SCRIPT)
++	$(MAKE) -C $(KDIR)/build M=`pwd` modules_install
++	depmod $(KVER)
++	@if [ "$(KVER)" = "$$(uname -r)" ]; then \
++		rmmod $(MODNAME)   2>/dev/null ;\
++		rmmod $(CONFLICTS) 2>/dev/null ;\
++		modprobe -v $(MODNAME) ;\
++	fi
++
++clean:
++	$(MAKE) -C $(KDIR)/build M=`pwd` clean
++	-rm -f $(KEYMAP_SCRIPT)
++
++clean_modparms:
++	@if [ -e $(MODPARAMS) ]; then rm -f $(MODPARMS) ; fi ; exit 0
++
++uninstall: clean clean_modparms
++	-rmmod $(MODNAME)
++	-rm -f $(BLACKLIST)
++	-rm -f /usr/local/bin/$(KEYMAP_SCRIPT)
++	-rm -f $(KDIR)/extra/$(MODNAME).ko
++	depmod
++
++install: $(MODNAME).ko clean_modparms modinstall $(BLACKLIST) $(KEYMAP_SCRIPT)
++	install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/
++	[ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap || exit 0
++	sync
++
++all: install
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index fc8cc5b..f6db82d 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -9,7 +9,7 @@ _prefix=/usr
 
 pkgname=xbmc
 pkgver=11.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -105,4 +105,4 @@ package() {
 # vim:set ts=2 sw=2 et:
 md5sums=('9e8a26ee25173c7268abea7f1d82d428'
          '5aa2e21a1f9fea60a2e5bb345e5aefd0'
-         '316fb34ed4496972ddf59f278d9adb25')
+         'e48a3d87984669ef206e902bc8290ff9')
diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh
index 333c857..b073e5d 100644
--- a/abs/extra/xbmc/xbmc.sh
+++ b/abs/extra/xbmc/xbmc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Stop XScreensaver
-stop_xss.sh
+stop_xss.sh &
 #Launch XBMC
 /usr/bin/xbmc --lircdev /var/run/lirc/lircd
 #Once XBMC exits, start XSceensager again