diff --git a/config/functions b/config/functions index 44cb8818a9..ce78e0943f 100644 --- a/config/functions +++ b/config/functions @@ -374,7 +374,6 @@ show_config() { config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT" config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT" config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT" - config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT" config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT" # Misc. hardware configuration diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 30c50183b2..44f3b9971d 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -144,9 +144,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="yes" -# build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="yes" - # build and install Joystick support (yes / no) JOYSTICK_SUPPORT="yes" diff --git a/packages/mediacenter/kodi/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config index e20e35870c..85a650e2a9 100755 --- a/packages/mediacenter/kodi/scripts/kodi-config +++ b/packages/mediacenter/kodi/scripts/kodi-config @@ -42,10 +42,6 @@ if [ ! -f $HOME/.kodi/userdata/guisettings.xml ] ; then fi fi -if [ -e /run/lirc/lircd.irtrans ]; then - KODI_ARGS="--lircdev /run/lirc/lircd.irtrans" -else - KODI_ARGS="--lircdev /run/lirc/lircd" -fi +KODI_ARGS="--lircdev /run/lirc/lircd" echo "KODI_ARGS=\"$KODI_ARGS\"" > /run/libreelec/kodi.conf diff --git a/packages/sysutils/irserver/config/remote.conf b/packages/sysutils/irserver/config/remote.conf deleted file mode 100644 index fb4a575427..0000000000 --- a/packages/sysutils/irserver/config/remote.conf +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ -# remote.conf - -# This configuration file lets you setup remote control access for your -# system -# Options are "none" / "lirc" / "irtrans" - -# none: No remote control hardware is installed -# lirc: Use lirc as remote control backend (default) -# irtrans: Use irtrans as remote control backend - -REMOTE_BACKEND="lirc" diff --git a/packages/sysutils/irserver/init.d/61_irserver b/packages/sysutils/irserver/init.d/61_irserver deleted file mode 100644 index 38847b1975..0000000000 --- a/packages/sysutils/irserver/init.d/61_irserver +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -# start the IRtrans daemon -# -# runlevels: openelec, textmode - -[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf -[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf - -if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then - - progress "Starting IRtrans daemon" - - [ "$DEBUG" = "yes" ] && \ - IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode - - irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \ - $IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1 - -fi \ No newline at end of file diff --git a/packages/sysutils/irserver/package.mk b/packages/sysutils/irserver/package.mk deleted file mode 100644 index 56c718c349..0000000000 --- a/packages/sysutils/irserver/package.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="irserver" -PKG_VERSION="6.03.08" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Freeware" -PKG_SITE="http://http://www.irtrans.de" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="sysutils/remote" -PKG_SHORTDESC="irserver: IR Trans transforms your PC into a programmable remote control." -PKG_LONGDESC="IR Trans transforms your PC into a programmable remote control: It learns the codes of your remote control, stores them in a database and sends them controlled by your applications." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -if [ "$TARGET_ARCH" = "x86_64" ]; then - IRSERVER_BIN="irserver64" -elif [ "$TARGET_ARCH" = "arm" ]; then - IRSERVER_BIN="irserver_arm" -fi - -make_target() { - make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $IRSERVER_BIN - $STRIP $IRSERVER_BIN -} - -makeinstall_target() { - mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/*.conf $INSTALL/usr/config - - mkdir -p $INSTALL/usr/sbin - cp -P $IRSERVER_BIN $INSTALL/usr/sbin/irserver - - mkdir -p $INSTALL/usr/share/irtrans/remotes - cp remotes/irtrans.rem $INSTALL/usr/share/irtrans/remotes - cp remotes/mediacenter.rem $INSTALL/usr/share/irtrans/remotes -} diff --git a/packages/sysutils/irserver/patches/irserver-6.03.08-add_support_for_dev_irtransX-0.1.patch b/packages/sysutils/irserver/patches/irserver-6.03.08-add_support_for_dev_irtransX-0.1.patch deleted file mode 100644 index c9aa492d56..0000000000 --- a/packages/sysutils/irserver/patches/irserver-6.03.08-add_support_for_dev_irtransX-0.1.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur irserver-05.02.10/lowlevel.c irserver-05.02.10.patch/lowlevel.c ---- irserver-05.02.10/lowlevel.c 2010-02-05 01:14:44.000000000 +0100 -+++ irserver-05.02.10.patch/lowlevel.c 2010-04-26 13:22:40.171936190 +0200 -@@ -2638,10 +2638,17 @@ - #endif - #ifdef LINUX - //LINUX Autofind USB devices -- if ((!strncmp (st + q,"usb",3) || !strncmp (st + q,"USB",3)) && !autoflag) { -+ if( !strncmp( st, "/dev/irtrans", 12 ) && !autoflag ) { -+ autoflag = 1; -+ res = 0; -+ get_detail_deviceinfo ("",st,IF_USB); -+ } -+ else if ((!strncmp (st + q,"usb",3) || !strncmp (st + q,"USB",3)) && !autoflag) { - autoflag = 1; - res = 0; - for (i=0;i < 16;i++) { -+ sprintf (dst,"/dev/irtrans%d",i); -+ if (get_detail_deviceinfo ("",dst,IF_USB)) { - sprintf (dst,"/dev/ttyUSB%d",i); - if (get_detail_deviceinfo ("",dst,IF_USB)) { - sprintf (dst,"/dev/usb/ttyUSB%d",i); -@@ -2655,6 +2662,7 @@ - } - } - } -+ } - else if ((!strncmp (st + q,"/dev/usb/tty",12) || !strncmp (st + q,"/dev/ttyUSB",11) || !strncmp (st + q,"/dev/usb/tts",12) || - !strncmp (st + q,"/dev/ttyusb",11) || !strncmp (st + q,"/dev/tts/USB",12)) && !autoflag) { - if (st[q + strlen (st+q) - 1] == ']') { diff --git a/packages/sysutils/irserver/patches/irserver-6.03.08-lirc_0.8.6.patch b/packages/sysutils/irserver/patches/irserver-6.03.08-lirc_0.8.6.patch deleted file mode 100644 index 15751a7089..0000000000 --- a/packages/sysutils/irserver/patches/irserver-6.03.08-lirc_0.8.6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur irserver-20100817-old/server.c irserver-20100817-new/server.c ---- irserver-20100817-old/server.c 2010-08-16 15:17:31.000000000 -0700 -+++ irserver-20100817-new/server.c 2010-08-17 06:08:44.000000000 -0700 -@@ -101,7 +101,7 @@ - - #ifdef LINUX - SOCKET local_socket; --#define LIRCD "/dev/lircd" -+#define LIRCD "/run/lirc/lircd.irtrans" - #define PERMISSIONS 0666 - #endif - diff --git a/packages/sysutils/irserver/tmpfiles.d/63_irserver.conf b/packages/sysutils/irserver/tmpfiles.d/63_irserver.conf deleted file mode 100644 index e9c344b64f..0000000000 --- a/packages/sysutils/irserver/tmpfiles.d/63_irserver.conf +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -d /run/lirc 0755 root root - - diff --git a/packages/sysutils/irserver/udev.d/81-irtrans.rules b/packages/sysutils/irserver/udev.d/81-irtrans.rules deleted file mode 100644 index 1fad3a8f6a..0000000000 --- a/packages/sysutils/irserver/udev.d/81-irtrans.rules +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -ACTION=="remove", GOTO="irtrans_end" -SUBSYSTEM!="tty", GOTO="irtrans_end" -KERNEL!="ttyUSB[0-9]*", GOTO="irtrans_end" - -#IMPORT{builtin}="usb_id" - -ATTRS{product}=="IRTrans*USB", SYMLINK+="irtrans%n" - -LABEL="irtrans_end" - - diff --git a/packages/sysutils/lcdproc/package.mk b/packages/sysutils/lcdproc/package.mk index 46f0d8f03b..6c494e8467 100644 --- a/packages/sysutils/lcdproc/package.mk +++ b/packages/sysutils/lcdproc/package.mk @@ -32,10 +32,6 @@ PKG_LONGDESC="LCDproc is a piece of software that displays real-time system info PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -if [ "$IRSERVER_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET irserver" -fi - IFS=$',' for i in $LCD_DRIVER; do case $i in @@ -58,7 +54,6 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/bin sed -e "s|^DriverPath=.*$|DriverPath=/usr/lib/lcdproc/|" \ - -e "s|^Driver=.*$|Driver=irtrans|" \ -e "s|^#Foreground=.*$|Foreground=no|" \ -e "s|^#ServerScreen=.*$|ServerScreen=blank|" \ -e "s|^#Backlight=.*$|Backlight=open|" \ diff --git a/packages/virtual/remote/package.mk b/packages/virtual/remote/package.mk index d2a98e929e..dd06f09e22 100644 --- a/packages/virtual/remote/package.mk +++ b/packages/virtual/remote/package.mk @@ -35,10 +35,6 @@ if [ "$ATVCLIENT_SUPPORT" = "yes" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET atvclient" fi -if [ "$IRSERVER_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET irserver" -fi - if [ "$AMREMOTE_SUPPORT" = "yes" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET amremote" fi diff --git a/projects/Odroid_C2/options b/projects/Odroid_C2/options index 70e6c1e441..148de3f5d7 100644 --- a/projects/Odroid_C2/options +++ b/projects/Odroid_C2/options @@ -107,9 +107,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/RPi/options b/projects/RPi/options index ff444598fb..52b728533e 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -117,9 +117,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/RPi2/options b/projects/RPi2/options index 0820d2e1ee..72276a0faf 100644 --- a/projects/RPi2/options +++ b/projects/RPi2/options @@ -117,9 +117,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options index cd2b4399ea..915537a982 100644 --- a/projects/WeTek_Core/options +++ b/projects/WeTek_Core/options @@ -127,9 +127,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/WeTek_Hub/options b/projects/WeTek_Hub/options index e300d2a860..a52fb572ab 100644 --- a/projects/WeTek_Hub/options +++ b/projects/WeTek_Hub/options @@ -115,9 +115,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options index 5818715b5d..6ab0e9519f 100644 --- a/projects/WeTek_Play/options +++ b/projects/WeTek_Play/options @@ -121,9 +121,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/WeTek_Play_2/options b/projects/WeTek_Play_2/options index be0e08ff48..bba7c576c4 100644 --- a/projects/WeTek_Play_2/options +++ b/projects/WeTek_Play_2/options @@ -114,9 +114,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none" diff --git a/projects/imx6/options b/projects/imx6/options index 85f38f46fe..6892e52dfd 100644 --- a/projects/imx6/options +++ b/projects/imx6/options @@ -142,9 +142,6 @@ # build and install ATV IR remote support (yes / no) ATVCLIENT_SUPPORT="no" - # build and install IRServer IR/LCD support (yes / no) - IRSERVER_SUPPORT="no" - # "none" for disable LCD support LCD_DRIVER="none"