From 85859e33f3e0ec3d8efd49f8bfc26da35d94d621 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 27 Apr 2013 22:02:02 +0200 Subject: [PATCH 1/6] acinclude: better fix for pkg-config 0.28 behaviour Old pkg-config always retured a non-empty string for --cflags. It always contained at least one bogus space. New pkg-config does not do that. Do not rely on --cflags being non-empty. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4d4dad453603e6d4e9f098fa9164de43c66ee0f8 Author: Stefan Seyfried Date: 2013-04-27 (Sat, 27 Apr 2013) ------------------ This commit was generated by Migit --- acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 38323b1d9..664b0c8cd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -317,6 +317,7 @@ if $PKG_CONFIG --exists "$2" ; then AC_MSG_RESULT(yes) $1_CFLAGS=$($PKG_CONFIG --cflags "$2") $1_LIBS=$($PKG_CONFIG --libs "$2") + $1_EXISTS=yes else AC_MSG_RESULT(no) fi @@ -327,7 +328,7 @@ AC_SUBST($1_LIBS) AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) -if test -z "$$1_CFLAGS" ; then +if test x"$$1_EXISTS" != xyes; then AC_MSG_ERROR([could not find package $2]); fi ]) From 02c624802c90e5ebd13e303d49666f9bae6e0667 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 11 May 2013 13:45:58 +0200 Subject: [PATCH 2/6] acinclude: fix variable expansion issues Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/edbe92bf0c630e600b3de5e558012dee2126b387 Author: Stefan Seyfried Date: 2013-05-11 (Sat, 11 May 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 664b0c8cd..e50254329 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -82,21 +82,33 @@ check_path () { ]) +dnl expand nested ${foo}/bar +AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2" + for __CNT in false false false false true; do dnl max 5 levels of indirection + + $1=`eval echo "$__$1"` + echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable + __$1="${$1}" + done + $__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand +]) + AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[ AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[ _$2=$withval if test "$TARGET" = "cdk"; then - $2=`eval echo "$TARGET_PREFIX$withval"` + $2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO else $2=$withval fi TARGET_$2=${$2} ],[ - $2="\${$3}$5" + # RFC 1925: "you can always add another level of indirection..." + TUXBOX_EXPAND_VARIABLE($2,"${$3}$5") if test "$TARGET" = "cdk"; then - _$2=`eval echo "${target$3}$5"` + TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5") else - _$2=`eval echo "${$3}$5"` + _$2=${$2} fi TARGET_$2=$_$2 ]) From 58f77a1311bcd6ad94d83d575e016306b3bf9555 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 22 Oct 2016 11:50:38 +0200 Subject: [PATCH 3/6] fix Makefiles to include SIGC_CFLAGS now that the framebuffer class includes libsigc++, the path to it must be known to all parts using framebuffer.h Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/944a4e4ecd51c9412c55870f8d4d344ebcb48a27 Author: Stefan Seyfried Date: 2016-10-22 (Sat, 22 Oct 2016) ------------------ This commit was generated by Migit --- lib/libdvbsub/Makefile.am | 1 + lib/libtuxtxt/Makefile.am | 1 + src/zapit/src/Makefile.am | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am index 6ac627d08..aa9082181 100644 --- a/lib/libdvbsub/Makefile.am +++ b/lib/libdvbsub/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/zapit/include \ @AVFORMAT_CFLAGS@ \ + @SIGC_CFLAGS@ \ @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am index 7ea232ad1..5d24e483e 100644 --- a/lib/libtuxtxt/Makefile.am +++ b/lib/libtuxtxt/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/zapit/include \ $(FREETYPE_CFLAGS) \ + @SIGC_CFLAGS@ \ @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index a1dac17bc..0130f3a8a 100644 --- a/src/zapit/src/Makefile.am +++ b/src/zapit/src/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/xmltree \ @FREETYPE_CFLAGS@ \ + @SIGC_CFLAGS@ \ @HWLIB_CFLAGS@ noinst_LIBRARIES = libzapit.a From 91b1329bd5d146e01500b78e5b1f3086fc43e485 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 26 Jan 2015 13:52:56 +0100 Subject: [PATCH 4/6] make curl and freetype2 detection crosscompile-friendly Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a40b58fa20e03245fd5a69c968e6c74c6f55eacd Author: Stefan Seyfried Date: 2015-01-26 (Mon, 26 Jan 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f4d28a7ba..bac79fa15 100644 --- a/configure.ac +++ b/configure.ac @@ -89,8 +89,16 @@ fi AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) -TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) -TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) +TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) +TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2) +# 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) +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) +fi TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) From 8fe91d62727f5b2f17fc7d6f2fd980adf24586e9 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 23 Oct 2016 17:43:16 +0200 Subject: [PATCH 5/6] update_ext: fix build with glibc > 2.21 (open needs mode) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b46420506f7fa462b1a267e5bb5ed1bb7e6535a1 Author: Stefan Seyfried Date: 2016-10-23 (Sun, 23 Oct 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/update_ext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/update_ext.cpp b/src/gui/update_ext.cpp index c946c89b5..3e6246d36 100644 --- a/src/gui/update_ext.cpp +++ b/src/gui/update_ext.cpp @@ -324,7 +324,7 @@ bool CExtUpdate::applySettings() fd2 = -1; int tmpCount = 0; while (fd2 < 0) { - fd2 = open(mtdBlockFileName.c_str(), O_WRONLY); + fd2 = open(mtdBlockFileName.c_str(), O_WRONLY, 00644); tmpCount++; if (tmpCount > 3) break; @@ -375,7 +375,7 @@ bool CExtUpdate::applySettings() if (fd1 < 0) return ErrorReset(RESET_UNLOAD | DELETE_MTDBUF, "cannot read mtdBlock"); fsize = mtdRamSize; - fd2 = open(imgFilename.c_str(), O_WRONLY | O_CREAT); + fd2 = open(imgFilename.c_str(), O_WRONLY | O_CREAT, 00644); if (fd2 < 0) return ErrorReset(RESET_UNLOAD | CLOSE_FD1 | DELETE_MTDBUF, "cannot open image file: ", imgFilename); while(fsize > 0) { From d346268eb9155d1c4b6d644c3012aab5acbf4f5d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 23 Oct 2016 17:45:58 +0200 Subject: [PATCH 6/6] channellist: fix linking without --enable-pip Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/830b5c2aa75e833afc994774f52b1f32b0493ecc Author: Stefan Seyfried Date: 2016-10-23 (Sun, 23 Oct 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 5bb4f06ef..c6c9bafa3 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1080,10 +1080,12 @@ bool CChannelList::checkLockStatus(neutrino_msg_data_t data, bool pip) out: if (startvideo) { if(pip) { +#ifdef ENABLE_PIP if (CNeutrinoApp::getInstance()->StartPip((*chanlist)[selected]->getChannelID())) { calcSize(); paintBody(); } +#endif } else g_RemoteControl->startvideo(); return true;