Commit Graph

82 Commits

Author SHA1 Message Date
vanhofen
18770d7215 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f989a3625
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)



------------------
This commit was generated by Migit
2017-03-31 17:47:29 +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
fb73c5ab06 acinclude.m4: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0e7145f37
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)

Origin message was:
------------------
- acinclude.m4: fix merge error

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

------------------
This commit was generated by Migit
2017-03-23 19:00:57 +01:00
vanhofen
8ddf5d35ce acinclude.m4: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c0d135a1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
- acinclude.m4: fix merge error

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

------------------
This commit was generated by Migit
2017-03-22 15:32:58 +01: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
vanhofen
e2401e81d1 acinclude.m4: remove more old unused cruft
I don't know if CC/CXX-handling is right, but powerpc-tuxbox-linux-gnu
was definitely wrong.


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

Origin message was:
------------------
- acinclude.m4: remove more old unused cruft

I don't know if CC/CXX-handling is right, but powerpc-tuxbox-linux-gnu
was definitely wrong.


------------------
This commit was generated by Migit
2017-03-22 12:11:26 +01:00
vanhofen
e7fc4f07e2 acinclude.m4: align to neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ff55dd47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
- acinclude.m4: align to neutrino-mp

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

------------------
This commit was generated by Migit
2017-03-22 12:11:26 +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
Michael Liebmann
160599210d Merge branch 'master' into pu/mp
Conflicts:
 src/driver/screenshot.cpp
 src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e4678c6d4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/mp

Conflicts:
   src/driver/screenshot.cpp
   src/Makefile.am


------------------
This commit was generated by Migit
2017-03-17 12:34:28 +01:00
vanhofen
c37d8ac675 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1337e53425
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)



------------------
This commit was generated by Migit
2017-03-17 09:20:14 +01:00
vanhofen
87c7eeeb3c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4
	src/Makefile.am


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



------------------
This commit was generated by Migit
2017-03-16 22:29:22 +01:00
vanhofen
60ebad8e33 acinclude.m4: remove unused --enable-tmsdk switch; ...
There's so much more unused and outdated stuff :/


Origin commit data
------------------
Branch: ni/coolstream
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 :/


------------------
This commit was generated by Migit
2017-03-16 21:12:01 +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
3b3c8d975b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:59 +01:00
vanhofen
7e6242f666 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:31 +01:00
Stefan Seyfried
900788509e 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
------------------
Branch: ni/coolstream
Commit: f94f960e85
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)



------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
Stefan Seyfried
890fe307e0 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
------------------
Branch: ni/coolstream
Commit: b10cd6a973
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)



------------------
This commit was generated by Migit
2017-02-19 11:30:11 +01:00
vanhofen
6bb52f0731 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
------------------
Branch: ni/coolstream
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 22:54:00 +01:00
vanhofen
5708ad998c 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
------------------
Branch: ni/coolstream
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 21:52:59 +01:00
Michael Liebmann
78a5a4a658 Merge branch 'master' into pu/fb-setmode
Fix merge conflict


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
2017-02-14 20:11:08 +01:00
Stefan Seyfried
32120b3599 acinclude: only set default model to hd1 if boxtype=coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 62ee5185b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-14 20:01:55 +01:00
vanhofen
e67e33d323 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-13 23:29:07 +01:00
vanhofen
315955cc0d 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
------------------
Branch: ni/coolstream
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
2017-02-13 21:41:04 +01:00
Michael Liebmann
4211cb9d8e 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
Stefan Seyfried
28545cce78 acinclude: only set default model to hd1 if boxtype=coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80c961d5f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-13 00:03:58 +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
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
Stefan Seyfried
94d677b18c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-11 11:18:45 +01:00
vanhofen
c80102a917 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
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00
vanhofen
40162cdc5d acinclude.m4: align to tuxbox code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96bc77775e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)

Origin message was:
------------------
- acinclude.m4: align to tuxbox code

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

------------------
This commit was generated by Migit
2017-02-09 09:13:19 +01:00
vanhofen
b67368c624 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 08:35:14 +01:00
GetAway
602434236c make the webtv directory configurable
Origin commit data
------------------
Branch: ni/coolstream
Commit: a62d5b7c8e
Author: GetAway <get-away@t-online.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 08:22:43 +01:00
vanhofen
e5916b320c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 12:57:58 +01:00
vanhofen
58192b2280 acinclude.m4: fix WEBTVDIR
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a0c196513
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- acinclude.m4: fix WEBTVDIR

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

------------------
This commit was generated by Migit
2016-11-06 20:52:14 +01:00
vanhofen
06167cc8d0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 21:57:00 +02:00
Stefan Seyfried
02c624802c acinclude: fix variable expansion issues
Origin commit data
------------------
Branch: ni/coolstream
Commit: edbe92bf0c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)


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

------------------
This commit was generated by Migit
2016-10-23 17:19:43 +02:00
Stefan Seyfried
85859e33f3 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: 4d4dad4536
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-27 (Sat, 27 Apr 2013)



------------------
This commit was generated by Migit
2016-10-23 17:19:30 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
ca5c4b00d7 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
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02:00
Michael Liebmann
a47f07e7c6 Move definions for WEBTVDIR[_VAR] directories to configure
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32aed1162f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-01 (Sat, 01 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-01 11:49:40 +02:00
vanhofen
134a82959d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/global.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 005bd91ea9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)



------------------
This commit was generated by Migit
2016-10-01 11:04:00 +02:00
Michael Liebmann
bfe4f08ef7 Move definitions for '*_VAR' directories to configure
Origin commit data
------------------
Branch: ni/coolstream
Commit: 281930c35d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-30 (Fri, 30 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-30 05:58:17 +02:00
Stefan Seyfried
bd9c058bcd acinclude: fix DVB_API_VERSION check for gcc5
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f69a433ad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-11-15 (Sun, 15 Nov 2015)


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

------------------
This commit was generated by Migit
2015-12-31 11:44:04 +01:00
Stefan Seyfried
323f839572 acinclude: get rid of old nokia dvb API
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b337ee530
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-11-15 (Sun, 15 Nov 2015)


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

------------------
This commit was generated by Migit
2015-12-31 11:44:04 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Stefan Seyfried
07da0b4263 acinclude: fix DVB_API_VERSION check for gcc5
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6bc7e4e6fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-11-15 (Sun, 15 Nov 2015)


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

------------------
This commit was generated by Migit
2015-11-15 11:45:12 +01:00