x265 rebuilds

Looks like it had a API break. Rebuild gstreamer/ffmpeg.
This commit is contained in:
Christoph Reiter
2019-07-03 09:41:28 +02:00
parent 4bace05936
commit ccc23ff528
4 changed files with 79 additions and 4 deletions

View File

@@ -6,7 +6,7 @@ _realname=ffmpeg
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.1.3
pkgrel=1
pkgrel=2
pkgdesc="Complete and free Internet live audio and video broadcasting solution (mingw-w64)"
arch=('any')
url="https://ffmpeg.org/"

View File

@@ -0,0 +1,39 @@
From 49a2baebf58d9288f75964fc40a547fde510a840 Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Tue, 23 Apr 2019 09:06:13 +0200
Subject: [PATCH] opencv: allow compilation against 4.1.x
---
configure.ac | 2 +-
ext/opencv/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5486f80dc..5114e36fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1845,7 +1845,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
HAVE_OPENCV="yes"
fi
], [
- PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.1.0] , [
+ PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.2.0] , [
AC_PROG_CXX
AC_LANG([C++])
OLD_CPPFLAGS=$CPPFLAGS
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index d0ce1d3ee..f38b55dfe 100644
--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
@@ -65,7 +65,7 @@ if opencv_found
endif
endforeach
else
- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false)
+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
opencv_found = opencv_dep.found()
if opencv_found
foreach h : libopencv4_headers
--
2.21.0

View File

@@ -0,0 +1,30 @@
From d2f6facbfb89f13a891e710b44e1561570de006a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
<vjaquez@igalia.com>
Date: Wed, 8 May 2019 13:35:25 +0200
Subject: [PATCH] openh264enc: Fix compilation with openh264 v2.0
As OpenH264 increased its version to 2.0 the guard for structure
member is not valid.
This patch will fix the compilation with gst-build and openh264.
---
ext/openh264/gstopenh264enc.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp
index aa8138d7d..11be2a5b6 100644
--- a/ext/openh264/gstopenh264enc.cpp
+++ b/ext/openh264/gstopenh264enc.cpp
@@ -739,7 +739,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
enc_params.bEnableSceneChangeDetect = openh264enc->scene_change_detection;
enc_params.bEnableFrameSkip = openh264enc->enable_frame_skip;
enc_params.bEnableLongTermReference = 0;
-#if OPENH264_MINOR >= 4
+#if (OPENH264_MAJOR > 1 || (OPENH264_MAJOR == 1 && OPENH264_MINOR >= 4))
enc_params.eSpsPpsIdStrategy = CONSTANT_ID;
#else
enc_params.bEnableSpsPpsIdAddition = 0;
--
2.21.0

View File

@@ -6,7 +6,7 @@ _realname=gst-plugins-bad
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.16.0
pkgrel=2
pkgrel=3
pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
arch=('any')
url="https://gstreamer.freedesktop.org/"
@@ -66,11 +66,15 @@ options=(!libtool strip staticlibs)
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz
0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch
0002-meson-build-colormanagement.patch
0003-meson-lrdf-optional.patch)
0003-meson-lrdf-optional.patch
0004-opencv42.patch
0005-openh264.patch)
sha256sums=('22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05'
'1227ff3b65f88ef2b70290841c371ff76c90d66c23849647291a863cda6bcf4e'
'5bd5d52d55b34f18e00b27c1405b8a67c23a20f1babc4dce28af609faaa8c695'
'a992cf5fe1d159cf2cfe74556b5fe4018f9bcf421112f07e0e7571aa5bc912a0')
'a992cf5fe1d159cf2cfe74556b5fe4018f9bcf421112f07e0e7571aa5bc912a0'
'eb15c299087de3466b8fc6c3388d4aec16a5999248ffd9053cef884e58ec2992'
'df6ed6eca92a3ca49a0c98ca3ea2390a66801923d6dacb25765861a66e1fb14c')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
@@ -78,6 +82,8 @@ prepare() {
patch -p1 -i "${srcdir}"/0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch
patch -p1 -i "${srcdir}"/0002-meson-build-colormanagement.patch
patch -p1 -i "${srcdir}"/0003-meson-lrdf-optional.patch
patch -p1 -i "${srcdir}"/0004-opencv42.patch
patch -p1 -i "${srcdir}"/0005-openh264.patch
}
build() {