From b15a345851cf6a43675fe3769166328dd19dbc04 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 23 Aug 2014 16:04:49 +0200 Subject: [PATCH] libusb: import final version of akshay's work. * We have a merge request pending on libusb side. until then, we'll use akshay's github repo. * While this builds fine outside of Haikuporter, I had trouble with getting it to run inside it. I'm not sure what's causing this. I got it to build wth some minor tweaks to the makefile, anyway. --- ...usb-1.0.18.recipe => libusb-1.0.19.recipe} | 8 +++++-- .../libusb/patches/libusb-1.0.19.patchset | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) rename dev-libs/libusb/{libusb-1.0.18.recipe => libusb-1.0.19.recipe} (92%) create mode 100644 dev-libs/libusb/patches/libusb-1.0.19.patchset diff --git a/dev-libs/libusb/libusb-1.0.18.recipe b/dev-libs/libusb/libusb-1.0.19.recipe similarity index 92% rename from dev-libs/libusb/libusb-1.0.18.recipe rename to dev-libs/libusb/libusb-1.0.19.recipe index 28f1c20f7..161e4c7da 100644 --- a/dev-libs/libusb/libusb-1.0.18.recipe +++ b/dev-libs/libusb/libusb-1.0.19.recipe @@ -27,8 +27,10 @@ COPYRIGHT=" 2012-2013 Toby Gray " HOMEPAGE="http://libusbx.org/" -SRC_URI="git+git://github.com/akshay1994/libusb#c8f7684a853c322f048a1f57457837c32dae2fac" +SRC_URI="git+git://github.com/akshay1994/libusb#77993c7f437ba2ff03a24895b96ff6cbb49a6ee0" REVISION="1" +PATCHES="libusb-1.0.19.patchset" + ARCHITECTURES="x86 x86_64 x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -39,6 +41,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" " @@ -46,9 +49,10 @@ BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf cmd:automake - cmd:libtool + cmd:find cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtool cmd:make cmd:sed " diff --git a/dev-libs/libusb/patches/libusb-1.0.19.patchset b/dev-libs/libusb/patches/libusb-1.0.19.patchset new file mode 100644 index 000000000..00f125b80 --- /dev/null +++ b/dev-libs/libusb/patches/libusb-1.0.19.patchset @@ -0,0 +1,22 @@ +From f8c3c383ba24a35465353a6d811e78e2fa4612f5 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 23 Aug 2014 11:59:31 +0200 +Subject: Remove os/haiku from "dist" as this makes make install fail. + + +diff --git a/libusb/Makefile.am b/libusb/Makefile.am +index 45c605c..6aaf608 100644 +--- a/libusb/Makefile.am ++++ b/libusb/Makefile.am +@@ -12,7 +12,7 @@ NETBSD_USB_SRC = os/netbsd_usb.c + WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def + WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h + +-dist_data_DATA = os/haiku ++#dist_data_DATA = os/haiku + DIST_SUBDIRS = + + EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ +-- +1.8.3.4 +