diff options
Diffstat (limited to 'abs/extra')
| -rw-r--r-- | abs/extra/sapphire/PKGBUILD | 11 | ||||
| -rw-r--r-- | abs/extra/sapphire/sapphire.patch | 45 |
2 files changed, 37 insertions, 19 deletions
diff --git a/abs/extra/sapphire/PKGBUILD b/abs/extra/sapphire/PKGBUILD index 7877f8f..f6d872b 100644 --- a/abs/extra/sapphire/PKGBUILD +++ b/abs/extra/sapphire/PKGBUILD @@ -2,15 +2,15 @@ pkgname=sapphire _kernver=`uname -r` -pkgver=3.2 -pkgrel=2 +pkgver=3.4 +pkgrel=1 pkgdesc="Kernel module for Sapphire remote" arch=('i686' 'x86_64') url="http://rtr.ca/sapphire_remote" license=('GPL2') depends=('kernel26') makedepends=('kernel26-headers') -options=(!makeflags) +options=(!makeflags docs) install=sapphire.install source=(http://rtr.ca/sapphire_remote/${pkgname}-${pkgver}.tar.gz sapphire.patch) @@ -28,8 +28,7 @@ package() { install -m 755 sapphire_keymap.sh ${pkgdir}/usr/bin install -m 644 README.txt ${pkgdir}/usr/share/doc/sapphire install -m 644 keymap.default ${pkgdir}/usr/share/doc/sapphire - install -m 644 sapphire.c ${pkgdir}/usr/share/doc/sapphire rm -fr ${pkgdir}/lib/modules/$_kernver/modules* } -md5sums=('7379b9dd3283871234cbfb0f61516eae' - 'db733f5dd3697895062027d7a58a6657') +md5sums=('da5243f914aa3cecb8821dd12fe85933' + '90fcf01a3b96eb49a69d20bca74167a2') diff --git a/abs/extra/sapphire/sapphire.patch b/abs/extra/sapphire/sapphire.patch index ddd0653..93e4047 100644 --- a/abs/extra/sapphire/sapphire.patch +++ b/abs/extra/sapphire/sapphire.patch @@ -1,24 +1,43 @@ -diff -ruaN sapphire-3.2.orig//Makefile sapphire-3.2/Makefile ---- sapphire-3.2.orig//Makefile 2012-04-12 18:00:50.000000000 +0000 -+++ sapphire-3.2/Makefile 2012-04-22 08:42:19.000000000 +0000 -@@ -4,7 +4,7 @@ - # +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 +@@ -5,7 +5,7 @@ MODNAME=sapphire + MODSOURCE=$(MODNAME).c CONFLICTS=hid_topseed -BLACKLIST=/etc/modprobe.d/blacklist-$(CONFLICTS).conf +BLACKLIST=$(DESTDIR)/etc/modprobe.d/blacklist-$(CONFLICTS).conf + KEYMAP_SCRIPT=sapphire_keymap.sh + EXTRACT_KEYDEFS=extract_keydefs.sh + INPUT_H=/usr/include/linux/input.h +@@ -39,13 +39,13 @@ - ## MODPARMS is not used any more, but we have to nuke old copies to prevent issues: - MODPARMS=/etc/modprobe.d/$(MODNAME).conf -@@ -49,8 +49,8 @@ + 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) ;\ +- [ -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 @@ depmod - install: $(MODNAME).ko clean_modparms modloader $(BLACKLIST) -- cp sapphire_keymap.sh /usr/local/bin/ -- chmod a+rx /usr/local/bin/sapphire_keymap.sh + install: $(MODNAME).ko clean_modparms modinstall $(BLACKLIST) $(KEYMAP_SCRIPT) +- install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ - sync -+# cp sapphire_keymap.sh /usr/local/bin/ -+# chmod a+rx /usr/local/bin/sapphire_keymap.sh ++# install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ +# sync all: install |