Update package version to 7.1.1
This commit is contained in:
@@ -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"
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
name: ffmpeg
|
name: ffmpeg
|
||||||
description: A complete, cross-platform solution to record, convert and stream audio and video
|
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/
|
url: https://ffmpeg.org/
|
||||||
license: GPL3-only
|
license: GPL3-only
|
||||||
architecture: any
|
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"]
|
make_depends: ["mesa","nasm","vulkan-headers"]
|
||||||
type: source
|
type: source
|
||||||
|
|||||||
@@ -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;
|
|
||||||
@@ -10,10 +10,6 @@ FILENAME="${DOWNLOAD##*/}"
|
|||||||
prepare() {
|
prepare() {
|
||||||
wget "$DOWNLOAD"
|
wget "$DOWNLOAD"
|
||||||
tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
|
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
|
# The build function is executed in the source directory
|
||||||
@@ -22,21 +18,25 @@ build() {
|
|||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--enable-gpl \
|
--enable-gpl \
|
||||||
--enable-version3 \
|
--enable-version3 \
|
||||||
--enable-nonfree \
|
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
|
--enable-gnutls \
|
||||||
--enable-libaom \
|
--enable-libaom \
|
||||||
--enable-libass \
|
--enable-libass \
|
||||||
|
--enable-libdrm \
|
||||||
--enable-libfreetype \
|
--enable-libfreetype \
|
||||||
--enable-libmp3lame \
|
--enable-libmp3lame \
|
||||||
--enable-libopus \
|
--enable-libopus \
|
||||||
|
--enable-libpulse \
|
||||||
|
--enable-libspeex \
|
||||||
--enable-libvorbis \
|
--enable-libvorbis \
|
||||||
--enable-libvpx \
|
--enable-libvpx \
|
||||||
|
--enable-libwebp \
|
||||||
--enable-libx264 \
|
--enable-libx264 \
|
||||||
--enable-libx265 \
|
--enable-libx265 \
|
||||||
--enable-openssl \
|
--enable-libxml2 \
|
||||||
--disable-vulkan \
|
--enable-vulkan \
|
||||||
--ignore-tests=enhanced-flv-av1 \
|
--ignore-tests=enhanced-flv-av1 \
|
||||||
--docdir=/usr/share/doc/ffmpeg
|
--docdir=/usr/share/doc/ffmpeg
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user