Commit Graph

289 Commits

Author SHA1 Message Date
vanhofen
a8f82523dc acinclude/configure: show defaults
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8084c1d050
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-09 (Sat, 09 Dec 2017)

Origin message was:
------------------
- acinclude/configure: show defaults

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

------------------
This commit was generated by Migit
2017-12-09 13:01:37 +01:00
vanhofen
1dcf5eb187 configure: cleanup from commented code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c9ff581f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)

Origin message was:
------------------
- configure: cleanup from commented code

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

------------------
This commit was generated by Migit
2017-12-07 13:08:51 +01:00
vanhofen
d03566ee68 acinclude/configure: unify usage of AS_HELP_STRING(); minor format changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: f4b775b7b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)

Origin message was:
------------------
- acinclude/configure: unify usage of AS_HELP_STRING(); minor format changes

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

------------------
This commit was generated by Migit
2017-12-07 13:08:51 +01:00
vanhofen
fb776aa040 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 255927207b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-17 15:23:30 +01:00
Jacek Jendrzej
676d353bc5 add dependency to libswscale for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 541edc7514
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-17 (Fri, 17 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-17 14:45:12 +01:00
vanhofen
e815d5dfd4 configure.ac: align package name
Origin commit data
------------------
Branch: ni/coolstream
Commit: e612dae6b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- configure.ac: align package name

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

------------------
This commit was generated by Migit
2017-11-03 17:46:57 +01:00
Thilo Graf
a094b7e4fc update version to 3.6.1
start up AX/Mut@nt hd51 support


Origin commit data
------------------
Branch: ni/coolstream
Commit: 83655f78d6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



------------------
This commit was generated by Migit
2017-11-02 21:49:25 +01:00
Thilo Graf
397ebefc67 update version to 3.6.0
Prepared for multiplatform builds


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7922af575
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)



------------------
This commit was generated by Migit
2017-10-17 20:45:00 +02:00
Thilo Graf
5f29c788a7 Merge branch 'pu/mp' into 'master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-17 20:38:58 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
Thilo Graf
5426b516a8 update version to 3.5.1
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd99913d9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 12:16:17 +02:00
vanhofen
c5d81a62c4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)



------------------
This commit was generated by Migit
2017-09-07 16:41:06 +02:00
vanhofen
72d164d89d add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a1aeb3038
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start

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

------------------
This commit was generated by Migit
2017-08-31 08:59:06 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
vanhofen
e341deaadf configure.ac: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2458f9b89d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- configure.ac: fix merge error

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

------------------
This commit was generated by Migit
2017-06-07 15:28:53 +02:00
vanhofen
48db0bd94c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 15:14:51 +02:00
Michael Liebmann
8d55020df7 configure.ac: bump revision to 3.5.0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 45f915dd39
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 14:19:11 +02:00
vanhofen
1ab3418721 supplement to 27fb8a8db8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e9f516f5a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- supplement to 27fb8a8db8

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

------------------
This commit was generated by Migit
2017-06-06 00:23:04 +02:00
vanhofen
dd4501697b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



------------------
This commit was generated by Migit
2017-05-16 15:28:08 +02:00
vanhofen
91a37cf840 configure.ac: increase version to 3.40
Origin commit data
------------------
Branch: ni/coolstream
Commit: cade9ead98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- configure.ac: increase version to 3.40

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

------------------
This commit was generated by Migit
2017-05-16 15:26:20 +02:00
vanhofen
7994a9d2e1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f16d4b86d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:42:55 +02:00
vanhofen
6dcbf7453b Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 404e609553
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:41:29 +02:00
vanhofen
5c0f53bc08 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 940429c18a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-30 23:21:39 +02:00
vanhofen
156d43cedb neutrino: add fribidi support; ported from mohousch's nhd2
This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ffcb1ec609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)

Origin message was:
------------------
- neutrino: add fribidi support; ported from mohousch's nhd2

This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.


------------------
This commit was generated by Migit
2017-03-30 23:14:11 +02:00
vanhofen
4a4762935b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)



------------------
This commit was generated by Migit
2017-03-26 23:25:43 +02:00
vanhofen
b75146ea53 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c2ac42384
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)



------------------
This commit was generated by Migit
2017-03-22 14:32:42 +01:00
vanhofen
4ce21cbc1d Merge branch 'master' into pu/mp
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: b1ba85c8c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)



------------------
This commit was generated by Migit
2017-03-22 12:16:01 +01:00
Stefan Seyfried
949306bfed acinclude: remove old unused cruft
remove:
- unused boxtypes, these only give a false sense of support
- unused configure options and associated #defines in config.h
- unused confiugre check macros


Origin commit data
------------------
Branch: ni/coolstream
Commit: 216a774343
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)



------------------
This commit was generated by Migit
2017-03-22 12:11:26 +01:00
vanhofen
be7245daf0 configure.ac: align to tuxbox code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d56f091b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
- configure.ac: align to tuxbox code

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

------------------
This commit was generated by Migit
2017-03-17 12:15:20 +01:00
vanhofen
26e23762ca Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:45:02 +01:00
Jacek Jendrzej
59ae844e46 enable SCREENSHOT for generic
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf126eb761
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 19:10:35 +01:00
Stefan Seyfried
587fa7d77a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 19:43:06 +01:00
vanhofen
aa805890c7 fix last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19e994f0fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- fix last merge

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

------------------
This commit was generated by Migit
2017-03-06 23:11:30 +01:00
vanhofen
09e19facfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:40:18 +01:00
vanhofen
6d8078cf73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:07:52 +01:00
vanhofen
ca1ebd7eb2 configure.ac: remove duplicated code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3c3d3760c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- configure.ac: remove duplicated code

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
a60fcac65b move public libcoolstream-headers to hardware directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- move public libcoolstream-headers to hardware directory

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
c8efd4141c port hardware_caps from Neutrino-MP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 16:55:39 +01:00
Michael Liebmann
a7cdb2e024 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
------------------
Branch: ni/coolstream
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"


------------------
This commit was generated by Migit
2017-02-28 09:56:51 +01:00
vanhofen
2623c0d848 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)



------------------
This commit was generated by Migit
2017-02-26 00:45:36 +01:00
Stefan Seyfried
ba84b4493a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d9d81d448
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-15 20:26:44 +01:00
vanhofen
b838e4a638 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/fb_accel.h
	src/driver/fb_accel_glfb.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/gui/bookmarkmanager.cpp
	src/gui/epgview.h
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/gui/widget/buttons.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f312e1d00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 23:50:14 +01:00
vanhofen
afda007d95 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
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
4ac4e963ad 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
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Stefan Seyfried
416d98504a Merge remote-tracking branch 'tuxbox/pu/fb-modules'
only compile tested ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:29:10 +01:00
Michael Liebmann
ed047027d1 configure.ac: bump revision to 3.4.2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73e710a917
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 17:29:30 +01:00
Michael Liebmann
9b465b3b50 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 09:24:08 +01:00
Michael Liebmann
e8b36a1d80 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +01:00