diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-04-14 15:53:46 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-04-14 15:53:46 +0200 |
| commit | 4f0c2f0544679d9970e8107633125eab0cc7caa0 (patch) | |
| tree | 76dbcc62996bd63cf2afded37c1de78672347a5b /community/stlink | |
| parent | 41dc189d256d90aa5efaef1a858991133482767e (diff) | |
| download | aports-4f0c2f0544679d9970e8107633125eab0cc7caa0.tar.bz2 aports-4f0c2f0544679d9970e8107633125eab0cc7caa0.tar.xz | |
community/stlink: fix build with libusb >= 1.0.22
See: https://github.com/texane/stlink/issues/703
Diffstat (limited to 'community/stlink')
| -rw-r--r-- | community/stlink/0001-Fix-libusb-function-deprecation-used-for-stlinkv1.patch | 40 | ||||
| -rw-r--r-- | community/stlink/APKBUILD | 8 |
2 files changed, 45 insertions, 3 deletions
diff --git a/community/stlink/0001-Fix-libusb-function-deprecation-used-for-stlinkv1.patch b/community/stlink/0001-Fix-libusb-function-deprecation-used-for-stlinkv1.patch new file mode 100644 index 0000000000..e9e9161d91 --- /dev/null +++ b/community/stlink/0001-Fix-libusb-function-deprecation-used-for-stlinkv1.patch @@ -0,0 +1,40 @@ +From aaf8e92075811e6b78cd7f68b636c642f27749bf Mon Sep 17 00:00:00 2001 +From: Slyshyk Oleksiy <alexSlyshyk@gmail.com> +Date: Sun, 1 Apr 2018 20:16:49 +0300 +Subject: [PATCH] Fix libusb function deprecation used for stlinkv1 + +Fixes #703 +--- + src/sg.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/sg.c b/src/sg.c +index 541ef55..90a1441 100644 +--- a/src/sg.c ++++ b/src/sg.c +@@ -944,6 +944,10 @@ static stlink_t* stlink_open(const int verbose) { + struct stlink_libsg *slsg = malloc(sizeof (struct stlink_libsg)); + if (sl == NULL || slsg == NULL) { + WLOG("Couldn't malloc stlink and stlink_sg structures out of memory!\n"); ++ if(sl != NULL) ++ free(sl); ++ if(slsg != NULL) ++ free(slsg); + return NULL; + } + +@@ -954,7 +958,11 @@ static stlink_t* stlink_open(const int verbose) { + return NULL; + } + ++#if LIBUSBX_API_VERSION < 0x01000106 + libusb_set_debug(slsg->libusb_ctx, 3); ++#else ++ libusb_set_option(slsg->libusb_ctx, LIBUSB_OPTION_LOG_LEVEL, 3); ++#endif + + slsg->usb_handle = libusb_open_device_with_vid_pid(slsg->libusb_ctx, STLINK_USB_VID_ST, STLINK_USB_PID_STLINK); + if (slsg->usb_handle == NULL) { +-- +2.17.0 + diff --git a/community/stlink/APKBUILD b/community/stlink/APKBUILD index 73410a5c84..8d0168452e 100644 --- a/community/stlink/APKBUILD +++ b/community/stlink/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=stlink pkgver=1.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="STM32 discovery line linux programmer" url="https://github.com/texane/stlink" arch="all" @@ -13,7 +13,8 @@ makedepends="cmake libusb-dev" install="" options="!check" # upstream doesn't have automated tests subpackages="$pkgname-doc $pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/texane/$pkgname/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/texane/$pkgname/archive/$pkgver.tar.gz + 0001-Fix-libusb-function-deprecation-used-for-stlinkv1.patch" builddir="$srcdir"/$pkgname-$pkgver build() { @@ -37,4 +38,5 @@ package() { "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="0e93c0fdcd377c6f2d452b9b6fa00b741dc0dd906673773ef09185aca4f63930db61e137bb28c47e34218edca9f7a80cd05352fb8f9d8e50b000c779cc36580a stlink-1.5.0.tar.gz" +sha512sums="0e93c0fdcd377c6f2d452b9b6fa00b741dc0dd906673773ef09185aca4f63930db61e137bb28c47e34218edca9f7a80cd05352fb8f9d8e50b000c779cc36580a stlink-1.5.0.tar.gz +d3bf74913f675f2f49c2219883c50a138267caf0a2e20e11f461d10ff77d0e291cf44cc266fa200855c9e171081f560a460496df28cc20c1020fdaef95dc3753 0001-Fix-libusb-function-deprecation-used-for-stlinkv1.patch" |