mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,055 Commits 2 Branches 9 Tags
6bda6dbce7de482555fd87d91cd624a1b049f97c
Commit Graph

198 Commits

Author SHA1 Message Date
Michael Liebmann
2674a44fe5 configure.ac: Fix freetype check 
- Supplement for commit 2602f6c122


Origin commit data
------------------
Commit: 220c50eebf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
 2017-01-28 09:31:47 +01:00
vanhofen
53c811be8e Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8b6265c2a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:08 +01:00
Michael Liebmann
2602f6c122 configure.ac: Check freetype version >= 2.5.0 
Origin commit data
------------------
Commit: 33283d77bd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
 2017-01-26 18:26:28 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
 2017-01-22 22:59:39 +01:00
vanhofen
992b7b6980 bump neutrino version to 3.30 
Origin commit data
------------------
Commit: d97261772c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- bump neutrino version to 3.30
 2016-12-19 17:55:15 +01:00
vanhofen
5c391a82b8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 14:12:33 +01:00
vanhofen
1f85db63a9 configure.ac: sort Makefiles alphabetically 
Origin commit data
------------------
Commit: 48d0c1321d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- configure.ac: sort Makefiles alphabetically
 2016-12-15 14:00:45 +01:00
vanhofen
0a874ca762 yWeb: move data from /src to /data 
Origin commit data
------------------
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
 2016-12-15 14:00:45 +01:00
vanhofen
c29c3fc07f fix last commit 
Origin commit data
------------------
Commit: 9bcdd3487a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- fix last commit
 2016-12-07 11:24:30 +01:00
vanhofen
b50cceee20 icons: move NI icons into categorized subdirectories 
Origin commit data
------------------
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
 2016-12-07 11:14:14 +01:00
vanhofen
7e0aeb835f 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
------------------
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 10:55:25 +01:00
vanhofen
d2f4ae06e2 icons: move icons into categorized subdirectories 
Origin commit data
------------------
Commit: d5ca9aa0bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move icons into categorized subdirectories
 2016-12-07 10:36:47 +01:00
vanhofen
9a073920a3 configure.ac: change package name/version 
Origin commit data
------------------
Commit: 1530291023
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- configure.ac: change package name/version
 2016-12-05 10:54:11 +01:00
Stefan Seyfried
e4103adb9e configure: fix package name 
Origin commit data
------------------
Commit: 50790498b1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:26:45 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
vanhofen
cc7ad7ce1a 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
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
Thilo Graf
887bc80d84 prepare revision, bump version to 3.4.0 
Origin commit data
------------------
Commit: 4e3d2c854b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)
 2016-11-18 18:17:10 +01:00
vanhofen
2a64edef4f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 23:43:57 +01:00
Stefan Seyfried
24d2ccfea6 make sure the private dvb headers are used on coolstream 
Origin commit data
------------------
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 20:30:14 +01:00
vanhofen
9eae77e776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 10:06:31 +02:00
Stefan Seyfried
0897cd1c24 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
------------------
Commit: b8cf8167f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-20 (Thu, 20 Oct 2016)
 2016-10-24 10:00:51 +02: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
2dc1461e12 make curl and freetype2 detection crosscompile-friendly 
Origin commit data
------------------
Commit: a40b58fa20
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2016-10-23 17:24:07 +02:00
Stefan Seyfried
adee2844ce configure: remove unused LIBCS_* variables 
(forward ported neutrino-mp commit 45b4bb0488d)


Origin commit data
------------------
Commit: f6d09bd0ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 12:23:05 +02:00
Stefan Seyfried
07a1df57f1 remove obsolete embedded libtriple 
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
(forward ported neutrino-mp commit 2158fee441)


Origin commit data
------------------
Commit: 57078ed23d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 12:19:06 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
Stefan Seyfried
576ef77919 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
------------------
Commit: 4cb5245546
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-20 (Thu, 20 Oct 2016)
 2016-10-20 09:11:39 +02:00
vanhofen
57dd1c7712 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:41:28 +02:00
Thilo Graf
b0c0c3bd05 Moviebrowser: start outsourcing moviebrowser code 
Origin commit data
------------------
Commit: 64053c1758
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
 2016-09-06 11:32:41 +02:00
vanhofen
b71499ce2e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 22e12bdfa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-05 (Mon, 05 Sep 2016)
 2016-09-05 23:53:07 +02:00
Michael Liebmann
bd039291bd Add alternative variant for the display of __FILE__ (__path_file__) 
- __path_file__ includes the relevant parts of source path


