* [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/
@ 2016-07-02 15:35 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-07-02 15:35 UTC (permalink / raw
To: gentoo-commits
commit: 1a467e8b2506662594afc28732a9249e8686c10e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 15:33:32 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 15:35:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a467e8b
games-util/xboxdrv: Version bump to 0.8.8, EAPI bump to 6, bug #567182
Includes patch to fix 60 second delay, upstream GitHub issue #144.
Package-Manager: portage-2.3.0
games-util/xboxdrv/Manifest | 1 +
games-util/xboxdrv/files/github-144.patch | 15 ++++++
games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch | 13 +++++
games-util/xboxdrv/xboxdrv-0.8.8.ebuild | 63 ++++++++++++++++++++++
4 files changed, 92 insertions(+)
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index 4f53fe7..a5eaa4a 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -1 +1,2 @@
DIST xboxdrv-linux-0.8.5.tar.bz2 265805 SHA256 411195c4f5310a1a5f21f015daaf00b277f75da89df710308f8abfcf8f337e78 SHA512 954a3664462dfeff63a455f3dfea4bc14f8c3e07fa9b0c299bb523b4089faad7f8d634511eb66c023bd289adbbf18e96ce26cbcf5b8ffc9bb3088f1afe532601 WHIRLPOOL f47cdbcf40bd237715ff2b55354c6570ebbccd9cd0beb09b91869fa37db247c57019593b317d2acd767044fe92019defa01c9592bb3b63d2283103ff10dae844
+DIST xboxdrv-linux-0.8.8.tar.bz2 267919 SHA256 f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a SHA512 2978b33d23636431ee0cc393ea32d3d26ebe9f2b914f0bf8bc0e096f98202726768142e653bc5765ac55084b105ff3a6214bdf6e745fdd8aa167260c54c10494 WHIRLPOOL a27c0c68171cb08c6edc12aeafb84ae3a2edb14b8d4a87ad607f722581a58955d11808acb8c0b7169581850f52dd76be2c100de5e284a1521d10f0ae108a867d
diff --git a/games-util/xboxdrv/files/github-144.patch b/games-util/xboxdrv/files/github-144.patch
new file mode 100644
index 0000000..5782e1a
--- /dev/null
+++ b/games-util/xboxdrv/files/github-144.patch
@@ -0,0 +1,15 @@
+diff -Naur xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp xboxdrv-linux-0.8.5/src/usb_gsource.cpp
+--- xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp 2013-04-07 18:27:49.000000000 +0100
++++ xboxdrv-linux-0.8.5/src/usb_gsource.cpp 2016-07-02 12:35:41.692355904 +0100
+@@ -174,7 +174,10 @@
+ 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;
+ }
+
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
new file mode 100644
index 0000000..7900b25
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
@@ -0,0 +1,13 @@
+http://dev.gentoo.org/~vapier/scons-blows.txt
+
+diff -Naur xboxdrv-linux-0.8.8.orig/SConstruct xboxdrv-linux-0.8.8/SConstruct
+--- xboxdrv-linux-0.8.8.orig/SConstruct 2015-11-09 10:19:35.000000000 +0000
++++ xboxdrv-linux-0.8.8/SConstruct 2016-07-02 16:13:52.560961836 +0100
+@@ -84,6 +84,7 @@
+ opts.Add('CXXFLAGS', 'C++ Compiler flags')
+ opts.Add('LINKFLAGS', 'Linker Compiler flags')
+ opts.Add('AR', 'Library archiver')
++opts.Add('RANLIB', 'Archive indexer')
+ opts.Add('CC', 'C Compiler')
+ opts.Add('CXX', 'C++ Compiler')
+ opts.Add('BUILD', 'Build type: release, custom, development')
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
new file mode 100644
index 0000000..04d3c7d
--- /dev/null
+++ b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit linux-info scons-utils toolchain-funcs systemd udev
+
+MY_P=${PN}-linux-${PV}
+DESCRIPTION="Userspace Xbox 360 Controller driver"
+HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/"
+SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/boost:=
+ dev-libs/dbus-glib:=
+ virtual/libudev:=
+ sys-apps/dbus:=
+ dev-libs/glib:2=
+ virtual/libusb:1=
+ x11-libs/libX11:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-scons.patch
+ "${FILESDIR}"/github-144.patch
+)
+
+CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
+
+src_compile() {
+ escons \
+ BUILD=custom \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ CXXFLAGS="-Wall ${CXXFLAGS}" \
+ LINKFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin xboxdrv
+ doman doc/xboxdrv.1
+ dodoc AUTHORS NEWS PROTOCOL README.md TODO
+
+ newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
+ newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
+
+ insinto /etc/dbus-1/system.d/
+ doins "${FILESDIR}/org.seul.Xboxdrv.conf"
+
+ udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
+ systemd_dounit "${FILESDIR}"/xboxdrv.service
+}
+
+pkg_postinst() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/
@ 2016-07-02 15:35 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-07-02 15:35 UTC (permalink / raw
To: gentoo-commits
commit: e3eae680d120f76bc3ee6c27618daa0b54cae3f9
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 15:34:57 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 15:35:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3eae680
games-util/xboxdrv: Remove old 0.8.5-r2
Package-Manager: portage-2.3.0
.../files/xboxdrv-0.8.4-libusbx-1.0.13-fix.patch | 340 ---------------------
games-util/xboxdrv/xboxdrv-0.8.5-r2.ebuild | 63 ----
2 files changed, 403 deletions(-)
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.4-libusbx-1.0.13-fix.patch b/games-util/xboxdrv/files/xboxdrv-0.8.4-libusbx-1.0.13-fix.patch
deleted file mode 100644
index 5b8d2f4..0000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.4-libusbx-1.0.13-fix.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-commit 27cdd9c6a994f3059b8ae683adb711169341ffa5
-Author: Ingo Ruhnke <grumbel@gmail.com>
-Date: Wed Dec 19 11:39:31 2012 +0100
-
- Added additional bookkeeping to USBController to allow clean shutdowns with libusbx
-
- Fixes #28
-
---- a/src/firestorm_dual_controller.cpp
-+++ b/src/firestorm_dual_controller.cpp
-@@ -99,8 +99,6 @@ FirestormDualController::FirestormDualController(libusb_device* dev, bool is_vsb
-
- FirestormDualController::~FirestormDualController()
- {
-- usb_cancel_read();
-- usb_release_interface(0);
- }
-
- void
---- a/src/generic_usb_controller.cpp
-+++ b/src/generic_usb_controller.cpp
-@@ -62,8 +62,6 @@ GenericUSBController::GenericUSBController(libusb_device* dev,
-
- GenericUSBController::~GenericUSBController()
- {
-- usb_cancel_read();
-- usb_release_interface(m_interface);
- }
-
- void
---- a/src/playstation3_usb_controller.cpp
-+++ b/src/playstation3_usb_controller.cpp
-@@ -37,8 +37,6 @@ Playstation3USBController::Playstation3USBController(libusb_device* dev, bool tr
-
- Playstation3USBController::~Playstation3USBController()
- {
-- usb_cancel_read();
-- usb_release_interface(0);
- }
-
- #define HID_GET_REPORT 0x01
---- a/src/saitek_p2500_controller.cpp
-+++ b/src/saitek_p2500_controller.cpp
-@@ -66,8 +66,6 @@ SaitekP2500Controller::SaitekP2500Controller(libusb_device* dev, bool try_detach
-
- SaitekP2500Controller::~SaitekP2500Controller()
- {
-- usb_cancel_read();
-- usb_release_interface(0);
- }
-
- void
---- a/src/usb_controller.cpp
-+++ b/src/usb_controller.cpp
-@@ -28,7 +28,8 @@
- USBController::USBController(libusb_device* dev) :
- m_dev(dev),
- m_handle(0),
-- m_read_transfer(),
-+ m_transfers(),
-+ m_interfaces(),
- m_usbpath(),
- m_usbid(),
- m_name()
-@@ -78,7 +79,29 @@ USBController::USBController(libusb_device* dev) :
-
- USBController::~USBController()
- {
-- //log_tmp("~USBController");
-+ // cancel all transfers
-+ for(std::set<libusb_transfer*>::iterator it = m_transfers.begin(); it != m_transfers.end(); ++it)
-+ {
-+ libusb_cancel_transfer(*it);
-+ }
-+
-+ // wait for cancel to succeed
-+ while (!m_transfers.empty())
-+ {
-+ int ret = libusb_handle_events(NULL);
-+ if (ret != 0)
-+ {
-+ log_error("libusb_handle_events() failure: " << ret);
-+ }
-+ }
-+
-+ // release all claimed interfaces
-+ for(std::set<int>::iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it)
-+ {
-+ libusb_release_interface(m_handle, *it);
-+ }
-+
-+ // read and write transfers might still be going on and might need to be canceled
- libusb_close(m_handle);
- }
-
-@@ -103,23 +126,26 @@ USBController::get_name() const
- void
- USBController::usb_submit_read(int endpoint, int len)
- {
-- assert(!m_read_transfer);
--
-- m_read_transfer = libusb_alloc_transfer(0);
-+ libusb_transfer* transfer = libusb_alloc_transfer(0);
-
- uint8_t* data = static_cast<uint8_t*>(malloc(sizeof(uint8_t) * len));
-- m_read_transfer->flags |= LIBUSB_TRANSFER_FREE_BUFFER;
-- libusb_fill_interrupt_transfer(m_read_transfer, m_handle,
-+ transfer->flags |= LIBUSB_TRANSFER_FREE_BUFFER;
-+ libusb_fill_interrupt_transfer(transfer, m_handle,
- endpoint | LIBUSB_ENDPOINT_IN,
- data, len,
- &USBController::on_read_data_wrap, this,
- 0); // timeout
- int ret;
-- ret = libusb_submit_transfer(m_read_transfer);
-+ ret = libusb_submit_transfer(transfer);
- if (ret != LIBUSB_SUCCESS)
- {
-+ libusb_free_transfer(transfer);
- raise_exception(std::runtime_error, "libusb_submit_transfer(): " << usb_strerror(ret));
- }
-+ else
-+ {
-+ m_transfers.insert(transfer);
-+ }
- }
-
- void
-@@ -127,7 +153,6 @@ USBController::usb_write(int endpoint, uint8_t* data_in, int len)
- {
- libusb_transfer* transfer = libusb_alloc_transfer(0);
- transfer->flags |= LIBUSB_TRANSFER_FREE_BUFFER;
-- transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
-
- // copy data into a newly allocated buffer
- uint8_t* data = static_cast<uint8_t*>(malloc(sizeof(uint8_t) * len));
-@@ -143,8 +168,13 @@ USBController::usb_write(int endpoint, uint8_t* data_in, int len)
- ret = libusb_submit_transfer(transfer);
- if (ret != LIBUSB_SUCCESS)
- {
-+ libusb_free_transfer(transfer);
- raise_exception(std::runtime_error, "libusb_submit_transfer(): " << usb_strerror(ret));
- }
-+ else
-+ {
-+ m_transfers.insert(transfer);
-+ }
- }
-
- void
-@@ -154,7 +184,6 @@ USBController::usb_control(uint8_t bmRequestType, uint8_t bRequest,
- {
- libusb_transfer* transfer = libusb_alloc_transfer(0);
- transfer->flags |= LIBUSB_TRANSFER_FREE_BUFFER;
-- transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
-
- // create and fill control buffer
- uint8_t* data = static_cast<uint8_t*>(malloc(wLength + 8));
-@@ -168,14 +197,22 @@ USBController::usb_control(uint8_t bmRequestType, uint8_t bRequest,
- ret = libusb_submit_transfer(transfer);
- if (ret != LIBUSB_SUCCESS)
- {
-+ libusb_free_transfer(transfer);
- raise_exception(std::runtime_error, "libusb_submit_transfer(): " << usb_strerror(ret));
- }
-+ else
-+ {
-+ m_transfers.insert(transfer);
-+ }
- }
-
- void
- USBController::on_control(libusb_transfer* transfer)
- {
- log_debug("control transfer");
-+
-+ m_transfers.erase(transfer);
-+ libusb_free_transfer(transfer);
- }
-
- void
-@@ -183,19 +220,12 @@ USBController::on_write_data(libusb_transfer* transfer)
- {
- if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
- {
-- log_error("USB write failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
-+ if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
-+ log_error("USB write failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
- }
--}
-
--void
--USBController::usb_cancel_read()
--{
-- if (m_read_transfer)
-- {
-- libusb_cancel_transfer(m_read_transfer);
-- libusb_free_transfer(m_read_transfer);
-- m_read_transfer = 0;
-- }
-+ m_transfers.erase(transfer);
-+ libusb_free_transfer(transfer);
- }
-
- void
-@@ -203,31 +233,30 @@ USBController::on_read_data(libusb_transfer* transfer)
- {
- assert(transfer);
-
-- // FIXME: check for LIBUSB_TRANSFER_COMPLETED
--
-- // process data
-- XboxGenericMsg msg;
-- if (parse(transfer->buffer, transfer->actual_length, &msg))
-+ if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
- {
-- submit_msg(msg);
-- }
-+ if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
-+ log_error("USB read failure: " << transfer->length << ": " << usb_transfer_strerror(transfer->status));
-
-- if (false) // cleanup
-- {
-+ m_transfers.erase(transfer);
- libusb_free_transfer(transfer);
- }
-- else // resubmit
-- {
-+ else
-+ {
-+ // process data
-+ XboxGenericMsg msg;
-+ if (parse(transfer->buffer, transfer->actual_length, &msg))
-+ {
-+ submit_msg(msg);
-+ }
-+
- int ret;
- ret = libusb_submit_transfer(transfer);
- if (ret != LIBUSB_SUCCESS) // could also check for LIBUSB_ERROR_NO_DEVICE
- {
- log_error("failed to resubmit USB transfer: " << usb_strerror(ret));
-
-- assert(m_read_transfer == transfer);
--
- libusb_free_transfer(transfer);
-- m_read_transfer = 0;
-
- send_disconnect();
- }
-@@ -237,6 +266,11 @@ USBController::on_read_data(libusb_transfer* transfer)
- void
- USBController::usb_claim_interface(int ifnum, bool try_detach)
- {
-+ // keep track of all claimed interfaces so they can be released in
-+ // the destructor
-+ assert(m_interfaces.find(ifnum) == m_interfaces.end());
-+ m_interfaces.insert(ifnum);
-+
- int err = usb_claim_n_detach_interface(m_handle, ifnum, try_detach);
- if (err != 0)
- {
-@@ -247,13 +281,6 @@ USBController::usb_claim_interface(int ifnum, bool try_detach)
- }
- }
-
--void
--USBController::usb_release_interface(int ifnum)
--{
-- // should be called before closing the device handle
-- libusb_release_interface(m_handle, ifnum);
--}
--
- int
- USBController::usb_find_ep(int direction, uint8_t if_class, uint8_t if_subclass, uint8_t if_protocol)
- {
---- a/src/usb_controller.hpp
-+++ b/src/usb_controller.hpp
-@@ -22,6 +22,7 @@
- #include <libusb.h>
- #include <string>
- #include <memory>
-+#include <set>
-
- #include "controller.hpp"
-
-@@ -31,7 +32,8 @@ protected:
- libusb_device* m_dev;
- libusb_device_handle* m_handle;
-
-- libusb_transfer* m_read_transfer;
-+ std::set<libusb_transfer*> m_transfers;
-+ std::set<int> m_interfaces;
-
- std::string m_usbpath;
- std::string m_usbid;
-@@ -50,10 +52,8 @@ public:
- int usb_find_ep(int direction, uint8_t if_class, uint8_t if_subclass, uint8_t if_protocol);
-
- void usb_claim_interface(int ifnum, bool try_detach);
-- void usb_release_interface(int ifnum);
-
- void usb_submit_read(int endpoint, int len);
-- void usb_cancel_read();
-
- void usb_write(int endpoint, uint8_t* data, int len);
- void usb_control(uint8_t bmRequestType, uint8_t bRequest,
---- a/src/xbox360_controller.cpp
-+++ b/src/xbox360_controller.cpp
-@@ -86,8 +86,6 @@ Xbox360Controller::Xbox360Controller(libusb_device* dev,
-
- Xbox360Controller::~Xbox360Controller()
- {
-- usb_cancel_read();
-- usb_release_interface(0);
- }
-
- void
---- a/src/xbox360_wireless_controller.cpp
-+++ b/src/xbox360_wireless_controller.cpp
-@@ -50,8 +50,6 @@ Xbox360WirelessController::Xbox360WirelessController(libusb_device* dev, int con
-
- Xbox360WirelessController::~Xbox360WirelessController()
- {
-- usb_cancel_read();
-- usb_release_interface(m_interface);
- }
-
- void
---- a/src/xbox_controller.cpp
-+++ b/src/xbox_controller.cpp
-@@ -41,8 +41,6 @@ XboxController::XboxController(libusb_device* dev, bool try_detach) :
-
- XboxController::~XboxController()
- {
-- usb_cancel_read();
-- usb_release_interface(0);
- }
-
- void
diff --git a/games-util/xboxdrv/xboxdrv-0.8.5-r2.ebuild b/games-util/xboxdrv/xboxdrv-0.8.5-r2.ebuild
deleted file mode 100644
index f03ce60..0000000
--- a/games-util/xboxdrv/xboxdrv-0.8.5-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit linux-info scons-utils toolchain-funcs systemd udev
-
-MY_P=${PN}-linux-${PV}
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/"
-SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
- dev-libs/dbus-glib:=
- virtual/libudev:=
- sys-apps/dbus:=
- dev-libs/glib:2=
- virtual/libusb:1=
- x11-libs/libX11:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-scons.patch
-}
-
-src_compile() {
- escons \
- BUILD=custom \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- CXXFLAGS="-Wall ${CXXFLAGS}" \
- LINKFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xboxdrv
- doman doc/xboxdrv.1
- dodoc AUTHORS NEWS PROTOCOL README TODO
-
- newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
- newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
-
- insinto /etc/dbus-1/system.d/
- doins "${FILESDIR}/org.seul.Xboxdrv.conf"
-
- udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
- systemd_dounit "${FILESDIR}"/xboxdrv.service
-}
-
-pkg_postinst() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/
@ 2017-09-30 4:32 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2017-09-30 4:32 UTC (permalink / raw
To: gentoo-commits
commit: 4749884d33af885c8218d2c958958e30f5b9ad8e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 04:28:36 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 04:32:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4749884d
games-util/xboxdrv: remove 0.8.5-r1
Package-Manager: Portage-2.3.8, Repoman-2.3.3
games-util/xboxdrv/Manifest | 1 -
games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch | 13 ------
games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild | 48 ----------------------
3 files changed, 62 deletions(-)
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index a5eaa4a4edc..33aa9c2375e 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -1,2 +1 @@
-DIST xboxdrv-linux-0.8.5.tar.bz2 265805 SHA256 411195c4f5310a1a5f21f015daaf00b277f75da89df710308f8abfcf8f337e78 SHA512 954a3664462dfeff63a455f3dfea4bc14f8c3e07fa9b0c299bb523b4089faad7f8d634511eb66c023bd289adbbf18e96ce26cbcf5b8ffc9bb3088f1afe532601 WHIRLPOOL f47cdbcf40bd237715ff2b55354c6570ebbccd9cd0beb09b91869fa37db247c57019593b317d2acd767044fe92019defa01c9592bb3b63d2283103ff10dae844
DIST xboxdrv-linux-0.8.8.tar.bz2 267919 SHA256 f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a SHA512 2978b33d23636431ee0cc393ea32d3d26ebe9f2b914f0bf8bc0e096f98202726768142e653bc5765ac55084b105ff3a6214bdf6e745fdd8aa167260c54c10494 WHIRLPOOL a27c0c68171cb08c6edc12aeafb84ae3a2edb14b8d4a87ad607f722581a58955d11808acb8c0b7169581850f52dd76be2c100de5e284a1521d10f0ae108a867d
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch
deleted file mode 100644
index 3cc3649ca3d..00000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://dev.gentoo.org/~vapier/scons-blows.txt
-
---- SConstruct
-+++ SConstruct
-@@ -85,6 +85,8 @@
- opts.Add('LINKFLAGS', 'Linker Compiler flags')
- opts.Add('CC', 'C Compiler')
- opts.Add('CXX', 'C++ Compiler')
-+opts.Add('AR', 'Archiver')
-+opts.Add('RANLIB', 'Archive indexer')
- opts.Add('BUILD', 'Build type: release, custom, development')
-
- opts.Update(env)
diff --git a/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild b/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild
deleted file mode 100644
index 88a34e82347..00000000000
--- a/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit base linux-info scons-utils toolchain-funcs
-
-MY_P=${PN}-linux-${PV}
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/"
-SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
- virtual/udev
- sys-apps/dbus
- dev-libs/glib:2
- virtual/libusb:1
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-PATCHES=( "${FILESDIR}"/${P}-scons.patch )
-
-src_compile() {
- escons \
- BUILD=custom \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- CXXFLAGS="-Wall ${CXXFLAGS}" \
- LINKFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xboxdrv
- doman doc/xboxdrv.1
- dodoc AUTHORS NEWS PROTOCOL README TODO
-
- newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
- newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/
@ 2019-01-17 22:27 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2019-01-17 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 6f5dd987d612e67babe6029c8db433a0184d2e31
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 22:18:12 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 22:27:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5dd987
games-util/xboxdrv: Drop old 0.8.8
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/xboxdrv/Manifest | 1 -
games-util/xboxdrv/files/github-144.patch | 15 ------
.../xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch | 16 ------
games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch | 13 -----
games-util/xboxdrv/xboxdrv-0.8.8.ebuild | 63 ----------------------
5 files changed, 108 deletions(-)
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index a08c7116294..22664cac47a 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -1,2 +1 @@
DIST xboxdrv-0.8.8_p20190116.tar.gz 322469 BLAKE2B 8827cafb98235f7ad9d83204c808eb6bc25fdfd48321050ab79b561fc6a1a3b628e4bd667f7f1be511420514ef7906efc803db4f50130c393d7fa3cb498fed26 SHA512 3f9f8346a5a8486fb9f1af3e27a947e37c73ceab8f433639adf890144844f4fb6d005da3c4c6c1abf0a1550b71aba8b89001f58965d67fdc21e5f41e50a21436
-DIST xboxdrv-linux-0.8.8.tar.bz2 267919 BLAKE2B b6f09fc929ba561f0c18a777ca94f6972f366d29709d5fdcb168988311ca53eb813761df0f87d148795aa14d2d89b200e8123502c0b255ebe20e5f9caa18f8f1 SHA512 2978b33d23636431ee0cc393ea32d3d26ebe9f2b914f0bf8bc0e096f98202726768142e653bc5765ac55084b105ff3a6214bdf6e745fdd8aa167260c54c10494
diff --git a/games-util/xboxdrv/files/github-144.patch b/games-util/xboxdrv/files/github-144.patch
deleted file mode 100644
index 5782e1a8cd5..00000000000
--- a/games-util/xboxdrv/files/github-144.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp xboxdrv-linux-0.8.5/src/usb_gsource.cpp
---- xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp 2013-04-07 18:27:49.000000000 +0100
-+++ xboxdrv-linux-0.8.5/src/usb_gsource.cpp 2016-07-02 12:35:41.692355904 +0100
-@@ -174,7 +174,10 @@
- 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;
- }
-
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch
deleted file mode 100644
index 80a8d8f550e..00000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Cast boost::shared_ptr explicitly for C++14.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594674
-
---- a/src/controller_slot.cpp
-+++ b/src/controller_slot.cpp
-@@ -67,9 +67,9 @@ ControllerSlot::disconnect()
- }
-
- bool
- ControllerSlot::is_connected() const
- {
-- return m_thread;
-+ return static_cast<bool>(m_thread);
- }
-
- /* EOF */
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
deleted file mode 100644
index d6df8d99e32..00000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://dev.gentoo.org/~vapier/scons-blows.txt
-
-diff -Naur xboxdrv-linux-0.8.8.orig/SConstruct xboxdrv-linux-0.8.8/SConstruct
---- xboxdrv-linux-0.8.8.orig/SConstruct 2015-11-09 10:19:35.000000000 +0000
-+++ xboxdrv-linux-0.8.8/SConstruct 2016-07-02 16:13:52.560961836 +0100
-@@ -84,6 +84,7 @@
- opts.Add('CXXFLAGS', 'C++ Compiler flags')
- opts.Add('LINKFLAGS', 'Linker Compiler flags')
- opts.Add('AR', 'Library archiver')
-+opts.Add('RANLIB', 'Archive indexer')
- opts.Add('CC', 'C Compiler')
- opts.Add('CXX', 'C++ Compiler')
- opts.Add('BUILD', 'Build type: release, custom, development')
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
deleted file mode 100644
index a9324ad2dff..00000000000
--- a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info scons-utils toolchain-funcs systemd udev
-
-MY_P=${PN}-linux-${PV}
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="https://pingus.seul.org/~grumbel/xboxdrv/"
-SRC_URI="https://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/boost:=
- dev-libs/dbus-glib:=
- virtual/libudev:=
- sys-apps/dbus:=
- dev-libs/glib:2=
- virtual/libusb:1=
- x11-libs/libX11:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${P}-scons.patch
- "${FILESDIR}"/github-144.patch
- "${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-
-src_compile() {
- escons \
- BUILD=custom \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- CXXFLAGS="-Wall ${CXXFLAGS}" \
- LINKFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xboxdrv
- doman doc/xboxdrv.1
- dodoc AUTHORS NEWS PROTOCOL README.md TODO
-
- newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
- newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
-
- insinto /etc/dbus-1/system.d/
- doins "${FILESDIR}/org.seul.Xboxdrv.conf"
-
- udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
- systemd_dounit "${FILESDIR}"/xboxdrv.service
-}
-
-pkg_postinst() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/
@ 2024-07-16 7:46 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-07-16 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 29e6638615c6ae297d0af887b7644e76a766fd1a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 07:45:34 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 07:45:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e66386
games-util/xboxdrv: fix build w/ boost-1.85
Thanks to Bugs Bugs for the patch on the bug. It's kind of a stub but
it's only for a debug message so not so bad until we can package the
fork mentioned in the bug.
Closes: https://bugs.gentoo.org/932747
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch | 12 ++++++++++++
games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild | 7 ++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch
new file mode 100644
index 000000000000..77e910ababa3
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/932747#c4
+--- a/src/controller.cpp
++++ b/src/controller.cpp
+@@ -98,7 +98,7 @@ Controller::set_active(bool v)
+ {
+ if (m_is_active != v)
+ {
+- log_debug("activation status: " << v << " " << m_activation_cb);
++ log_debug("activation status: " << v << " " << "unknown");
+ m_is_active = v;
+ if (m_activation_cb)
+ {
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild
index 45fe2ace917b..4a0f4935dcc0 100644
--- a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild
@@ -37,9 +37,10 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/"xboxdrv-0.8.8-some-boost-fix.patch
- "${FILESDIR}/"xboxdrv-0.8.8-Update-SConstruct-to-python3.patch
- "${FILESDIR}/"xboxdrv-0.8.8-Updating-python-code-to-python3.patch
+ "${FILESDIR}/xboxdrv-0.8.8-some-boost-fix.patch"
+ "${FILESDIR}/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch"
+ "${FILESDIR}/xboxdrv-0.8.8-Updating-python-code-to-python3.patch"
+ "${FILESDIR}/xboxdrv-0.8.8-boost-1.85.patch"
)
CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/
@ 2025-02-26 13:34 Petr Vaněk
0 siblings, 0 replies; 6+ messages in thread
From: Petr Vaněk @ 2025-02-26 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 1dd437594308e2729d78dba567d967361b108ba7
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 13:33:24 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 13:33:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd43759
games-util/xboxdrv: drop 0.8.8_p20190118-r3
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
games-util/xboxdrv/Manifest | 1 -
...boxdrv-0.8.8-Update-SConstruct-to-python3.patch | 79 -------
...drv-0.8.8-Updating-python-code-to-python3.patch | 238 ---------------------
.../xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch | 12 --
.../files/xboxdrv-0.8.8-some-boost-fix.patch | 12 --
.../xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild | 84 --------
6 files changed, 426 deletions(-)
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index f7ba7e4a7cf6..4aa9d2fe9b7b 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -1,2 +1 @@
DIST xboxdrv-0.8.11.tar.gz 323870 BLAKE2B 3cfc5441496e72226a00a82874b580dd7113ff52317cc63afeca94d53c0c20d0d2bd8c458adabdd0e2358746d43de8a2815788d9fd82b21c4e733638a07379f8 SHA512 d6503ee3a4b0388214dd866e479205d37fc9dcd4aa8e8a10edae5db7368d755e2dcc1e4217ecde234c5dd4d0aec3548fd1eea980aa7d6150895ed6dfa3673e5a
-DIST xboxdrv-v0.8.8.tar.bz2 268046 BLAKE2B 3092a0e1e1cf1ee351879e791212445c567772f4115eb09eeb0c28bc1692b1951837ae7f6488091eb57d06cd38edae4e964502524606370f1ccd8fc39b307db8 SHA512 9b90f866ab322aaf3223215c78120a7aeacb56970fedf2e603f14704bd517b8316a3e28edb6a75e1a47729e9ced4cde5cac3a2f7a95d8514b83219b8821eb9db
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch
deleted file mode 100644
index accb4317fad4..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 39a334fbc0482626455f417e97308e52aa8746a7 Mon Sep 17 00:00:00 2001
-From: Ingo Ruhnke <grumbel@gmail.com>
-Date: Sun, 24 Nov 2019 18:16:16 +0100
-Subject: [PATCH 1/3] Update SConstruct to python3
-
----
- SConstruct | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git SConstruct SConstruct
-index 4cd7970..54fa11f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -15,7 +15,7 @@ def build_dbus_glue(target, source, env):
- "--mode=glib-server",
- "--prefix=" + env['DBUS_PREFIX'], source[0].get_path()],
- stdout=subprocess.PIPE).communicate()[0]
--
-+ xml = xml.decode()
- xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);",
- r"union { \1 fn; void* obj; } conv;\n "
- "conv.obj = (marshal_data ? marshal_data : cc->callback);\n "
-@@ -29,14 +29,14 @@ def build_bin2h(target, source, env):
- Takes a list of files and converts them into a C source that can be included
- """
- def c_escape(str):
-- return str.translate(string.maketrans("/.-", "___"))
-+ return str.translate(str.maketrans("/.-", "___"))
-
-- print target
-- print source
-+ print(target)
-+ print(source)
- with open(target[0].get_path(), "w") as fout:
- fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
-
-- if env.has_key("BIN2H_NAMESPACE"):
-+ if "BIN2H_NAMESPACE" in env:
- fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"])
-
- # write down data
-@@ -45,8 +45,8 @@ def build_bin2h(target, source, env):
- data = fin.read()
- fout.write("// \"%s\"\n" % src.get_path())
- fout.write("const char %s[] = {" % c_escape(src.get_path()))
-- bytes_arr = ["0x%02x" % ord(c) for c in data]
-- for i in xrange(len(bytes_arr)):
-+ bytes_arr = ["0x%02x" % c for c in data]
-+ for i in range(len(bytes_arr)):
- if i % 13 == 0:
- fout.write("\n ")
- fout.write(bytes_arr[i])
-@@ -62,7 +62,7 @@ def build_bin2h(target, source, env):
- for src in source], ",\n"))
- fout.write("\n}\n\n")
-
-- if env.has_key("BIN2H_NAMESPACE"):
-+ if "BIN2H_NAMESPACE" in env:
- fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"])
-
- fout.write("/* EOF */\n")
-@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version })
- conf = Configure(env)
- \f
- if not conf.env['CXX']:
-- print "g++ must be installed!"
-+ print("g++ must be installed!")
- Exit(1)
-
- # X11 checks
- if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'):
-- print 'libx11-dev must be installed!'
-+ print('libx11-dev must be installed!')
- Exit(1)
-
- env = conf.Finish()
---
-2.29.0.rc1
-
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-Updating-python-code-to-python3.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-Updating-python-code-to-python3.patch
deleted file mode 100644
index 139336affd90..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-Updating-python-code-to-python3.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From e37d3558a1a8a36fbc5d693c53893127a288fd02 Mon Sep 17 00:00:00 2001
-From: Ingo Ruhnke <grumbel@gmail.com>
-Date: Sun, 24 Nov 2019 18:36:25 +0100
-Subject: [PATCH 3/3] Updating python code to python3
-
----
- examples/responsecurve-generator.py | 14 ++++-----
- runxboxdrv/runxboxdrv | 46 ++++++++++++++---------------
- xboxdrvctl | 8 ++---
- 3 files changed, 34 insertions(+), 34 deletions(-)
-
-diff --git examples/responsecurve-generator.py examples/responsecurve-generator.py
-index c74e34d..942463b 100755
---- a/examples/responsecurve-generator.py
-+++ b/examples/responsecurve-generator.py
-@@ -1,14 +1,14 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- import sys
- import string
-
- if len(sys.argv) != 3:
-- print "Usage:", sys.argv[0], "STEPS", "EQUATION"
-- print "Simple generator for generating responsecurve data from equations."
-- print ""
-- print "Example:"
-- print " ", sys.argv[0], "6 i**2"
-+ print("Usage:", sys.argv[0], "STEPS", "EQUATION")
-+ print("Simple generator for generating responsecurve data from equations.")
-+ print("")
-+ print("Example:")
-+ print(" ", sys.argv[0], "6 i**2")
- else:
- steps = int(sys.argv[1])
- equation = sys.argv[2]
-@@ -19,6 +19,6 @@ else:
- left.reverse()
- left = left[0:-1]
-
-- print string.join([str(x) for x in (left + right)], ":")
-+ print(string.join([str(x) for x in (left + right)], ":"))
-
- # EOF #
-diff --git runxboxdrv/runxboxdrv runxboxdrv/runxboxdrv
-index 360c836..6983496 100755
---- a/runxboxdrv/runxboxdrv
-+++ b/runxboxdrv/runxboxdrv
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
-@@ -409,7 +409,7 @@ class ProcessManager(object):
- """
- # Since reap() modifies __procs, we have to iterate over a copy
- # of the keys in it. Thus, do not remove the .keys() call.
-- for procid in self.__procs.keys():
-+ for procid in list(self.__procs.keys()):
- self.reap(procid)
-
-
-@@ -445,7 +445,7 @@ import os, sys
- import os.path
- import fcntl
- import time
--import ConfigParser
-+import configparser
- from subprocess import check_call, Popen, PIPE
- from signal import SIGINT, SIGKILL
- from optparse import OptionParser
-@@ -482,7 +482,7 @@ class RunXBoxDrv(object):
-
- @staticmethod
- def runCommandAndGetOutput(command):
-- print command
-+ print(command)
- callcommand = Popen(command, shell=True, stdout=PIPE)
- outputcommand = callcommand.communicate()
- return outputcommand[0].split("\n")
-@@ -517,7 +517,7 @@ class RunXBoxDrv(object):
- if RunXBoxDrv.which(RunXBoxDrv.sudo_command) is None:
- raise Exception("Cannot find %s!" % RunXBoxDrv.sudo_command)
- commandline = "%s %s" % (RunXBoxDrv.sudo_command, command)
-- print commandline
-+ print(commandline)
- callcommand = Popen(commandline, shell=True, stdout=PIPE)
- outputcommand = callcommand.communicate()
- return outputcommand[0]
-@@ -525,14 +525,14 @@ class RunXBoxDrv(object):
- @staticmethod
- def killExistingXBoxDrv(sig, signame):
- for line in RunXBoxDrv.runCommandAndGetOutput("ps"):
-- print line
-+ print(line)
- fields = line.split()
- if len(fields) < 4:
- continue
- pid = fields[0]
- process = fields[3]
- if process.find(XBOXDRVNAME) != -1:
-- print "Using %s on existing %s" % (signame, XBOXDRVNAME)
-+ print("Using %s on existing %s" % (signame, XBOXDRVNAME))
- os.kill(int(pid), sig)
- return True
- return False
-@@ -542,7 +542,7 @@ class RunXBoxDrv(object):
- loadedmodules = []
- unloadedmodules = []
- for line in RunXBoxDrv.runCommandAndGetOutput("lsmod"):
-- print line
-+ print(line)
- fields = line.split()
- if len(fields) < 3:
- continue
-@@ -555,17 +555,17 @@ class RunXBoxDrv(object):
- unloadedmodules.append(modulename)
- for modulename in MODULELOAD:
- if modulename in loadedmodules:
-- print "%s already loaded!" % modulename
-+ print("%s already loaded!" % modulename)
- else:
-- print "Loading %s!" % modulename
-- print RunXBoxDrv.runCommandAsRoot("modprobe %s" % modulename)
-+ print("Loading %s!" % modulename)
-+ print(RunXBoxDrv.runCommandAsRoot("modprobe %s" % modulename))
-
- for modulename in MODULEUNLOAD:
- if modulename in unloadedmodules:
-- print "Unloading %s!" % modulename
-- print RunXBoxDrv.runCommandAsRoot("rmmod %s" % modulename)
-+ print("Unloading %s!" % modulename)
-+ print(RunXBoxDrv.runCommandAsRoot("rmmod %s" % modulename))
- else:
-- print "%s already unloaded!" % modulename
-+ print("%s already unloaded!" % modulename)
-
-
- @staticmethod
-@@ -579,11 +579,11 @@ class RunXBoxDrv(object):
- raise Exception("Cannot find one of: %s!" % str(UINPUT_LOCATIONS))
-
- if not os.access(location, os.W_OK):
-- print "Trying to change permissions of: %s" % location
-- print RunXBoxDrv.runCommandAsRoot("chmod 0660 %s" % location)
-+ print("Trying to change permissions of: %s" % location)
-+ print(RunXBoxDrv.runCommandAsRoot("chmod 0660 %s" % location))
-
- if os.access(location, os.W_OK):
-- print "%s is writable!" % location
-+ print("%s is writable!" % location)
- else:
- raise Exception("Could not set write permissions on %s" % location)
-
-@@ -614,36 +614,36 @@ class RunXBoxDrv(object):
- out = ""
- while out.lower().find(LOADEDTEXT) == -1:
- out = RunXBoxDrv.getNext(myProc)
-- print out
-+ print(out)
-
- def process(self):
- commandlist = [self.xboxdrvpath]
-
- if self.configfile:
- commandlist = commandlist + ["--config=%s" % self.configfile]
-- print commandlist
-+ print(commandlist)
- myProc = Process(commandlist)
- with_timeout(1, self.checkLoaded, myProc)
- if len(self.appandparams) == 0:
- print("WARNING: No path to application specified!")
- else:
-- print(self.appandparams)
-+ print((self.appandparams))
- check_call(self.appandparams)
-- print "Sending SIGINT"
-+ print("Sending SIGINT")
- myProc.kill(SIGINT)
- try:
- with_timeout(1, myProc.wait)
- sys.exit(0)
- except Timeout:
- pass
-- print "Sending SIGINT again"
-+ print("Sending SIGINT again")
- myProc.kill(SIGINT)
- try:
- with_timeout(1, myProc.wait)
- sys.exit(0)
- except Timeout:
- pass
-- print "Killing"
-+ print("Killing")
- myProc.terminate()
-
- def main():
-diff --git xboxdrvctl xboxdrvctl
-index 4807a11..57177dc 100755
---- a/xboxdrvctl
-+++ b/xboxdrvctl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
-
- ## Xbox360 USB Gamepad Userspace Driver
- ## Copyright (C) 2011 Ingo Ruhnke <grumbel@gmail.com>
-@@ -71,7 +71,7 @@ elif options.bus == "auto":
- except dbus.exceptions.DBusException:
- bus = dbus.SystemBus()
- else:
-- print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'"
-+ print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'")
- exit()
-
- if options.status:
-@@ -82,7 +82,7 @@ elif options.shutdown:
- daemon.Shutdown()
- else:
- if (options.led or options.rumble or options.config) and options.slot == None:
-- print "Error: --slot argument required"
-+ print("Error: --slot argument required")
- exit()
- else:
- if options.slot != None:
-@@ -94,7 +94,7 @@ else:
- if options.rumble:
- m = re.match('^(\d+):(\d+)$', options.rumble)
- if not m:
-- print "Error: invalid argument to --rumble"
-+ print("Error: invalid argument to --rumble")
- exit()
- else:
- left = int(m.group(1))
---
-2.29.0.rc1
-
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch
deleted file mode 100644
index 77e910ababa3..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-boost-1.85.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/932747#c4
---- a/src/controller.cpp
-+++ b/src/controller.cpp
-@@ -98,7 +98,7 @@ Controller::set_active(bool v)
- {
- if (m_is_active != v)
- {
-- log_debug("activation status: " << v << " " << m_activation_cb);
-+ log_debug("activation status: " << v << " " << "unknown");
- m_is_active = v;
- if (m_activation_cb)
- {
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-some-boost-fix.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-some-boost-fix.patch
deleted file mode 100644
index 2063979fee4f..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-some-boost-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/controller_slot.cpp b/src/controller_slot.cpp
---- a/src/controller_slot.cpp 2015-11-09 10:19:35.000000000 -0000
-+++ b/src/controller_slot.cpp 2021-08-02 13:05:48.647684177 -0000
-@@ -69,7 +69,7 @@
- bool
- ControllerSlot::is_connected() const
- {
-- return m_thread;
-+ return m_thread.get();
- }
-
- /* EOF */
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild
deleted file mode 100644
index 4a0f4935dcc0..000000000000
--- a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit linux-info python-any-r1 scons-utils toolchain-funcs systemd udev
-
-MY_P="${PN}-v$(ver_cut 1-3)"
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="https://xboxdrv.gitlab.io"
-SRC_URI="https://gitlab.com/xboxdrv/${PN}/-/archive/v$(ver_cut 1-3)/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/dbus-glib
- dev-libs/glib:2
- sys-apps/dbus
- virtual/libudev:=
- virtual/libusb:1
- x11-libs/libX11
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/xboxdrv-0.8.8-some-boost-fix.patch"
- "${FILESDIR}/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch"
- "${FILESDIR}/xboxdrv-0.8.8-Updating-python-code-to-python3.patch"
- "${FILESDIR}/xboxdrv-0.8.8-boost-1.85.patch"
-)
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-
-pkg_setup() {
- linux-info_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_compile() {
- escons \
- BUILD=custom \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- CXXFLAGS="-Wall ${CXXFLAGS}" \
- LINKFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xboxdrv
- doman doc/xboxdrv.1
- dodoc AUTHORS NEWS PROTOCOL README.md TODO
-
- newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
- newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
-
- insinto /etc/dbus-1/system.d
- doins "${FILESDIR}"/org.seul.Xboxdrv.conf
-
- udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
- systemd_dounit "${FILESDIR}"/xboxdrv.service
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-02-26 13:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-26 13:34 [gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/, games-util/xboxdrv/files/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2024-07-16 7:46 Sam James
2019-01-17 22:27 James Le Cuirot
2017-09-30 4:32 Michael Palimaka
2016-07-02 15:35 James Le Cuirot
2016-07-02 15:35 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox