[Buildroot] [PATCH 1/1] package/upower: bump to version 0.99.19

[Buildroot] [PATCH 1/1] package/upower: bump to version 0.99.19

[Fabrice Fontaine]

- 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>
---
 package/upower/Config.in   |  9 +++------
 package/upower/upower.hash |  4 ++--
 package/upower/upower.mk   | 20 ++++++++++++--------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/package/upower/Config.in b/package/upower/Config.in
index 612a2b74b9..e2bcdd12c3 100644
--- a/package/upower/Config.in
+++ b/package/upower/Config.in
@@ -1,12 +1,10 @@
 config BR2_PACKAGE_UPOWER
 	bool "upower"
 	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_WCHAR # libgudev
 	select BR2_PACKAGE_LIBGUDEV
-	select BR2_PACKAGE_LIBUSB
 	help
 	  UPower is an abstraction for enumerating power devices,
 	  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_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_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/upower/upower.hash b/package/upower/upower.hash
index e69ad20cbc..cabce1f558 100644
--- a/package/upower/upower.hash
+++ b/package/upower/upower.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef  upower-0.99.11.tar.xz
-sha256 c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d  COPYING
+sha256  e5bda2f5837ee311f5b7b6ec9549b029c88f4958011c6a8f5550b54408ee06ae  upower-v0.99.19.tar.bz2
+sha256  c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d  COPYING
diff --git a/package/upower/upower.mk b/package/upower/upower.mk
index a6f39d2f46..49aac8c7a2 100644
--- a/package/upower/upower.mk
+++ b/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_FILES = COPYING
 
@@ -17,16 +17,20 @@ UPOWER_DEPENDENCIES = \
 	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	libgudev \
-	libusb \
 	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)
-UPOWER_CONF_OPTS += --enable-introspection
+UPOWER_CONF_OPTS += -Dintrospection=enabled
 UPOWER_DEPENDENCIES += gobject-introspection
 else
-UPOWER_CONF_OPTS += --disable-introspection
+UPOWER_CONF_OPTS += -Dintrospection=disabled
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/upower: bump to version 0.99.19

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - 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>
 > ---
 >  package/upower/Config.in   |  9 +++------
 >  package/upower/upower.hash |  4 ++--
 >  package/upower/upower.mk   | 20 ++++++++++++--------
 >  3 files changed, 17 insertions(+), 16 deletions(-)

 > diff --git a/package/upower/Config.in b/package/upower/Config.in
 > index 612a2b74b9..e2bcdd12c3 100644
 > --- a/package/upower/Config.in
 > +++ b/package/upower/Config.in
 > @@ -1,12 +1,10 @@
 >  config BR2_PACKAGE_UPOWER
 >  	bool "upower"
 >  	depends on BR2_PACKAGE_HAS_UDEV
 > -	depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb
 > -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb

thermald selects upower, but you forgot to drop the gcc dependency from
thermald.
 
 > -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

No flag to disable tests?

Committed with the dependencies of thermald fixed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/upower: bump to version 0.99.19

[Fabrice Fontaine]

Le mar. 28 juin 2022 à 08:04, Peter Korsgaard <peter@korsgaard.com> a écrit :
>
> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
>
>  > - 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>
>  > ---
>  >  package/upower/Config.in   |  9 +++------
>  >  package/upower/upower.hash |  4 ++--
>  >  package/upower/upower.mk   | 20 ++++++++++++--------
>  >  3 files changed, 17 insertions(+), 16 deletions(-)
>
>  > diff --git a/package/upower/Config.in b/package/upower/Config.in
>  > index 612a2b74b9..e2bcdd12c3 100644
>  > --- a/package/upower/Config.in
>  > +++ b/package/upower/Config.in
>  > @@ -1,12 +1,10 @@
>  >  config BR2_PACKAGE_UPOWER
>  >      bool "upower"
>  >      depends on BR2_PACKAGE_HAS_UDEV
>  > -    depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb
>  > -    depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
>
> thermald selects upower, but you forgot to drop the gcc dependency from
> thermald.
>
>  > -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
>
> No flag to disable tests?

Indeed, up_self_test is now unconditionally built. Should I send a PR
to upstream?

>
> Committed with the dependencies of thermald fixed, thanks.
>
> --
> Bye, Peter Korsgaard

Best Regards,

Fabrice
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/upower: bump to version 0.99.19

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

Hi,

 >> No flag to disable tests?

 > Indeed, up_self_test is now unconditionally built. Should I send a PR
 > to upstream?

You can, but if it doesn't cause any build errors then I would just
leave it.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot