haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set SRC_URI to libusb * as changes merged upstream *

Browse Source
This commit is contained in:
Akshay Jaggi
2014-09-27 05:26:07 +00:00
committed by Adrien Destugues
parent 0abab7dd5d
commit 511beee26e
4 changed files with 5 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
dev-libs/libusb/libusb-1.0.17.recipe
View File

@@ -1,90 +0,0 @@
SUMMARY="libusbx is a library that provides generic access to USB devices."
DESCRIPTION="
libusbx is a library that provides generic access to USB devices. As a library,
it is meant to be used by developers, to facilitate the production of
applications that communicate with USB hardware.
It is portable: Using a single cross-platform API, it provides access to USB
devices on Linux, OS X, Windows and OpenBSD.
It is user-mode: No special privilege or elevation is required for the
application to communicate with a device.
It is version-agnostic: All versions of the USB protocol, from 1.0 to 3.0
(latest), are supported.
"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="
2001 Johannes Erdfelt <johannes@erdfelt.com>
2007-2009 Daniel Drake <dsd@gentoo.org>
2010-2012 Peter Stuge <peter@stuge.se>
2008-2013 Nathan Hjelm <hjelmn@users.sourceforge.net>
2009-2013 Pete Batard <pete@akeo.ie>
2009-2013 Ludovic Rousseau <ludovic.rousseau@gmail.com>
2010-2012 Michael Plante <michael.plante@gmail.com>
2011-2013 Hans de Goede <hdegoede@redhat.com>
2012-2013 Martin Pieuchot <mpi@openbsd.org>
2012-2013 Toby Gray <toby.gray@realvnc.com>
"
HOMEPAGE="http://libusbx.org/"
SRC_URI="git+git://github.com/pulkomandy/libusbx#c6f866b9914f266ab198a3313eba45e55c094024"
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
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="libusb-$portVersion.patchset"
PROVIDES="
libusb$secondaryArchSuffix = $portVersion
lib:libusb_1.0$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:autoconf
cmd:automake
cmd:libtool
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:sed
"
BUILD()
{
sh bootstrap.sh
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
# set up the develop directory correctly
prepareInstalledDevelLibs libusb-1.0
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libusb${secondaryArchSuffix}_devel = $portVersion
devel:libusb_1.0${secondaryArchSuffix} = $portVersion
"
REQUIRES_devel="
libusb${secondaryArchSuffix} == $portVersion base
"

15
dev-libs/libusb/libusb-1.0.19.recipe
View File

@@ -1,6 +1,6 @@
SUMMARY="libusbx is a library that provides generic access to USB devices."
SUMMARY="libusb is a library that provides generic access to USB devices."
DESCRIPTION="
libusbx is a library that provides generic access to USB devices. As a library,
libusb is a library that provides generic access to USB devices. As a library,
it is meant to be used by developers, to facilitate the production of
applications that communicate with USB hardware.
@@ -26,12 +26,9 @@ COPYRIGHT="
2012-2013 Martin Pieuchot <mpi@openbsd.org>
2012-2013 Toby Gray <toby.gray@realvnc.com>
"
HOMEPAGE="http://libusbx.org/"
SRC_URI="https://github.com/akshay1994/libusb/archive/77993c7f437ba2ff03a24895b96ff6cbb49a6ee0.tar.gz"
SRC_FILENAME="libusb-$portVersion.tar.gz"
CHECKSUM_SHA256="82531191dad50b77d4b1c64395f663b57cea297a7e69457e5166b24746a617a4"
REVISION="1"
PATCHES="libusb-1.0.19.patchset"
HOMEPAGE="http://libusb.org/"
SRC_URI="git+git://github.com/libusb/libusb.git#a447fa4cd517e5393c0f1504b1a35b095aafa334"
REVISION="2"
ARCHITECTURES="x86 x86_64 x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -64,8 +61,6 @@ BUILD_PREREQUIRES="
cmd:make
cmd:sed
"
SOURCE_DIR="libusb-77993c7f437ba2ff03a24895b96ff6cbb49a6ee0"
BUILD()
{

31
dev-libs/libusb/patches/libusb-1.0.17.patchset
View File

@@ -1,31 +0,0 @@
From 91edd51cfa1be577227e396f3460f7564964b46c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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

22
dev-libs/libusb/patches/libusb-1.0.19.patchset
View File

@@ -1,22 +0,0 @@
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