[totem/wip/hadess/remove-lirc: 2/2] lirc: Remove lirc plugin



commit c4b21bb799b74dce04fd7da764407ab614ec3575
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jul 12 16:16:43 2019 +0200

    lirc: Remove lirc plugin
    
    The lirc plugin does not work in Flatpak, and the benefits that lirc
    brought are largely matched by Wayland and the native remote controls
    support in the Linux kernel.
    
    Closes: #303

 .gitlab-ci.yml                          |   2 +-
 po/POTFILES.in                          |   2 -
 src/plugins/lirc/lirc.plugin.desktop.in |   8 -
 src/plugins/lirc/meson.build            |  31 ----
 src/plugins/lirc/totem-lirc.c           | 296 --------------------------------
 src/plugins/lirc/totem_lirc_default     | 228 ------------------------
 src/plugins/meson.build                 |  12 --
 7 files changed, 1 insertion(+), 578 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0c71e034..60c4ed0d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ build-fedora:
   image: fedora:latest
   stage: test
   before_script:
-    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel 
clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel 
gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool 
libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel pygobject3-devel pylint python3-devel 
totem-pl-parser-devel flatpak-builder xorg-x11-server-Xvfb
+    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel 
clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel 
gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool 
libappstream-glib liberation-sans-fonts libpeas-devel pygobject3-devel pylint python3-devel 
totem-pl-parser-devel flatpak-builder xorg-x11-server-Xvfb
   script:
     - meson _build
     - G_MESSAGES_DEBUG=all xvfb-run -a -s "-screen 0 1024x768x24" ninja -C _build test
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bc9a7cc72..c8023aecd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,8 +38,6 @@ src/plugins/dbusservice/dbusservice.plugin.desktop.in
 src/plugins/dbusservice/dbusservice.py
 src/plugins/im-status/totem-im-status.c
 src/plugins/im-status/totem-im-status.plugin.desktop.in
-src/plugins/lirc/lirc.plugin.desktop.in
-src/plugins/lirc/totem-lirc.c
 src/plugins/media-player-keys/media-player-keys.plugin.desktop.in
 src/plugins/open-directory/open-directory.plugin.desktop.in
 src/plugins/open-directory/totem-open-directory.c
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index be6482d08..13e801974 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -18,7 +18,6 @@ allowed_plugins = [
   'brasero-disc-recorder',
   'dbusservice',
   'im-status',
-  'lirc',
   'media-player-keys',
   'open-directory',
   'opensubtitles',
@@ -58,17 +57,6 @@ if plugins_option != 'none'
 
   plugin_error = (plugins_option == 'all')
 
-  lirc_dep = dependency('lirc', required: false)
-  if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and 
cc.has_header('lirc/lirc_client.h')
-    plugins += 'lirc'
-  else
-    str = 'you need lirc_client installed for the lirc plugin'
-    if plugin_error
-      error(str)
-    endif
-    message(str)
-  endif
-
   libxml_req_version = '>= 2.6.0'
   libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false)
   gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]