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

Testing #87

Merged
merged 31 commits into from
Feb 17, 2022
Merged

Testing #87

merged 31 commits into from
Feb 17, 2022

Conversation

tituspijean
Copy link
Member

@tituspijean tituspijean commented Jan 22, 2022

Plenty of good enhancements and fixes, notably for Bullseye.

Closes #77
Closes #81
Closes #83

PR Status

  • Code finished and ready to be reviewed/tested
  • The fix/enhancement were manually tested (if applicable)

Automatic tests

Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ after creating the PR, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)

check_process Show resolved Hide resolved
if [ $architecture == "arm64" ]; then
ffmpeg_deps="libass9 libbluray2 libc6 libdrm2 libfontconfig1 libfreetype6 libfribidi0 libgcc1 libgmp10 libgnutls30 libmp3lame0 libopus0 libstdc++6 libtheora0 libvdpau1 libvorbis0a libvorbisenc2 libvpx5 libwebp6 libwebpmux3 libx11-6 libx264-155 libx265-165 libzvbi0 zlib1g"
else
ffmpeg_deps="libass9 libbluray2 libc6 libdrm-intel1 libdrm2 libfontconfig1 libfreetype6 libfribidi0 libgcc1 libgmp10 libgnutls30 libmp3lame0 libopus0 libstdc++6 libtheora0 libvdpau1 libvorbis0a libvorbisenc2 libvpx5 libwebp6 libwebpmux3 libx11-6 libx264-155 libx265-165 libzvbi0 libopencl1 zlib1g"
Copy link
Member

Choose a reason for hiding this comment

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

That would be easier to read with a "common_ffmpeg_deps" or something :

ffmpeg_deps="libass9 libbluray2 libc6 libdrm2 libfontconfig1 libfreetype6 libfribidi0 libgcc1 libgmp10 libgnutls30 libmp3lame0 libopus0 libstdc++6 libtheora0 libvdpau1 libvorbis0a libvorbisenc2 libvpx5 libwebp6 libwebpmux3 libx11-6 libx264-155 libx265-165 libzvbi0 zlib1g"

if [ $architecture == "arm64" ]; then
    :
else
    ffmpeg_deps="$ffmpeg_deps libdrm-intel1 libopencl1" 
fi

Copy link
Member Author

Choose a reason for hiding this comment

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

Haha indeed! Though I am discovering this deps list does not work on my RPi. Needs investigation.

Copy link
Member

Choose a reason for hiding this comment

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

libx264-155 libx265-165 I think this is not valid for Bullseye. I couldn't restore a backed up Jellyfin because

jellyfin-ffmpeg : Depends: libvpx5 (>= 1.6.0) but it is not installable
2022-02-14 20:00:59,615: DEBUG -                    Depends: libx264-155 but it is not installable
2022-02-14 20:00:59,615: DEBUG -                    Depends: libx265-165 (>= 2.9) but it is not installable

Available in bullseye are libvpx6, libx264-160, libx265-192. Who the F puts version numbers in package names ?!

Copy link
Member Author

Choose a reason for hiding this comment

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

Had no issue installing it on an ARM64 Bullseye. What do you think, let's merge and see?

src_url=$(grep 'SOURCE_URL=' "../settings/conf/server.$architecture.src" | cut -d= -f2-)
if ! curl --output /dev/null --silent --head --fail "$src_url"; then
ynh_replace_string --match_string="releases/server/debian/versions/stable/server/$version/jellyfin-server_$version-1_$architecture.deb" --replace_string="archive/debian/stable/$version/server/jellyfin-server_$version-1_$architecture.deb" --target_file="../settings/conf/server.$architecture.src"
fi
Copy link
Member

Choose a reason for hiding this comment

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

Would it be possible to backup the deb files instead ?
Whenever the deb files become unavailable, this method may be broken and people may find themselves in unsolvable solutions.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's definitely a step better than "won't work whenever a new release is made". What you are suggesting is doable too, feel free to suggest a plan on how/where to store the debs.

Copy link
Member

Choose a reason for hiding this comment

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

100% agreed :)

scripts/upgrade Show resolved Hide resolved
@Salamandar
Copy link
Member

I approved the changes, but I commented about the library package names above :)

@tituspijean
Copy link
Member Author

Let's fix and merge #88 first before merging here. ;)

@tituspijean
Copy link
Member Author

Buster:
Test Badge

Bullseye:
Test Badge

@Salamandar
Copy link
Member

Let's merge this ! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants