Merge SynoCommunity#5559 and exclusions for ARMv7 archs

mreid-tt · Jan 30, 2023 · ad92e17 · ad92e17
1 parent 7ac5659
commit ad92e17
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/cross/radarr/Makefile b/cross/radarr/Makefile
@@ -7,7 +7,13 @@ PKG_DIR = Radarr
 
 DEPENDS =
 
-UNSUPPORTED_ARCHS = $(DOTNET_UNSUPPORTED_ARCHS)
+UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)
+# custom exclusions for dotNET 6 on ARMv7 archs
+ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
+UNSUPPORTED_ARCHS += $(ARMv7_ARCHS)
+else
+UNSUPPORTED_ARCHS += armada370
+endif
 
 HOMEPAGE = https://radarr.video/
 COMMENT  = Radarr is a movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them. It can also be configured to automatically upgrade the quality of existing files in the library when a better quality format becomes available.
@@ -16,11 +22,14 @@ LICENSE  = GPLv3
 INSTALL_TARGET = radarr_install
 
 # use digests with multiple files
-PKG_DIST_ARCH_LIST = x64 arm arm64
+PKG_DIST_ARCH_LIST = x86 x64 arm arm64
 
 include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))
+PKG_DIST_ARCH = x86
+else ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
 PKG_DIST_ARCH = x64
-ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS)),$(ARCH))
+else ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS)),$(ARCH))
 PKG_DIST_ARCH = arm
 else ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
 PKG_DIST_ARCH = arm64

diff --git a/cross/radarr/digests b/cross/radarr/digests
@@ -7,3 +7,6 @@ Radarr.master.4.3.2.6857.linux-core-arm64.tar.gz MD5 a092e72a9b77675e717cf1a2996
 Radarr.master.4.3.2.6857.linux-core-x64.tar.gz SHA1 2133450662caa214f44b8ecd5019ad486c3accfe
 Radarr.master.4.3.2.6857.linux-core-x64.tar.gz SHA256 ece6681ef0c92015e88143c774aa6189a8ed08138ea2e48f7bfa60645df4b52f
 Radarr.master.4.3.2.6857.linux-core-x64.tar.gz MD5 51184436a69fc6aec5afb4bd7341e99e
+Radarr.master.4.3.2.6857.linux-core-x86.tar.gz SHA1 856d74f637b86669934d868a8a723af1982a7dff
+Radarr.master.4.3.2.6857.linux-core-x86.tar.gz SHA256 c8d75cc26f76333943eb57e2036396d93eeb72ad113f49c904fba06afb3120b3
+Radarr.master.4.3.2.6857.linux-core-x86.tar.gz MD5 3134a5b1844a060c0a8861cdfe60048c
diff --git a/spk/radarr/Makefile b/spk/radarr/Makefile
@@ -5,7 +5,13 @@ SPK_ICON = src/radarr.png
 
 DEPENDS = cross/libstdc++ cross/libmediainfo cross/sqlite cross/radarr
 
-UNSUPPORTED_ARCHS = $(DOTNET_UNSUPPORTED_ARCHS)
+UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)
+# custom exclusions for dotNET 6 on ARMv7 archs
+ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
+UNSUPPORTED_ARCHS += $(ARMv7_ARCHS)
+else
+UNSUPPORTED_ARCHS += armada370
+endif
 
 MAINTAINER = Team Radarr
 MAINTAINER_URL = https://radarr.video/
@@ -15,7 +21,7 @@ SUPPORTURL = https://radarr.video/\#support
 DESCRIPTION = Radarr is a movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them. It can also be configured to automatically upgrade the quality of existing files in the library when a better quality format becomes available.
 STARTABLE = yes
 DISPLAY_NAME = Radarr
-CHANGELOG = "1. Upgrade to Radarr 4.3.2.6857.<br>2. Fix package update.<br>3. Enlarge the service start/stop timeout to 90 seconds."
+CHANGELOG = "1. Upgrade to Radarr 4.3.2.6857.<br>2. Fix package update.<br>3. Enlarge the service start/stop timeout to 90 seconds.<br>4. Add support for x86 (32-bit) architecture."
 
 HOMEPAGE = https://radarr.video/
 LICENSE = GPLv3