mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libmediaart: bump to version 1.9.5

Browse Source 
- Switch to meson-package
- Drop BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE which is not supported
  anymore
- Update indentation in hash file (two spaces)

https://gitlab.gnome.org/GNOME/libmediaart/-/blob/1.9.5/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
2021-10-26 21:56:01 +02:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent 84e90ce45c
commit 3db4d486d6
6 changed files with 157 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Config.in.legacy
View File

@@ -144,6 +144,15 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2022.02"
config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
bool "libmediaart 'none' backend removed"
select BR2_LEGACY
help
'none' backend has been removed from libmediaart since version
1.9.5.
comment "Legacy options removed in 2021.11" comment "Legacy options removed in 2021.11"
config BR2_OPENJDK_VERSION_LTS config BR2_OPENJDK_VERSION_LTS

87
package/libmediaart/0001-meson-add-introspection-option.patch Normal file
View File

@@ -0,0 +1,87 @@
From ee7d8736af172cd5ad71a0bd511c39daf401e3f6 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 5 Oct 2021 23:35:26 +0200
Subject: [PATCH] meson: add introspection option
Add introspection option
Fix #3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/14]
---
libmediaart/meson.build | 42 +++++++++++++++++++++--------------------
meson_options.txt | 2 ++
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/libmediaart/meson.build b/libmediaart/meson.build
index 56e00ab..2f44e63 100644
--- a/libmediaart/meson.build
+++ b/libmediaart/meson.build
@@ -41,28 +41,30 @@ libmediaart = shared_library(
install: true,
)
-gir_args = [
- '--quiet',
- '-DLIBMEDIAART_COMPILATION',
-]
+if get_option('introspection')
+ gir_args = [
+ '--quiet',
+ '-DLIBMEDIAART_COMPILATION',
+ ]
-libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart,
- sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers,
- nsversion: libmediaart_api_version,
- namespace: 'MediaArt',
- identifier_prefix: 'MediaArt',
- symbol_prefix: 'media_art',
- includes: ['Gio-2.0', 'GObject-2.0'],
- header: 'libmediaart/mediaart.h',
- export_packages: 'libmediaart-' + libmediaart_api_version,
- extra_args: gir_args,
- install: true
-)
+ libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart,
+ sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers,
+ nsversion: libmediaart_api_version,
+ namespace: 'MediaArt',
+ identifier_prefix: 'MediaArt',
+ symbol_prefix: 'media_art',
+ includes: ['Gio-2.0', 'GObject-2.0'],
+ header: 'libmediaart/mediaart.h',
+ export_packages: 'libmediaart-' + libmediaart_api_version,
+ extra_args: gir_args,
+ install: true
+ )
-libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
- sources: libmediaart_gir_and_typelib[0],
- packages: 'gio-2.0',
- install: true)
+ libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
+ sources: libmediaart_gir_and_typelib[0],
+ packages: 'gio-2.0',
+ install: true)
+endif
libmediaart_dep = declare_dependency(
link_with: libmediaart,
diff --git a/meson_options.txt b/meson_options.txt
index 3ef49ba..b8c51b1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,7 @@
option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'],
description: 'Which image processing backend to use')
+option('introspection', type : 'boolean', value : 'true',
+ description : 'Enable / disable the GObject-Introspection integration')
option('gtk_doc',
type: 'boolean',
value: 'false',
--
2.33.0

48
package/libmediaart/0002-meson-add-unit_tests-option.patch Normal file
View File

@@ -0,0 +1,48 @@
From 01d94777d9d1906750db0e27e2e7b8f228ae4343 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 9 Oct 2021 23:45:53 +0200
Subject: [PATCH] meson: add unit_tests option
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet (waiting feedback on first patch)]
---
meson_options.txt | 2 ++
tests/meson.build | 14 ++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/meson_options.txt b/meson_options.txt
index b8c51b1..1172f93 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,6 +2,8 @@ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'q
description: 'Which image processing backend to use')
option('introspection', type : 'boolean', value : 'true',
description : 'Enable / disable the GObject-Introspection integration')
+option('unit_tests', type : 'boolean', value : 'true',
+ description : 'Enable / disable unit tests')
option('gtk_doc',
type: 'boolean',
value: 'false',
diff --git a/tests/meson.build b/tests/meson.build
index 28834c0..02c96a1 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,7 +1,9 @@
-mediaart_test = executable('mediaart-test',
- 'mediaarttest.c',
- dependencies: libmediaart_dep,
-)
+if get_option('unit_tests')
+ mediaart_test = executable('mediaart-test',
+ 'mediaarttest.c',
+ dependencies: libmediaart_dep,
+ )
-test('mediaart', mediaart_test,
- env: 'G_TEST_SRCDIR=' + meson.current_source_dir())
+ test('mediaart', mediaart_test,
+ env: 'G_TEST_SRCDIR=' + meson.current_source_dir())
+endif
--
2.33.0

8
package/libmediaart/Config.in
View File

@@ -18,13 +18,7 @@ if BR2_PACKAGE_LIBMEDIAART
choice choice
prompt "media art backend" prompt "media art backend"
default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE default BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
bool "none"
help
With no backend, libmediaart will not be able to process MP3
album art.
config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
bool "gdk-pixbuf" bool "gdk-pixbuf"

6
package/libmediaart/libmediaart.hash
View File

@@ -1,5 +1,5 @@
# Hash from: http://ftp.gnome.org/pub/gnome/sources/libmediaart/1.9/libmediaart-1.9.4.sha256sum: # Hash from: http://ftp.gnome.org/pub/gnome/sources/libmediaart/1.9/libmediaart-1.9.5.sha256sum:
sha256 a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d libmediaart-1.9.4.tar.xz sha256 07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6 libmediaart-1.9.5.tar.xz
# Locally computed: # Locally computed:
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER

25
package/libmediaart/libmediaart.mk
View File

@@ -5,39 +5,32 @@
################################################################################ ################################################################################
LIBMEDIAART_VERSION_MAJOR = 1.9 LIBMEDIAART_VERSION_MAJOR = 1.9
LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).4 LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).5
LIBMEDIAART_SOURCE = libmediaart-$(LIBMEDIAART_VERSION).tar.xz LIBMEDIAART_SOURCE = libmediaart-$(LIBMEDIAART_VERSION).tar.xz
LIBMEDIAART_SITE = \ LIBMEDIAART_SITE = \
http://ftp.gnome.org/pub/gnome/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR) http://ftp.gnome.org/pub/gnome/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR)
LIBMEDIAART_LICENSE = LGPL-2.1+ LIBMEDIAART_LICENSE = LGPL-2.1+
LIBMEDIAART_LICENSE_FILES = COPYING.LESSER LIBMEDIAART_LICENSE_FILES = COPYING.LESSER
LIBMEDIAART_INSTALL_STAGING = YES LIBMEDIAART_INSTALL_STAGING = YES
LIBMEDIAART_DEPENDENCIES = libglib2 LIBMEDIAART_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES)
LIBMEDIAART_CONF_OPTS = --disable-unit-tests LIBMEDIAART_CONF_OPTS = -Dunit_tests=false
LIBMEDIAART_LDFLAGS = $(TARGET_NLS_LIBS)
ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y) ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y)
LIBMEDIAART_DEPENDENCIES += gdk-pixbuf LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
LIBMEDIAART_CONF_OPTS += \ LIBMEDIAART_CONF_OPTS += -Dimage_library=gdk-pixbuf
--enable-gdkpixbuf \
--disable-qt
else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y) else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
# qt5 needs c++11 (since qt-5.7) # qt5 needs c++11 (since qt-5.7)
LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
LIBMEDIAART_DEPENDENCIES += qt5base LIBMEDIAART_DEPENDENCIES += qt5base
LIBMEDIAART_CONF_OPTS += \ LIBMEDIAART_CONF_OPTS += -Dimage_library=qt5
--disable-gdkpixbuf \
--enable-qt
else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y)
LIBMEDIAART_CONF_OPTS += \
--disable-gdkpixbuf \
--disable-qt
endif endif
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
LIBMEDIAART_CONF_OPTS += --enable-introspection LIBMEDIAART_CONF_OPTS += -Dintrospection=true
LIBMEDIAART_DEPENDENCIES += gobject-introspection LIBMEDIAART_DEPENDENCIES += gobject-introspection
else else
LIBMEDIAART_CONF_OPTS += --disable-introspection LIBMEDIAART_CONF_OPTS += -Dintrospection=false
endif endif
$(eval $(autotools-package)) $(eval $(meson-package))