mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,915 Commits 2 Branches 9 Tags
d9fc0a4a98e2de36830d43b51fcace243b71befe
Commit Graph

210 Commits

Author SHA1 Message Date
vanhofen
ea38ceb799 configure.ac: align to tuxbox code 
Origin commit data
------------------
Commit: 2d56f091b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
- configure.ac: align to tuxbox code
 2017-03-17 12:15:20 +01:00
vanhofen
85fab3c019 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:45:02 +01:00
Jacek Jendrzej
d5872aa9e0 enable SCREENSHOT for generic 
Origin commit data
------------------
Commit: cf126eb761
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:10:35 +01:00
Stefan Seyfried
6d86f585cb Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:43:06 +01:00
vanhofen
1f3de3b531 fix last merge 
Origin commit data
------------------
Commit: 19e994f0fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- fix last merge
 2017-03-06 23:11:30 +01:00
vanhofen
3a863c91f0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:40:18 +01:00
vanhofen
fdda0de766 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:07:52 +01:00
vanhofen
a6b0409160 configure.ac: remove duplicated code 
Origin commit data
------------------
Commit: d3c3d3760c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- configure.ac: remove duplicated code
 2017-03-06 21:49:32 +01:00
vanhofen
97391211a4 move public libcoolstream-headers to hardware directory 
Origin commit data
------------------
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- move public libcoolstream-headers to hardware directory
 2017-03-06 21:49:32 +01:00
vanhofen
459cf4d8ea port hardware_caps from Neutrino-MP 
Origin commit data
------------------
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP
 2017-03-06 21:49:32 +01:00
vanhofen
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +01:00
Michael Liebmann
5173230337 configure: --enable-libcoolstream-static 
--with-libcoolstream-static-dir= for path to static libcoolstream

Example for neutrino.mk:
 N_CONFIG_OPTS += --enable-libcoolstream-static
 # path for static libcoolstream
 N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib"


Origin commit data
------------------
Commit: 544b8c76b3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)

Origin message was:
------------------
configure: --enable-libcoolstream-static

 --with-libcoolstream-static-dir= for path to static libcoolstream

Example for neutrino.mk:
 N_CONFIG_OPTS += --enable-libcoolstream-static
 # path for static libcoolstream
 N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib"
 2017-02-28 09:56:51 +01:00
vanhofen
4f4c656b55 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 00:45:36 +01:00
Stefan Seyfried
2369bc3cd6 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 1d9d81d448
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 20:26:44 +01:00
vanhofen
bad03fe56c Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/fb_accel.h
	src/driver/fb_accel_glfb.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/gui/bookmarkmanager.cpp
	src/gui/epgview.h
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/gui/widget/buttons.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8f312e1d00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:50:14 +01:00
vanhofen
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +01:00
Stefan Seyfried
c4cc5e62bb Merge remote-tracking branch 'tuxbox/pu/fb-modules' 
only compile tested ;-)


Origin commit data
------------------
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:29:10 +01:00
Michael Liebmann
455e997886 configure.ac: bump revision to 3.4.2 
Origin commit data
------------------
Commit: 73e710a917
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 17:29:30 +01:00
Michael Liebmann
3b018febe6 Merge branch 'master' into pu/fb-modules 
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 09:24:08 +01:00
Michael Liebmann
61ccbe74d9 configure: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 configure parameter: --with-boxmodel=hd1
 --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 configure parameter: --with-boxmodel=hd2
 --with-boxmodel=apollo is deprecated, but still valid


Origin commit data
------------------
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
  configure parameter: --with-boxmodel=hd1
  --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
  configure parameter: --with-boxmodel=hd2
  --with-boxmodel=apollo is deprecated, but still valid
 2017-02-12 09:21:04 +01:00
Stefan Seyfried
706a5ba010 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
 2017-02-11 11:18:45 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 08:02:39 +01:00
Stefan Seyfried
506b6c54d2 framebuffer/configure: remove unused --restore-prev-mode 
this is unused, untested and most likely not working at all


Origin commit data
------------------
Commit: c695ae8ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-07 18:38:44 +01:00
Stefan Seyfried
8b4c30e093 replace framebuffer.h include with forward declaration 
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01:00
vanhofen
44f0315213 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 582013faf2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-05 22:06:59 +01:00
Stefan Seyfried
3ae998de08 replace framebuffer.h include with forward declaration 
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: 63b6efd1f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-05 13:05:07 +01:00
Stefan Seyfried
40d45e44a3 add --enable-fastscan configure option 
The #define in src/gui/scan_setup.h did not work (undefining
ENABLE_FASTSCAN caused really strange side effects wrt background
scanning in standby mode), and all the unused code was still built.
With this configure option, people who really want this obscure feature
can enable it for their builds.


Origin commit data
------------------
Commit: 6525d1164a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-04 12:09:47 +01:00
Stefan Seyfried
58839565b3 framebuffer/configure: remove unused --restore-prev-mode 
this is unused, untested and most likely not working at all


Origin commit data
------------------
Commit: ffa3fdd6c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-04 11:35:05 +01:00
Michael Liebmann
2fd3b0e8da configure.ac: Fix freetype check 
Origin commit data
------------------
Commit: dccb6ba8f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-04 10:55:34 +01:00
vanhofen
61eb18580b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 684f444f52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-03 (Fri, 03 Feb 2017)
 2017-02-03 13:24:38 +01:00
Stefan Seyfried
e3cecf23e1 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
------------------
Commit: 2ca807e34a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
 2017-02-02 14:34:34 +01:00
vanhofen
fccd63624c 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
------------------
Commit: dd0237039d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:12:54 +01:00
vanhofen
59d037e5ea Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:10:10 +01:00
Stefan Seyfried
b899dea5b2 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
------------------
Commit: deaab224b9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
 2017-02-01 22:07:10 +01:00
Stefan Seyfried
f9341822cf Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
 2017-02-01 22:03:40 +01:00
Michael Liebmann
39fdfa9fdd configure.ac: bump revision to 3.4.1 
Origin commit data
------------------
Commit: a9d6133765
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
 2017-01-31 17:15:17 +01:00
vanhofen
550611ef8c 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
------------------
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)
 2017-01-31 16:48:40 +01:00
Michael Liebmann
686b809591 configure.ac: Check freetype version >= 2.5.0 
Origin commit data
------------------
Commit: 86c3b08533
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
 2017-01-31 16:36:42 +01:00
vanhofen
c64c3f48c6 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fa6cac3836
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 16:33:02 +01:00
vanhofen
149638164c configure.ac: fix native build 
Origin commit data
------------------
Commit: ef78979165
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)

Origin message was:
------------------
- configure.ac: fix native build
 2017-01-30 14:18:31 +01:00
Michael Liebmann
de641b0c55 Revert "configure.ac: Fix freetype check" 
This reverts commit 2674a44fe5.


Origin commit data
------------------
Commit: a84b07ee86
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 07:15:12 +01:00
vanhofen
b0faca6cc0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:32:04 +01:00
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
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +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