Stefan Seyfried
3a728f9ee1
Makefiles: simplify includes for libcoolstream/libstb-hal
2013-11-11 21:51:08 +01: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
5091e920fc
Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
2013-10-17 04:22:49 +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
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
d3d2efe475
Makefiles.am: add conditional include for libcoolstream
2013-01-11 14:17:16 +04:00
Stefan Seyfried
af6881a53c
tuxtxt: use neutrino rcinput
2012-11-02 19:11:38 +01:00
Stefan Seyfried
ae1b98aa38
Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
...
This is the last commit before the "menu hints" started.
Needs buildfixing...
Conflicts:
configure.ac
src/daemonc/remotecontrol.cpp
src/daemonc/remotecontrol.h
src/driver/audiodec/basedec.cpp
src/driver/fb_window.cpp
src/driver/rcinput.cpp
src/driver/volume.cpp
src/global.h
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/plugins.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/neutrino.cpp
src/sectionsd/dmx.cpp
src/sectionsd/dmxapi.cpp
src/sectionsd/sectionsd.cpp
src/system/setting_helpers.cpp
src/zapit/include/zapit/client/zapittypes.h
src/zapit/include/zapit/frontend_c.h
src/zapit/include/zapit/satconfig.h
src/zapit/include/zapit/scan.h
src/zapit/lib/zapitclient.cpp
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/pmt.cpp
src/zapit/src/scan.cpp
src/zapit/src/sdt.cpp
src/zapit/src/zapit.cpp
2012-07-23 01:02:29 +02:00
micha-bbg
f36ee26d87
* Add missing $(top_builddir) to Makefile.am
2012-04-27 16:54:01 +01:00
Stefan Seyfried
6f5e4238cc
libneutrino-hal is now libstb-hal
2012-04-17 19:33:52 +02:00
Stefan Seyfried
c8a561244e
enable usage of a separately built replacement of libtriple
...
In order to improve portability, libtriple will be split off and
built separately as "libneutrino-hal" (for hardware abstraction layer)
Enable the makefiles to deal with that.
2012-04-17 19:33:52 +02:00
[CST] Bas
b04b3f270a
lib: fix compile after include change.
2012-03-04 15:53:33 +08:00
seife
3259f26dfe
tuxtxt: fix config file saving
...
tuxtxt does not need the config file, but it needs the *directory*
$(CONFIGDIR)/tuxtxt
Since tuxtxt is no longer standalone, moving the config into main
neutrino.conf would be better, but for now (and in order to not
invalidate all the docs) just create the directory during installation.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1862 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-18 06:56:27 +00:00
seife
e69a204e73
neutrino: align tuxtxt defaults with config file
...
Let the code use the same defaults as are in the config file,
so that installing the config file is no longer necessary.
This makes for easier packaging of neutrino.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1829 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-05 17:10:03 +00:00
seife
5d0acf2341
libtuxtxt uses freetype, so we need the CFLAGS...
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1285 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-11 21:46:50 +00:00
seife
2590adfe15
add generic dispatcher headers for frontend etc
...
add generic audio, video and demux headers in zapit/include (TODO: put them
into a better place, or put wrappers into lib directories) that automatically
dispatch to the hardware specific functions and use them in the code
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@962 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-25 17:43:28 +00:00
seife
d7f56e6dcc
tuxtxt: install config file (currently empty)
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@230 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-31 10:39:55 +00:00
focus
2444fc5f58
More hacks about subtitles...
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@189 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-20 14:10:54 +00:00
mrcolor
bc5bd4154e
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-08 11:05:11 +00:00
