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.

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

Conversation

smaarn
Copy link
Contributor

@smaarn smaarn commented Oct 8, 2023

Description

  • Upgrades bazarr version to 1.4.0
  • Cleanup no longer relevant ARMv7L_ARCHS logics for numpy

Checklist

  • Build rule all-supported completed successfully
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested

Type of change

  • Package update

@ngthwi
Copy link

ngthwi commented Oct 12, 2023

Working fine on a DS215j and a DS218j
Thanks a lot

@smaarn smaarn marked this pull request as ready for review October 13, 2023 19:30
@smaarn smaarn requested a review from th0ma7 October 13, 2023 19:30
@hgy59
Copy link
Contributor

hgy59 commented Oct 14, 2023

Working fine on a DS215j and a DS218j Thanks a lot

Those models are not ARMv7L

Only models with hi3535 CPU are ARMv7L, i.e.

  • Network Video Recorders (NVR216, NVR1218)
  • Video Station Models

Details see https://github.com/SynoCommunity/spksrc/wiki/Synology-and-SynoCommunity-Package-Architectures

EDIT:
update models (Routers are not ARMv7L but Video Station Models are), ...

@smaarn smaarn marked this pull request as draft October 14, 2023 22:21
@smaarn
Copy link
Contributor Author

smaarn commented Oct 14, 2023

Flagging as draft as, even if it does compile and build successfully we don't really have any client for testing it, as of now.

@ngthwi
Copy link

ngthwi commented Oct 14, 2023

This is the bazarr status page on a DS218j...
There's a reference to ARMv7l on the os name...
Would it mean that Synology is using the same os on ARMv7l and ARMv7..?
IMG_6450

@smaarn smaarn changed the title bazarr: add back armv7l support bazarr: add back armv7l support + upgrade to 1.4.0 Dec 7, 2023
@smaarn smaarn marked this pull request as ready for review December 7, 2023 22:02
@smaarn smaarn force-pushed the feat/bazarr/arm-support branch from ac6984c to ddc693c Compare December 7, 2023 22:04
* Add back support for ARMv7 architecture
* Relax hardcoded version constraint on python dependency
@smaarn smaarn force-pushed the feat/bazarr/arm-support branch from 83ca74f to 791b91f Compare December 29, 2023 11:04
@smaarn
Copy link
Contributor Author

smaarn commented Dec 30, 2023

@ngthwi I think this ought to be ready for merge & release. Do you think you could have time to test the latest 1.4.0 binaries ? They are available here: https://github.com/SynoCommunity/spksrc/pull/5911/checks

@th0ma7 any objection to merging ? (things I wouldn't have spotted for example...)

All apologies for the delays

@smaarn smaarn requested a review from hgy59 December 30, 2023 16:23
@hgy59
Copy link
Contributor

hgy59 commented Dec 30, 2023

Just to be clear: $(ARMv7L_ARCHS) is not related to armv7l as reported by uname -m.

we have the definitions in spksrc.archs.mk

ARMv7_ARCHS = $(GENERIC_ARMv7_ARCH) $(DSM_ARMv7_ARCHS) $(SRM_ARMv7_ARCHS)
# hi3535 is not supported by generic ARMv7 arch
ARMv7L_ARCHS = hi3535

ARMv7L_ARCHS is used to separate hi3535 cpu from other armv7 cpus.

None of the Diskstation Models have ARMv7L_ARCHS. Only the (Network Video Recorder) Models NVR1218 and NVR216 and the (VideoStation) Model VS360HD have.

So the title of this PR is missleading since armv7 support for DSM was never dropped.

Was there any request to support this package on NVR1218, NVR216 or VS360HD?.
If not, I recommend to keep

UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS)

and to remove the <br />2. Add back support for ARMv7L architectures' from the changelog.

If you want to keep the ARMv7L_ARCHS then please update the changelog to
<br />2. Add back support for NVR1218, NVR216 and VS360HD Models'

@smaarn
Copy link
Contributor Author

smaarn commented Dec 30, 2023

Just to be clear: $(ARMv7L_ARCHS) is not related to armv7l as reported by uname -m.

we have the definitions in spksrc.archs.mk

ARMv7_ARCHS = $(GENERIC_ARMv7_ARCH) $(DSM_ARMv7_ARCHS) $(SRM_ARMv7_ARCHS)
# hi3535 is not supported by generic ARMv7 arch
ARMv7L_ARCHS = hi3535

ARMv7L_ARCHS is used to separate hi3535 cpu from other armv7 cpus.

None of the Diskstation Models have ARMv7L_ARCHS. Only the (Network Video Recorder) Models NVR1218 and NVR216 and the (VideoStation) Model VS360HD have.

So the title of this PR is missleading since armv7 support for DSM was never dropped.

Was there any request to support this package on NVR1218, NVR216 or VS360HD?. If not, I recommend to keep

UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS)

and to remove the <br />2. Add back support for ARMv7L architectures' from the changelog.

If you want to keep the ARMv7L_ARCHS then please update the changelog to <br />2. Add back support for NVR1218, NVR216 and VS360HD Models'

I think I got confused here with the custom logic for numpy which was related to those ARMv7L_ARCHS architectures.

Will be reverting the change and removing the therefore useless tricks for numpy.

Comment on lines -68 to -70
# [numpy] <= 1.22.4 (armv7l)
ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
WHEELS += src/requirements-crossenv-numpy-armv7l.txt
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

@smaarn smaarn changed the title bazarr: add back armv7l support + upgrade to 1.4.0 bazarr: update to 1.4.0 Dec 30, 2023
Copy link
Contributor

@hgy59 hgy59 left a comment

Choose a reason for hiding this comment

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

LGTM

@smaarn smaarn merged commit 1985749 into SynoCommunity:master Dec 30, 2023
17 checks passed
@smaarn smaarn deleted the feat/bazarr/arm-support branch December 30, 2023 21:46
@ngthwi
Copy link

ngthwi commented Dec 30, 2023

@ngthwi I think this ought to be ready for merge & release. Do you think you could have time to test the latest 1.4.0 binaries ? They are available here: https://github.com/SynoCommunity/spksrc/pull/5911/checks

@th0ma7 any objection to merging ? (things I wouldn't have spotted for example...)

All apologies for the delays

Already tested that...
Working fine

@mreid-tt
Copy link
Contributor

mreid-tt commented Jan 1, 2024

Hello @smaarn, I've successfully published the builds for the merged PR on the website. The qoriq build remains inactive, due to a compatibility issue with OpenSSL 3, as reported in #5905 (comment).

By the way, I've observed that the recent commits you've merged were published by other contributors. While we're more than willing to provide assistance, if you encounter any challenges with your publishing process, feel free to reach out to me on Discord for support.

@mreid-tt mreid-tt added status/published Published and activated (may take up to 48h until visible in DSM package manager) and removed status/to-publish labels Jan 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/published Published and activated (may take up to 48h until visible in DSM package manager)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants