iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch Normal file
View File

@@ -0,0 +1,60 @@
From 9225b076d107538209fbd5b8bbc21a68d1b2c016 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 15 Jul 2020 22:42:44 +0200
Subject: [PATCH] Revert "build: Always build gupnp-binding-tool manpage"
This reverts commit 23f54c2a1e8718e836224d68dafded091604a677 until
upstream decides what to do between adding a new option or renaming
gtk_doc into documentation:
https://gitlab.gnome.org/GNOME/gupnp/-/issues/17
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
doc/meson.build | 2 --
meson.build | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
index b71b657..478650b 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -4,7 +4,6 @@ version_xml = configure_file(input: 'version.xml.in',
output: 'version.xml', configuration:
entities)
-if get_option('gtk_doc')
gnome.gtkdoc('gupnp',
main_xml : 'gupnp-docs.xml',
src_dir : [join_paths(meson.source_root(), 'libgupnp'),
@@ -27,7 +26,6 @@ gnome.gtkdoc('gupnp',
'gupnp-types-private.h'
],
install : true)
-endif
xsltproc = find_program('xsltproc', required: false)
if xsltproc.found()
diff --git a/meson.build b/meson.build
index 28c40b2..dea0a49 100644
--- a/meson.build
+++ b/meson.build
@@ -31,12 +31,15 @@ dependencies = [
subdir('libgupnp')
subdir('tests')
subdir('tools')
-subdir('doc')
if get_option('vapi') and get_option('introspection')
subdir('vala')
endif
+if get_option('gtk_doc')
+ subdir('doc')
+endif
+
if get_option('examples')
subdir('examples')
endif
--
2.27.0

6
package/gupnp/gupnp.hash
View File

@@ -1,5 +1,5 @@
# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.4.sha256sum:
sha256 8b0992650c6ef8566d2d0c9198c8a669106dc2c73aa908fcc4a4d043a8c0b544 gupnp-1.0.4.tar.xz
# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.2/gupnp-1.2.4.sha256sum:
sha256 f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1 gupnp-1.2.4.tar.xz
# Hash for license file:
sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING

12
package/gupnp/gupnp.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
GUPNP_VERSION_MAJOR = 1.0
GUPNP_VERSION_MAJOR = 1.2
GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4
GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz
GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR)
@@ -12,5 +12,13 @@ GUPNP_LICENSE = LGPL-2.0+
GUPNP_LICENSE_FILES = COPYING
GUPNP_INSTALL_STAGING = YES
GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
GUPNP_CONF_OPTS = -Dexamples=false
$(eval $(autotools-package))
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
GUPNP_CONF_OPTS += -Dintrospection=true -Dvapi=true
GUPNP_DEPENDENCIES += host-vala gobject-introspection
else
GUPNP_CONF_OPTS += -Dintrospection=false -Dvapi=false
endif
$(eval $(meson-package))