Skip to content

Commit

Permalink
Merge pull request #120 from Shadowghost/bump
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuaboniface authored Mar 23, 2022
2 parents 8d692b6 + 10d2c15 commit aea6bec
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build-win64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ done

# Use the latest distro for toolchains
distro="ubuntu:jammy"
ffrevison="3"
ffrevison="4"
image_name="jellyfin-ffmpeg-build-windows-win64"
package_temporary_dir="$( mktemp -d )"
current_user="$( whoami )"
Expand Down
2 changes: 1 addition & 1 deletion build.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# We just wrap `build` so this is really it
name: "jellyfin-ffmpeg"
version: "4.4.1-3"
version: "4.4.1-4"
packages:
- buster-amd64
- buster-armhf
Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
jellyfin-ffmpeg (4.4.1-4) unstable; urgency=medium

* Update dependencies (#120)
* Update dav1d to 1.0.0 (#118)
* fix libass AR and blur issue (#119)

-- Joshua Boniface <[email protected]> Wed, 23 Mar 2022 01:02:21 -0500

jellyfin-ffmpeg (4.4.1-3) unstable; urgency=medium

* Allow configuration of used driver via ENV variable (#101)
Expand Down
6 changes: 3 additions & 3 deletions docker-build-win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ popd
# FREETYPE
mkdir freetype
pushd freetype
ft_ver="2.11.0"
ft_ver="2.11.1"
ft_link="https://sourceforge.net/projects/freetype/files/freetype2/${ft_ver}/freetype-${ft_ver}.tar.xz/download"
wget ${ft_link} -O ft.tar.gz
tar xaf ft.tar.gz
Expand Down Expand Up @@ -136,7 +136,7 @@ popd
# SDL2
mkdir sdl2
pushd sdl2
sdl2_ver="2.0.16"
sdl2_ver="2.0.20"
sdl2_link="https://libsdl.org/release/SDL2-${sdl2_ver}.tar.gz"
wget ${sdl2_link} -O sdl2.tar.gz
tar xaf sdl2.tar.gz
Expand All @@ -155,7 +155,7 @@ popd
# FONTCONFIG
mkdir fontconfig
pushd fontconfig
fc_ver="2.13.94"
fc_ver="2.13.96"
fc_link="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${fc_ver}.tar.xz"
wget ${fc_link} -O fc.tar.gz
tar xaf fc.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ prepare_extra_amd64() {
# Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer
# Both MSDK and VPL runtime can be loaded by MFX dispatcher (libmfx.so.1)
pushd ${SOURCE_DIR}
git clone -b intel-onevpl-22.3.0 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu
git clone -b intel-onevpl-22.3.1 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu
pushd oneVPL-intel-gpu
mkdir build && pushd build
cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} ..
Expand Down

0 comments on commit aea6bec

Please sign in to comment.