- fix links target; many thanks to max_10 ┗(-_-)┛┏(-_-)┓

archive-patches/links-2.17-ac-prog-cxx.patch

@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -16,9 +16,11 @@ image_formats="GIF PNG XBM"
+ AM_CONFIG_HEADER(config.h)
+ 
+ dnl Checks for programs.
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ 
+-dnl AC_PROG_CXX
++AC_PROG_CXX
+ dnl AC_PROG_AWK
+ dnl AM_PROG_LEX
+ dnl AC_PROG_YACC

archive-patches/links-2.17-hd51-input.patch

@@ -0,0 +1,11 @@
+--- a/rcinput.c
++++ b/rcinput.c
+@@ -151,7 +151,7 @@
+ {
+ 	char buf[32];
+ 	//KbInitialize();
+-	fd = open("/dev/input/event0", O_RDONLY);
++	fd = open("/dev/input/event1", O_RDONLY);
+ 
+ 	if (fd == -1)
+ 	{

make/archives.mk

@@ -386,5 +386,9 @@ LIBDPF_SOURCE = dpf-ax-git-$(LIBDPF_VER).tar.bz2
 $(ARCHIVE)/$(LIBDPF_SOURCE):
 	get-git-archive.sh https://github.com/MaxWiesel/dpf-ax.git $(LIBDPF_VER) $(notdir $@) $(ARCHIVE)
 
+LINKS_VER = 2.17
+$(ARCHIVE)/links-$(LINKS_VER).tar.bz2:
+	$(WGET) http://links.twibright.com/download/links-$(LINKS_VER).tar.bz2
+
 $(ARCHIVE)/cacert.pem:
 	$(WGET) https://curl.haxx.se/ca/cacert.pem

make/plugins-extra.mk

@@ -1,40 +1,5 @@
 # makefile for plugins (currently unused in ni-image)
 
-#links
-links: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(LIBPLUGINS)/links.so
-
-$(LIBPLUGINS)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib $(LIBPLUGINS) $(VARCONFIG)
-	$(REMOVE)/links
-	tar -C $(SOURCE_DIR)/$(TUXBOX_PLUGINS) -cp links --exclude-vcs | tar -C $(BUILD_TMP) -x
-	$(CHDIR)/links && \
-		export CC=$(TARGET)-gcc && \
-		export AR=$(TARGET)-ar && \
-		export NM=$(TARGET)-nm && \
-		export RANLIB=$(TARGET)-ranlib && \
-		export OBJDUMP=$(TARGET)-objdump && \
-		export STRIP=$(TARGET)-strip && \
-		export SYSROOT=$(TARGET_DIR) && \
-		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
-		export LD_LIBRARY_PATH=$(TARGET_LIB_DIR) && \
-		export CFLAGS="$(TARGET_CFLAGS)" && \
-		export LIBS="$(TARGET_LDFLAGS) $(CORTEX-STRINGS)" && \
-		./configure \
-			--host=$(TARGET) \
-			--build=$(BUILD) \
-			--prefix= \
-			--mandir=$(BUILD_TMP)/.remove \
-			--without-svgalib \
-			--without-directfb \
-			--without-x \
-			--without-libtiff \
-			--enable-graphics \
-			--enable-javascript && \
-		$(MAKE) && \
-		DESTDIR=$(TARGET_DIR) make install prefix=$(TARGET_DIR)
-	$(REMOVE)/links
-	mv -f $(BIN)/links $(LIBPLUGINS)/links.so
-	cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
-
 FritzBoxAction: convert
 	mkdir -p $(VARPLUGINS) && \
 	pushd $(SOURCES)/FritzBoxAction && \

make/plugins.mk

@@ -547,3 +547,39 @@ $(LIBPLUGINS)/shellexec.so: $(D)/freetype $(LIBPLUGINS) $(SHAREFLEX) $(VARCONFIG
 	mv -f $(LIBPLUGINS)/shellexec.cfg $(LIBPLUGINS)/00_shellexec.cfg
 	mv -f $(LIBPLUGINS)/shellexec_hint.png $(LIBPLUGINS)/00_shellexec_hint.png
 	ln -sf /lib/tuxbox/plugins/00_shellexec.so $(BIN)/shellexec
+
+# -----------------------------------------------------------------------------
+
+LINKS_PATCH  = links-$(LINKS_VER).patch
+LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch
+ifeq ($(BOXSERIES), hd51)
+LINKS_PATCH += links-$(LINKS_VER)-hd51-input.patch
+endif
+
+$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(LIBPLUGINS) | $(TARGET_DIR)
+	$(REMOVE)/links-$(LINKS_VER)
+	$(UNTAR)/links-$(LINKS_VER).tar.bz2
+	$(CHDIR)/links-$(LINKS_VER); \
+		$(call apply_patches,$(LINKS_PATCH)); \
+		autoreconf -vfi; \
+		$(CONFIGURE) \
+			--prefix= \
+			--mandir=$(BUILD_TMP)/.remove \
+			--enable-graphics \
+			--with-fb \
+			--with-libjpeg \
+			--with-ssl=$(TARGET_DIR) \
+			--without-atheos \
+			--without-directfb \
+			--without-libtiff \
+			--without-lzma \
+			--without-pmshell \
+			--without-svgalib \
+			--without-x \
+			; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
+	mv -f $(BIN)/links $(LIBPLUGINS)/links.so
+	cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
+	$(REMOVE)/links-$(LINKS_VER)
+	$(TOUCH)