From 31523328c8c2bc8b5ec7685082a139da0cb79735 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 3 May 2019 23:17:29 +0200 Subject: [PATCH] mipsel: fix merge Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c28cac49bb2cbe8bec29586059c7c0d9ee9d493a Author: max_10 Date: 2019-05-03 (Fri, 03 May 2019) Origin message was: ------------------ - mipsel: fix merge --- configure.ac | 2 +- src/driver/rcinput.cpp | 2 +- src/driver/simple_display.cpp | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index ec09f8b3b..edd8b2816 100644 --- a/configure.ac +++ b/configure.ac @@ -149,7 +149,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) -if test "$BOXTYPE" = "armbox"; then +if test "$BOXTYPE" = "armbox" -o "$BOXTYPE" = "mipsbox"; then TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) fi diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index b7729a2f9..f336b488e 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1743,7 +1743,7 @@ int CRCInput::translate(int code) return RC_page_up; case KEY_CHANNELDOWN: return RC_page_down; -#ifdef HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE case KEY_SWITCHVIDEOMODE: return RC_mode; case KEY_VIDEO: diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index d7d48a350..378aff090 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -57,14 +57,7 @@ static bool usb_icon = false; static bool timer_icon = false; #endif -#if HAVE_ARM_HARDWARE -#define DISPLAY_DEV "/dev/dbox/oled0" -#include -static bool usb_icon = false; -static bool timer_icon = false; -#endif - -#if HAVE_MIPS_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #define DISPLAY_DEV "/dev/dbox/oled0" #include static bool usb_icon = false;