Commit Graph

100 Commits

Author SHA1 Message Date
vanhofen
4319451ff9 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ed73077c19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-28 (Sat, 28 Jan 2017)
2017-01-28 12:32:09 +01:00
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
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
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
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
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
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
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
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
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
Thilo Graf
2dbbd10ce7 configure: move option enable testmenu to enable testing
Testing is also plausible for general usage of other tests or other
experimental code parts.


Origin commit data
------------------
Commit: 201a6aa56e
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-19 (Fri, 19 Sep 2014)
2014-09-25 11:01:17 +04:00
Thilo Graf
303e0e88e8 configure: add libsigc++ support
Origin commit data
------------------
Commit: 6e126bd74d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-07-29 (Tue, 29 Jul 2014)
2014-09-25 10:58:13 +04: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
Thilo Graf
afb44fe375 configure: add libbluray support into configure
It may happen that the build process aborts if this lib is not
expilzit specified, although this lib is not used directly
by neutrino.
It seems to be dependent of build environment, and should be understand
as a prevention.


Origin commit data
------------------
Commit: f2bfa22159
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
2014-03-03 08:54:09 +01:00
gixxpunk
84577152ea rewrite Lua handling
* depend pkg checks on enable-lua switch
* define STATIC_LUAPOSIX in case of static lua build to exclude unwanted
code in neutrino
* remove DYNAMIC_LUAPOSIX code as it's not needed in case of dynamic lua
build


Origin commit data
------------------
Commit: 4b6d2d310c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2014-01-25 (Sat, 25 Jan 2014)

Origin message was:
------------------
- rewrite Lua handling

* depend pkg checks on enable-lua switch
* define STATIC_LUAPOSIX in case of static lua build to exclude unwanted
code in neutrino
* remove DYNAMIC_LUAPOSIX code as it's not needed in case of dynamic lua
build
2014-01-25 21:17:06 +01:00
Michael Liebmann
2056b4ed80 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
2014-01-21 17:05:24 +01:00
Stefan Seyfried
ad9a584052 configure: try to autodetect lualib
Origin commit data
------------------
Commit: 966c7f1379
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)
2014-01-19 20:57:37 +01:00
[CST] Focus
e86e6a4b23 configure.ac: add --enable-ffmpegdec option to switch between old decoders and ffmpeg decoder
Origin commit data
------------------
Commit: 64e2a0c2ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
2013-12-15 14:46:45 +04:00
martii
a8f5b925e9 driver/audiodec: Switch to ffmpeg, drop custom decoder implementations, drop libvorbis/libmad/libid3/libogg/libflac. Not fully regression tested.
Conflicts:
	configure.ac
	src/Makefile.am
	src/driver/audiodec/Makefile.am


Origin commit data
------------------
Commit: d5ea074457
Author: martii <m4rtii@gmx.de>
Date: 2013-10-19 (Sat, 19 Oct 2013)
2013-12-15 14:40:53 +04:00
Stefan Seyfried
abe49faabb fix cleantargets
Origin commit data
------------------
Commit: f04bfbdd88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-13 10:38:42 +01:00