Origin commit data
------------------
Commit: 92a88906a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)
 2016-09-05 23:46:01 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Stefan Seyfried
dfc1d459bb configure: remove unused LIBCS_* variables 
Origin commit data
------------------
Commit: 45b4bb0488
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 16:46:14 +01:00
vanhofen
69c265b382 configure.ac: remove $(top_srcdir)/src/zapit/include/private 
Stuff like this maybe is better included in ADDITIONAL_CFLAGS or so.


Origin commit data
------------------
Commit: 06778d42c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)

Origin message was:
------------------
- configure.ac: remove $(top_srcdir)/src/zapit/include/private

Stuff like this maybe is better included in ADDITIONAL_CFLAGS or so.
 2016-01-14 23:53:56 +01:00
Stefan Seyfried
2b00b2936c zapit/debug: remove filename hack with a more elegant one 
Origin commit data
------------------
Commit: 54e1d3eecb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
df903525f5 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd 
Origin commit data
------------------
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)

Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
e10ab96f49 zapit/debug: remove filename hack with a more elegant one 
Origin commit data
------------------
Commit: 2ee9ca5471
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 18:33:27 +01:00
Stefan Seyfried
f7bb2a8e13 configure: remove redundant section 
One of the last merges introduced duplicate Lua config sections. Just
use the standard one (but turn lua support on by default).


Origin commit data
------------------
Commit: 0a07aa2acd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
 2016-01-01 16:00:33 +01:00
Stefan Seyfried
0222346c9a Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
 2016-01-01 14:10:48 +01:00
Stefan Seyfried
4fad676f6d define LUA_COMPAT_5_2 to allow build with newer lua versions 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Commit: dbad3b069a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 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
14b9082d1b define LUA_COMPAT_5_2 to allow build with newer lua versions 
Origin commit data
------------------
Commit: 565e5ff3ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 13:56:56 +01:00
Michael Liebmann
6cef9d09fb CLuaInstance: Move luainstance into a separate directory (src/gui/lua) 
- Move video functions from luainstance.cpp to lua_video.cpp
 - For the future, provided the individual classes
 (eg menu, CComponents etc.) to move in separate files.


Origin commit data
------------------
Commit: 464f929437
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)

Origin message was:
------------------
CLuaInstance: Move luainstance into a separate directory (src/gui/lua)

 - Move video functions from luainstance.cpp to lua_video.cpp
 - For the future, provided the individual classes
  (eg menu, CComponents etc.) to move in separate files.
 2015-12-08 12:01:25 +01:00
Jacek Jendrzej
c5e24e6410 eitd: add and move viasat to extra switch 
Origin commit data
------------------
Commit: fceeab4027
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-09 (Sun, 09 Aug 2015)
 2015-08-09 18:00:13 +02:00
Jacek Jendrzej
519b645c1d audioplayer: -add flv format (THX Houdini) 
Origin commit data
------------------
Commit: 29aa47aef0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-27 (Mon, 27 Jul 2015)
 2015-07-27 12:40:41 +02:00
FlatTV
e90d1aebcc add lib/jsoncpp v0.10.2 
use amalgamated source and header based on version 0.10.2
 See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md


Origin commit data
------------------
Commit: 76e26c0b98
Author: FlatTV <FlatTV@gmx.de>
Date: 2015-06-01 (Mon, 01 Jun 2015)

Origin message was:
------------------
- add lib/jsoncpp v0.10.2

 use amalgamated source and header based on version 0.10.2
 See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md
 2015-06-01 12:36:15 +02:00
vanhofen
e22449fb3f src/nhttpd/tuxboxapi: remove unused dbox code 
Origin commit data
------------------
Commit: e59f8adccc
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- src/nhttpd/tuxboxapi: remove unused dbox code
 2015-05-06 22:59:04 +02:00
Jacek Jendrzej
787fc5ebda add pugixml 
Origin commit data
------------------
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
 2015-04-28 10:12:23 +02:00
Stefan Seyfried
98fe56c38b Merge remote-tracking branch 'test/cst-next' 
Origin commit data
------------------
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)
 2015-03-07 20:09:44 +01:00
vanhofen
35bae7820a yWeb: hopefully the last fix for f0ad744 
Origin commit data
------------------
Commit: b1b45f6029
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-01 (Sun, 01 Mar 2015)

Origin message was:
------------------
- yWeb: hopefully the last fix for f0ad744
 2015-03-01 21:31:28 +01:00