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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-09 13:19:03 +01:00
parent 2f63d963eb 695c7d3df9
commit c80102a917
132 changed files with 4170 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -98,7 +98,6 @@ AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
# TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 2.5.0], echo "freetype2 >= 2.5.0 found")
# fallback to curl-config (which is ugly for cross-compilation)
if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
@@ -107,7 +106,7 @@ fi
# fallback to freetype-config (which is ugly for cross-compilation)
if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
CPPFLAGS+="$FREETYPE_CFLAGS"
CPPFLAGS+=" $FREETYPE_CFLAGS"
AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
AC_TRY_CPP([
#include <ft2build.h>
@@ -153,10 +152,6 @@ AC_ARG_ENABLE(keyboard-no-rc,
[ --enable-keyboard-no-rc enable keyboard control, disable rc control],
[AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL,1,[enable keyboard control, disable rc control])])
AC_ARG_ENABLE(restore-prev-mode,
[ --enable-restore-prev-mode enable return from graphics mode],
[AC_DEFINE(RETURN_FROM_GRAPHICS_MODE,1,[enable return from graphics mode])])
AC_ARG_ENABLE(mdev,
[ --enable-mdev disable broken neutrino mount hack, use with mdev],
[AC_DEFINE(ASSUME_MDEV,1,[disable broken neutrino mount hack, use with mdev])])
@@ -288,6 +283,9 @@ HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/inclu
fi
fi
# hack, so that framebuffer.h does not need to be included everywhere...
AC_DEFINE(fb_pixel_t, uint32_t, [hack, so that framebuffer.h does not need to be included everywhere...])
# hack to define a short filename also for out-of-tree build
if test `dirname $0` = `pwd` || test "$0" = ./configure; then
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'