possibility to build with libstb_hal_ddt

diff --git a/Makefile b/Makefile
index 50db26b1f9ee173c33651e1680cb99d6325170eb..fd0f7acaac547de636c736bd17053c466983f617 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,7 @@ update-git-coolstream:
 
 update-git-armbox:
        $(MAKE) $(GIT_LIBSTB_HAL)
+       $(MAKE) $(GIT_LIBSTB_HAL_DDT)
 #      $(MAKE) $(GIT_BOOTLOADER)
 #      $(MAKE) $(GIT_DRIVERS)
 #      $(MAKE) $(GIT_KERNEL_HD51)
@@ -195,6 +196,7 @@ prerequisites-coolstream:
 prerequisites-armbox:
        $(MAKE) $(SOURCE_DIR)/neutrino-hd
        $(MAKE) $(GIT_LIBSTB_HAL)
+       $(MAKE) $(GIT_LIBSTB_HAL_DDT)
 #      $(MAKE) $(GIT_BOOTLOADER)
 #      $(MAKE) $(GIT_DRIVERS_THIRDPARTY)
 #      $(MAKE) $(GIT_DRIVERS)

diff --git a/doc/config.example b/doc/config.example
index caadf83e041fd90675a0f90ee43ea9d3a87c64cc..5545f011750d0a43dbc8f481abd145e0f8a5342d 100755 (executable)
--- a/doc/config.example
+++ b/doc/config.example
@@ -55,6 +55,10 @@ CST_DRIVER_VERSION=master
 # CST_FFMPEG_VERSION=ffmpeg-3.3
 CST_FFMPEG_VERSION=ffmpeg-3.3
 
+# chosse one of the following library-stb-hal; default: libstb_hal_tuxbox
+# LIB_HAL_SOURCE=libstb_hal_tuxbox
+# LIB_HAL_SOURCE=libstb_hal_ddt
+
 ###########################################################################################
 ### SYSTEMTOOLS
 ###########################################################################################

diff --git a/make/environment.mk b/make/environment.mk
index 1c14d91844ec649b15e01568b5a6f724bc70c645..251127189d5037165823c0614eb824f3091268cd 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -8,6 +8,7 @@ CROSS_BUILD_DIR = $(CROSS_BUILD_VERSION:-tls=)
 DEBUG          ?= "no"
 SKEL_ROOT_DIR  ?= ""
 PLUGIN_PATH    ?= ""
+LIB_HAL_SOURCE ?= "libstb_hal_tuxbox"
 
 ARCHIVE      = $(BASE_DIR)/download
 PATCHES      = $(BASE_DIR)/archive-patches
@@ -109,6 +110,7 @@ else
   $(error $(BOXTYPE) BOXMODEL $(BOXMODEL) not supported)
 endif
 
+
 ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream armbox))
   BOXARCH = arm
 endif
@@ -224,6 +226,7 @@ SVNCO ?= $(SVN) co http://tuxcode.svn.sourceforge.net/svnroot/tuxcode
 
 #CSGIT ?= git://git.coolstreamtech.de
 CSGIT ?= git://github.com/tuxbox-neutrino
+DDTGIT ?= git://github.com/Duckbox-Developers
 
 NTGIT ?= git://novatux.git.sourceforge.net/gitroot/novatux
 
@@ -236,6 +239,7 @@ REPO_GUI_YWEB = gui-yweb.git
 #REPO_LIBRARY_DVBSI = library-dvbsi.git
 #REPO_LIBRARY_FFMPEG_CST = library-ffmpeg-cst.git
 REPO_LIBSTB_HAL = library-stb-hal.git
+REPO_LIBSTB_HAL_DDT = libstb-hal-ddt.git
 REPO_KERNEL_CST = linux-kernel-cst.git
 REPO_PLUGIN_BLOCKADS = plugin-blockads.git
 REPO_PLUGIN_COOLITSCLIMAX = plugin-cooliTSclimax.git
@@ -257,6 +261,7 @@ REPO_PLUGINS = plugins.git # (Enthält Submodules)
 
 # some usefull folders
 GIT_LIBSTB_HAL         = $(SOURCE_DIR)/git/LIBSTB_HAL
+GIT_LIBSTB_HAL_DDT     = $(SOURCE_DIR)/git/LIBSTB_HAL_DDT
 GIT_BOOTLOADER         = $(SOURCE_DIR)/git/BOOTLOADER
 GIT_DRIVERS_THIRDPARTY = $(SOURCE_DIR)/git/DRIVERS_THIRDPARTY
 GIT_DRIVERS            = $(SOURCE_DIR)/git/DRIVERS

