From: Markham <markham001@gmx.de>
Date: Thu, 25 Oct 2018 12:42:18 +0000 (+0200)
Subject: possibility to build with libstb_hal_ddt
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=628f8b59a023f8857796d0ccc57a8bc8e29079ec;p=bs-cst-neutrino-hd.git

possibility to build with libstb_hal_ddt
---

diff --git a/Makefile b/Makefile
index 50db26b..fd0f7ac 100755
--- 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 caadf83..5545f01 100755
--- 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 1c14d91..2511271 100755
--- 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 dff31e0..9d21922 100755
--- 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 e8f106a..e3086d2 100755
--- 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 0cc6be1..b51b374 100755
--- 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)