From 5cc3753cdc7feb03afee455cf77d0582c1a2acd7 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Mon, 11 Aug 2025 12:56:24 +0300 Subject: [PATCH] Update package version to 7.1.1 --- check-version.sh | 12 +++++++++ pkg.info | 4 +-- source-files/chromium-ffmpeg.patch | 42 ------------------------------ source.sh | 14 +++++----- 4 files changed, 21 insertions(+), 51 deletions(-) create mode 100644 check-version.sh delete mode 100644 source-files/chromium-ffmpeg.patch diff --git a/check-version.sh b/check-version.sh new file mode 100644 index 0000000..881de0e --- /dev/null +++ b/check-version.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Git repository +REPO="https://git.ffmpeg.org/ffmpeg.git" + +# Get tag name using 'git ls-remote' +TAG_NAME=$(git ls-remote --exit-code --refs --tags --sort='v:refname' "$REPO" | cut -d'/' -f3 | grep -E "^n([0-9]*\.[0-9]*\.[0-9]*)\$" | sort -r | head -n1) + +# Trim 'v' character in VERSION variable +VERSION=$(echo "$TAG_NAME" | tr -d 'n') + +echo "$VERSION" diff --git a/pkg.info b/pkg.info index b706bf1..901bcf8 100644 --- a/pkg.info +++ b/pkg.info @@ -1,9 +1,9 @@ name: ffmpeg description: A complete, cross-platform solution to record, convert and stream audio and video -version: 6.1.1 +version: 7.1.1 url: https://ffmpeg.org/ license: GPL3-only architecture: any -depends: ["alsa-lib","libaom","bzip2","cairo","fontconfig","freetype2","fribidi","glib","glibc","gmp","gnutls","harfbuzz","lame","libass","libdrm","libglvnd","librsvg","libva","libvdpau","libvorbis","libvpx","libwebp","libx11","libxcb","libxext","libxml2","libxv","speex","vulkan-loader","x264","x265","xz-utils","zlib"] +depends: ["alsa-lib","libaom","bzip2","fontconfig","freetype2","fribidi","glib","glibc","gnutls","harfbuzz","lame","libass","libdrm","libpulse","libva","libvdpau","libvorbis","libvpx","libwebp","libx11","libxcb","libxext","libxml2","libxv","sdl2-compat","speex","vulkan-loader","x264","x265","xz-utils","zlib"] make_depends: ["mesa","nasm","vulkan-headers"] type: source diff --git a/source-files/chromium-ffmpeg.patch b/source-files/chromium-ffmpeg.patch deleted file mode 100644 index 9aee44a..0000000 --- a/source-files/chromium-ffmpeg.patch +++ /dev/null @@ -1,42 +0,0 @@ -Submitted By: Marty Jack (martyj19 at comcast dot net) -Date: 2022-07-23 -Initial Package Version: 5.1.0 -Origin: Rediffed from ffmpeg-5.0.1-api_addition-1.patch -Upstream Status: Not accepted -Description: The ffmpeg upstream is not willing to take this as a -permanent fix and suggests that Chromium should change to keep the -information locally to Chromium. Until that happens it appears -that many distros are carrying this patch as a temporary -expedient to allow building with system ffmpeg. - -diff -Naur ffmpeg-5.1.orig/libavformat/avformat.h ffmpeg-5.1/libavformat/avformat.h ---- ffmpeg-5.1.orig/libavformat/avformat.h 2022-07-22 13:58:39.000000000 -0400 -+++ ffmpeg-5.1/libavformat/avformat.h 2022-07-22 19:34:07.490051886 -0400 -@@ -1128,6 +1128,10 @@ - */ - int64_t av_stream_get_end_pts(const AVStream *st); - -+// Chromium: We use the internal field first_dts vvv -+int64_t av_stream_get_first_dts(const AVStream *st); -+// Chromium: We use the internal field first_dts ^^^ -+ - #define AV_PROGRAM_RUNNING 1 - - /** -diff -Naur ffmpeg-5.1.orig/libavformat/demux_utils.c ffmpeg-5.1/libavformat/demux_utils.c ---- ffmpeg-5.1.orig/libavformat/demux_utils.c 2022-07-22 13:58:39.000000000 -0400 -+++ ffmpeg-5.1/libavformat/demux_utils.c 2022-07-22 19:36:39.646735587 -0400 -@@ -29,6 +29,13 @@ - #include "demux.h" - #include "internal.h" - -+// Chromium: We use the internal field first_dts vvv -+int64_t av_stream_get_first_dts(const AVStream *st) -+{ -+ return cffstream(st)->first_dts; -+} -+// Chromium: We use the internal field first_dts ^^^ -+ - struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) - { - return cffstream(st)->parser; diff --git a/source.sh b/source.sh index 062658b..2cda2a9 100644 --- a/source.sh +++ b/source.sh @@ -10,10 +10,6 @@ FILENAME="${DOWNLOAD##*/}" prepare() { wget "$DOWNLOAD" tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" - - cd "$BPM_SOURCE" - # Patch from BLFS - patch -Np1 -i ../chromium-ffmpeg.patch } # The build function is executed in the source directory @@ -22,21 +18,25 @@ build() { ./configure --prefix=/usr \ --enable-gpl \ --enable-version3 \ - --enable-nonfree \ --disable-static \ --enable-shared \ --disable-debug \ + --enable-gnutls \ --enable-libaom \ --enable-libass \ + --enable-libdrm \ --enable-libfreetype \ --enable-libmp3lame \ --enable-libopus \ + --enable-libpulse \ + --enable-libspeex \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx264 \ --enable-libx265 \ - --enable-openssl \ - --disable-vulkan \ + --enable-libxml2 \ + --enable-vulkan \ --ignore-tests=enhanced-flv-av1 \ --docdir=/usr/share/doc/ffmpeg