mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,584 Commits 1 Branch 51 Tags
8c45b2eea6a71522ef89ebbc4beb51aabe72d2eb
Commit Graph

546 Commits

Author SHA1 Message Date
Jacek Jendrzej
8c45b2eea6 Merge branch 'master' into pu/mp 2017-08-21 13:13:03 +02:00
vanhofen
c307ed5b36 - hw_caps: remove CFEManager-code; ... 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
 2017-08-21 12:56:00 +02:00
Jacek Jendrzej
0238049daf part from 382181e289ac990fa1bc69ec528b8c25be6c6537 2017-08-21 10:57:18 +02:00
Stefan Seyfried
e2db590797 Revert "- hardware_caps: fix has_fan and add detection of Neo Twin" 
This reverts commit c225c2d4b6.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.
 2017-08-21 10:17:05 +02:00
M. Liebmann
542626c0da Merge branch 'master' into pu/mp 2017-06-29 15:06:39 +02:00
M. Liebmann
a6344b3527 lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to 7aec84d 2017-06-29 15:05:30 +02:00
Jacek Jendrzej
8b89baa7a2 Merge branch 'master' into pu/mp 2017-06-26 22:22:07 +02:00
Jacek Jendrzej
7aec84d124 lib/libtuxtxt/tuxtxt.cpp avoid segfault, FIXME 2017-06-26 11:53:59 +02:00
Jacek Jendrzej
d612fbc05f Merge branch 'master' into pu/mp 2017-06-18 12:21:18 +02:00
M. Liebmann
e3cc6cee67 Revert "HD1: Workaround for missing cs_get_chip_type" 
This reverts commit a6fe60d60a.
 2017-06-16 19:33:29 +02:00
Jacek Jendrzej
4c3002cb26 Merge branch 'master' into pu/mp 2017-06-15 12:32:31 +02:00
svenhoefer
4295839526 - vfd-setup: fix brightness setup for CST's boxmodel "Link" ... 
and hide the brightness menu for all "Trinity" models. There's no display.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-15 01:01:55 +02:00
Jacek Jendrzej
ca83324763 Merge branch 'master' into pu/mp 2017-06-07 16:20:47 +02:00
M. Liebmann
624f2b3154 Merge branch 'pu/fb-setmode' 2017-06-07 14:18:01 +02:00
M. Liebmann
a6fe60d60a HD1: Workaround for missing cs_get_chip_type 2017-06-07 14:16:11 +02:00
Jacek Jendrzej
3fe94beaa4 Merge branch 'master' into pu/mp 2017-04-24 22:39:33 +02:00
M. Liebmann
1852183fa6 Merge branch 'master' into pu/fb-setmode 2017-04-24 22:35:45 +02:00
M. Liebmann
6a08685b57 lib/libtuxtxt/Makefile.am: Fix FREETYPE_CFLAGS 2017-04-24 22:34:51 +02:00
svenhoefer
404e609553 Merge branch 'master' into pu/mp 2017-03-31 17:41:29 +02:00
M. Liebmann
9e08f4cb92 lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2 2017-03-28 23:56:57 +02:00
M. Liebmann
5e00bc5b4c Merge branch 'master' into pu/fb-setmode 2017-03-28 21:54:01 +02:00
svenhoefer
b945336a79 - jsoncpp: update to current version 1.8.0 
Use amalgamated src from https://github.com/open-source-parsers/jsoncpp
 2017-03-28 21:23:10 +02:00
svenhoefer
78e519f694 Revert "- jsoncpp: update to current version 1.8.0; align Makefile.am" 
This reverts commit 760a64fc6a, because
some people has build-problems.
 2017-03-28 21:10:27 +02:00
svenhoefer
760a64fc6a - jsoncpp: update to current version 1.8.0; align Makefile.am 
Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp
 2017-03-28 11:22:41 +02:00
svenhoefer
b1ba85c8c1 Merge branch 'master' into pu/mp 
Conflicts:
	acinclude.m4
 2017-03-22 12:16:01 +01:00
M. Liebmann
0cac85205b Merge branch 'master' into pu/fb-setmode 2017-03-22 01:24:03 +01:00
M. Liebmann
9bc2d9b95e hd[1|2]/libcoolstream: Update headers for new libcoolstream functions 
libcoolstream-mt.so version 3.2.0 required

  Functions:
    - updateOsdScreenInfo()
    - GetVideoSystem()
    - GetVideoSystemFormatName()
    - fbCopy()
    - fbFill()
    - cs_set_extra_debug()
 2017-03-22 01:23:45 +01:00
svenhoefer
b12624d1fa Merge branch 'master' into pu/mp 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
 2017-03-20 01:31:51 +01:00
M. Liebmann
2ca9d9c4f9 Merge branch 'master' into pu/fb-setmode 2017-03-19 08:38:15 +01:00
svenhoefer
c225c2d4b6 - hardware_caps: fix has_fan and add detection of Neo Twin 2017-03-19 01:04:48 +01:00
svenhoefer
8bdb16cec6 Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
 2017-03-13 16:14:33 +01:00
M. Liebmann
87cb1b514a Merge branch 'master' into pu/fb-setmode 2017-03-10 15:38:15 +01:00
svenhoefer
ff6046bb56 - hardware_caps: just changes in comments 2017-03-10 15:07:52 +01:00
svenhoefer
24b159f84c - hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines 2017-03-10 15:07:52 +01:00
svenhoefer
7cca1e02c3 - hardware_caps: use define instead of value; better readability 2017-03-10 15:07:52 +01:00
svenhoefer
83de4ba055 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()" 
This reverts commit f5cdaff282
because libcoolstream now is updated
 2017-03-10 15:07:52 +01:00
M. Liebmann
5e09df1d91 Merge branch 'master' into pu/fb-setmode 2017-03-10 14:50:04 +01:00
M. Liebmann
ab6ca5b606 hd2/libcoolstream/*.h: Update for new libcoolstream functions 
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - Add CS_CHIP_NEVIS definitions
 2017-03-10 14:35:32 +01:00
M. Liebmann
7eecd09eca hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions 
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - cs_get_chip_type() (dummy function for compatibility with hd2)
 - Add CS_CHIP_xxx definitions
 2017-03-10 14:35:32 +01:00
M. Liebmann
fee5cd0175 Merge branch 'master' into pu/fb-setmode 2017-03-09 17:34:42 +01:00
M. Liebmann
f5cdaff282 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type() 2017-03-09 17:34:25 +01:00
M. Liebmann
94492c4271 Merge branch 'master' into pu/fb-setmode 2017-03-09 15:17:25 +01:00
svenhoefer
b546ed517e - hardware_caps: add latest coolstream models 2017-03-09 12:51:44 +01:00
M. Liebmann
7ad59776d1 Merge branch 'master' into pu/fb-setmode 2017-03-08 00:35:16 +01:00
Stefan Seyfried
6f1cfd42bb Merge remote-tracking branch 'tuxbox/master' 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
bfa589eb08 make neutrino compatible with new ffmpeg 2017-03-07 15:00:17 +01:00
M. Liebmann
bab10ee438 Merge branch 'master' into pu/fb-setmode 2017-03-06 22:06:38 +01:00
svenhoefer
2029a684e5 - move public libcoolstream-headers to hardware directory 2017-03-06 21:49:32 +01:00
svenhoefer
29fd05002f - port hardware_caps from Neutrino-MP 2017-03-06 21:49:32 +01:00
Jacek Jendrzej
e10cb00613 subpagetable is unsigned 2017-03-06 15:50:06 +01:00