Merge pull request #9074 from heitbaum/pkg

This commit is contained in:
Christian Hewitt 2024-07-09 16:57:54 +04:00 committed by GitHub
commit 1b1a4e6520
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 56 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bluez"
PKG_VERSION="5.76"
PKG_SHA256="55e2c645909ad82d833c42ce85ec20434e0ef0070941b1eab73facdd240bbd63"
PKG_VERSION="5.77"
PKG_SHA256="5d032fdc1d4a085813554f57591e2e1fb0ceb2b3616ee56f689bc00e1d150812"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/"
PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -1,50 +0,0 @@
From e679b29bcf4890d61294e4110bace5f783632e5a Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 9 Mar 2024 08:55:24 +0000
Subject: [PATCH] Revert "build: Fix distcheck"
This reverts commit d5a9195a6269e703c6e3a47c40982ec94d8cc838.
---
Makefile.tools | 6 +-----
configure.ac | 8 +-------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/Makefile.tools b/Makefile.tools
index 27a753762..c17244677 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -539,11 +539,7 @@ endif
if CUPS
-if CUPS_SERVERBIN
-cupsdir = $(CUPS_SERVERBIN)/backend
-else
-cupsdir = $(libdir)/cups/backend
-endif
+cupsdir = $(CUPSDIR)
cups_PROGRAMS = profiles/cups/bluetooth
diff --git a/configure.ac b/configure.ac
index 9ebc250cf..0190e8271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,13 +247,7 @@ AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups],
[disable CUPS printer support]), [enable_cups=${enableval}])
AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no")
if (test "${enable_cups}" != "no"); then
- AC_MSG_CHECKING([cups directory])
- cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin`
- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "")
- if (test "${cups_serverbin}" != ""); then
- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin})
- fi
- AC_MSG_RESULT([${cups_serverbin}])
+ AC_SUBST(CUPSDIR, `$PKG_CONFIG cups --variable=cups_serverbin`/backend)
fi
AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh],
--
2.43.0

View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="iwd"
PKG_VERSION="2.18"
PKG_SHA256="100d029171d161411f6cd8e1f95708e3a4351fb19e6847ba04819377b5fed13e"
PKG_VERSION="2.19"
PKG_SHA256="9d0b934e51580316919796aa0357590971fc0df244b273fa10e154c268374f91"
PKG_LICENSE="GPL"
PKG_SITE="https://git.kernel.org/cgit/network/wireless/iwd.git/about/"
PKG_URL="https://www.kernel.org/pub/linux/network/wireless/iwd-${PKG_VERSION}.tar.xz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bemenu"
PKG_VERSION="0.6.21"
PKG_SHA256="854901e8d8aa45c20a284263e43d2d02c413d3b69bf2b854b5ed6d09117560ef"
PKG_VERSION="0.6.22"
PKG_SHA256="f54bfdd4366b7c27eb361fbce995bb2276dc31553211d86820a09fb0ce7b6537"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/Cloudef/bemenu"
PKG_URL="https://github.com/Cloudef/bemenu/archive/${PKG_VERSION}.tar.gz"