Commit Graph

329 Commits

Author SHA1 Message Date
vanhofen
6709af371b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 684f444f52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-03 (Fri, 03 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-03 13:24:38 +01:00
Stefan Seyfried
c4c6ac0881 configure.ac: use pkg-config to check freetype version
the PKG_CHECK_MODULES macro allows to check for a version -- use it
instead of homegrown TUXBOX_APPS_LIB_PKGCONFIG

Signed-off-by: M. Liebmann <git@tuxcode.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ca807e34a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)



------------------
This commit was generated by Migit
2017-02-02 14:34:34 +01:00
vanhofen
f7ad8c74e7 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/framebuffer_ng.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-02 13:12:54 +01:00
vanhofen
659e55fd39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
2017-02-02 13:10:10 +01:00
Stefan Seyfried
1b5fc6b12f configure.ac: use pkg-config to check freetype version
the PKG_CHECK_MODULES macro allows to check for a version -- use it
instead of homegrown TUXBOX_APPS_LIB_PKGCONFIG


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



------------------
This commit was generated by Migit
2017-02-01 22:07:10 +01:00
Stefan Seyfried
b887345480 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-01 22:03:40 +01:00
Michael Liebmann
d2668ef219 configure.ac: bump revision to 3.4.1
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9d6133765
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 17:15:17 +01:00
vanhofen
e72ba5d052 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	src/gui/screensaver.cpp
	src/gui/volumebar.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:48:40 +01:00
Michael Liebmann
1de4cfa9c5 configure.ac: Check freetype version >= 2.5.0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86c3b08533
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
vanhofen
9290240f66 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa6cac3836
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-30 16:33:02 +01:00
vanhofen
8f0542c377 configure.ac: fix native build
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef78979165
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)

Origin message was:
------------------
- configure.ac: fix native build

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

------------------
This commit was generated by Migit
2017-01-30 14:18:31 +01:00
Michael Liebmann
64ff06def7 Revert "configure.ac: Fix freetype check"
This reverts commit 46cf08e884.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a84b07ee86
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
2017-01-30 07:15:12 +01:00
vanhofen
d9a8d365f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:32:04 +01:00
vanhofen
c16bc1f968 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed73077c19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-28 (Sat, 28 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-28 12:32:09 +01:00
Michael Liebmann
46cf08e884 configure.ac: Fix freetype check
- Supplement for commit 7f78259dc6


Origin commit data
------------------
Branch: ni/coolstream
Commit: 220c50eebf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)



------------------
This commit was generated by Migit
2017-01-28 09:31:47 +01:00
vanhofen
f70f7df777 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-27 18:49:24 +01:00
vanhofen
01da122686 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b6265c2a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-27 18:49:08 +01:00
Michael Liebmann
7f78259dc6 configure.ac: Check freetype version >= 2.5.0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33283d77bd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-26 18:26:28 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
vanhofen
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +01:00
vanhofen
ae4716c5bc bump neutrino version to 3.30
Origin commit data
------------------
Branch: ni/coolstream
Commit: d97261772c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- bump neutrino version to 3.30

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

------------------
This commit was generated by Migit
2016-12-19 17:55:15 +01:00
vanhofen
421080e258 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c47a38c87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 15:06:21 +01:00
vanhofen
42a7ef830b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 14:12:33 +01:00
vanhofen
8f24b9a3a4 configure.ac: sort Makefiles alphabetically
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48d0c1321d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- configure.ac: sort Makefiles alphabetically

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

------------------
This commit was generated by Migit
2016-12-15 14:00:45 +01:00
vanhofen
8ac19456e1 yWeb: move data from /src to /data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29847283ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- yWeb: move data from /src to /data

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

------------------
This commit was generated by Migit
2016-12-15 14:00:45 +01:00
vanhofen
a6d2a92aa9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ead60b3fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-07 12:35:53 +01:00
vanhofen
c98eab8e52 fix last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bcdd3487a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- fix last commit

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

------------------
This commit was generated by Migit
2016-12-07 11:24:30 +01:00
vanhofen
1244d7f99a icons: move NI icons into categorized subdirectories
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ada0f42ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move NI icons into categorized subdirectories

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

------------------
This commit was generated by Migit
2016-12-07 11:14:14 +01:00
vanhofen
e3154ef43b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/Makefile.am
	data/icons/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)



------------------
This commit was generated by Migit
2016-12-07 10:55:25 +01:00
vanhofen
ffcdb41b84 icons: move icons into categorized subdirectories
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5ca9aa0bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move icons into categorized subdirectories

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

------------------
This commit was generated by Migit
2016-12-07 10:36:47 +01:00
vanhofen
43e7aa77b2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 20:46:37 +01:00
vanhofen
5feb35309f configure.ac: change package name/version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1530291023
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- configure.ac: change package name/version

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

------------------
This commit was generated by Migit
2016-12-05 10:54:11 +01:00
Stefan Seyfried
3cbd0716f4 configure: fix package name
Origin commit data
------------------
Branch: ni/coolstream
Commit: 50790498b1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 18:26:45 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Thilo Graf
898f86b97e prepare revision, bump version to 3.4.0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e3d2c854b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-18 18:17:10 +01:00
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00
vanhofen
70d2c535ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 23:43:57 +01:00
Stefan Seyfried
0f5446036c make sure the private dvb headers are used on coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-16 20:30:14 +01:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
f23c56ed95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 10:06:31 +02:00
Stefan Seyfried
07f447e0f9 configure: fix short-filename logic
if configure was not called from absolute path, detection
would fail and huge filenames would be included in binary
(noticed in yocto krogoth release)


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



------------------
This commit was generated by Migit
2016-10-24 10:00:51 +02: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
91b1329bd5 make curl and freetype2 detection crosscompile-friendly
Origin commit data
------------------
Branch: ni/coolstream
Commit: a40b58fa20
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)


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

------------------
This commit was generated by Migit
2016-10-23 17:24:07 +02:00
Stefan Seyfried
3c48c06dd2 configure: remove unused LIBCS_* variables
(forward ported neutrino-mp commit 45b4bb0488d)


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



------------------
This commit was generated by Migit
2016-10-23 12:23:05 +02:00
Stefan Seyfried
43ac9473e5 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
(forward ported neutrino-mp commit 9fc6c24a21)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57078ed23d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)



------------------
This commit was generated by Migit
2016-10-23 12:19:06 +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
Stefan Seyfried
c0910d6be4 configure: fix short-filename logic
if configure was not called from absolute path, detection
would fail and huge filenames would be included in binary
(noticed in yocto krogoth release)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cb5245546
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-20 (Thu, 20 Oct 2016)



------------------
This commit was generated by Migit
2016-10-20 09:11:39 +02:00
vanhofen
d9d0455142 configure.ac: remove useless LIBCS-stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1c7f4587a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)

Origin message was:
------------------
- configure.ac: remove useless LIBCS-stuff

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

------------------
This commit was generated by Migit
2016-09-26 23:13:10 +02:00