diff --git a/README.rst b/README.rst index 1cfd742c..eed1b84f 100644 --- a/README.rst +++ b/README.rst @@ -17,13 +17,11 @@ Features Currently FFmpeg 8.1 is built with the following packages enabled for all platforms: - lame 3.100 -- ogg 1.3.6 - opus 1.6.1 -- vorbis 1.3.7 - dav1d 1.5.3 - libsvtav1 4.1.0 - vpx 1.16.0 -- png 1.6.56 +- png 1.6.58 - webp 1.5.0 - openh264 2.6.0 - opencore-amr 0.1.6 diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py index 64097142..61616c40 100644 --- a/scripts/build-ffmpeg.py +++ b/scripts/build-ffmpeg.py @@ -67,23 +67,12 @@ def calculate_sha256(filename: str) -> str: sha256="ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e", build_arguments=["--disable-gtktest"], ), - Package( - name="ogg", - source_url="http://downloads.xiph.org/releases/ogg/libogg-1.3.6.tar.gz", - sha256="83e6704730683d004d20e21b8f7f55dcb3383cdf84c0daedf30bde175f774638", - ), Package( name="opus", source_url="https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.6.1.tar.gz", sha256="6ffcb593207be92584df15b32466ed64bbec99109f007c82205f0194572411a1", build_arguments=["--disable-doc", "--disable-extra-programs"], ), - Package( - name="vorbis", - source_url="https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.xz", - sha256="b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b", - requires=["ogg"], - ), Package( name="dav1d", source_url="https://code.videolan.org/videolan/dav1d/-/archive/1.5.3/dav1d-1.5.3.tar.bz2", @@ -112,8 +101,8 @@ def calculate_sha256(filename: str) -> str: ), Package( name="png", - source_url="https://downloads.sourceforge.net/project/libpng/libpng16/1.6.56/libpng-1.6.56.tar.xz", - sha256="f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18", + source_url="https://downloads.sourceforge.net/project/libpng/libpng16/1.6.58/libpng-1.6.58.tar.xz", + sha256="28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775", # avoid an assembler error on Windows build_arguments=["PNG_COPTS=-fno-asynchronous-unwind-tables"], ), @@ -308,7 +297,6 @@ def main(): # print tool locations print("PATH", os.environ["PATH"]) if is_arm: - # CLANGARM64 uses clang instead of gcc tools = ["clang", "clang++", "curl", "ld", "pkg-config"] else: tools = ["gcc", "g++", "curl", "ld", "nasm", "pkg-config"] @@ -353,7 +341,6 @@ def main(): "--enable-libopencore-amrwb", "--enable-libopus", "--enable-libsvtav1", - "--enable-libvorbis", "--enable-libvpx", "--enable-libwebp", "--enable-libopenh264",