diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index b612274a..13c1e98e 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -18,6 +18,8 @@ jobs: pkgtype: deb - dockerimg: ubuntu2204 pkgtype: deb + - dockerimg: ubuntu2404 + pkgtype: deb - dockerimg: fedora32 pkgtype: rpm diff --git a/build_deb.sh b/build_deb.sh index 33e8d9ad..a935b1c3 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -24,6 +24,11 @@ if [ -e /etc/lsb-release ]; then PACKAGE_DEPENDS="${PACKAGE_DEPENDS},intel-media-va-driver-non-free,intel-opencl-icd,libmfx1,libmfxgen1|libmfx-gen1.2" PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libva-drm2,libva-x11-2,libigfxcmrt7" PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libavcodec58,libavutil56,libavformat58,libswresample3,libavfilter7,libavdevice58,libass9" + elif [ "${PACKAGE_OS_CODENAME}" = "noble" ]; then + PACKAGE_DEPENDS="libc6(>=2.29),libstdc++6(>=6)" + PACKAGE_DEPENDS="${PACKAGE_DEPENDS},intel-media-va-driver-non-free,intel-opencl-icd,libmfx1,libmfxgen1|libmfx-gen1.2" + PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libva-drm2,libva-x11-2,libigfxcmrt7" + PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libavcodec60,libavutil58,libavformat60,libswresample4,libavfilter9,libavdevice60,libass9" else echo "${PACKAGE_OS_ID}${PACKAGE_OS_VER} ${PACKAGE_OS_CODENAME} not supported in this script!" exit 1 diff --git a/docker/docker_ubuntu2404 b/docker/docker_ubuntu2404 new file mode 100644 index 00000000..c99b580e --- /dev/null +++ b/docker/docker_ubuntu2404 @@ -0,0 +1,44 @@ +FROM ubuntu:24.04 + +ARG DEBIAN_FRONTEND=noninteractive \ + LOCAL_USER_ID=1000 \ + LOCAL_GROUP_ID=1000 + +RUN apt-get update \ + && apt install -y \ + wget \ + git \ + cmake \ + intel-media-va-driver-non-free \ + libva-drm2 \ + libva-x11-2 \ + libva-glx2 \ + libx11-dev \ + libigfxcmrt7 \ + libva-dev \ + libdrm-dev \ + opencl-headers \ + build-essential \ + libavcodec60 \ + libavcodec-dev \ + libavutil58 \ + libavutil-dev \ + libavformat60 \ + libavformat-dev \ + libswresample4 \ + libswresample-dev \ + libavfilter9 \ + libavfilter-dev \ + libavdevice60 \ + libavdevice-dev \ + libass9 \ + libass-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN useradd -u $LOCAL_USER_ID -m --user-group --shell /bin/bash rigaya +RUN groupmod -g $LOCAL_GROUP_ID rigaya +WORKDIR /home/rigaya +COPY . . +RUN chown -R rigaya:rigaya . +USER rigaya