vanhofen
fe4c1bcdb6
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/Makefile.am
Origin commit data
------------------
Commit: 1337e53425
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-03-17 (Fri, 17 Mar 2017)
2017-03-17 09:20:14 +01:00
vanhofen
3ab316026b
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
acinclude.m4
src/Makefile.am
Origin commit data
------------------
Commit: 195c22fffa
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-03-16 (Thu, 16 Mar 2017)
2017-03-16 22:29:22 +01:00
vanhofen
1f913b6ec7
acinclude.m4: remove unused --enable-tmsdk switch; ...
...
There's so much more unused and outdated stuff :/
Origin commit data
------------------
Commit: 93e22163e9
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-03-16 (Thu, 16 Mar 2017)
Origin message was:
------------------
- acinclude.m4: remove unused --enable-tmsdk switch; ...
There's so much more unused and outdated stuff :/
2017-03-16 21:12:01 +01:00
vanhofen
68e2832f96
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/Makefile.am
src/neutrino.cpp
Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 16:55:39 +01:00
Michael Liebmann
5173230337
configure: --enable-libcoolstream-static
...
--with-libcoolstream-static-dir= for path to static libcoolstream
Example for neutrino.mk:
N_CONFIG_OPTS += --enable-libcoolstream-static
# path for static libcoolstream
N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib"
Origin commit data
------------------
Commit: 544b8c76b3
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-20 (Mon, 20 Feb 2017)
Origin message was:
------------------
configure: --enable-libcoolstream-static
--with-libcoolstream-static-dir= for path to static libcoolstream
Example for neutrino.mk:
N_CONFIG_OPTS += --enable-libcoolstream-static
# path for static libcoolstream
N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib"
2017-02-28 09:56:51 +01:00
vanhofen
59b2a3b072
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-21 (Tue, 21 Feb 2017)
2017-02-21 15:14:59 +01:00
vanhofen
25f833735d
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-21 (Tue, 21 Feb 2017)
2017-02-21 15:14:31 +01:00
Stefan Seyfried
caef43db36
acinclude: move AC_SYS_LARGEFILE after AC_CANONICAL_*
...
no idea why, but detection of 64bit largefile flags fails otherwise in
some setups
Origin commit data
------------------
Commit: f94f960e85
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-19 (Sun, 19 Feb 2017)
2017-02-21 06:38:48 +01:00
vanhofen
25046a4627
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
lib/libtuxtxt/tuxtxt.cpp
lib/libtuxtxt/tuxtxt.h
src/driver/screenshot.cpp
src/neutrino.cpp
Origin commit data
------------------
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 22:54:00 +01:00
vanhofen
298fdbfe36
Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
lib/libtuxtxt/tuxtxt.cpp
lib/libtuxtxt/tuxtxt.h
src/driver/fb_generic.h
Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 21:52:59 +01:00
Michael Liebmann
15c81625d6
Merge branch 'master' into pu/fb-setmode
...
Fix merge conflict
Origin commit data
------------------
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:11:08 +01:00
Stefan Seyfried
2823bb29b6
acinclude: only set default model to hd1 if boxtype=coolstream
...
Origin commit data
------------------
Commit: 62ee5185b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-14 20:01:55 +01:00
vanhofen
ca916b849c
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/driver/fb_generic.cpp
src/neutrino.cpp
Origin commit data
------------------
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 23:29:07 +01:00
vanhofen
8704cb914a
Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/osd_setup.cpp
src/neutrino.cpp
src/neutrino.h
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:04 +01:00
Michael Liebmann
c96eccb348
configure: Add macro ENABLE_CHANGE_OSD_RESOLUTION
...
- macro is default for hd2
- macro can activated for other hardware by
configure option --enable-reschange
Origin commit data
------------------
Commit: 9497a3c43a
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
configure: Add macro ENABLE_CHANGE_OSD_RESOLUTION
- macro is default for hd2
- macro can activated for other hardware by
configure option --enable-reschange
2017-02-13 12:51:14 +01:00
vanhofen
ba302de46b
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/Makefile.am
src/gui/imageinfo_ni.cpp
src/gui/movieplayer.cpp
src/gui/update.cpp
src/gui/videosettings.cpp
src/system/setting_helpers.cpp
Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:17:17 +01:00
vanhofen
5df8b0409e
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/fonts/Makefile.am
src/gui/cam_menu.cpp
src/gui/update.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
61ccbe74d9
configure: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
configure parameter: --with-boxmodel=hd1
--with-boxmodel=nevis is deprecated, but still valid
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
configure parameter: --with-boxmodel=hd2
--with-boxmodel=apollo is deprecated, but still valid
Origin commit data
------------------
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
configure parameter: --with-boxmodel=hd1
--with-boxmodel=nevis is deprecated, but still valid
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
configure parameter: --with-boxmodel=hd2
--with-boxmodel=apollo is deprecated, but still valid
2017-02-12 09:21:04 +01:00
vanhofen
c4de218cb2
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
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
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 13:19:03 +01:00
vanhofen
85046c3249
acinclude.m4: align to tuxbox code
...
Origin commit data
------------------
Commit: 96bc77775e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
Origin message was:
------------------
- acinclude.m4: align to tuxbox code
2017-02-09 09:13:19 +01:00
vanhofen
49762424a6
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 08:35:14 +01:00
GetAway
21345ecf59
make the webtv directory configurable
...
Origin commit data
------------------
Commit: a62d5b7c8e
Author: GetAway <get-away@t-online.de >
Date: 2017-02-07 (Tue, 07 Feb 2017)
2017-02-09 08:22:43 +01:00
vanhofen
398a5d8a2b
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-07 (Mon, 07 Nov 2016)
2016-11-07 12:57:58 +01:00
vanhofen
e95b9083a0
acinclude.m4: fix WEBTVDIR
...
Origin commit data
------------------
Commit: 3a0c196513
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-06 (Sun, 06 Nov 2016)
Origin message was:
------------------
- acinclude.m4: fix WEBTVDIR
2016-11-06 20:52:14 +01:00
vanhofen
da3d97b77e
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-23 (Sun, 23 Oct 2016)
2016-10-23 21:57:00 +02:00
Stefan Seyfried
185fa754bb
acinclude: fix variable expansion issues
...
Origin commit data
------------------
Commit: edbe92bf0c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-11 (Sat, 11 May 2013)
2016-10-23 17:19:43 +02:00
Stefan Seyfried
740e2b9257
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
------------------
Commit: 4d4dad4536
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-27 (Sat, 27 Apr 2013)
2016-10-23 17:19:30 +02:00
vanhofen
7220c6b265
Merge branch 'ni/cst-next' into ni/mp/cst-next
...
Conflicts:
acinclude.m4
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/epgplus.cpp
src/gui/plugins.cpp
src/gui/widget/listbox.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 17:27:55 +02:00
Michael Liebmann
ad7836f819
Move definions for WEBTVDIR[_VAR] directories to configure
...
Origin commit data
------------------
Commit: 32aed1162f
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-10-01 (Sat, 01 Oct 2016)
2016-10-01 11:49:40 +02:00
vanhofen
93a0de1cc1
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Conflicts:
src/global.h
Origin commit data
------------------
Commit: 005bd91ea9
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-01 (Sat, 01 Oct 2016)
2016-10-01 11:04:00 +02:00
Michael Liebmann
bdb6d1c998
Move definitions for '*_VAR' directories to configure
...
Origin commit data
------------------
Commit: 281930c35d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-09-30 (Fri, 30 Sep 2016)
2016-09-30 05:58:17 +02:00
Stefan Seyfried
5787034823
acinclude: fix DVB_API_VERSION check for gcc5
...
Origin commit data
------------------
Commit: 7f69a433ad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-11-15 (Sun, 15 Nov 2015)
2015-12-31 11:44:04 +01:00
Stefan Seyfried
bce1e79df2
acinclude: get rid of old nokia dvb API
...
Origin commit data
------------------
Commit: 9b337ee530
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-11-15 (Sun, 15 Nov 2015)
2015-12-31 11:44:04 +01:00
Stefan Seyfried
17880c4125
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
Stefan Seyfried
b45a94b32f
acinclude: fix DVB_API_VERSION check for gcc5
...
Origin commit data
------------------
Commit: 6bc7e4e6fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-11-15 (Sun, 15 Nov 2015)
2015-11-15 11:45:12 +01:00
Stefan Seyfried
96d951908f
acinclude: get rid of old nokia dvb API
...
Origin commit data
------------------
Commit: 462c584d5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-11-15 (Sun, 15 Nov 2015)
2015-11-15 11:43:18 +01:00
vanhofen
3429bd79b2
fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
...
Origin commit data
------------------
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-06 (Wed, 06 May 2015)
Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
2015-05-06 22:58:54 +02:00
vanhofen
d0f20f6de3
add and use LOCALEDIR variable; move LOCALEDIR_VAR to global.h
...
Origin commit data
------------------
Commit: 910497f762
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-06 (Wed, 06 May 2015)
Origin message was:
------------------
- add and use LOCALEDIR variable; move LOCALEDIR_VAR to global.h
2015-05-06 22:58:54 +02:00
vanhofen
66fb29fbbb
remove obsolete UCODEDIR variable
...
Origin commit data
------------------
Commit: abc145fa78
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-06 (Wed, 06 May 2015)
Origin message was:
------------------
- remove obsolete UCODEDIR variable
2015-05-06 22:58:54 +02:00
vanhofen
9ec97d366b
fix and use THEMESDIR variable; move THEMESDIR_VAR to global.h
...
Origin commit data
------------------
Commit: 51e77c3fc6
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-06 (Wed, 06 May 2015)
Origin message was:
------------------
- fix and use THEMESDIR variable; move THEMESDIR_VAR to global.h
2015-05-06 22:58:54 +02:00
vanhofen
5ab57ea72a
acinclude.m4: fix themesdir and iconsdir definitions
...
Origin commit data
------------------
Commit: e1fb4cdf49
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-05 (Tue, 05 May 2015)
Origin message was:
------------------
- acinclude.m4: fix themesdir and iconsdir definitions
2015-05-05 14:48:25 +02:00
Stefan Seyfried
ec1a9fce17
Merge remote-tracking branch 'check/cst-next'
...
needs build- and functional fixes
Conflicts:
configure.ac
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/english.locale
lib/libmd5sum/md5.c
src/driver/scanepg.cpp
src/driver/streamts.cpp
src/driver/vfd.cpp
src/driver/vfd.h
src/driver/volume.cpp
src/eitd/dmx.cpp
src/eitd/xmlutil.cpp
src/gui/Makefile.am
src/gui/audiomute.cpp
src/gui/channellist.cpp
src/gui/dboxinfo.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/keybind_setup.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/miscsettings_menu.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/osd_progressbar_setup.cpp
src/gui/osd_progressbar_setup.h
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/personalize.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/update_settings.cpp
src/gui/user_menue.cpp
src/gui/user_menue_setup.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/menue.h
src/gui/widget/progresswindow.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/setting_helpers.cpp
src/zapit/lib/zapitclient.cpp
src/zapit/src/fastscan.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/scan.cpp
src/zapit/src/scannit.cpp
src/zapit/src/scanpmt.cpp
src/zapit/src/transponder.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
martii
f0bcb0fa4d
lua: implement "luaclient".
...
This allows for starting Lua scripts in neutrino context from the
command line. Experimental, not fully regression-tested.
Origin commit data
------------------
Commit: 5d25185684
Author: martii <m4rtii@gmx.de >
Date: 2014-10-13 (Mon, 13 Oct 2014)
2014-10-14 10:27:37 +02:00
[CST] Bas
307a1bab7f
split fec to fec/modulation/delivery system;
...
switch to new dvb-api headers;
improve dvb-t manual scan
Origin commit data
------------------
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2014-08-08 (Fri, 08 Aug 2014)
2014-08-27 17:14:33 +04:00
gixxpunk
8b3a4a4bac
acinclude: fix typo
...
Origin commit data
------------------
Commit: f2e42f4026
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2013-10-20 (Sun, 20 Oct 2013)
Origin message was:
------------------
- acinclude: fix typo
2013-10-20 21:07:59 +02:00
Stefan Seyfried
d4168dd85b
add Raspberry Pi as 'boxtype'
...
Origin commit data
------------------
Commit: f98d40de2b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-10-10 (Thu, 10 Oct 2013)
2013-10-10 09:46:06 +02:00
Stefan Seyfried
2c2b4894cd
fix broken native build
...
Origin commit data
------------------
Commit: 6f0bf5e1e3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-07-14 (Sun, 14 Jul 2013)
2013-07-14 20:33:20 +02:00
Stefan Seyfried
6830b68cac
Merge branch 'check/next-cc'
...
again: it compiles, but is not really tested...
Conflicts:
acinclude.m4
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/osd_setup.cpp
src/gui/start_wizard.cpp
src/zapit/src/getservices.cpp
Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
vanhofen
09e6f924d9
yweb: re-introduce 'WebsiteMain.hosted_directory'
...
* this directory can be used to host some of your cracy stuff.
yhtm, yjs and ysh will also parsed now. it is reachable with
<boxip>/hosted/
* if exist a subdir named 'logos' in this directory you can use
this as an external logo-dir for yweb too
* path can be configured with '--with-hosted_httpddir=PATH'
Origin commit data
------------------
Commit: 9078775a0a
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-06-27 (Thu, 27 Jun 2013)
Origin message was:
------------------
- yweb: re-introduce 'WebsiteMain.hosted_directory'
* this directory can be used to host some of your cracy stuff.
yhtm, yjs and ysh will also parsed now. it is reachable with
<boxip>/hosted/
* if exist a subdir named 'logos' in this directory you can use
this as an external logo-dir for yweb too
* path can be configured with '--with-hosted_httpddir=PATH'
2013-06-27 12:20:29 +02:00
Stefan Seyfried
6b44e7ad3c
acinclude: don't require a targetprefix
...
Origin commit data
------------------
Commit: d84c0f68a1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 16:00:10 +02:00