We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] configury patch to allow libusb-less hidapi for macosx

3.patch (text/plain), 3.59 KB, created by Ozkan Sezer on 2019-08-01 09:01:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2019-08-01 09:01:59 UTC

Size: 3.59 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>--- a/configure.ac
>+++ b/configure.ac
>@@ -3232,27 +3232,39 @@ AS_HELP_STRING([--enable-hidapi], [use H
>             PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], have_libusb=yes, have_libusb=no)
>             save_CFLAGS="$CFLAGS"
>             CFLAGS="$save_CFLAGS $LIBUSB_CFLAGS"
>             AC_CHECK_HEADER(libusb.h, have_libusb_h=yes)
>             CFLAGS="$save_CFLAGS"
>             if test x$have_libusb_h = xyes; then
>                 hidapi_support=yes
>+            elif test x$onlylibusb = xno; then
>+                case "$host" in
>+                *-*-darwin* )
>+                    hidapi_support=yes
>+                    ;;
>+                esac
>             fi
>         fi
> 
>         if test x$hidapi_support = xyes; then
>             AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
>             EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
>             SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
> 
>             if test x$skiplibusb = xno; then
>                 EXTRA_CFLAGS="$EXTRA_CFLAGS $LIBUSB_CFLAGS"
>                 if test x$onlylibusb = xyes; then
>                     SOURCES="$SOURCES $srcdir/src/hidapi/libusb/hid.c"
>                     EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBUSB_LIBS"
>+                elif test x$have_libusb_h != xyes ; then
>+                    case "$host" in
>+                    *-*-darwin* )
>+                        SOURCES="$SOURCES $srcdir/src/hidapi/mac/hid.c"
>+                        ;;
>+                    esac
>                 else
>                     if test x$have_loadso != xyes; then
>                         AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic libusb loading])
>                     fi
>                     SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
>                     # libusb is loaded dynamically, so don't add it to LDFLAGS
>                     libusb_lib=""
>diff --git a/configure b/configure
>--- a/configure
>+++ b/configure
>@@ -24217,14 +24217,20 @@ if test "x$ac_cv_header_libusb_h" = xyes
>   have_libusb_h=yes
> fi
> 
> 
>             CFLAGS="$save_CFLAGS"
>             if test x$have_libusb_h = xyes; then
>                 hidapi_support=yes
>+            elif test x$onlylibusb = xno; then
>+                case "$host" in
>+                *-*-darwin* )
>+                    hidapi_support=yes
>+                    ;;
>+                esac
>             fi
>         fi
> 
>         if test x$hidapi_support = xyes; then
> 
> $as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
> 
>@@ -24232,14 +24238,20 @@ fi
>             SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
> 
>             if test x$skiplibusb = xno; then
>                 EXTRA_CFLAGS="$EXTRA_CFLAGS $LIBUSB_CFLAGS"
>                 if test x$onlylibusb = xyes; then
>                     SOURCES="$SOURCES $srcdir/src/hidapi/libusb/hid.c"
>                     EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBUSB_LIBS"
>+                elif test x$have_libusb_h != xyes ; then
>+                    case "$host" in
>+                    *-*-darwin* )
>+                        SOURCES="$SOURCES $srcdir/src/hidapi/mac/hid.c"
>+                        ;;
>+                    esac
>                 else
>                     if test x$have_loadso != xyes; then
>                         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic libusb loading" >&5
> $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic libusb loading" >&2;}
>                     fi
>                     SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
>                     # libusb is loaded dynamically, so don't add it to LDFLAGS

Actions: View | Diff

Attachments on bug 4554: 3700 | 3897 | 3913 | 3915 | 3917 | 3919 | 3921

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.