mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
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.
This commit is contained in:
@@ -27,8 +27,10 @@ COPYRIGHT="
|
||||
2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
"
|
||||
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
|
||||
"
|
||||
22
dev-libs/libusb/patches/libusb-1.0.19.patchset
Normal file
22
dev-libs/libusb/patches/libusb-1.0.19.patchset
Normal file
@@ -0,0 +1,22 @@
|
||||
From f8c3c383ba24a35465353a6d811e78e2fa4612f5 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user