[ffmpeg/f36] Fix sdl2 test
by Leigh Scott
commit 00b5a7ba47cc07980a0026b568d561b287cafc22
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Oct 17 14:09:21 2022 +0100
Fix sdl2 test
c6fdbe26ef30fff817581e5ed6e078d96111248a.patch | 31 ++++++++++++++++++++++++++
ffmpeg.spec | 3 +++
2 files changed, 34 insertions(+)
---
diff --git a/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch b/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch
new file mode 100644
index 0000000..d23c1e4
--- /dev/null
+++ b/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch
@@ -0,0 +1,31 @@
+From c6fdbe26ef30fff817581e5ed6e078d96111248a Mon Sep 17 00:00:00 2001
+From: dvhh <dvhh-at-yahoo.com(a)ffmpeg.org>
+Date: Sat, 18 Jun 2022 01:46:12 +0900
+Subject: [PATCH] configure: fix SDL2 version check for pkg_config fallback
+
+pkg_config fallback for SDL2 use 2.1.0 as max (excluded) version
+where the pkg_config specify 3.0.0
+Correcting fallback version to be in line with the pkg_config version
+
+Signed-off-by: dvhh <dvhh(a)yahoo.com>
+Signed-off-by: Marton Balint <cus(a)passwd.hu>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 7d5c4900bf..0558e937ca 100755
+--- a/configure
++++ b/configure
+@@ -6756,7 +6756,7 @@ if enabled sdl2; then
+ sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
+ sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
+ test_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags &&
+- test_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags &&
++ test_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x030000" $sdl2_cflags &&
+ check_func_headers SDL_events.h SDL_PollEvent $sdl2_extralibs $sdl2_cflags &&
+ enable sdl2
+ fi
+--
+2.25.1
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 51ab24c..055b7aa 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -142,6 +142,9 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix-vmaf-model-path.patch
+# Fix sdl test
+# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c6fdbe26ef30fff817581e5ed...
+Patch1: c6fdbe26ef30fff817581e5ed6e078d96111248a.patch
Conflicts: %{name}-free
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
2 years
[ffmpeg/f36] Disable rtmp because of rfbz: 6441 & 2399
by Leigh Scott
commit b708aaa3d6408c12e5fac64e294c89b02295eb9d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Oct 17 12:22:01 2022 +0100
Disable rtmp because of rfbz: 6441 & 2399
ffmpeg.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5cb4c0b..51ab24c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -23,7 +23,6 @@
%global _with_chromaprint 1
%global _with_ilbc 1
%global _with_rav1e 1
-%global _with_rtmp 1
%global _with_rubberband 1
%global _with_smb 1
%global _with_snappy 1
@@ -134,7 +133,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.0.1
-Release: 7%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 8%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -187,6 +186,7 @@ BuildRequires: libmodplug-devel
BuildRequires: libmysofa-devel
BuildRequires: libopenmpt-devel
BuildRequires: librsvg2-devel
+# Disable rtmp because of rfbz: 6441 & 2399
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
BuildRequires: libssh-devel
@@ -511,6 +511,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Oct 17 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.1-8
+- Disable rtmp because of rfbz: 6441 & 2399
+
* Sun Jun 12 2022 Sérgio Basto <sergio(a)serjux.com> - 5.0.1-7
- unbootstrap
2 years
[ffmpeg/el9] (6 commits) ...Disable rtmp because of rfbz: 6441 & 2399
by Leigh Scott
Summary of changes:
15c0273... Switch from glslang to shaderc (*)
6369da3... Change f37 so we can get some testing done before release (*)
69b7644... Fedora has fixed lv2 to include the old headers (*)
6ec873e... Update to 5.1.2 release (*)
d5b7758... Implement libavcodec-freeworld (*)
c35ade4... Disable rtmp because of rfbz: 6441 & 2399 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years
[ffmpeg] Disable rtmp because of rfbz: 6441 & 2399
by Leigh Scott
commit c35ade47f46ecf65506d079565d5265fdec02208
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Oct 17 12:16:01 2022 +0100
Disable rtmp because of rfbz: 6441 & 2399
ffmpeg.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a4db7b3..14c192f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -34,7 +34,6 @@
%global _without_frei0r 1
%global _without_lv2 1
%endif
-%global _with_rtmp 1
%global _with_rubberband 1
%global _with_smb 1
%global _with_snappy 1
@@ -117,7 +116,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.1.2
-Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 3%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -169,6 +168,7 @@ BuildRequires: libmodplug-devel
BuildRequires: libmysofa-devel
BuildRequires: libopenmpt-devel
BuildRequires: librsvg2-devel
+# Disable rtmp because of rfbz: 6441 & 2399
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
BuildRequires: libssh-devel
@@ -521,6 +521,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Mon Oct 17 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.2-3
+- Disable rtmp because of rfbz: 6441 & 2399
+
* Wed Sep 28 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 5.1.2-2
- Implement libavcodec-freeworld
2 years
[wl-kmod/el7: 3/3] Merge branch 'master' into el7
by Nicolas Viéville
commit aa333ba0a8557701d748bf4c4f206c29e8c783d0
Merge: 4f808ba 52de525
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Oct 17 01:51:26 2022 +0200
Merge branch 'master' into el7
wl-kmod-023_kernel_6.0_adaptation.patch | 8 +++++---
wl-kmod.spec | 13 +++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)
---
2 years