diff --git a/make/multimedia.mk b/make/multimedia.mk
index dff31e0c31b21115f34cac2e7f4820d050ff916b..9d219226744e76d5c48d7b018c709bf0a0141f93 100755 (executable)
--- a/make/multimedia.mk
+++ b/make/multimedia.mk
@@ -144,7 +144,7 @@ $(D)/libsdl-mixer: $(D)/libsdl $(ARCHIVE)/SDL_mixer-1.2.11.tar.gz | $(TARGETPREF
        $(REMOVE)/SDL_mixer-1.2.11
        $(TOUCH)
 
-$(D)/alsa-lib: $(ARCHIVE)/alsa-lib-$(ALSA_LIB_VER).tar.bz2
+$(D)/alsa-lib: $(ARCHIVE)/alsa-lib-$(ALSA_LIB_VER).tar.bz2 | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/alsa-lib-$(ALSA_LIB_VER).tar.bz2
        set -e; cd $(BUILD_TMP)/alsa-lib-$(ALSA_LIB_VER); \

diff --git a/make/neutrino.mk b/make/neutrino.mk
index e8f106ab980c2c6415da84ce9b6ebc9c1035d033..e3086d2609c92fe404fc6ec2f908546d21e91295 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -61,7 +61,12 @@ N_BUILDENV = \
 
 # finally we can build outside of the source directory
 NEUTRINO_OBJDIR = $(BUILD_TMP)/neutrino-hd
-LH_OBJDIR = $(BUILD_TMP)/LIBSTB_HAL
+
+ifeq ($(LIB_HAL_SOURCE), libstb_hal_ddt)
+       LH_OBJDIR = $(BUILD_TMP)/LIBSTB_HAL_DDT
+else
+       LH_OBJDIR = $(BUILD_TMP)/LIBSTB_HAL
+endif
 
 AUDIODEC = ffmpeg
 
@@ -144,7 +149,11 @@ $(NEUTRINO_OBJDIR)/config.status: $(D)/neutrino-hd-libs $(NEUTRINO_DEPS)
 
 $(LH_OBJDIR)/config.status: $(LH_DEPS)
        rm -rf $(LH_OBJDIR)
-       tar -C $(SOURCE_DIR)/git -cp LIBSTB_HAL --exclude-vcs | tar -C $(BUILD_TMP) -x;
+       if [ $(LIB_HAL_SOURCE) = "libstb_hal_ddt" ]; then \
+               tar -C $(SOURCE_DIR)/git -cp LIBSTB_HAL_DDT --exclude-vcs | tar -C $(BUILD_TMP) -x; \
+       else \
+               tar -C $(SOURCE_DIR)/git -cp LIBSTB_HAL --exclude-vcs | tar -C $(BUILD_TMP) -x; \
+       fi;
        pushd $(LH_OBJDIR) && \
                ./autogen.sh && \
                \

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index 0cc6be193da73ed790a7b0e3c5f4d59276bddaab..b51b374f27119b3fa7a59ac4d83daef232802442 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -54,6 +54,20 @@ $(GIT_LIBSTB_HAL):
                        git checkout mpx; \
                fi
 
+$(GIT_LIBSTB_HAL_DDT):
+       mkdir -p $(SOURCE_DIR)/git
+       cd $(SOURCE_DIR)/git && \
+               if [ -d $(GIT_LIBSTB_HAL_DDT)/ ]; then \
+                       cd $(GIT_LIBSTB_HAL_DDT) && \
+                       git pull origin master; \
+                       cd $(BASE_DIR); \
+                       $(MAKE) libstb-hal-clean; \
+               else \
+                       cd $(SOURCE_DIR)/git; \
+                       git clone $(DDTGIT)/$(REPO_LIBSTB_HAL_DDT) LIBSTB_HAL_DDT; \
+                       cd $(GIT_LIBSTB_HAL_DDT); \
+               fi
+
 $(GIT_BOOTLOADER):
        mkdir -p $(SOURCE_DIR)/git
        cd $(SOURCE_DIR)/git && \
@@ -127,6 +141,7 @@ $(GIT_PLUGINS):
 # hack to make sure they are always copied
 PHONY += $(SOURCE_DIR)/neutrino-hd
 PHONY += $(GIT_LIBSTB_HAL)
+PHONY += $(GIT_LIBSTB_HAL_DDT)
 PHONY += $(GIT_BOOTLOADER)
 PHONY += $(GIT_DRIVERS_THIRDPARTY)
 PHONY += $(GIT_DRIVERS)