From ad5b3870cbd4cfa435d0e4738800c611e8c9b629 Mon Sep 17 00:00:00 2001 From: Markham Date: Fri, 29 Mar 2024 21:35:13 +0100 Subject: [PATCH] fix oscam build CST --- make/oscam.mk | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/make/oscam.mk b/make/oscam.mk index 0f7b7a9..d3e3d68 100644 --- a/make/oscam.mk +++ b/make/oscam.mk @@ -4,14 +4,9 @@ # ################################################################################ +OSCAM_VER = 11757 +OSCAM_EMU_PATCH = 3ae1a44 -ifeq ($(BOXMODEL),$(filter $(BOXMODEL),kronos kronos_v2)) -define OSCAM_FIXUP_MAX_COOL_DMX - $(SED) "s|^#define MAX_COOL_DMX.*|#define MAX_COOL_DMX 3|" $(PKG_BUILD_DIR)/module-dvbapi-coolapi.c - $(SED) "s|^#define MAX_COOL_DMX.*|#define MAX_COOL_DMX 3|" $(PKG_BUILD_DIR)/module-dvbapi-coolapi-legacy.c -endef -OSCAM_POST_PATCH_HOOKS += OSCAM_FIXUP_MAX_COOL_DMX -endif OSCAM_CONF_OPTS = \ --enable readers \ @@ -80,8 +75,6 @@ OSCAM_MAKE_OPTS += \ LIBDVBCSA_LIB=$(TARGETLIB)/libdvbcsa.a ifeq ($(BOXTYPE), coolstream) -OSCAM_DEPENDENCIES += coolstream-libs - # enable coolapi ifeq ($(BOXMODEL),nevis) OSCAM_MAKE_OPTS += \ @@ -92,9 +85,9 @@ OSCAM_MAKE_OPTS += \ endif endif + # https://github.com/oscam-emu/oscam-emu/commits/master OSCAM_EMU_GIT = https://github.com/oscam-emu/oscam-emu.git -OSCAM_EMU_PATCH = 3ae1a44 $(ARCHIVE)/oscam-emu-patch-$(OSCAM_EMU_PATCH).tar.bz2: | $(HOSTPREFIX)/bin/get-git-archive.sh get-git-archive.sh $(OSCAM_EMU_GIT) $(OSCAM_EMU_PATCH) $(notdir $@) $(ARCHIVE) @@ -106,7 +99,6 @@ oscam_emu_patch: $(ARCHIVE)/oscam-emu-patch-$(OSCAM_EMU_PATCH).tar.bz2 | $(TARGE TRUNKURL="https://svn.streamboard.tv/oscam/trunk" -OSCAM_VER=11757 oscam: oscam_emu_patch $(D)/libusb $(D)/openssl $(D)/libdvbcsa | $(TARGETPREFIX) $(START_BUILD) @@ -117,7 +109,13 @@ oscam: oscam_emu_patch $(D)/libusb $(D)/openssl $(D)/libdvbcsa | $(TARGETPREFIX) cp -r $(ARCHIVE)/oscam-svn $(BUILD_TMP)/oscam-svn set -e; cd $(BUILD_TMP)/oscam-svn; \ patch -p0 < $(BUILD_TMP)/oscam-emu-patch-$(OSCAM_EMU_PATCH)/oscam-emu.patch; \ + if [ "$(BOXMODEL)" = "kronos" -o "$(BOXMODEL)" = "kronos_v2" ]; then \ + sed -i -e "s|^#define MAX_COOL_DMX.*|#define MAX_COOL_DMX 3|" $(BUILD_TMP)/oscam-svn/module-dvbapi-coolapi.c; \ + sed -i -e "s|^#define MAX_COOL_DMX.*|#define MAX_COOL_DMX 3|" $(BUILD_TMP)/oscam-svn/module-dvbapi-coolapi-legacy.c; \ + fi; \ ./config.sh $(OSCAM_CONF_OPTS); \ - $(MAKE) $(OSCAM_MAKE_OPTS); - - + $(MAKE) $(OSCAM_MAKE_OPTS) + upx $(BUILD_TMP)/oscam-svn/Distribution/oscam* + cp -f $(BUILD_TMP)/oscam-svn/Distribution/oscam* $(BUILD_TMP) + $(REMOVE)/oscam-emu-patch-$(OSCAM_EMU_PATCH) + $(REMOVE)/oscam-svn -- 2.39.5