[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Friday, August 28, 2020 @ 12:06:52 Author: freswa Revision: 690642 fix unquoted variables Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD | 24 1 file changed, 12 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-08-28 12:06:37 UTC (rev 690641) +++ PKGBUILD2020-08-28 12:06:52 UTC (rev 690642) @@ -44,14 +44,14 @@ '1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8') prepare() { -cd "${srcdir}/${pkgname}-${pkgver}" -for p in ${srcdir}/*.patch; do -patch -Np1 -i "$p" +cd "${srcdir}"/${pkgname}-${pkgver} +for p in "${srcdir}"/*.patch; do +patch -Np1 -i "${p}" done } build() { -cd "${srcdir}/${pkgname}-${pkgver}" +cd "${srcdir}"/${pkgname}-${pkgver} CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common ./configure \ CONF_DRIVER_MODULE_NVIDIA=nvidia \ @@ -66,25 +66,25 @@ } package() { -cd "${srcdir}/${pkgname}-${pkgver}" +cd "${srcdir}"/${pkgname}-${pkgver} # Install main app -make install DESTDIR="$pkgdir" \ +make install DESTDIR="${pkgdir}" \ completiondir=/usr/share/bash-completion/completions # Blacklist nvidia and nouveau modules # Reference: https://github.com/Bumblebee-Project/Bumblebee/issues/719 -install -Dm644 "${srcdir}/bumblebee.conf" "${pkgdir}/usr/lib/modprobe.d/bumblebee.conf" +install -Dm644 "${srcdir}"/bumblebee.conf "${pkgdir}"/usr/lib/modprobe.d/bumblebee.conf # Install systemd unit -install -Dm644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" -sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" +install -Dm644 scripts/systemd/bumblebeed.service "${pkgdir}"/usr/lib/systemd/system/bumblebeed.service +sed -i "s/sbin/bin/" "${pkgdir}"/usr/lib/systemd/system/bumblebeed.service # Make bash_completion work -mv -v "$pkgdir"/usr/share/bash-completion/completions/{bumblebee,optirun} +mv -v "${pkgdir}"/usr/share/bash-completion/completions/{bumblebee,optirun} # Fix for FS#59312 -sed -i "s/have/_have/" "${pkgdir}/usr/share/bash-completion/completions/optirun" +sed -i "s/have/_have/" "${pkgdir}"/usr/share/bash-completion/completions/optirun -install -Dm644 "$srcdir"/bumblebee.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf +install -Dm644 "${srcdir}"/bumblebee.sysusers "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf }
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Tuesday, July 7, 2020 @ 21:19:46 Author: felixonmars Revision: 660336 upgpkg: bumblebee 3.2.1-21: reproducibility rebuild Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-07-07 21:19:45 UTC (rev 660335) +++ PKGBUILD2020-07-07 21:19:46 UTC (rev 660336) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=20 +pkgrel=21 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl')
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Tuesday, July 7, 2020 @ 21:16:10 Author: foutrelis Revision: 660261 Add -fcommon workaround for GCC 10 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-07-07 21:16:09 UTC (rev 660260) +++ PKGBUILD2020-07-07 21:16:10 UTC (rev 660261) @@ -43,12 +43,16 @@ '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193' '1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" for p in ${srcdir}/*.patch; do patch -Np1 -i "$p" done +} +build() { +cd "${srcdir}/${pkgname}-${pkgver}" +CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common ./configure \ CONF_DRIVER_MODULE_NVIDIA=nvidia \ CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia:/usr/lib:/usr/lib32 \
[arch-commits] Commit in bumblebee/trunk (PKGBUILD nvidia-drm-outputclass.conf)
Date: Thursday, October 4, 2018 @ 22:39:49 Author: svenstaro Revision: 389689 upgpkg: bumblebee 3.2.1-20 Revert last change Modified: bumblebee/trunk/PKGBUILD Deleted: bumblebee/trunk/nvidia-drm-outputclass.conf -+ PKGBUILD| 11 +++ nvidia-drm-outputclass.conf | 15 --- 2 files changed, 3 insertions(+), 23 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-10-04 22:28:50 UTC (rev 389688) +++ PKGBUILD2018-10-04 22:39:49 UTC (rev 389689) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=19 +pkgrel=20 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -30,8 +30,7 @@ "0007-bb_mutebblogger.patch" "0008-libglvnd.patch" "bumblebee.conf" -"bumblebee.sysusers" -"nvidia-drm-outputclass.conf") +"bumblebee.sysusers") sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e' 'aff3528d17a77ff19b4e0a7a10682b8351456f11795f71ef62b315e774fb408a' '70ad9b3d8e0d70a504110651c6f5f3a1b1d3c4c44eeb0fd49a4463e99124a47b' @@ -42,8 +41,7 @@ 'cbe3e1717bc80146b87d8f2ab1158ee9e094ea5bb2ca9a4a8c09c24b086a7792' 'b260d64a53617807afe21560db0592d114d7775b182e13fb59349f0157c8dba4' '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193' -'1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8' -'089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182') +'1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -85,7 +83,4 @@ sed -i "s/have/_have/" "${pkgdir}/usr/share/bash-completion/completions/optirun" install -Dm644 "$srcdir"/bumblebee.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf - -# Overwrite the OutputClass due to https://bugs.archlinux.org/task/60102 -install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/11-nvidia-drm-outputclass.conf" } Deleted: nvidia-drm-outputclass.conf === --- nvidia-drm-outputclass.conf 2018-10-04 22:28:50 UTC (rev 389688) +++ nvidia-drm-outputclass.conf 2018-10-04 22:39:49 UTC (rev 389689) @@ -1,15 +0,0 @@ -Section "OutputClass" -Identifier "intel" -MatchDriver "i915" -Driver "modesetting" -EndSection - -Section "OutputClass" -Identifier "nvidia" -MatchDriver "nvidia-drm" -Driver "nvidia" -Option "AllowEmptyInitialConfiguration" -Option "PrimaryGPU" "yes" -ModulePath "/usr/lib/nvidia/xorg" -ModulePath "/usr/lib/xorg/modules" -EndSection
[arch-commits] Commit in bumblebee/trunk (PKGBUILD nvidia-drm-outputclass.conf)
Date: Monday, September 24, 2018 @ 06:47:19 Author: svenstaro Revision: 384337 upgpkg: bumblebee 3.2.1-19 Overwrite OutputClass and set PrimaryGPU due to FS#60102 Added: bumblebee/trunk/nvidia-drm-outputclass.conf Modified: bumblebee/trunk/PKGBUILD -+ PKGBUILD| 11 --- nvidia-drm-outputclass.conf | 15 +++ 2 files changed, 23 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-24 06:47:09 UTC (rev 384336) +++ PKGBUILD2018-09-24 06:47:19 UTC (rev 384337) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=18 +pkgrel=19 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -30,7 +30,8 @@ "0007-bb_mutebblogger.patch" "0008-libglvnd.patch" "bumblebee.conf" -"bumblebee.sysusers") +"bumblebee.sysusers" +"nvidia-drm-outputclass.conf") sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e' 'aff3528d17a77ff19b4e0a7a10682b8351456f11795f71ef62b315e774fb408a' '70ad9b3d8e0d70a504110651c6f5f3a1b1d3c4c44eeb0fd49a4463e99124a47b' @@ -41,7 +42,8 @@ 'cbe3e1717bc80146b87d8f2ab1158ee9e094ea5bb2ca9a4a8c09c24b086a7792' 'b260d64a53617807afe21560db0592d114d7775b182e13fb59349f0157c8dba4' '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193' -'1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8') +'1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8' +'089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -83,4 +85,7 @@ sed -i "s/have/_have/" "${pkgdir}/usr/share/bash-completion/completions/optirun" install -Dm644 "$srcdir"/bumblebee.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf + +# Overwrite the OutputClass due to https://bugs.archlinux.org/task/60102 +install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/11-nvidia-drm-outputclass.conf" } Added: nvidia-drm-outputclass.conf === --- nvidia-drm-outputclass.conf (rev 0) +++ nvidia-drm-outputclass.conf 2018-09-24 06:47:19 UTC (rev 384337) @@ -0,0 +1,15 @@ +Section "OutputClass" +Identifier "intel" +MatchDriver "i915" +Driver "modesetting" +EndSection + +Section "OutputClass" +Identifier "nvidia" +MatchDriver "nvidia-drm" +Driver "nvidia" +Option "AllowEmptyInitialConfiguration" +Option "PrimaryGPU" "yes" +ModulePath "/usr/lib/nvidia/xorg" +ModulePath "/usr/lib/xorg/modules" +EndSection
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Tuesday, July 17, 2018 @ 22:48:51 Author: svenstaro Revision: 361184 upgpkg: bumblebee 3.2.1-18 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-07-17 22:19:23 UTC (rev 361183) +++ PKGBUILD2018-07-17 22:48:51 UTC (rev 361184) @@ -3,7 +3,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=17 +pkgrel=18 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -80,5 +80,8 @@ # Make bash_completion work mv -v "$pkgdir"/usr/share/bash-completion/completions/{bumblebee,optirun} +# Fix for FS#59312 +sed -i "s/have/_have/" "${pkgdir}/usr/share/bash-completion/completions/optirun" + install -Dm644 "$srcdir"/bumblebee.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf }
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Saturday, May 12, 2018 @ 01:00:05 Author: svenstaro Revision: 320923 upgpkg: bumblebee 3.2.1-17 Switch to updated nvidia versions Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-05-12 00:58:40 UTC (rev 320922) +++ PKGBUILD2018-05-12 01:00:05 UTC (rev 320923) @@ -3,7 +3,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=16 +pkgrel=17 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -10,8 +10,8 @@ makedepends=('help2man') optdepends=('bbswitch: switch on/off discrete card' 'nvidia: NVIDIA kernel driver' -'nvidia-340xx: NVIDIA kernel driver for older devices' -'nvidia-304xx: NVIDIA kernel driver for even older devices' +'nvidia-390xx: NVIDIA kernel driver for old devices' +'nvidia-340xx: NVIDIA kernel driver for even older devices' 'primus: faster back-end for optirun' 'lib32-virtualgl: run 32bit applications with optirun' 'lib32-primus: faster back-end for optirun')
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Wednesday, December 13, 2017 @ 04:57:17 Author: svenstaro Revision: 274104 Use https Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-12-13 04:56:15 UTC (rev 274103) +++ PKGBUILD2017-12-13 04:57:17 UTC (rev 274104) @@ -21,7 +21,7 @@ backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia') -source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz; +source=("https://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz; "0001-bb_nvidia_modeset-detection_bug699_01.patch::https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56.patch; "0002-bb_nvidia_modeset-detection_bug699_02.patch::https://github.com/arafey/Bumblebee/commit/09d537e8e5313cd0f2c7bf6620ca70454de8a04a.patch; "0003-bb_nvidia_umv_detection_bug699.patch::https://github.com/arafey/Bumblebee/commit/dbbf20a38aa2bffb10c4e8af583b34dff6bfe721.patch;
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Wednesday, August 2, 2017 @ 07:29:59 Author: bpiotrowski Revision: 247391 use architecture-specific options instead of bash hackery Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-08-02 04:48:28 UTC (rev 247390) +++ PKGBUILD2017-08-02 07:29:59 UTC (rev 247391) @@ -13,10 +13,8 @@ 'nvidia-340xx: NVIDIA kernel driver for older devices' 'nvidia-304xx: NVIDIA kernel driver for even older devices' 'primus: faster back-end for optirun') -if [ "$CARCH" = "x86_64" ]; then - optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' - optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' -fi +optdepends_x86_64=('lib32-virtualgl: run 32bit applications with optirun' + 'lib32-primus: faster back-end for optirun') url="http://www.bumblebee-project.org; license=("GPL3") install='bumblebee.install'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Monday, February 27, 2017 @ 20:36:31 Author: heftig Revision: 214100 3.2.1-15 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-02-27 20:26:16 UTC (rev 214099) +++ PKGBUILD2017-02-27 20:36:31 UTC (rev 214100) @@ -1,13 +1,14 @@ +# $Id$ # Maintainer: Sven-Hendrik Haasepkgname=bumblebee pkgver=3.2.1 -pkgrel=14 +pkgrel=15 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') makedepends=('help2man') -optdepends=('bbswitch: switch on/off discrete card' +optdepends=('bbswitch: switch on/off discrete card' 'nvidia: NVIDIA kernel driver' 'nvidia-340xx: NVIDIA kernel driver for older devices' 'nvidia-304xx: NVIDIA kernel driver for even older devices' @@ -19,8 +20,8 @@ url="http://www.bumblebee-project.org; license=("GPL3") install='bumblebee.install' -backup=('etc/bumblebee/bumblebee.conf' -'etc/bumblebee/xorg.conf.nouveau' +backup=('etc/bumblebee/bumblebee.conf' +'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia') source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz; "0001-bb_nvidia_modeset-detection_bug699_01.patch::https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56.patch; @@ -48,14 +49,14 @@ for p in ${srcdir}/*.patch; do patch -Np1 -i "$p" done - + ./configure \ CONF_DRIVER_MODULE_NVIDIA=nvidia \ -CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \ -CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \ + CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia:/usr/lib:/usr/lib32 \ +CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg,/usr/lib/xorg/modules \ --prefix=/usr \ --sbindir=/usr/bin \ ---with-udev-rules=/usr/lib/udev/rules.d/ \ +--with-udev-rules=/usr/lib/udev/rules.d \ --sysconfdir=/etc \ --without-pidfile make @@ -63,17 +64,17 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" - + # Install main app make install DESTDIR="$pkgdir" \ completiondir=/usr/share/bash-completion/completions - + # Blacklist nvidia and nouveau modules # Reference: https://github.com/Bumblebee-Project/Bumblebee/issues/719 install -Dm644 "${srcdir}/bumblebee.conf" "${pkgdir}/usr/lib/modprobe.d/bumblebee.conf" - + # Install systemd unit -install -Dm644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" +install -Dm644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" # Make bash_completion work
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, February 23, 2017 @ 17:50:54 Author: lcarlier Revision: 213655 upgpkg: bumblebee 3.2.1-13 pkgrel bump to 13 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-02-23 17:49:37 UTC (rev 213654) +++ PKGBUILD2017-02-23 17:50:54 UTC (rev 213655) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=12 +pkgrel=13 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl')
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, February 23, 2017 @ 17:46:39 Author: lcarlier Revision: 213651 upgpkg: bumblebee 3.2.1-12 remove conflicts/provides nvidia 340 and 304 gl packages Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-02-23 17:07:12 UTC (rev 213650) +++ PKGBUILD2017-02-23 17:46:39 UTC (rev 213651) @@ -16,8 +16,8 @@ optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' fi -conflicts=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl') -provides=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl') +conflicts=('nvidia-libgl') +provides=('nvidia-libgl') url="http://www.bumblebee-project.org; license=("GPL3") install='bumblebee.install'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, July 28, 2016 @ 20:18:28 Author: heftig Revision: 184585 3.2.1-12 Modified: bumblebee/trunk/PKGBUILD (contents, properties) --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-07-28 20:17:52 UTC (rev 184584) +++ PKGBUILD2016-07-28 20:18:28 UTC (rev 184585) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=11 +pkgrel=12 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -65,7 +65,8 @@ cd "${srcdir}/${pkgname}-${pkgver}" # Install main app -make install DESTDIR="$pkgdir" +make install DESTDIR="$pkgdir" \ + completiondir=/usr/share/bash-completion/completions # Blacklist nvidia and nouveau modules # Reference: https://github.com/Bumblebee-Project/Bumblebee/issues/719 @@ -76,5 +77,5 @@ sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" # Make bash_completion work -mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun" +mv -v "$pkgdir"/usr/share/bash-completion/completions/{bumblebee,optirun} } Property changes on: bumblebee/trunk/PKGBUILD ___ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Monday, May 4, 2015 @ 19:56:56 Author: svenstaro Revision: 132748 upgpkg: bumblebee 3.2.1-10 Fix FS#44833 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-05-04 17:35:09 UTC (rev 132747) +++ PKGBUILD2015-05-04 17:56:56 UTC (rev 132748) @@ -3,7 +3,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=9 +pkgrel=10 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -63,4 +63,6 @@ # Make bash_completion work mv -v ${pkgdir}/etc/bash_completion.d/bumblebee ${pkgdir}/etc/bash_completion.d/optirun + +echo blacklist nouveau ${pkgdir}/usr/lib/modprobe.d/bumblebee.conf }
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Saturday, December 13, 2014 @ 15:40:40 Author: fyan Revision: 123838 upgpkg: bumblebee 3.2.1-8 make bumblebee work with nvidia-304xx by adding nvidia-304xx-libgl to provides array. Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-12-13 14:32:20 UTC (rev 123837) +++ PKGBUILD2014-12-13 14:40:40 UTC (rev 123838) @@ -1,8 +1,9 @@ +# $Id$ # Maintainer: Sven-Hendrik Haase s...@lutzhaase.com pkgname=bumblebee pkgver=3.2.1 -pkgrel=7 +pkgrel=8 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -16,8 +17,8 @@ optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' fi -conflicts=('nvidia-libgl' 'nvidia-340xx-libgl') -provides=('nvidia-libgl' 'nvidia-340xx-libgl') +conflicts=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl') +provides=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl') url=http://www.bumblebee-project.org; license=(GPL3) install='bumblebee.install'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Tuesday, November 18, 2014 @ 17:01:27 Author: svenstaro Revision: 122706 upgpkg: bumblebee 3.2.1-7 Remove nouveau from optdeps as it doesn't actually work with bb Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-11-18 15:49:13 UTC (rev 122705) +++ PKGBUILD2014-11-18 16:01:27 UTC (rev 122706) @@ -2,14 +2,12 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=6 +pkgrel=7 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') makedepends=('help2man') -optdepends=('xf86-video-nouveau: nouveau driver' -'nouveau-dri: 3D acceleration features fo nouveau' -'bbswitch: switch on/off discrete card' +optdepends=('bbswitch: switch on/off discrete card' 'nvidia: NVIDIA kernel driver' 'nvidia-340xx: NVIDIA kernel driver for older devices' 'nvidia-304xx: NVIDIA kernel driver for even older devices'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Sunday, October 26, 2014 @ 22:37:36 Author: svenstaro Revision: 121439 upgpkg: bumblebee 3.2.1-6 Fix FS#41983 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-26 21:17:31 UTC (rev 121438) +++ PKGBUILD2014-10-26 21:37:36 UTC (rev 121439) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=5 +pkgrel=6 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -26,12 +26,16 @@ backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia') -source=(http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz;) -md5sums=('30974e677bb13e8a3825fd6f3e7d3b24') +source=(http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz; + bumblebee-hexadecimal.patch::https://github.com/Bumblebee-Project/Bumblebee/commit/2073f8537412aa47755eb6f3f22a114403e5285b.patch;) +md5sums=('30974e677bb13e8a3825fd6f3e7d3b24' + 'd0a7d504a717e34b05fb4bc9ee68f881') build() { cd ${srcdir}/${pkgname}-${pkgver} +patch -Np1 ${srcdir}/bumblebee-hexadecimal.patch + ./configure \ CONF_DRIVER_MODULE_NVIDIA=nvidia \ CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Wednesday, October 8, 2014 @ 02:14:38 Author: svenstaro Revision: 120377 upgpkg: bumblebee 3.2.1-4 Add nvidia-340xx Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-07 21:17:53 UTC (rev 120376) +++ PKGBUILD2014-10-08 00:14:38 UTC (rev 120377) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=3 +pkgrel=4 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -11,7 +11,8 @@ 'nouveau-dri: 3D acceleration features fo nouveau' 'bbswitch: switch on/off discrete card' 'nvidia: NVIDIA kernel driver' -'nvidia-304xx: NVIDIA kernel driver for older devices' +'nvidia-340xx: NVIDIA kernel driver for older devices' +'nvidia-304xx: NVIDIA kernel driver for even older devices' 'primus: faster back-end for optirun') if [ $CARCH = x86_64 ]; then optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Wednesday, October 8, 2014 @ 03:48:31 Author: svenstaro Revision: 120379 upgpkg: bumblebee 3.2.1-5 Whoops Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-08 00:15:09 UTC (rev 120378) +++ PKGBUILD2014-10-08 01:48:31 UTC (rev 120379) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=4 +pkgrel=5 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -18,8 +18,8 @@ optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' fi -conflicts=('nvidia-libgl') -provides=('nvidia-libgl') +conflicts=('nvidia-libgl' 'nvidia-340xx-libgl') +provides=('nvidia-libgl' 'nvidia-340xx-libgl') url=http://www.bumblebee-project.org; license=(GPL3) install='bumblebee.install'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, March 13, 2014 @ 15:27:20 Author: svenstaro Revision: 107148 Add nvidia-304xx optdep Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2014-03-13 13:24:28 UTC (rev 107147) +++ PKGBUILD2014-03-13 14:27:20 UTC (rev 107148) @@ -11,6 +11,7 @@ 'nouveau-dri: 3D acceleration features fo nouveau' 'bbswitch: switch on/off discrete card' 'nvidia: NVIDIA kernel driver' +'nvidia-304xx: NVIDIA kernel driver for older devices' 'primus: faster back-end for optirun') if [ $CARCH = x86_64 ]; then optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Friday, May 17, 2013 @ 01:09:08 Author: svenstaro Revision: 90974 upgpkg: bumblebee 3.2.1-2 Try to fix nvidia loading on bootup Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-05-16 23:06:59 UTC (rev 90973) +++ PKGBUILD2013-05-16 23:09:08 UTC (rev 90974) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -47,6 +47,10 @@ make install DESTDIR=$pkgdir +# Stop nvidia from loading on boot +mkdir -p ${pkgdir}/usr/lib/modprobe.d/ +echo blacklist nvidia ${pkgdir}/usr/lib/modprobe.d/bumblebee.conf + # Install systemd unit install -D -m644 scripts/systemd/bumblebeed.service ${pkgdir}/usr/lib/systemd/system/bumblebeed.service
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Friday, May 17, 2013 @ 01:59:09 Author: svenstaro Revision: 90986 upgpkg: bumblebee 3.2.1-3 Move stuff out of sbin Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-05-16 23:52:19 UTC (rev 90985) +++ PKGBUILD2013-05-16 23:59:09 UTC (rev 90986) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -35,6 +35,7 @@ CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \ CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \ --prefix=/usr \ +--sbindir=/usr/bin \ --with-udev-rules=/usr/lib/udev/rules.d/ \ --sysconfdir=/etc \ --without-pidfile @@ -53,6 +54,7 @@ # Install systemd unit install -D -m644 scripts/systemd/bumblebeed.service ${pkgdir}/usr/lib/systemd/system/bumblebeed.service +sed -i s/sbin/bin/ ${pkgdir}/usr/lib/systemd/system/bumblebeed.service # Make bash_completion work mv -v ${pkgdir}/etc/bash_completion.d/bumblebee ${pkgdir}/etc/bash_completion.d/optirun
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Sunday, May 12, 2013 @ 10:26:37 Author: svenstaro Revision: 90401 Fix FS#35211 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2013-05-12 07:35:25 UTC (rev 90400) +++ PKGBUILD2013-05-12 08:26:37 UTC (rev 90401) @@ -35,6 +35,7 @@ CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \ CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \ --prefix=/usr \ +--with-udev-rules=/usr/lib/udev/rules.d/ \ --sysconfdir=/etc \ --without-pidfile
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Saturday, April 27, 2013 @ 02:11:17 Author: svenstaro Revision: 89127 upgpkg: bumblebee 3.2.1-1 Updating to 3.2.1 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-26 23:37:42 UTC (rev 89126) +++ PKGBUILD2013-04-27 00:11:17 UTC (rev 89127) @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase s...@lutzhaase.com pkgname=bumblebee -pkgver=3.2 +pkgver=3.2.1 pkgrel=1 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ 'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia') source=(http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz;) -md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74') +md5sums=('30974e677bb13e8a3825fd6f3e7d3b24') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, April 25, 2013 @ 10:44:05 Author: svenstaro Revision: 88960 upgpkg: bumblebee 3.2-1 Updating to 3.2 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-25 08:44:03 UTC (rev 88959) +++ PKGBUILD2013-04-25 08:44:05 UTC (rev 88960) @@ -1,8 +1,8 @@ # Maintainer: Sven-Hendrik Haase s...@lutzhaase.com pkgname=bumblebee -pkgver=3.1 -pkgrel=6 +pkgver=3.2 +pkgrel=1 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -25,7 +25,7 @@ 'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia') source=(http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz;) -md5sums=('de515ef51b1e0714c2f1b2a95f83e77e') +md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Monday, April 8, 2013 @ 14:53:05 Author: svenstaro Revision: 87882 upgpkg: bumblebee 3.1-6 Add suggestion from FS#34634 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-08 12:41:31 UTC (rev 87881) +++ PKGBUILD2013-04-08 12:53:05 UTC (rev 87882) @@ -2,10 +2,11 @@ pkgname=bumblebee pkgver=3.1 -pkgrel=5 +pkgrel=6 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') -depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') +depends=('virtualgl' 'glib2' 'mesa-libgl') +makedepends=('help2man') optdepends=('xf86-video-nouveau: nouveau driver' 'nouveau-dri: 3D acceleration features fo nouveau' 'bbswitch: switch on/off discrete card' @@ -34,7 +35,8 @@ CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \ CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \ --prefix=/usr \ ---sysconfdir=/etc +--sysconfdir=/etc \ +--without-pidfile make }
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 08:28:57 Author: svenstaro Revision: 87611 upgpkg: bumblebee 3.1-2 Depend on mesa-libgl directly Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-04 04:03:28 UTC (rev 87610) +++ PKGBUILD2013-04-04 06:28:57 UTC (rev 87611) @@ -2,10 +2,10 @@ pkgname=bumblebee pkgver=3.1 -pkgrel=1 +pkgrel=2 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') -depends=('virtualgl' 'libbsd' 'glib2') +depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') optdepends=('xf86-video-nouveau: Nouveau driver' 'nouveau-dri: 3D acceleration features fo Nouveau' 'bbswitch: switch on/off discrete card'
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 12:38:08 Author: svenstaro Revision: 87635 upgpkg: bumblebee 3.1-3 Oh crap, how did these old strings stay in here? Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-04 10:28:35 UTC (rev 87634) +++ PKGBUILD2013-04-04 10:38:08 UTC (rev 87635) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') @@ -31,8 +31,8 @@ ./configure \ CONF_DRIVER_MODULE_NVIDIA=nvidia \ - CONF_LDPATH_NVIDIA=/usr/lib/nvidia-bumblebee:/usr/lib32/nvidia-bumblebee \ - CONF_MODPATH_NVIDIA=/usr/lib/nvidia-bumblebee/xorg/,/usr/lib/xorg/modules \ +CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \ +CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \ --prefix=/usr \ --sysconfdir=/etc
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 12:40:47 Author: svenstaro Revision: 87636 upgpkg: bumblebee 3.1-4 Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-04-04 10:38:08 UTC (rev 87635) +++ PKGBUILD2013-04-04 10:40:47 UTC (rev 87636) @@ -2,7 +2,7 @@ pkgname=bumblebee pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl')
[arch-commits] Commit in bumblebee/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 16:43:09 Author: svenstaro Revision: 87642 upgpkg: bumblebee 3.1-5 Try to fix the nvidia dep chain Modified: bumblebee/trunk/PKGBUILD --+ PKGBUILD | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-04 13:30:22 UTC (rev 87641) +++ PKGBUILD2013-04-04 14:43:09 UTC (rev 87642) @@ -2,24 +2,24 @@ pkgname=bumblebee pkgver=3.1 -pkgrel=4 +pkgrel=5 pkgdesc=NVIDIA Optimus support for Linux through VirtualGL arch=('i686' 'x86_64') depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') -optdepends=('xf86-video-nouveau: Nouveau driver' -'nouveau-dri: 3D acceleration features fo Nouveau' +optdepends=('xf86-video-nouveau: nouveau driver' +'nouveau-dri: 3D acceleration features fo nouveau' 'bbswitch: switch on/off discrete card' -'nvidia: Nvidia kernel driver' +'nvidia: NVIDIA kernel driver' 'primus: faster back-end for optirun') if [ $CARCH = x86_64 ]; then optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' fi conflicts=('nvidia-libgl') -url=http://www.Bumblebee-Project.org; +provides=('nvidia-libgl') +url=http://www.bumblebee-project.org; license=(GPL3) install='bumblebee.install' -provides=('bumblebee') backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia')