Skip to content

Commit

Permalink
Merge pull request #197 from nyanmisaka/hotfix-mesa
Browse files Browse the repository at this point in the history
Hotfix for Mesa driver build
  • Loading branch information
nyanmisaka committed Oct 29, 2022
2 parents a7ee174 + ee5d049 commit 19d5b0e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions Dockerfile.in
Expand Up @@ -7,6 +7,7 @@ ENV DEB_BUILD_OPTIONS=noddebs
ENV DEBIAN_FRONTEND=noninteractive
ENV ARCH=BUILD_ARCHITECTURE
ENV GCC_VER=GCC_RELEASE_VERSION
ENV LLVM_VER=LLVM_RELEASE_VERSION
ENV SOURCE_DIR=/ffmpeg
ENV ARTIFACT_DIR=/dist
ENV TARGET_DIR=/usr/lib/jellyfin-ffmpeg
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.make
Expand Up @@ -5,6 +5,6 @@ LLVM_VER=13
ARCH=amd64
.PHONY: Dockerfile
Dockerfile: Dockerfile.in
sed 's/DISTRO/$(DISTRO)/; s/BUILD_ARCHITECTURE/$(ARCH)/; s/GCC_RELEASE_VERSION/$(GCC_VER)/' $< > $@ || rm -f $@
sed 's/DISTRO/$(DISTRO)/; s/BUILD_ARCHITECTURE/$(ARCH)/; s/GCC_RELEASE_VERSION/$(GCC_VER)/; s/LLVM_RELEASE_VERSION/$(LLVM_VER)/' $< > $@ || rm -f $@
clean:
rm -f Dockerfile
2 changes: 1 addition & 1 deletion build.yaml
@@ -1,7 +1,7 @@
---
# We just wrap `build` so this is really it
name: "jellyfin-ffmpeg"
version: "5.1.2-3"
version: "5.1.2-4"
packages:
- buster-amd64
- buster-armhf
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
jellyfin-ffmpeg (5.1.2-4) unstable; urgency=medium

* Hotfix for Mesa driver build

-- nyanmisaka <nst799610810@gmail.com> Sat, 29 Oct 2022 17:22:13 +0800

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

* Add tier option for the QSV HEVC encoder
Expand Down

0 comments on commit 19d5b0e

Please sign in to comment.