bumblebee-libre: fix issues and update patch

2 files changed, 50 insertions, 25 deletions

diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index 4ac8c524d..a7b9ad140 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -28,17 +28,18 @@ backup=('etc/bumblebee/bumblebee.conf'
 source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz"
         'libre.patch')
 md5sums=('30974e677bb13e8a3825fd6f3e7d3b24'
-         'f8b6044310039911236f53a625c611a6')
+         '1daed1e00f74538add6c435dfa0569d1')
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
 
     # Remove nonfree references to nonfree nvidia driver and unnecessaries files
     rm -rv "README.markdown"
-    rm -rv "conf/"{99-remove-nvidia-dev.rules,xorg.conf.nvidia}
+    rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia}
     rm -rv "doc"
     rm -rv "scripts/bumblebee-bugreport.in"
     patch -Np1 -i "${srcdir}/libre.patch"
+}
 
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee-libre/libre.patch
index 0952b1d11..81d49ca33 100644
--- a/libre/bumblebee-libre/libre.patch
+++ b/libre/bumblebee-libre/libre.patch
@@ -1,27 +1,31 @@
-diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
---- bumblebee-3.1.orig/Makefile.am	2013-02-24 21:29:35.055167554 -0200
-+++ bumblebee-3.1/Makefile.am	2013-04-06 07:25:37.798457580 -0300
+diff -Nur bumblebee-3.2.1.orig/Makefile.am bumblebee-3.2.1/Makefile.am
+--- bumblebee-3.2.1.orig/Makefile.am	2013-04-26 12:49:03.022174178 -0300
++++ bumblebee-3.2.1/Makefile.am	2013-04-28 17:08:11.719589284 -0300
 @@ -1,7 +1,6 @@
  # -*- Makefile -*-
  
  GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)")
--relnotes = doc/RELEASE_NOTES_3_1
+-relnotes = doc/RELEASE_NOTES_3_2_1
  
  bumblebeedconfdir=$(sysconfdir)/bumblebee
  
-@@ -19,19 +18,12 @@
+@@ -20,23 +19,16 @@
  noinst_SCRIPTS += scripts/sysvinit/bumblebeed
  endif
  
 -bin_SCRIPTS = scripts/bumblebee-bugreport
 -
+ xconfddir = $(bumblebeedconfdir)/xorg.conf.d
+ xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
+ 
  CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS)
  EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
  	scripts/upstart/bumblebeed.conf.in \
--	conf/99-remove-nvidia-dev.rules \
+-	conf/99-bumblebee-nvidia-dev.rules \
  	conf/bumblebee.conf.in \
 -	conf/xorg.conf.nvidia \
  	conf/xorg.conf.nouveau \
+ 	$(xconfd_DATA) \
 -	README.markdown \
  	scripts/bash_completion/bumblebee \
 -	scripts/bumblebee-bugreport.in \
@@ -29,7 +33,7 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
  	version.sh
  # for laziness include all headers found
  EXTRA_DIST += src/*.h src/*/switching.h
-@@ -52,8 +44,7 @@
+@@ -57,17 +49,11 @@
  	src/driver.c src/bumblebeed.c
  bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt
  
@@ -39,7 +43,16 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
  
  completiondir = $(sysconfdir)/bash_completion.d
  completion_DATA = scripts/bash_completion/bumblebee
-@@ -91,10 +82,6 @@
+ 
+-if WITH_UDEV_RULES
+-udevrulesdir = $(UDEV_RULES_DIR)
+-udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules
+-endif
+-
+ do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \
+ 	-e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \
+ 	-e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \
+@@ -97,10 +83,6 @@
  	mkdir -p scripts/systemd
  	$(do_subst) < $< > $@
  
@@ -50,38 +63,49 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
  if WITH_PIDFILE
  scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in
  	mkdir -p scripts/sysvinit
-diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in
---- bumblebee-3.1.orig/Makefile.in	2013-02-24 21:34:57.103561881 -0200
-+++ bumblebee-3.1/Makefile.in	2013-04-06 07:23:01.600417658 -0300
-@@ -315,7 +315,6 @@
+diff -Nur bumblebee-3.2.1.orig/Makefile.in bumblebee-3.2.1/Makefile.in
+--- bumblebee-3.2.1.orig/Makefile.in	2013-04-26 12:49:11.306174579 -0300
++++ bumblebee-3.2.1/Makefile.in	2013-04-28 17:21:38.698898621 -0300
+@@ -220,7 +220,6 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-UDEV_RULES_DIR = @UDEV_RULES_DIR@
+ VERSION = @VERSION@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -273,7 +272,6 @@
  x11_CFLAGS = @x11_CFLAGS@
  x11_LIBS = @x11_LIBS@
  GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)")
--relnotes = doc/RELEASE_NOTES_3_1
+-relnotes = doc/RELEASE_NOTES_3_2_1
  bumblebeedconfdir = $(sysconfdir)/bumblebee
  AM_CPPFLAGS = ${regular_CPPFLAGS} \
  		-DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \
-@@ -327,16 +326,15 @@
+@@ -286,7 +284,6 @@
  
  noinst_SCRIPTS = scripts/systemd/bumblebeed.service \
  	scripts/upstart/bumblebeed.conf $(am__append_1)
 -bin_SCRIPTS = scripts/bumblebee-bugreport
+ xconfddir = $(bumblebeedconfdir)/xorg.conf.d
+ xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
  CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \
- 	$(am__append_3)
+@@ -294,10 +291,10 @@
  # for laziness include all headers found
  EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
  	scripts/upstart/bumblebeed.conf.in \
--	conf/99-remove-nvidia-dev.rules conf/bumblebee.conf.in \
--	conf/xorg.conf.nvidia conf/xorg.conf.nouveau README.markdown \
-+	conf/bumblebee.conf.in \
-+	conf/xorg.conf.nouveau \
- 	scripts/bash_completion/bumblebee \
+-	conf/99-bumblebee-nvidia-dev.rules conf/bumblebee.conf.in \
+-	conf/xorg.conf.nvidia conf/xorg.conf.nouveau $(xconfd_DATA) \
+-	README.markdown scripts/bash_completion/bumblebee \
 -	scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \
-+	scripts/bumblebee-bugreport.in version.sh src/*.h \
++	conf/bumblebee.conf.in \
++	conf/xorg.conf.nouveau $(xconfd_DATA) \
++	scripts/bash_completion/bumblebee \
++	version.sh src/*.h \
  	src/*/switching.h $(am__append_2)
  bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \
  	src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c
-@@ -348,12 +346,9 @@
+@@ -309,12 +306,9 @@
  	src/driver.c src/bumblebeed.c
  
  bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt
@@ -91,7 +115,7 @@ diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in
  completiondir = $(sysconfdir)/bash_completion.d
  completion_DATA = scripts/bash_completion/bumblebee
 -@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR)
--@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-remove-nvidia-dev.rules
+-@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules
  do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \
  	-e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \
  	-e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \