From 609d410ce369f427a2ecc49a944fd14bf8f7a6d6 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 19 Feb 2017 21:06:49 +0100
Subject: [PATCH] update target lcd4linux

---
 make/applications.mk | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/make/applications.mk b/make/applications.mk
index 8aebe7d..1855221 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -521,19 +521,19 @@ $(D)/qtweb: $(ARCHIVE)/qt-everywhere-opensource-src-4.6.3.tar.gz | $(TARGETPREFI
 $(D)/lcd4linux: $(D)/libusb_compat $(D)/libgd2 | $(TARGETPREFIX)
 	tar -C $(BUILD_TMP) -xf $(BASE_DIR)/archive-sources/lcd4linux/dpflib.tar.gz
 	cd $(BUILD_TMP)/dpflib/dpflib && \
-		cp -a $(TARGETPREFIX)/lib/libusb-1.0.a $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb-1.0.a && \
-		cp -a $(TARGETPREFIX)/lib/libusb-1.0.la $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb-1.0.la && \
-		cp -a $(TARGETPREFIX)/lib/libusb.a $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb.a && \
-		cp -a $(TARGETPREFIX)/lib/libusb.la $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb.la && \
-		cp -a $(TARGETPREFIX)/include/usb.h $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/usr/include/usb.h && \
-		cp -a $(TARGETPREFIX)/include/libusb-1.0 $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/usr/include/libusb-1.0 && \
+		cp -a $(TARGETPREFIX)/lib/libusb-1.0.a $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb-1.0.a && \
+		cp -a $(TARGETPREFIX)/lib/libusb-1.0.la $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb-1.0.la && \
+		cp -a $(TARGETPREFIX)/lib/libusb.a $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb.a && \
+		cp -a $(TARGETPREFIX)/lib/libusb.la $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb.la && \
+		cp -a $(TARGETPREFIX)/include/usb.h $(CROSS_DIR)/$(TARGET)/sys-root/usr/include/usb.h && \
+		cp -a $(TARGETPREFIX)/include/libusb-1.0 $(CROSS_DIR)/$(TARGET)/sys-root/usr/include/libusb-1.0 && \
 		$(BUILDENV) $(MAKE) CC=$(TARGET)-gcc
-		rm -rf $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb-1.0.a
-		rm -rf $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb-1.0.la
-		rm -rf $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb.a
-		rm -rf $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/lib/libusb.la
-		rm -rf $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/usr/include/usb.h
-		rm -rf $(CROSS_DIR)/arm-cx2450x-linux-gnueabi/sys-root/usr/include/libusb-1.0
+		rm -rf $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb-1.0.a
+		rm -rf $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb-1.0.la
+		rm -rf $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb.a
+		rm -rf $(CROSS_DIR)/$(TARGET)/sys-root/lib/libusb.la
+		rm -rf $(CROSS_DIR)/$(TARGET)/sys-root/usr/include/usb.h
+		rm -rf $(CROSS_DIR)/$(TARGET)/sys-root/usr/include/libusb-1.0
 		cp -f $(BUILD_TMP)/dpflib/dpflib/dpf.h $(TARGETPREFIX)/include
 		mkdir -p $(TARGETPREFIX)/include/libdpf
 		cp -f $(BUILD_TMP)/dpflib/dpflib/dpf.h $(TARGETPREFIX)/include/libdpf/libdpf.h
@@ -541,13 +541,12 @@ $(D)/lcd4linux: $(D)/libusb_compat $(D)/libgd2 | $(TARGETPREFIX)
 		cp -f $(BUILD_TMP)/dpflib/include/* $(TARGETPREFIX)/include
 		cp -f $(BUILD_TMP)/dpflib/dpflib/libdpf.a $(TARGETPREFIX)/lib
 	cd $(BUILD_TMP) && \
-	svn co -r1171 https://ssl.bulix.org/svn/lcd4linux/trunk lcd4linux && \
+	git clone git://git.webhop.me/pub/lcd4linux.git lcd4linux && \
 	cd $(BUILD_TMP)/lcd4linux && \
-		./svn_version.sh && \
-		mkdir libdpf && \
+		./vcs_version.sh && \
+		mkdir -p libdpf && \
 		cp -f $(BUILD_TMP)/dpflib/dpflib/libdpf.a libdpf/ && \
-		mkdir m4 && \
-		$(PATCH)/lcd4linux-svn1168-dpf.patch && \
+		mkdir -p m4 && \
 		autoreconf -fi && \
 		$(BUILDENV) ./configure \
 		--build=$(BUILD) \
@@ -555,22 +554,17 @@ $(D)/lcd4linux: $(D)/libusb_compat $(D)/libgd2 | $(TARGETPREFIX)
 		--libdir=$(TARGETPREFIX)/lib \
 		--includedir=$(TARGETPREFIX)/include \
 		--oldincludedir=$(TARGETPREFIX)/include \
-		--bindir=$(TARGETPREFIX)/bin \
+		--bindir=$(TARGETPREFIX)/var/bin \
 		--prefix= \
 		--mandir=/.remove \
 		--docdir=/.remove \
 		--infodir=/.remove \
-		--with-drivers='DPF' \
+		--with-drivers='DPF,SamsungSPF' \
 		--with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog' \
 		--without-ncurses && \
 	$(MAKE) all && \
 	$(TARGET)-strip lcd4linux && \
 	$(MAKE) install
-	install -D -m 600 $(BASE_DIR)/archive-sources/lcd4linux/lcd4linux.conf $(TARGETPREFIX)/etc
-	install -D -m 600 $(BASE_DIR)/archive-sources/lcd4linux/lcd4linux-standby.conf $(TARGETPREFIX)/etc
-	install -D -m 755 $(BASE_DIR)/archive-sources/lcd4linux/standby.on $(TARGETPREFIX)/var/tuxbox/config
-	install -D -m 755 $(BASE_DIR)/archive-sources/lcd4linux/standby.off $(TARGETPREFIX)/var/tuxbox/config
-	cp -f -R $(BASE_DIR)/archive-sources/lcd4linux/lcd $(TARGETPREFIX)/var
 	$(REMOVE)/dpflib
 	$(REMOVE)/lcd4linux
 	touch $@
-- 
2.39.5