From 7f78259dc652a297d74598c733ccebe9787717c0 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Thu, 26 Jan 2017 18:16:27 +0100 Subject: [PATCH 1/2] configure.ac: Check freetype version >= 2.5.0 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/33283d77bd97fd16094714be07ed20c8ed5e9d81 Author: Michael Liebmann Date: 2017-01-26 (Thu, 26 Jan 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index 4b729fadf..6f6606da4 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,18 @@ AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2) +AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher]) + AC_TRY_CPP([ + #include + #include FT_FREETYPE_H + #if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5) + #error Freetype version too low. + #endif + ], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher]) + ]) + # fallback to curl-config (which is ugly for cross-compilation) if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) From 806ec2a0de35a58ccb65cba1b706988402a6ace5 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 27 Jan 2017 10:47:30 +0100 Subject: [PATCH 2/2] CVolumeBar: Enable background paint for digits Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d6d8127c396fb2e8ed582dcc2d102f7a9616ce9c Author: Michael Liebmann Date: 2017-01-27 (Fri, 27 Jan 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/volumebar.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp index 982c15e12..a7fa30a75 100644 --- a/src/gui/volumebar.cpp +++ b/src/gui/volumebar.cpp @@ -211,6 +211,7 @@ void CVolumeBar::initVolumeBarDigit() vb_digit->setDimensionsAll(vb_digit_x, 0, vb_digit_w, height); vb_digit->setTextColor(COL_MENUCONTENT_TEXT); vb_digit->setCorner(cornerRad(), CORNER_RIGHT); + vb_digit->doPaintTextBoxBg(true); initVolumeBarDigitValue(); //add digit label to container