Commit Graph

18 Commits

Author SHA1 Message Date
Stefan Seyfried
6b44e7ad3c acinclude: don't require a targetprefix
Origin commit data
------------------
Commit: d84c0f68a1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 16:00:10 +02:00
Stefan Seyfried
d5213a070d acinclude: fix default paths and help texts
Origin commit data
------------------
Commit: cba717494e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 13:47:20 +02:00
Stefan Seyfried
bdf90eaec5 acinclude: fix variable expansion issues
Origin commit data
------------------
Commit: 474600ee2a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 13:45:58 +02:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
Stefan Seyfried
7837ef59d7 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.


Origin commit data
------------------
Commit: 79184569fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-27 (Sat, 27 Apr 2013)
2013-04-27 22:02:02 +02:00
Stefan Seyfried
001cfaa9bc acinclude: workaround for packages with empty FOO_CFLAGS
should probably be fixed differently but works for now ;-)


Origin commit data
------------------
Commit: b46a806cb9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:38:17 +02:00
Stefan Seyfried
8c6c5e3c5f fix exec_prefix for native build
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: aeb3ead6a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-12 17:25:56 +04:00
Stefan Seyfried
369ffd705e fix exec_prefix for native build
Origin commit data
------------------
Commit: 49d9ebf833
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 01:44:21 +01:00
[CST] Focus
3fe71fe637 acinclude.m4: set default box type to nevis
Origin commit data
------------------
Commit: 258d2b8666
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 14:28:07 +04:00
[CST] Bas
a310363ee8 neutrino: add multiple paths so they can be configured and not be hard-coded in
multiple files.


Origin commit data
------------------
Commit: ee169288a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)

Origin message was:
------------------
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
2499edf8fa acinclude.m4: add nevis/apollo box models
Origin commit data
------------------
Commit: bfa6c6e738
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 13:59:51 +04:00
[CST] Bas
6c09d2b3d3 neutrino: fix config file locations.
Origin commit data
------------------
Commit: e426104399
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
2012-11-13 12:45:17 +08:00
Stefan Seyfried
99895f0f41 neutrino: first preliminary support for AZbox ME
this is very experimental and depends on more fixes in
libstb-hal, but audio / video / OSD are basically working


Origin commit data
------------------
Commit: 2541edc918
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-27 21:18:19 +02:00
Stefan Seyfried
c41d28b7e5 use crosscompile-friendly AC_PATH_TOOL to find pkg-config
Origin commit data
------------------
Commit: 5634ee39f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-15 (Sun, 15 Apr 2012)
2012-04-17 19:34:00 +02:00
Stefan Seyfried
cda058b7b4 add boxtype 'spark'
Origin commit data
------------------
Commit: dbc40c4a80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-05 (Sun, 05 Feb 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
1cb03407cc fix wrong --prefix and DESTDIR usage (also needs buildsystem)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1029 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 2eb0338560
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-15 (Sat, 15 Jan 2011)
2011-01-15 17:27:57 +00:00
Stefan Seyfried
b5fe4cd89f Merge branch 'tmp'
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@763 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 982b28298a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-09-12 (Sun, 12 Sep 2010)
2010-09-12 16:13:53 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00