package/network/bluez/hotfix-udev.patch

   1 # --- T2-COPYRIGHT-BEGIN ---
   2 # t2/package/*/bluez/hotfix-udev.patch
   3 # Copyright (C) 2025 The T2 SDE Project
   4 # SPDX-License-Identifier: GPL-2.0 or patched project license
   5 # --- T2-COPYRIGHT-END ---
   6
   7 --- bluez-5.74/configure.vanilla        2025-01-09 13:31:30.596666664 +0100
   8 +++ bluez-5.74/configure        2025-01-09 13:34:18.346666655 +0100
   9 @@ -15542,11 +15542,11 @@
  10   elif test -n "$PKG_CONFIG"; then
  11      if test -n "$PKG_CONFIG" && \
  12      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 196\""; } >&5
  13 -  ($PKG_CONFIG --exists --print-errors "libudev >= 196") 2>&5
  14 +  ($PKG_CONFIG --exists --print-errors "libudev >= 182") 2>&5
  15    ac_status=$?
  16    printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  17    test $ac_status = 0; }; then
  18 -  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 196" 2>/dev/null`
  19 +  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 182" 2>/dev/null`
  20                       test "x$?" != "x0" && pkg_failed=yes
  21  else
  22    pkg_failed=yes
  23 @@ -15559,11 +15559,11 @@
  24   elif test -n "$PKG_CONFIG"; then
  25      if test -n "$PKG_CONFIG" && \
  26      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 196\""; } >&5
  27 -  ($PKG_CONFIG --exists --print-errors "libudev >= 196") 2>&5
  28 +  ($PKG_CONFIG --exists --print-errors "libudev >= 12") 2>&5
  29    ac_status=$?
  30    printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  31    test $ac_status = 0; }; then
  32 -  pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 196" 2>/dev/null`
  33 +  pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 182" 2>/dev/null`
  34                       test "x$?" != "x0" && pkg_failed=yes
  35  else
  36    pkg_failed=yes
  37 @@ -15584,9 +15584,9 @@
  38          _pkg_short_errors_supported=no
  39  fi
  40          if test $_pkg_short_errors_supported = yes; then
  41 -                UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 196" 2>&1`
  42 +                UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 182" 2>&1`
  43          else
  44 -                UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 196" 2>&1`
  45 +                UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 182" 2>&1`
  46          fi
  47          # Put the nasty error message in config.log where it belongs
  48          echo "$UDEV_PKG_ERRORS" >&5
  49 --- bluez-5.74/src/oui.c.vanilla        2025-01-09 13:40:57.683333330 +0100
  50 +++ bluez-5.74/src/oui.c        2025-01-09 13:41:38.336666657 +0100
  51 @@ -26,6 +26,7 @@
  52         struct udev_list_entry *head, *entry;
  53         char modalias[11], *comp = NULL;
  54
  55 +#if 0
  56         sprintf(modalias, "OUI:%2.2X%2.2X%2.2X", ba->b[5], ba->b[4], ba->b[3]);
  57
  58         udev = udev_new();
  59 @@ -51,7 +52,7 @@
  60
  61  done:
  62         udev = udev_unref(udev);
  63 -
  64 +#endif
  65         return comp;
  66  }
  67  #else
  68 --- bluez-5.74/monitor/hwdb.c.vanilla   2025-01-09 13:37:22.223333331 +0100
  69 +++ bluez-5.74/monitor/hwdb.c   2025-01-09 13:40:48.539999993 +0100
  70 @@ -27,8 +27,8 @@
  71         struct udev *udev;
  72         struct udev_hwdb *hwdb;
  73         struct udev_list_entry *head, *entry;
  74 -       bool result;
  75 -
  76 +       bool result = false;
  77 +#if 0
  78         udev = udev_new();
  79         if (!udev)
  80                 return false;
  81 @@ -62,7 +62,7 @@
  82
  83  done:
  84         udev = udev_unref(udev);
  85 -
  86 +#endif
  87         return result;
  88  }
  89
  90 @@ -72,11 +72,12 @@
  91         struct udev_hwdb *hwdb;
  92         struct udev_list_entry *head, *entry;
  93         char modalias[11];
  94 -       bool result;
  95 +       bool result = false;
  96
  97         if (!bdaddr[2] && !bdaddr[1] && !bdaddr[0])
  98                 return false;
  99
 100 +#if 0
 101         sprintf(modalias, "OUI:%2.2X%2.2X%2.2X",
 102                                 bdaddr[5], bdaddr[4], bdaddr[3]);
 103
 104 @@ -109,7 +109,7 @@
 105
 106  done:
 107         udev = udev_unref(udev);
 108 -
 109 +#endif
 110         return result;
 111  }
 112  #else