From 33a53514a68c3cf3eb9d29088df074ae60649c98 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 21 May 2014 21:22:16 +0000 Subject: [PATCH] libusb: build fix 1.0.17 --- dev-libs/libusb/libusb-1.0.17.recipe | 4 ++- .../libusb/patches/libusb-1.0.17.patchset | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 dev-libs/libusb/patches/libusb-1.0.17.patchset diff --git a/dev-libs/libusb/libusb-1.0.17.recipe b/dev-libs/libusb/libusb-1.0.17.recipe index 5e07192fd..3e383bc34 100644 --- a/dev-libs/libusb/libusb-1.0.17.recipe +++ b/dev-libs/libusb/libusb-1.0.17.recipe @@ -28,7 +28,7 @@ COPYRIGHT=" " HOMEPAGE="http://libusbx.org/" SRC_URI="git+git://github.com/pulkomandy/libusbx#c6f866b9914f266ab198a3313eba45e55c094024" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -37,6 +37,8 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" +PATCHES="$portVersionedName.patchset" + PROVIDES=" libusb$secondaryArchSuffix = $portVersion lib:libusb_1.0$secondaryArchSuffix = $portVersion diff --git a/dev-libs/libusb/patches/libusb-1.0.17.patchset b/dev-libs/libusb/patches/libusb-1.0.17.patchset new file mode 100644 index 000000000..581ddea6f --- /dev/null +++ b/dev-libs/libusb/patches/libusb-1.0.17.patchset @@ -0,0 +1,31 @@ +From 91edd51cfa1be577227e396f3460f7564964b46c Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 21 May 2014 21:18:27 +0000 +Subject: build fix + + +diff --git a/libusb/os/haiku_usbkit.cpp b/libusb/os/haiku_usbkit.cpp +index f4955c0..eec2007 100644 +--- a/libusb/os/haiku_usbkit.cpp ++++ b/libusb/os/haiku_usbkit.cpp +@@ -69,7 +69,7 @@ private: + usb_configuration_descriptor** fConfigurationDescriptors; + uint32 fActiveConfiguration; + char* fPath; +- volatile int32 fOpenCount; ++ int32 fOpenCount; + }; + + +@@ -609,7 +609,7 @@ UsbRoster::DeviceRemoved(BUSBDevice* device) + + + UsbRoster gUsbRoster; +-volatile int32 gInitCount = 0; ++int32 gInitCount = 0; + + static int + haiku_init(struct libusb_context* ctx) +-- +1.8.3.4 +