From: Markham <markham001@gmx.de>
Date: Sun, 7 Apr 2024 07:50:07 +0000 (+0200)
Subject: adapt to oscam gitlab
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=a81d75bf5c0409c9cf955d69d2932e6b65418043;p=bs-cst-neutrino-hd.git

adapt to oscam gitlab
---

diff --git a/make/oscam.mk b/make/oscam.mk
index 03b9d13..094c27a 100644
--- a/make/oscam.mk
+++ b/make/oscam.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-OSCAM_VER = 11760
+# 11760
+OSCAM_GIT = 2e0811d
 OSCAM_EMU_PATCH = 68a345a
 
 # https://github.com/oscam-emu/oscam-emu/commits/master
 OSCAM_EMU_GIT = "https://github.com/oscam-emu/oscam-emu.git"
-TRUNKURL = "https://svn.streamboard.tv/oscam/trunk"
+OSCAM_URL = "https://git.streamboard.tv/common/oscam.git"
 
 
 OSCAM_CONF_OPTS = \
@@ -104,15 +105,19 @@ oscam: oscam_emu_patch $(D)/libusb $(D)/openssl $(D)/libdvbcsa | $(TARGETPREFIX)
 	$(START_BUILD)
 	echo $(OSCAM_MAKE_OPTS)
 	$(REMOVE)/oscam-svn
-	svn checkout -r $(OSCAM_VER) $(TRUNKURL) $(ARCHIVE)/oscam-svn
-	svn revert -R $(ARCHIVE)/oscam-svn
+	if [ -e $(ARCHIVE)/oscam-svn ]; then \
+		set -e; cd $(ARCHIVE)/oscam-svn; \
+		git pull; git checkout $(OSCAM_GIT); \
+	else \
+		git clone $(OSCAM_URL) $(ARCHIVE)/oscam-svn;\
+	fi; \
 	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; \
+		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)
 	upx $(BUILD_TMP)/oscam-svn/Distribution/oscam*