Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bazarr: update to 1.4.0 #5911

Merged
merged 4 commits into from
Dec 30, 2023
Merged

bazarr: update to 1.4.0 #5911

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
791b91f
bazarr: upgrade 1.3.0 -> 1.4.0
smaarn Oct 7, 2023
e43e3ef
Remove unsolicited file
smaarn Dec 29, 2023
6915cba
Rollback thing on ARMv7L_ARCHS
smaarn Dec 30, 2023
85244b7
Remove now unsolicited file
smaarn Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cross/bazarr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = bazarr
PKG_VERS = 1.3.0
PKG_VERS = 1.4.0
PKG_EXT = zip
PKG_DIST_NAME = $(PKG_NAME).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
Expand Down
6 changes: 3 additions & 3 deletions cross/bazarr/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bazarr-1.3.0.zip SHA1 19c0745e3e9e8dfb223b8085cf8b41cd21a9dbac
bazarr-1.3.0.zip SHA256 7fd2ca2595fe7594541aafa0fcf1ef0b337c5290e2069115bea10ee8264fa001
bazarr-1.3.0.zip MD5 74d0d31dd880fa8c6b6f79009cc2c593
bazarr-1.4.0.zip SHA1 382f96afa748842647cd3f9d31338a8b205dbcae
bazarr-1.4.0.zip SHA256 b023f5239ec54974dfe624259942101ccad218d3b11bf47669a854dc3f31e56c
bazarr-1.4.0.zip MD5 b6faa26c117cfaf807f2ad022963062f
13 changes: 5 additions & 8 deletions spk/bazarr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SPK_NAME = bazarr
SPK_VERS = 1.3.0
SPK_REV = 12
SPK_VERS = 1.4.0
SPK_REV = 13
SPK_ICON = src/bazarr.png

PYTHON_PACKAGE = python311

SPK_DEPENDS = "python311>=3.11.4-7:ffmpeg"
SPK_DEPENDS = "python311:ffmpeg"

WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt

Expand All @@ -28,7 +28,7 @@ WHEELS_BUILD_ARGS += --enable-zlib
MAINTAINER = smaarn
DESCRIPTION = "Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movies and Bazarr takes care of everything for you."
DISPLAY_NAME = Bazarr
CHANGELOG = "Update to version 1.3.0.<br />See corresponding changelogs <a href=\"https://github.com/morpheus65535/bazarr/releases/tag/v1.3.0\">here</a> for more details"
CHANGELOG = 'Update to <a href="https://github.com/morpheus65535/bazarr/releases/tag/v1.4.0">1.4.0</a> (also includes <a href="https://github.com/morpheus65535/bazarr/releases/tag/v1.3.1">1.3.1</a>)'

HOMEPAGE = https://www.bazarr.media/
LICENSE = GPL-3.0 license
Expand Down Expand Up @@ -65,11 +65,8 @@ else
WHEELS += src/requirements-crossenv-greenlet-v1.txt
endif

# [numpy] <= 1.22.4 (armv7l)
ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
WHEELS += src/requirements-crossenv-numpy-armv7l.txt
Comment on lines -68 to -70
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that ARMv7L_ARCHS are actually part of the unsupported architectures and this line is therefore useless

# [numpy] <= 1.24.4 last working version with gcc-4.9
else ifeq ($(call version_le, $(TC_GCC), 5.0),1)
ifeq ($(call version_le, $(TC_GCC), 5.0),1)
WHEELS += src/requirements-crossenv-numpy-gcc4.txt
# [numpy] >= 1.25.0 requires c++17
else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
Expand Down
8 changes: 8 additions & 0 deletions spk/bazarr/src/requirements-crossenv-numpy-armv7l.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
##
## All configurations below are optional and
## are provided to demonstrate how to build
## various wheels. Uncoment to enable.
##

# [numpy]
numpy==1.22.4