mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

mipsel: fix merge

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c28cac49bb
Author: max_10 <max_10@gmx.de>
Date: 2019-05-03 (Fri, 03 May 2019)

Origin message was:
------------------
- mipsel: fix merge

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2019-05-03 23:17:29 +02:00
committed by vanhofen
parent 082b8b0154
commit 7a5a827fd6
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -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

2
src/driver/rcinput.cpp
View File

@@ -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:

9
src/driver/simple_display.cpp
View File

@@ -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 <zapit/zapit.h>
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 <zapit/zapit.h>
static bool usb_icon = false;