Hello community,
here is the log from the commit of package bumblebee for openSUSE:Factory
checked in at 2020-09-15 16:31:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bumblebee (Old)
and /work/SRC/openSUSE:Factory/.bumblebee.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bumblebee"
Tue Sep 15 16:31:20 2020 rev:13 rq:834552 version:3.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/bumblebee/bumblebee.changes 2020-02-04
19:53:38.369331616 +0100
+++ /work/SRC/openSUSE:Factory/.bumblebee.new.4249/bumblebee.changes
2020-09-15 16:31:39.894790646 +0200
@@ -1,0 +2,11 @@
+Mon Sep 14 16:14:09 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add Debian patch to fix build with GCC10:
+ * Fix_build_with_GCC10.patch
+
+-------------------------------------------------------------------
+Wed Aug 19 08:56:33 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com>
+
+- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
+
+-------------------------------------------------------------------
New:
----
Fix_build_with_GCC10.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bumblebee.spec ++++++
--- /var/tmp/diff_new_pack.aPsfz1/_old 2020-09-15 16:31:41.090791791 +0200
+++ /var/tmp/diff_new_pack.aPsfz1/_new 2020-09-15 16:31:41.090791791 +0200
@@ -27,6 +27,8 @@
Source1: %{name}-rpmlintrc
Patch0: nvidia-uvm-modeset-drm-support.patch
Patch1: bumblebee-decimal-pciid.patch
+# PATCH-FIX-UPSTREAM
+Patch2: Fix_build_with_GCC10.patch
BuildRequires: glib2-devel
BuildRequires: help2man
BuildRequires: pciutils
@@ -63,28 +65,25 @@
also smart power management of the dGPU when it is not in use.
%prep
-%setup -q
-# Apply patch to add support for nvidia-uvm
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%build
%configure \
--without-pidfile \
- --with-udev-rules=%{_libexecdir}/udev/rules.d/ \
- CONF_DRIVER_MODULE_NVIDIA=nvidia
CONF_LDPATH_NVIDIA=%{_libdir}/nvidia:%{_libexecdir}/nvidia \
+ --with-udev-rules=%{_udevrulesdir}/ \
+ CONF_DRIVER_MODULE_NVIDIA=nvidia
CONF_LDPATH_NVIDIA=%{_libdir}/nvidia:%{_prefix}/lib/nvidia \
CONF_MODPATH_NVIDIA=%{_libdir}/nvidia/xorg/,%{_libdir}/xorg/modules \
- CONF_PRIMUS_LD_PATH=%{_libdir}/primus:%{_libexecdir}/primus
+ CONF_PRIMUS_LD_PATH=%{_libdir}/primus:%{_prefix}/lib/primus
make %{?_smp_mflags}
%install
%make_install
-install -d 755 %{buildroot}%{_libexecdir}/systemd
-install -D -m644
"%{_builddir}/%{name}-%{version}/scripts/systemd/bumblebeed.service"
"%{buildroot}%{_libexecdir}/systemd/system/bumblebeed.service"
+install -d 755 %{buildroot}%{_prefix}/lib/systemd
+install -D -m644
"%{_builddir}/%{name}-%{version}/scripts/systemd/bumblebeed.service"
"%{buildroot}%{_unitdir}/bumblebeed.service"
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcbumblebeed
# Fix service to run after dkms and modules leading service
-sed -i '3i After=dkms.service systemd-modules-load.service'
%{buildroot}%{_libexecdir}/systemd/system/bumblebeed.service
+sed -i '3i After=dkms.service systemd-modules-load.service'
%{buildroot}%{_unitdir}/bumblebeed.service
# according to rpmlint error suse-filelist-forbidden-bashcomp-userdirs
install -d -m 0755 %{buildroot}/%{_datadir}/bash-completion/completions/
mv %{buildroot}/%{_sysconfdir}/bash_completion.d/bumblebee
%{buildroot}/%{_datadir}/bash-completion/completions/
@@ -123,8 +122,7 @@
%config(noreplace) %{_sysconfdir}/bumblebee/bumblebee.conf
%dir %{_sysconfdir}/bumblebee/xorg.conf.d
%config %{_sysconfdir}/bumblebee/xorg.conf.d/10-dummy.conf
-%dir %{_libexecdir}/systemd/system
-%{_libexecdir}/systemd/system/bumblebeed.service
+%{_unitdir}/bumblebeed.service
%{_sbindir}/rcbumblebeed
%{_udevrulesdir}/99-bumblebee-nvidia-dev.rules
%dir %{_datadir}/bash-completion/completions/
++++++ Fix_build_with_GCC10.patch ++++++
Author: Andreas Beckmann <a...@debian.org> Description: fix
FTBFS with gcc-10 gcc-10 defaults to -fno-common see
https://gcc.gnu.org/gcc-10/porting_to.html Bug-Debian:
https://bugs.debian.org/957058
---
src/bbconfig.h | 2 +-
src/bbsecondary.c | 3 +++
src/bbsecondary.h | 2 +-
src/switch/switching.c | 2 ++
src/switch/switching.h | 4 ++--
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/bbconfig.h b/src/bbconfig.h
index 5596b64..78b0d49 100644
--- a/src/bbconfig.h
+++ b/src/bbconfig.h
@@ -102,7 +102,7 @@ enum bb_pm_method {
PM_VGASWITCHEROO,
PM_METHODS_COUNT /* not a method but a marker for the end */
};
-const char *bb_pm_method_string[PM_METHODS_COUNT];
+extern const char *bb_pm_method_string[PM_METHODS_COUNT];
/* String buffer size */
#define BUFFER_SIZE 1024
diff --git a/src/bbsecondary.c b/src/bbsecondary.c
index 71a6b73..9cc449b 100644
--- a/src/bbsecondary.c
+++ b/src/bbsecondary.c
@@ -37,6 +37,9 @@
#include "pci.h"
#include "module.h"
+/* PCI Bus ID of the discrete video card */
+struct pci_bus_id *pci_bus_id_discrete;
+
/**
* Substitutes DRIVER in the passed path
* @param x_conf_file A path to be processed
diff --git a/src/bbsecondary.h b/src/bbsecondary.h
index 291c20f..d69b726 100644
--- a/src/bbsecondary.h
+++ b/src/bbsecondary.h
@@ -29,7 +29,7 @@
#define XORG_BINARY "Xorg"
/* PCI Bus ID of the discrete video card */
-struct pci_bus_id *pci_bus_id_discrete;
+extern struct pci_bus_id *pci_bus_id_discrete;
/// Start the X server by fork-exec, turn card on if needed.
bool start_secondary(bool);
diff --git a/src/switch/switching.c b/src/switch/switching.c
index 7ed716e..4872122 100644
--- a/src/switch/switching.c
+++ b/src/switch/switching.c
@@ -31,6 +31,8 @@ struct switching_method switching_methods[SWITCHERS_COUNT] = {
switcheroo_on, switcheroo_off}
};
+struct switching_method *switcher = NULL;
+
/**
* Enumerates through available switching methods and try a method
*
diff --git a/src/switch/switching.h b/src/switch/switching.h
index e0a54bc..4e7b03a 100644
--- a/src/switch/switching.h
+++ b/src/switch/switching.h
@@ -60,10 +60,10 @@ void switcheroo_off(void);
/* number of switchers as defined in switching.c */
#define SWITCHERS_COUNT 2
-struct switching_method switching_methods[SWITCHERS_COUNT];
+extern struct switching_method switching_methods[SWITCHERS_COUNT];
/* A switching method that can be used or NULL if none */
-struct switching_method *switcher;
+extern struct switching_method *switcher;
struct switching_method *switcher_detect(const char *name, struct switch_info);
enum switch_state switch_status(void);
--
2.28.0
