mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,888 Commits 1 Branch 51 Tags
73f0c4b25ea9c65ee64a05f6ab8e374eb4b84eef
Commit Graph

188 Commits

Author SHA1 Message Date
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2014-04-27 19:14:06 +02:00
Thilo Graf
f2bfa22159 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.
 2014-03-03 08:54:09 +01:00
Stefan Seyfried
899837e003 lua: detect if static or dynamic linking is wanted 2014-01-26 01:25:06 +01:00
striper
4b6d2d310c - 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
Stefan Seyfried
5525e9f4b5 Revert "Add a --enable-lua switch to enable LUA support" 
This reverts commit 82d4832013.

This just makes the code unreadable and why would one build
without lua :-)
 2014-01-23 14:11:03 +01:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
 2014-01-23 14:08:37 +01:00
M. Liebmann
82d4832013 Add a --enable-lua switch to enable LUA support 2014-01-21 17:05:24 +01:00
Stefan Seyfried
966c7f1379 configure: try to autodetect lualib 2014-01-19 20:57:37 +01:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing
 2013-12-22 21:25:05 +01:00
[CST] Focus
64e2a0c2ad configure.ac: add --enable-ffmpegdec option to switch between old decoders and ffmpeg decoder 2013-12-15 14:46:45 +04:00
martii
d5ea074457 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
 2013-12-15 14:40:53 +04:00
Stefan Seyfried
06f233b288 configure: put buildinfo stuff in own config header 
...so there's no need to rebuild everything all the time
 2013-11-13 14:34:18 +01:00
Stefan Seyfried
548448456a Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
f04bfbdd88 fix cleantargets 2013-11-13 10:38:42 +01:00
Stefan Seyfried
3a728f9ee1 Makefiles: simplify includes for libcoolstream/libstb-hal 2013-11-11 21:51:08 +01:00
Michael Liebmann
4cf4857201 Add display of build info 
- Display compiler version, compiler flags, build PC, kernel version
- configure.ac part ported from filezilla project
 2013-11-11 00:20:09 +01:00
Stefan Seyfried
7fbbcbe9a4 fix cleantargets 2013-11-10 19:47:44 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
Thilo Graf
6f700d80c0 CTestMenu: add configure option --enable-testmenu 2013-11-05 13:22:28 +01:00
Stefan Seyfried
756080ba19 fix build when --with-stb-hal-build is given 2013-11-03 12:20:58 +01:00
Stefan Seyfried
6f174c2c26 allow empty --with-stb-hal-build path 2013-11-03 02:09:32 +01:00
[CST] Focus
7f01a5740d add libiw to build 2013-11-01 16:43:06 +04:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2013-10-21 22:58:55 +02:00
Michael Liebmann
2299807e11 src/system/mtdutils: Add and patch makefiles 2013-09-27 06:44:34 +02:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
 2013-07-06 19:01:15 +02:00
[CST] Focus
33bc58915a add initial Astra 19e settings to install 2013-06-28 16:12:33 +04:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
Michael Liebmann
d74ce0da45 * Software update: Add flash.start to neutrino start/stop scripts 2013-06-08 16:20:32 +02:00
Stefan Seyfried
862fb0aada configure: remove linker hacks, now that libstb-hal is fixed 2013-06-01 13:56:41 +02:00
Stefan Seyfried
0c3c93e7db configure: try to autodetect lualib 2013-05-27 13:36:50 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
e388b08dfe neutrino: remove glthread, use GLFramebuffer instead 
now that libstb-hal provides an easy to use virtual framebuffer,
use it instead of the glthread implementation.
 2013-05-04 13:07:52 +02:00
Stefan Seyfried
79184569fc 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.
 2013-04-27 22:02:02 +02:00
[CST] Focus
8bb70d1ab3 Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
5ad0b6b6dc Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp
 2013-04-06 11:21:55 +02:00
Thilo Graf
98b3265719 Data files: add license files 
Avoids hard coded parts e.g. for use mainly in image info.
 2013-03-18 12:05:01 +01:00
Stefan Seyfried
d2d8218885 remove obsolete embedded libtriple 
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
 2013-03-06 17:23:46 +01:00
[CST] Focus
57cdcd8379 configure.ac: add enable-pip option 2013-03-05 18:33:52 +04:00
[CST] Focus
026592e8fe Merge branch 'dvbsi++' into next 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2013-02-28 16:39:34 +04:00
Stefan Seyfried
5b72a7fe3c make the extupdate build conditional 
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure
 2013-02-22 17:14:38 +01:00
Thilo Graf
0a961a4cf6 CComponents: move class into its own source directory 
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.
 2013-02-19 11:27:46 +01:00
Thilo Graf
f3f347bdb3 CComponents: move class into its own source directory 
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.
 2013-02-16 12:13:24 +01:00
[CST] Focus
6724414335 configure.ac: always define HAVE_COOLSTREAM_NEVIS_IR_H, ifdef in rcinput.h decide what to include 2013-01-30 11:16:24 +04:00
[CST] Bas
ee169288a5 neutrino: add multiple paths so they can be configured and not be hard-coded in 
multiple files.
 2013-01-29 01:18:38 +08:00
[CST] Focus
18380c2e94 configure.ac: change tests for apollo headers 2013-01-11 14:00:25 +04:00
Stefan Seyfried
acfd623d02 fix nevis_ir.h check and libcoolstream/hwcaps 2012-12-30 21:36:44 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
micha-bbg
b1138e16b0 * Fix include path for moved header files 2012-12-13 18:09:09 +01:00
[CST] Bas
cdcd42ea8a neutrino: use pkgconfig for OGG. 2012-12-04 00:24:46 +08:00
[CST] Bas
a806919b8c neutrino: add data to the make file so they get installed properly. 2012-11-13 12:46:20 +08:00