diff --git a/Dockerfile b/Dockerfile index c3d262e0..305467a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:noble +FROM ghcr.io/linuxserver/baseimage-ubuntu:resolute # set version label ARG BUILD_DATE @@ -15,7 +15,6 @@ ARG DEBIAN_FRONTEND="noninteractive" ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" ENV ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb /dev/vchiq /dev/video1? -type c" -# install packages RUN \ echo "**** add emby deps *****" && \ apt-get update && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ebc9638d..2a032708 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-resolute # set version label ARG BUILD_DATE @@ -19,10 +19,7 @@ RUN \ echo "**** add emby deps *****" && \ apt-get update && \ apt-get install -y --no-install-recommends \ - libexpat1 \ - libomxil-bellagio0 \ - libomxil-bellagio-bin \ - libraspberrypi0 && \ + libexpat1 && \ echo "**** install emby ****" && \ mkdir -p \ /app/emby \ diff --git a/README.md b/README.md index 56ac858e..78b8e3fa 100644 --- a/README.md +++ b/README.md @@ -73,16 +73,6 @@ Emby has very complete and verbose documentation located [here](https://github.c This section lists the enhancements we have made for hardware acceleration in this image specifically. -#### OpenMAX (Raspberry Pi) - -Hardware acceleration users for Raspberry Pi MMAL/OpenMAX will need to mount their `/dev/vcsm` and `/dev/vchiq` video devices inside of the container and their system OpenMax libs by passing the following options when running or creating the container: - -``` ---device=/dev/vcsm:/dev/vcsm ---device=/dev/vchiq:/dev/vchiq --v /opt/vc/lib:/opt/vc/lib -``` - #### V4L2 (Raspberry Pi) Hardware acceleration users for Raspberry Pi V4L2 will need to mount their `/dev/video1X` devices inside of the container by passing the following options when running or creating the container: @@ -360,6 +350,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.07.26:** - Rebase to Ubuntu Resolute. * **12.01.26:** - Set home to /config. * **13.08.24:** - Rebase to Ubuntu Noble. * **12.02.24:** - Use universal hardware acceleration blurb diff --git a/readme-vars.yml b/readme-vars.yml index b4b895e1..944cb939 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -34,7 +34,6 @@ opt_param_volumes: opt_param_device_map: true opt_param_devices: - {device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "Only needed if you want to use your Intel or AMD GPU for hardware accelerated video encoding (vaapi)."} - - {device_path: "/dev/vchiq", device_host_path: "/dev/vchiq", desc: "Only needed if you want to use your Raspberry Pi OpenMax video encoding (Bellagio)."} - {device_path: "/dev/video10", device_host_path: "/dev/video10", desc: "Only needed if you want to use your Raspberry Pi V4L2 video encoding."} - {device_path: "/dev/video11", device_host_path: "/dev/video11", desc: "Only needed if you want to use your Raspberry Pi V4L2 video encoding."} - {device_path: "/dev/video12", device_host_path: "/dev/video12", desc: "Only needed if you want to use your Raspberry Pi V4L2 video encoding."} @@ -48,30 +47,6 @@ app_setup_block: | Webui can be found at `http://:8096` Emby has very complete and verbose documentation located [here](https://github.com/MediaBrowser/Wiki/wiki) . - - ### Hardware Acceleration Enhancements - - This section lists the enhancements we have made for hardware acceleration in this image specifically. - - #### OpenMAX (Raspberry Pi) - - Hardware acceleration users for Raspberry Pi MMAL/OpenMAX will need to mount their `/dev/vcsm` and `/dev/vchiq` video devices inside of the container and their system OpenMax libs by passing the following options when running or creating the container: - - ``` - --device=/dev/vcsm:/dev/vcsm - --device=/dev/vchiq:/dev/vchiq - -v /opt/vc/lib:/opt/vc/lib - ``` - - #### V4L2 (Raspberry Pi) - - Hardware acceleration users for Raspberry Pi V4L2 will need to mount their `/dev/video1X` devices inside of the container by passing the following options when running or creating the container: - - ``` - --device=/dev/video10:/dev/video10 - --device=/dev/video11:/dev/video11 - --device=/dev/video12:/dev/video12 - ``` readme_hwaccel: true # init diagram init_diagram: | @@ -116,6 +91,7 @@ init_diagram: | "emby:latest" <- Base Images # changelog changelogs: + - {date: "14.07.26:", desc: "Rebase to Ubuntu Resolute."} - {date: "12.01.26:", desc: "Set home to /config."} - {date: "13.08.24:", desc: "Rebase to Ubuntu Noble."} - {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"}