Hello community, here is the log from the commit of package xboxdrv for openSUSE:Factory checked in at 2017-02-21 13:49:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xboxdrv (Old) and /work/SRC/openSUSE:Factory/.xboxdrv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xboxdrv" Changes: -------- --- /work/SRC/openSUSE:Factory/xboxdrv/xboxdrv.changes 2017-02-04 16:51:56.734241907 +0100 +++ /work/SRC/openSUSE:Factory/.xboxdrv.new/xboxdrv.changes 2017-02-21 13:49:08.398574558 +0100 @@ -1,0 +2,9 @@ +Tue Feb 7 14:11:28 UTC 2017 - sor.alexei@meowr.ru + +- Use optflags. +- Install xboxdrvctl and require dbus-1-python. +- Add xboxdrv-fix-delay.patch: Fix 60 seconds delay, from + https://github.com/xboxdrv/xboxdrv/pull/214 +- Some spec cleanup. + +------------------------------------------------------------------- New: ---- xboxdrv-fix-delay.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xboxdrv.spec ++++++ --- /var/tmp/diff_new_pack.7DGvI3/_old 2017-02-21 13:49:08.946497446 +0100 +++ /var/tmp/diff_new_pack.7DGvI3/_new 2017-02-21 13:49:08.950496884 +0100 @@ -19,7 +19,7 @@ Name: xboxdrv Version: 0.8.8 Release: 0 -Summary: Xbox/Xbo360 USB Gamepad Driver for Userspace +Summary: Xbox/Xbox360 USB Gamepad Driver for Userspace License: GPL-3.0+ Group: Hardware/Joystick Url: http://pingus.seul.org/~grumbel/xboxdrv/ @@ -27,51 +27,56 @@ Source1: 50-xpad.conf Source2: %{name}.conf Source3: %{name}.service -BuildRequires: automake -BuildRequires: dbus-1-glib-devel +# PATCH-FIX-UPSTREAM xboxdrv-fix-delay.patch -- Fix 60 seconds delay, from https://github.com/xboxdrv/xboxdrv/pull/214 +Patch0: %{name}-fix-delay.patch BuildRequires: gcc-c++ -BuildRequires: libX11-devel -BuildRequires: libudev-devel -BuildRequires: libusb-1_0-devel +BuildRequires: pkgconfig BuildRequires: scons -%if 0%{?suse_version} > 1325 +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(x11) +Requires: dbus-1-python +%if 0%{?suse_version} > 1320 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Xboxdrv is a Xbox/Xbox360 gamepad driver for Linux that works in userspace. It is an alternative to the xpad kernel driver and has -support for Xbox1 gamepads, Xbox360 USB gamepads and Xbox360 wireless -gamepads. The Xbox360 guitar and some Xbox1 dancemats might work too. -The Xbox 360 racing wheel is not supported, but shouldn't be to hard -to add if somebody is interested. +support for Xbox1 gamepads, Xbox360 USB gamepads and Xbox360 +wireless gamepads. The Xbox360 guitar and some Xbox1 dancemats +might work too. The Xbox 360 racing wheel is not supported, but +shouldn't be to hard to add if somebody is interested. %prep %setup -q -n %{name}-linux-%{version} +%patch0 -p1 +cp -f %{SOURCE1} 50-xpad.conf +cp -f %{SOURCE2} %{name}.conf +cp -f %{SOURCE3} %{name}.service + +tee custom.py << EOF +CCFLAGS = "%{optflags}" +EOF %build -make %{?_smp_mflags} +scons %{?_smp_mflags} %install -# don't use make install until python dependencies for xboxdrvctl -# are clarified; also the man file is installed with incorrect permissions -mkdir -p %{buildroot}%{_bindir} -install -m 755 %{name} %{buildroot}%{_bindir} - -mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d -install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.d/ -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir} +%make_install PREFIX=%{_prefix} -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 644 doc/xboxdrv.1 %{buildroot}%{_mandir}/man1 +chmod a-x %{buildroot}%{_mandir}/man1/%{name}.1 -mkdir -p %{buildroot}%{_unitdir} -install -m 644 %{SOURCE3} %{buildroot}%{_unitdir} +install -Dpm 0644 50-xpad.conf \ + %{buildroot}%{_sysconfdir}/modprobe.d/50-xpad.conf -mkdir -p %{buildroot}%{_sbindir} +install -Dpm 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf +install -Dpm 0644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service + +mkdir -p %{buildroot}%{_sbindir}/ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %pre @@ -88,13 +93,14 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING NEWS PROTOCOL README.md TODO VERSION -%{_bindir}/%{name} -%{_sbindir}/rc%{name} +%doc AUTHORS COPYING NEWS PROTOCOL README.md TODO %config(noreplace) %{_sysconfdir}/%{name}.conf -%dir %{_sysconfdir}/modprobe.d +%dir %{_sysconfdir}/modprobe.d/ %config %{_sysconfdir}/modprobe.d/50-xpad.conf +%{_bindir}/%{name} +%{_bindir}/%{name}ctl +%{_sbindir}/rc%{name} %{_unitdir}/%{name}.service -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1%{?ext_man} %changelog ++++++ xboxdrv-fix-delay.patch ++++++ --- a/src/usb_gsource.cpp +++ b/src/usb_gsource.cpp @@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* gboolean USBGSource::on_source() { - libusb_handle_events(NULL); + struct timeval to; + to.tv_sec = 0; + to.tv_usec = 0; + libusb_handle_events_timeout_completed(NULL, &to, NULL); return TRUE; }