Commit Graph

130 Commits

Author SHA1 Message Date
vanhofen
de887bc457 configure.ac: fix merge error
Origin commit data
------------------
Commit: 2458f9b89d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- configure.ac: fix merge error
2017-06-07 15:28:53 +02:00
vanhofen
5a9e9904a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 15:14:51 +02:00
Michael Liebmann
66f45a1be9 configure.ac: bump revision to 3.5.0
Origin commit data
------------------
Commit: 45f915dd39
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 14:19:11 +02:00
vanhofen
a9f6059ba2 supplement to a0ec4edf2e
Origin commit data
------------------
Commit: 2e9f516f5a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- supplement to a0ec4edf2e
2017-06-06 00:23:04 +02:00
vanhofen
aa49ad86ff configure.ac: increase version to 3.40
Origin commit data
------------------
Commit: cade9ead98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- configure.ac: increase version to 3.40
2017-05-16 15:26:20 +02:00
vanhofen
1f9ef0861f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 940429c18a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)
2017-03-30 23:21:39 +02:00
vanhofen
a95874932e neutrino: add fribidi support; ported from mohousch's nhd2
This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.


Origin commit data
------------------
Commit: ffcb1ec609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)

Origin message was:
------------------
- neutrino: add fribidi support; ported from mohousch's nhd2

This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.
2017-03-30 23:14:11 +02:00
vanhofen
3e0f8a63c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: 6c2ac42384
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
2017-03-22 14:32:42 +01:00
Stefan Seyfried
5338d08756 acinclude: remove old unused cruft
remove:
- unused boxtypes, these only give a false sense of support
- unused configure options and associated #defines in config.h
- unused confiugre check macros


Origin commit data
------------------
Commit: 216a774343
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
2017-03-22 12:11:26 +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
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
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
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
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
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
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
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
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