[totem-pl-parser/wip/hadess/remove-quvi: 3/3] all: Remove quvi dependency
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem-pl-parser/wip/hadess/remove-quvi: 3/3] all: Remove quvi dependency
- Date: Wed, 23 Jun 2021 14:57:10 +0000 (UTC)
commit d215a84ebe05557828c24fe5e7ab400e2b41a328
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 23 14:22:23 2021 +0200
all: Remove quvi dependency
libquvi has been dead upstream for a number of years, and recent lua
changes made it drop from distributions. It wasn't used in our official
distribution channel, through Flathub.
.gitlab-ci.yml | 7 --
meson.build | 28 +------
meson_options.txt | 2 -
plparse/meson.build | 10 ---
plparse/tests/meson.build | 4 -
plparse/videosite-quvi.c | 191 ----------------------------------------------
6 files changed, 4 insertions(+), 238 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fb9ff8..43f24d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
variables:
DEPENDENCIES: redhat-rpm-config meson git gettext gtk-doc meson glib2-devel libxml2-devel
gobject-introspection-devel libgcrypt-devel libarchive-devel uchardet-devel
- DEPS_QUVI: libquvi-devel
DEPS_ABI_CHECK: libsoup-devel gmime-devel
TEST_DEPS: gvfs dbus-daemon shared-mime-info
LAST_ABI_BREAK: "9ccc3c78a5a41b86bdd2c9fb63ad4963e65e4f63"
@@ -15,12 +14,6 @@ build-fedora:
- dnf install -y $TEST_DEPS
- GIO_USE_VOLUME_MONITOR=unix dbus-run-session ninja -C _build test
- ninja -C _build install
- # And now with quvi support
- - rm -rf _build
- - dnf install -y $DEPS_QUVI
- - meson _build
- - GIO_USE_VOLUME_MONITOR=unix dbus-run-session ninja -C _build test
- - ninja -C _build install
# ABI check, the deps are needed to build the old version of totem-pl-parser
- curl https://gitlab.freedesktop.org/hadess/check-abi/-/raw/main/contrib/check-abi-fedora.sh | bash
- dnf install -y $DEPS_ABI_CHECK
diff --git a/meson.build b/meson.build
index 0aa06cf..0a34d1d 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,6 @@ plparse_libversion = '@0@.@1@.@2@'.format(plparse_soversion, plparse_lt_age, pl
# Requirements
glib_req = '>= 2.56.0'
gio_req = '>= 2.24.0'
-quvi_req = '>= 0.9.1'
archive_req = '>= 3.0'
# Dependencies
@@ -152,23 +151,6 @@ if enable_uchardet != 'no'
endif
endif
-# quvi dependency
-enable_quvi = get_option('enable-quvi')
-have_quvi = false
-pkgconf.set('QUVI', '')
-if enable_quvi != 'no'
- quvi_dep = dependency('libquvi-0.9', version: quvi_req, required: false)
- if enable_quvi == 'yes' and not quvi_dep.found()
- error('Quvi support requested but not available.')
- endif
- if quvi_dep.found()
- pkgconf.set('QUVI', 'libquvi-0.9')
- cdata.set('HAVE_QUVI', true,
- description: 'libquvi available in the system')
- have_quvi = true
- endif
-endif
-
# libarchive dependency
enable_libarchive = get_option('enable-libarchive')
have_libarchive = false
@@ -251,12 +233,10 @@ message('''
Configuration summary:
- Quvi video link parsing : @0@
- ISO detection with libarchive : @1@
- AmazonAMZ decoding with libgcrypt : @2@
- uchardet encoding detection : @3@
-'''.format(have_quvi.to_string('yes', 'no'),
- have_libarchive.to_string('yes', 'no'),
+ ISO detection with libarchive : @0@
+ AmazonAMZ decoding with libgcrypt : @1@
+ uchardet encoding detection : @2@
+'''.format(have_libarchive.to_string('yes', 'no'),
have_libgcrypt.to_string('yes', 'no'),
have_uchardet.to_string('yes', 'no')))
diff --git a/meson_options.txt b/meson_options.txt
index 24df404..3146e85 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,3 @@
-option('enable-quvi', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'no',
- description : 'Enable libquvi support.')
option('enable-libarchive', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
description : 'Enable libarchive support.')
option('enable-libgcrypt', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
diff --git a/plparse/meson.build b/plparse/meson.build
index df3e318..cc3b221 100644
--- a/plparse/meson.build
+++ b/plparse/meson.build
@@ -113,16 +113,6 @@ plparser_mini_lib = library('totem-plparser-mini',
install_data('README-videosite-script.md',
install_dir: join_paths(libexecdir, 'totem-pl-parser'))
-if have_quvi
- videosite_quvi_exe = executable('99-totem-pl-parser-videosite-quvi',
- 'videosite-quvi.c', totem_pl_parser_builtins_h,
- c_args: '-DLIBEXECDIR="@0@"'.format(libexecdir),
- include_directories: [config_inc, totemlib_inc],
- dependencies: [quvi_dep, glib_dep],
- install_dir: join_paths(libexecdir, 'totem-pl-parser'),
- install: true)
-endif
-
# Introspection
if get_option('introspection')
gnome.generate_gir(plparser_lib,
diff --git a/plparse/tests/meson.build b/plparse/tests/meson.build
index fc7bf9a..f6a56b8 100644
--- a/plparse/tests/meson.build
+++ b/plparse/tests/meson.build
@@ -9,9 +9,5 @@ foreach test_name : tests
dependencies: plparser_dep)
env = environment()
- if have_quvi
- env.set('TOTEM_PL_PARSER_VIDEOSITE_SCRIPT', videosite_quvi_exe.full_path())
- endif
-
test(test_name, exe, env: env, timeout: 3 * 60)
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]