From 50627cb22c2639054364962553a4b0d07ea8e782 Mon Sep 17 00:00:00 2001 From: th0ma7 Date: Mon, 30 Sep 2024 15:49:27 -0400 Subject: [PATCH] Imlib2 armv5 build fix and removal of dependent and obsolete plowshare (#6246) * plowshare: Remove and obsolete since DSM5 * imlib2: Fix build failure for armv5 by adding -lrt to LDFLAGS --- cross/bash/Makefile | 17 ---------------- cross/bash/PLIST | 1 - cross/bash/digests | 3 --- cross/imlib2/Makefile | 6 ++++++ cross/plowshare/Makefile | 34 -------------------------------- cross/plowshare/PLIST | 19 ------------------ cross/plowshare/digests | 3 --- spk/plowshare/Makefile | 20 ------------------- spk/plowshare/src/plowshare.png | Bin 3145 -> 0 bytes 9 files changed, 6 insertions(+), 97 deletions(-) delete mode 100644 cross/bash/Makefile delete mode 100644 cross/bash/PLIST delete mode 100644 cross/bash/digests delete mode 100644 cross/plowshare/Makefile delete mode 100644 cross/plowshare/PLIST delete mode 100644 cross/plowshare/digests delete mode 100644 spk/plowshare/Makefile delete mode 100644 spk/plowshare/src/plowshare.png diff --git a/cross/bash/Makefile b/cross/bash/Makefile deleted file mode 100644 index d8fb89c5c45..00000000000 --- a/cross/bash/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -PKG_NAME = bash -PKG_VERS = 4.3 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://ftp.gnu.org/gnu/bash -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -DEPENDS = cross/ncursesw - -HOMEPAGE = https://www.gnu.org/software/bash/ -COMMENT = Bash is the GNU Project's shell. Bash is the Bourne Again SHell. Bash is an sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh). -LICENSE = GPLv3 - -GNU_CONFIGURE = 1 -CONFIGURE_ARGS = bash_cv_dev_fd=whacky - -include ../../mk/spksrc.cross-cc.mk diff --git a/cross/bash/PLIST b/cross/bash/PLIST deleted file mode 100644 index b6e4dd9f5f6..00000000000 --- a/cross/bash/PLIST +++ /dev/null @@ -1 +0,0 @@ -bin:bin/bash diff --git a/cross/bash/digests b/cross/bash/digests deleted file mode 100644 index 20df7f38bf8..00000000000 --- a/cross/bash/digests +++ /dev/null @@ -1,3 +0,0 @@ -bash-4.3.tar.gz SHA1 45ac3c5727e7262334f4dfadecdf601b39434e84 -bash-4.3.tar.gz SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 -bash-4.3.tar.gz MD5 81348932d5da294953e15d4814c74dd1 diff --git a/cross/imlib2/Makefile b/cross/imlib2/Makefile index ce7e6281bde..5f26e1758c9 100644 --- a/cross/imlib2/Makefile +++ b/cross/imlib2/Makefile @@ -16,4 +16,10 @@ CONFIGURE_ARGS = --disable-static CONFIGURE_ARGS += --without-x ADDITIONAL_CFLAGS = -O +include ../../mk/spksrc.common.mk + +ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH)) +ADDITIONAL_LDFLAGS = -lrt +endif + include ../../mk/spksrc.cross-cc.mk diff --git a/cross/plowshare/Makefile b/cross/plowshare/Makefile deleted file mode 100644 index f392a629566..00000000000 --- a/cross/plowshare/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -PKG_NAME = plowshare -PKG_VERS = 2.1.2 -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/mcrapet/plowshare/archive -PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -OPTIONAL_DEPENDS = cross/bash - -HOMEPAGE = https://github.com/mcrapet/plowshare -COMMENT = Command-line tool and engine for managing sharing websites. -LICENSE = GPLv3 - -INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX) - -POST_INSTALL_TARGET = plowshare_post_install - -include ../../mk/spksrc.common.mk -ifeq ($(call version_lt, $(TCVERSION), 6.0),1) -# install and patch for bash for DSM <= 5.x -POST_INSTALL_TARGET += bash_post_install -DEPENDS += cross/bash -endif - -include ../../mk/spksrc.install-resources.mk - -.PHONY: plowshare_post_install -plowshare_post_install: - sed -i "s|img2txt|$(INSTALL_PREFIX)/bin/img2txt|g" $(STAGING_INSTALL_PREFIX)/share/plowshare/core.sh - -.PHONY: bash_post_install -bash_post_install: - @sed -i "s|^#!/usr/bin/env bash|#!/usr/bin/env $(INSTALL_PREFIX)/bin/bash|g" $(STAGING_INSTALL_PREFIX)/share/plowshare/*.sh diff --git a/cross/plowshare/PLIST b/cross/plowshare/PLIST deleted file mode 100644 index 26c9822bd58..00000000000 --- a/cross/plowshare/PLIST +++ /dev/null @@ -1,19 +0,0 @@ -rsc:bin/plowdel -rsc:bin/plowdown -rsc:bin/plowlist -rsc:bin/plowmod -rsc:bin/plowprobe -rsc:bin/plowup -rsc:share/bash-completion/completions/plowdel -rsc:share/bash-completion/completions/plowdown -rsc:share/bash-completion/completions/plowlist -rsc:share/bash-completion/completions/plowprobe -rsc:share/bash-completion/completions/plowup -rsc:share/plowshare/core.sh -rsc:share/plowshare/delete.sh -rsc:share/plowshare/download.sh -rsc:share/plowshare/list.sh -rsc:share/plowshare/mod.sh -rsc:share/plowshare/modules/config -rsc:share/plowshare/probe.sh -rsc:share/plowshare/upload.sh diff --git a/cross/plowshare/digests b/cross/plowshare/digests deleted file mode 100644 index 8430da97b82..00000000000 --- a/cross/plowshare/digests +++ /dev/null @@ -1,3 +0,0 @@ -plowshare-2.1.2.tar.gz SHA1 35d551e915977b3e48952e72301e1b0bdcb2fb1e -plowshare-2.1.2.tar.gz SHA256 d9b9f2aa464d7d2966f49704234c79139d1162705a0a553a3059c68fbf4be21a -plowshare-2.1.2.tar.gz MD5 83af5ec30745c33bfe5983fdb3b6e536 diff --git a/spk/plowshare/Makefile b/spk/plowshare/Makefile deleted file mode 100644 index e8e78d07432..00000000000 --- a/spk/plowshare/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -SPK_NAME = plowshare -SPK_VERS = 2.1.2 -SPK_REV = 3 -SPK_ICON = src/plowshare.png - -DEPENDS = cross/libcaca cross/screen cross/plowshare - -MAINTAINER = SynoCommunity -DESCRIPTION = Plowshare is a command-line \(CLI\) download/upload tool for popular file sharing websites. -STARTABLE = no -DISPLAY_NAME = plowshare -BETA = 1 -CHANGELOG = Update to 2.1.2 - -HOMEPAGE = https://github.com/mcrapet/plowshare -LICENSE = GPLv3 - -SPK_COMMANDS = bin/plowdel bin/plowdown bin/plowlist bin/plowmod bin/plowprobe bin/plowup - -include ../../mk/spksrc.spk.mk diff --git a/spk/plowshare/src/plowshare.png b/spk/plowshare/src/plowshare.png deleted file mode 100644 index c449d7024d09b7c3bb27bd4ca62575944d08f880..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3145 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