Переглянути джерело

package/upower: bump to version 0.99.19

- Switch site to get latest release
- Switch to meson-package (autotools dropped since version 0.99.14)
- libusb is not a dependency since
  https://gitlab.freedesktop.org/upower/upower/-/commit/64582256a8c75127c3de23f5542c8467e2e9484a
- Update indentation in hash file (two spaces)

https://gitlab.freedesktop.org/upower/upower/-/blob/v0.99.19/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Peter: also update thermald dependencies]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 3 роки тому
батько
коміт
e62db6c7cc

+ 2 - 3
package/thermald/Config.in

@@ -4,7 +4,6 @@ config BR2_PACKAGE_THERMALD
 	depends on BR2_USE_MMU # uses fork()
 	depends on BR2_USE_MMU # uses fork()
 	depends on BR2_USE_WCHAR # upower -> libgudev
 	depends on BR2_USE_WCHAR # upower -> libgudev
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # upower -> libusb
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2, dbus, upower
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2, dbus, upower
 	depends on BR2_USE_WCHAR # dbus-glib -> glib2
 	depends on BR2_USE_WCHAR # dbus-glib -> glib2
 	depends on BR2_PACKAGE_HAS_UDEV # upower
 	depends on BR2_PACKAGE_HAS_UDEV # upower
@@ -22,11 +21,11 @@ config BR2_PACKAGE_THERMALD
 
 
 	  https://github.com/intel/thermal_daemon
 	  https://github.com/intel/thermal_daemon
 
 
-comment "thermald needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
+comment "thermald needs a toolchain w/ C++, wchar, threads"
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_USE_MMU
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+		!BR2_INSTALL_LIBSTDCPP
 
 
 comment "thermald needs udev /dev management"
 comment "thermald needs udev /dev management"
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_i386 || BR2_x86_64

+ 3 - 6
package/upower/Config.in

@@ -1,12 +1,10 @@
 config BR2_PACKAGE_UPOWER
 config BR2_PACKAGE_UPOWER
 	bool "upower"
 	bool "upower"
 	depends on BR2_PACKAGE_HAS_UDEV
 	depends on BR2_PACKAGE_HAS_UDEV
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev
 	depends on BR2_USE_MMU # libgudev
 	depends on BR2_USE_MMU # libgudev
 	depends on BR2_USE_WCHAR # libgudev
 	depends on BR2_USE_WCHAR # libgudev
 	select BR2_PACKAGE_LIBGUDEV
 	select BR2_PACKAGE_LIBGUDEV
-	select BR2_PACKAGE_LIBUSB
 	help
 	help
 	  UPower is an abstraction for enumerating power devices,
 	  UPower is an abstraction for enumerating power devices,
 	  listening to device events and querying history and
 	  listening to device events and querying history and
@@ -23,7 +21,6 @@ comment "upower needs udev /dev management"
 	depends on BR2_USE_MMU
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_HAS_UDEV
 	depends on !BR2_PACKAGE_HAS_UDEV
 
 
-comment "upower needs a toolchain w/ threads, wchar, gcc >= 4.9"
+comment "upower needs a toolchain w/ threads, wchar"
 	depends on BR2_USE_MMU
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

+ 2 - 2
package/upower/upower.hash

@@ -1,3 +1,3 @@
 # Locally calculated
 # Locally calculated
-sha256 64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef  upower-0.99.11.tar.xz
-sha256 c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d  COPYING
+sha256  e5bda2f5837ee311f5b7b6ec9549b029c88f4958011c6a8f5550b54408ee06ae  upower-v0.99.19.tar.bz2
+sha256  c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d  COPYING

+ 12 - 8
package/upower/upower.mk

@@ -4,9 +4,9 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-UPOWER_VERSION = 0.99.11
-UPOWER_SOURCE = upower-$(UPOWER_VERSION).tar.xz
-UPOWER_SITE = https://upower.freedesktop.org/releases
+UPOWER_VERSION = 0.99.19
+UPOWER_SOURCE = upower-v$(UPOWER_VERSION).tar.bz2
+UPOWER_SITE = https://gitlab.freedesktop.org/upower/upower/-/archive/v$(UPOWER_VERSION)
 UPOWER_LICENSE = GPL-2.0+
 UPOWER_LICENSE = GPL-2.0+
 UPOWER_LICENSE_FILES = COPYING
 UPOWER_LICENSE_FILES = COPYING
 
 
@@ -17,16 +17,20 @@ UPOWER_DEPENDENCIES = \
 	$(TARGET_NLS_DEPENDENCIES) \
 	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	host-pkgconf \
 	libgudev \
 	libgudev \
-	libusb \
 	udev
 	udev
 
 
-UPOWER_CONF_OPTS = --disable-man-pages --disable-tests
+UPOWER_CONF_OPTS = \
+	-Dgtk-doc=false \
+	-Dman=false \
+	-Dsystemdsystemunitdir=/usr/lib/systemd/system \
+	-Dudevhwdbdir=/lib/udev/hwdb.d \
+	-Dudevrulesdir=/lib/udev/rules.d
 
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-UPOWER_CONF_OPTS += --enable-introspection
+UPOWER_CONF_OPTS += -Dintrospection=enabled
 UPOWER_DEPENDENCIES += gobject-introspection
 UPOWER_DEPENDENCIES += gobject-introspection
 else
 else
-UPOWER_CONF_OPTS += --disable-introspection
+UPOWER_CONF_OPTS += -Dintrospection=disabled
 endif
 endif
 
 
-$(eval $(autotools-package))
+$(eval $(meson-package))