X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fmxe_fixes.patch;h=e0e2b6a10a018bdcc20ac0531cf4bfbacb9f2291;hp=6a0a3d6c5a08d7433d4c8ac393378fc3c7a156cf;hb=c9f28bdd231ae9e86660045b13790ff7f9b053be;hpb=ef311ddb9282ea0cb1ff1a0365f8368c270f742c diff --git a/cross-compile/mingw/mxe_fixes.patch b/cross-compile/mingw/mxe_fixes.patch index 6a0a3d6..e0e2b6a 100644 --- a/cross-compile/mingw/mxe_fixes.patch +++ b/cross-compile/mingw/mxe_fixes.patch @@ -3,6 +3,9 @@ MXE setup for sigrok usage. - libsigrok currently requires a special libusb branch. + - Add an additional libusb RAW_IO patch in MXE directly, which obsoletes + the need to build a custom libusb in sigrok-cross-mingw. + - We're reverting to glib 2.44.1 for now since more recent versions (e.g. 2.50.2) seem to have a bug. Details: https://sigrok.org/bugzilla/show_bug.cgi?id=1232 @@ -12,22 +15,195 @@ MXE setup for sigrok usage. https://sigrok.org/bugzilla/show_bug.cgi?id=986 https://gitlab.gnome.org/GNOME/glib/commit/3d7cde654c4c6f3bdad32f5521f28f5802a7c377 + - Bump MXE's binutils to version 2.35, which added -mbig-obj support + for 32bit Windows (64bit was supported already). Required for PulseView. + +diff --git a/src/binutils-1-fixes.patch b/src/binutils-1-fixes.patch +deleted file mode 100644 +index 357428fe..00000000 +--- a/src/binutils-1-fixes.patch ++++ /dev/null +@@ -1,147 +0,0 @@ +-This file is part of MXE. See LICENSE.md for licensing information. +- +-Contains ad hoc patches for cross building. +- +-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +-From: Stephen Kitt +-Date: Sat, 15 Jul 2017 00:09:40 +1000 +-Subject: [PATCH 1/1] Allow the PE timestamp to be specified with +- SOURCE_DATE_EPOCH +- +-Taken from: +-https://sources.debian.net/patches/binutils-mingw-w64/7.4/specify-timestamp.patch/ +- +-diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +-index 1111111..2222222 100644 +---- a/bfd/peXXigen.c +-+++ b/bfd/peXXigen.c +-@@ -70,6 +70,9 @@ +- #include +- #endif +- +-+#include +-+#include +-+ +- /* NOTE: it's strange to be including an architecture specific header +- in what's supposed to be general (to PE/PEI) code. However, that's +- where the definitions are, and they don't vary per architecture +-@@ -878,10 +881,38 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) +- H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); +- +- /* Only use a real timestamp if the option was chosen. */ +-- if ((pe_data (abfd)->insert_timestamp)) +-- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); +-- else +-+ if (pe_data (abfd)->insert_timestamp) { +-+ time_t now; +-+ char *source_date_epoch; +-+ unsigned long long epoch; +-+ char *endptr; +-+ +-+ now = time(NULL); +-+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); +-+ if (source_date_epoch) { +-+ errno = 0; +-+ epoch = strtoull(source_date_epoch, &endptr, 10); +-+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) +-+ || (errno != 0 && epoch == 0)) { +-+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", +-+ strerror(errno)); +-+ } else if (endptr == source_date_epoch) { +-+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", +-+ endptr); +-+ } else if (*endptr != '\0') { +-+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", +-+ endptr); +-+ } else if (epoch > ULONG_MAX) { +-+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", +-+ ULONG_MAX, epoch); +-+ } else { +-+ now = epoch; +-+ } +-+ } +-+ H_PUT_32 (abfd, now, filehdr_out->f_timdat); +-+ } else { +- H_PUT_32 (abfd, 0, filehdr_out->f_timdat); +-+ } +- +- PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, +- filehdr_out->f_symptr); +-diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em +-index 1111111..2222222 100644 +---- a/ld/emultempl/pe.em +-+++ b/ld/emultempl/pe.em +-@@ -305,7 +305,7 @@ gld${EMULATION_NAME}_add_options +- OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, +- {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, +- {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, +-- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, +-+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, +- {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, +- #ifdef DLL_SUPPORT +- /* getopt allows abbreviations, so we do this to stop it +-diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em +-index 1111111..2222222 100644 +---- a/ld/emultempl/pep.em +-+++ b/ld/emultempl/pep.em +-@@ -321,7 +321,7 @@ gld${EMULATION_NAME}_add_options +- {"no-bind", no_argument, NULL, OPTION_NO_BIND}, +- {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, +- {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, +-- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, +-+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, +- {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, +- {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, +- {NULL, no_argument, NULL, 0} +-diff --git a/ld/pe-dll.c b/ld/pe-dll.c +-index 1111111..2222222 100644 +---- a/ld/pe-dll.c +-+++ b/ld/pe-dll.c +-@@ -26,6 +26,8 @@ +- #include "filenames.h" +- #include "safe-ctype.h" +- +-+#include +-+#include +- #include +- +- #include "ld.h" +-@@ -1192,8 +1194,36 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) +- +- memset (edata_d, 0, edata_sz); +- +-- if (pe_data (abfd)->insert_timestamp) +-- H_PUT_32 (abfd, time (0), edata_d + 4); +-+ if (pe_data (abfd)->insert_timestamp) { +-+ time_t now; +-+ char *source_date_epoch; +-+ unsigned long long epoch; +-+ char *endptr; +-+ +-+ now = time(NULL); +-+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); +-+ if (source_date_epoch) { +-+ errno = 0; +-+ epoch = strtoull(source_date_epoch, &endptr, 10); +-+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) +-+ || (errno != 0 && epoch == 0)) { +-+ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", +-+ strerror(errno)); +-+ } else if (endptr == source_date_epoch) { +-+ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", +-+ endptr); +-+ } else if (*endptr != '\0') { +-+ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", +-+ endptr); +-+ } else if (epoch > ULONG_MAX) { +-+ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", +-+ ULONG_MAX, epoch); +-+ } else { +-+ now = epoch; +-+ } +-+ } +-+ H_PUT_32 (abfd, now, edata_d + 4); +-+ } +- +- if (pe_def_file->version_major != -1) +- { +diff --git a/src/binutils.mk b/src/binutils.mk +index 9721b581..8eab8bf3 100644 +--- a/src/binutils.mk ++++ b/src/binutils.mk +@@ -3,8 +3,8 @@ + PKG := binutils + $(PKG)_WEBSITE := https://www.gnu.org/software/binutils/ + $(PKG)_DESCR := GNU Binutils +-$(PKG)_VERSION := 2.28 +-$(PKG)_CHECKSUM := 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 ++$(PKG)_VERSION := 2.35 ++$(PKG)_CHECKSUM := 7d24660f87093670738e58bcc7b7b06f121c0fcb0ca8fc44368d675a5ef9cff7 + $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) + $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.bz2 + $(PKG)_URL := https://ftp.gnu.org/gnu/binutils/$($(PKG)_FILE) diff --git a/src/libusb1.mk b/src/libusb1.mk -index 358d0f3c..2f97246e 100644 +index ab01bf69..53aed36e 100644 --- a/src/libusb1.mk +++ b/src/libusb1.mk -@@ -5,10 +5,10 @@ $(PKG)_WEBSITE := https://libusb.info/ +@@ -4,11 +4,11 @@ PKG := libusb1 + $(PKG)_WEBSITE := https://libusb.info/ $(PKG)_DESCR := LibUsb-1.0 $(PKG)_IGNORE := - $(PKG)_VERSION := 1.0.21 --$(PKG)_CHECKSUM := 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b +-$(PKG)_VERSION := 1.0.23 +-$(PKG)_CHECKSUM := 4fc17b2ef3502757641bf8fe2c14ad86ec86302a2b785abcb0806fd03aa1201f -$(PKG)_SUBDIR := libusb-$($(PKG)_VERSION) -$(PKG)_FILE := libusb-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/libusb/libusb-1.0/libusb-$($(PKG)_VERSION)/$($(PKG)_FILE) ++$(PKG)_VERSION := 1.0.20-rc3-event-abstraction-v4 +$(PKG)_CHECKSUM := 58fee7f3f05fda209d14c55763df36ab86028bd9ab82c9bb74f1d5ab3208bcfd +$(PKG)_SUBDIR := libusb-event-abstraction-v4 +$(PKG)_FILE := libusb-event-abstraction-v4.zip -+$(PKG)_URL := https://github.com/dickens/libusb/archive/event-abstraction-v4.zip ++$(PKG)_URL := https://github.com/uwehermann/libusb/archive/event-abstraction-v4.zip $(PKG)_DEPS := cc define $(PKG)_UPDATE @@ -40,15 +216,52 @@ index 358d0f3c..2f97246e 100644 $(MXE_CONFIGURE_OPTS) \ CFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j '$(JOBS)' install +diff --git a/src/libusb1-1-fixes.patch b/src/libusb1-1-fixes.patch +new file mode 100644 +index 00000000..6cdeb0c4 +--- /dev/null ++++ b/src/libusb1-1-fixes.patch +@@ -0,0 +1,31 @@ ++From d4f7a49d77bd8f4ac871a999fc9ec898cb22b8c3 Mon Sep 17 00:00:00 2001 ++From: Vlad Ivanov ++Date: Tue, 9 Feb 2016 10:35:23 +0300 ++Subject: [PATCH] windows_usb: enable RAW_IO policy by default ++ ++libusb should set RAW_IO policy unconditionally because it ++implements the buffer management itself. ++ ++Signed-off-by: Vlad Ivanov ++--- ++ libusb/os/windows_usb.c | 4 ++++ ++ 1 file changed, 4 insertions(+) ++ ++diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c ++index 6640ad5..12fdab0 100644 ++--- a/libusb/os/windows_usb.c +++++ b/libusb/os/windows_usb.c ++@@ -2890,6 +2890,10 @@ static int winusbx_configure_endpoints(int sub_api, struct libusb_device_handle ++ AUTO_CLEAR_STALL, sizeof(UCHAR), &policy)) { ++ usbi_dbg("failed to enable AUTO_CLEAR_STALL for endpoint %02X", endpoint_address); ++ } +++ if (!WinUSBX[sub_api].SetPipePolicy(winusb_handle, endpoint_address, +++ RAW_IO, sizeof(UCHAR), &policy)) { +++ usbi_dbg("failed to enable RAW_IO for endpoint %02X", endpoint_address); +++ } ++ } ++ ++ return LIBUSB_SUCCESS; ++-- ++2.5.0 ++ diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch -index 021a5cac..428cc6a9 100644 +index 764ece9e..428cc6a9 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Sep 2010 21:42:46 +0200 --Subject: [PATCH 1/9] fix tool paths +-Subject: [PATCH 01/10] fix tool paths +Subject: [PATCH] fix tool paths @@ -57,7 +270,7 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:25:01 +0200 --Subject: [PATCH 2/9] Avoid DllMain symbol conflict when linking statically +-Subject: [PATCH 02/10] Avoid DllMain symbol conflict when linking statically +Subject: [PATCH] Avoid DllMain symbol conflict when linking statically -Adjusted by Boris Nagaev on 29-Jan-2017 to fix @@ -112,7 +325,7 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:27:22 +0200 --Subject: [PATCH 3/9] Allow building without inotify support +-Subject: [PATCH 03/10] Allow building without inotify support +Subject: [PATCH] Allow building without inotify support @@ -129,7 +342,7 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:28:14 +0200 --Subject: [PATCH 4/9] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. +-Subject: [PATCH 04/10] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. +Subject: [PATCH] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. Backported from upstream @@ -147,7 +360,7 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:29:06 +0200 --Subject: [PATCH 5/9] Link with dnsapi +-Subject: [PATCH 05/10] Link with dnsapi +Subject: [PATCH] Link with dnsapi @@ -156,7 +369,7 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:29:38 +0200 --Subject: [PATCH 6/9] Ensure globals are initialized even when DllMain is not +-Subject: [PATCH 06/10] Ensure globals are initialized even when DllMain is not - being run +Subject: [PATCH] Ensure globals are initialized even when DllMain is not being + run @@ -193,7 +406,7 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gerardo Ballabio Date: Sun, 16 Aug 2015 13:18:24 +0200 --Subject: [PATCH 7/9] Remove an annoying runtime warning +-Subject: [PATCH 07/10] Remove an annoying runtime warning +Subject: [PATCH] Remove an annoying runtime warning that pops up when using GtkApplication in Gtk+ 3 programs. @@ -220,19 +433,19 @@ index 021a5cac..428cc6a9 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: aquiles2k Date: Wed, 6 Apr 2016 22:39:53 +0300 --Subject: [PATCH 8/9] fix error "won't overwrite defined macro" on OSX +-Subject: [PATCH 08/10] fix error "won't overwrite defined macro" on OSX +Subject: [PATCH] fix error "won't overwrite defined macro" on OSX See https://github.com/mxe/mxe/issues/1281 -@@ -596,48 +580,22 @@ index 1111111..2222222 100644 +@@ -596,110 +580,22 @@ index 1111111..2222222 100644 dnl At the end, if we're not within glib, we'll define the public dnl definitions in terms of our private definitions. -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -Date: Mon, 26 Feb 2018 16:09:53 +1100 --Subject: [PATCH 9/9] darwin: disable g_cocoa_notification_backend +-Subject: [PATCH 09/10] darwin: disable g_cocoa_notification_backend +From: Boris Pek +Date: Thu, 28 Apr 2016 16:48:12 +0300 @@ -289,6 +502,68 @@ index 021a5cac..428cc6a9 100644 - #ifdef G_OS_WIN32 - g_type_ensure (_g_winhttp_vfs_get_type ()); - #endif +- +-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +-From: Ernestas Kulik +-Date: Tue, 29 Jan 2019 09:50:46 +0100 +-Subject: [PATCH 10/10] gdbus: Avoid printing null strings +- +-This mostly affects the 2.56 branch, but, given that GCC 9 is being +-stricter about passing null string pointers to printf-like functions, it +-might make sense to proactively fix such calls. +- +-gdbusauth.c: In function '_g_dbus_auth_run_server': +-gdbusauth.c:1302:11: error: '%s' directive argument is null +-[-Werror=format-overflow=] +- 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", +- line); +- | +- +-gdbusmessage.c: In function ‘g_dbus_message_to_blob’: +-gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=] +- 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str); +- | +- +-diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c +-index 1111111..2222222 100644 +---- a/gio/gdbusauth.c +-+++ b/gio/gdbusauth.c +-@@ -1295,9 +1295,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth, +- &line_length, +- cancellable, +- error); +-- debug_print ("SERVER: WaitingForBegin, read '%s'", line); +- if (line == NULL) +- goto out; +-+ debug_print ("SERVER: WaitingForBegin, read '%s'", line); +- if (g_strcmp0 (line, "BEGIN") == 0) +- { +- /* YAY, done! */ +-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c +-index 1111111..2222222 100644 +---- a/gio/gdbusmessage.c +-+++ b/gio/gdbusmessage.c +-@@ -2695,7 +2695,6 @@ g_dbus_message_to_blob (GDBusMessage *message, +- if (message->body != NULL) +- { +- gchar *tupled_signature_str; +-- tupled_signature_str = g_strdup_printf ("(%s)", signature_str); +- if (signature == NULL) +- { +- g_set_error (error, +-@@ -2703,10 +2702,10 @@ g_dbus_message_to_blob (GDBusMessage *message, +- G_IO_ERROR_INVALID_ARGUMENT, +- _("Message body has signature '%s' but there is no signature header"), +- signature_str); +-- g_free (tupled_signature_str); +- goto out; +- } +-- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) +-+ tupled_signature_str = g_strdup_printf ("(%s)", signature_str); +-+ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) +- { +- g_set_error (error, +- G_IO_ERROR, diff --git a/src/glib-2-format.patch b/src/glib-2-format.patch new file mode 100644 index 00000000..3d594af0