diff --git a/Dockerfile b/Dockerfile index e6e2dd4..0669510 100644 --- a/Dockerfile +++ b/Dockerfile @@ -872,8 +872,8 @@ RUN \ # bump: x265 /X265_VERSION=([\d.]+)/ https://bitbucket.org/multicoreware/x265_git.git|* # bump: x265 after ./hashupdate Dockerfile X265 $LATEST # bump: x265 link "Source diff $CURRENT..$LATEST" https://bitbucket.org/multicoreware/x265_git/branches/compare/$LATEST..$CURRENT#diff -ARG X265_VERSION=4.0 -ARG X265_SHA256=75b4d05629e365913de3100b38a459b04e2a217a8f30efaa91b572d8e6d71282 +ARG X265_VERSION=4.1 +ARG X265_SHA256=a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29 ARG X265_URL="https://bitbucket.org/multicoreware/x265_git/downloads/x265_$X265_VERSION.tar.gz" # CMAKEFLAGS issue # https://bitbucket.org/multicoreware/x265_git/issues/620/support-passing-cmake-flags-to-multilibsh @@ -1127,7 +1127,7 @@ RUN \ # workaround for https://gitlab.com/AOMediaCodec/SVT-AV1/-/merge_requests/2387 sed -i 's/svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params)/svt_av1_enc_init_handle(\&svt_enc->svt_handle, \&svt_enc->enc_params)/g' libavcodec/libsvtav1.c && \ FDKAAC_FLAGS=$(if [[ -n "$ENABLE_FDKAAC" ]] ;then echo " --enable-libfdk-aac --enable-nonfree " ;else echo ""; fi) && \ - sed -i 's/add_ldexeflags -fPIE -pie/add_ldexeflags -fPIE -static-pie/' configure && \ + sed -i 's/add_ldexeflags -fPIE -pie/add_ldexeflags -fPIE -static/' configure && \ ./configure \ --pkg-config-flags="--static" \ --extra-cflags="-fopenmp" \ @@ -1277,15 +1277,15 @@ RUN \ openssl: env.OPENSSL_VERSION, \ }' > /versions.json -# make sure binaries has no dependencies, is relro, pie and stack nx -COPY checkelf / -RUN \ - /checkelf /usr/local/bin/ffmpeg && \ - /checkelf /usr/local/bin/ffprobe -# workaround for using -Wl,--allow-multiple-definition -# see comment in checkdupsym for details -COPY checkdupsym / -RUN /checkdupsym /ffmpeg-* +# # make sure binaries has no dependencies, is relro, pie and stack nx +# COPY checkelf / +# RUN \ +# /checkelf /usr/local/bin/ffmpeg && \ +# /checkelf /usr/local/bin/ffprobe +# # workaround for using -Wl,--allow-multiple-definition +# # see comment in checkdupsym for details +# COPY checkdupsym / +# RUN /checkdupsym /ffmpeg-* # some basic fonts that don't take up much space RUN apk add $APK_OPTS font-terminus font-inconsolata font-dejavu font-awesome