Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

bbswitch/PKGBUILD

@@ -1,14 +1,14 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Platform Packages for Chakra, part of chakra-project.org
 #
 # maintainer abveritas@chakra-project.org
 
 _extramodules=extramodules-3.6-CHAKRA
 _kver="$(cat /lib/modules/${_extramodules}/version)"
- 
+
 pkgname=bbswitch
-pkgver=0.4.2
-pkgrel=6
+pkgver=0.5
+pkgrel=3
 pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
 arch=('x86_64')
 url=("http://github.com/Bumblebee-Project/bbswitch")
@@ -18,7 +18,7 @@ install=bbswitch.install
 depends=('linux>=3.6' 'linux<3.7')
 makedepends=('linux' 'linux-headers')
 source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0db72765c6accb49426a40c4cb1556d3')
+md5sums=('5e0e6eb9c5e8c10db56e5b349b43bba7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

bbswitch/bbswitch.install

@@ -12,4 +12,4 @@ post_upgrade() {
 post_remove() {
     EXTRAMODULES='extramodules-3.6-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
+}

bumblebee/PKGBUILD

@@ -7,7 +7,7 @@
 
 pkgname=bumblebee
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Bumblebee brings Optimus Support for Linux Through VirtualGL. You need to install proper drivers separately. Can be used with Nouveau or Nvidia"
 arch=('i686' 'x86_64')
 depends=('virtualgl' 'libbsd' 'glib2')
@@ -23,11 +23,11 @@ backup=('etc/bumblebee/bumblebee.conf'
     'etc/bumblebee/xorg.conf.nouveau'
     'etc/bumblebee/xorg.conf.nvidia')
 source=("https://github.com/downloads/Bumblebee-Project/Bumblebee/${pkgname}-${pkgver}.tar.gz"
-#        'bumblebeed.in'
-        '99-remove-nvidia-dev.rules')
+        '99-remove-nvidia-dev.rules'
+        'rmmod-remove.patch')
 md5sums=('7b3fd4bfa0d59e877abdb75cbdba30f8'
-#         '8b05da760e9236ecff2c6820616119f7'
-         'b2a411f8610107946a9bec3bcb282f7b')
+         'b2a411f8610107946a9bec3bcb282f7b'
+         'ea2a0a7e973f974cf6e9d54638011565')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
@@ -37,6 +37,8 @@ build() {
         CONF_MODPATH_NVIDIA=/usr/lib/nvidia-bumblebee/xorg/,/usr/lib/xorg/modules \
         --prefix=/usr \
         --sysconfdir=/etc
+    #found this on AUR, patch needed for kmod11: https://github.com/Bumblebee-Project/Bumblebee/issues/283
+    patch -p1 -i ${srcdir}/rmmod-remove.patch
     make
 }
 
@@ -51,4 +53,4 @@ package() {
     mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
     #Install udev rule to prevent GH-#144
     install -D -m644 "$srcdir/99-remove-nvidia-dev.rules" "${pkgdir}/lib/udev/rules.d/99-remove-nvidia-dev.rules"
-   }
+   }

bumblebee/rmmod-remove.patch

@@ -0,0 +1,12 @@
+diff --git a/src/module.c b/src/module.c
+index 06f8872..55fa70e 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -96,7 +96,6 @@ int module_unload(char *driver) {
+     bb_log(LOG_INFO, "Unloading %s driver\n", driver);
+     char *mod_argv[] = {
+       "rmmod",
+-      "--wait",
+       driver,
+       NULL
+     };