[vcmi/f37] Switch to compat-ffmpeg4
by Leigh Scott
Summary of changes:
5d0d91f... Switch to compat-ffmpeg4 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 2 months
[vcmi] Switch to compat-ffmpeg4
by Leigh Scott
commit 5d0d91fc714993ce3ddff82362cdbab63f51e736
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 5 01:05:59 2022 +0100
Switch to compat-ffmpeg4
fix_ffmpeg_suffix.patch | 11 +++++++++++
vcmi.spec | 7 ++++---
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/fix_ffmpeg_suffix.patch b/fix_ffmpeg_suffix.patch
new file mode 100644
index 0000000..a8f076d
--- /dev/null
+++ b/fix_ffmpeg_suffix.patch
@@ -0,0 +1,11 @@
+--- a/cmake_modules/FindFFmpeg.cmake
++++ b/cmake_modules/FindFFmpeg.cmake
+@@ -79,7 +79,7 @@ macro(find_component _component _pkgconf
+ ${PC_LIB${_component}_INCLUDEDIR}
+ ${PC_LIB${_component}_INCLUDE_DIRS}
+ PATH_SUFFIXES
+- ffmpeg
++ compat-ffmpeg4
+ )
+
+ find_library(${_component}_LIBRARIES NAMES ${_library}
diff --git a/vcmi.spec b/vcmi.spec
index 98af0c9..5d2a37b 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -26,6 +26,7 @@ Source2: %{name}.zip
# Boost 1.71+
Patch1: https://github.com/vcmi/vcmi/commit/ac81d0f.patch
+Patch2: fix_ffmpeg_suffix.patch
# The Koji builder gets killed here, but I don't expect people to use this there
ExcludeArch: ppc64le
@@ -48,8 +49,7 @@ BuildRequires: boost-program-options >= 1.51
BuildRequires: boost-locale >= 1.51
BuildRequires: minizip-devel
BuildRequires: zlib-devel
-BuildRequires: ffmpeg-devel
-BuildRequires: ffmpeg-libs
+BuildRequires: compat-ffmpeg4-devel
BuildRequires: qt5-qtbase-devel
Requires: hicolor-icon-theme
@@ -87,6 +87,7 @@ mv vcmi/Mods/* Mods && rm -rf vcmi
dos2unix README.md license.txt AUTHORS ChangeLog
%patch1 -p1
+%patch2 -p1
# Don't show GITDIR-NOTFOUND in the window title
sed -i 's/GITDIR-NOTFOUND/%{scommit}/' cmake_modules/*
@@ -94,7 +95,7 @@ sed -i 's/GITDIR-NOTFOUND/%{scommit}/' cmake_modules/*
%build
# low effort fix of some cmake brokenness
-export CXXFLAGS="%{build_cxxflags} -I/usr/include/ffmpeg"
+export CXXFLAGS="%{build_cxxflags} -I/usr/include/compat-ffmpeg4"
%cmake \
-DENABLE_TEST=0 \
2 years, 2 months
[compat-ffmpeg4] Remove pkgconfig requires from devel
by Leigh Scott
commit f20ae81fe413aa021005d1ca69697b84ca5f425c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 22:02:22 2022 +0100
Remove pkgconfig requires from devel
compat-ffmpeg4.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec
index 7c65778..535077b 100644
--- a/compat-ffmpeg4.spec
+++ b/compat-ffmpeg4.spec
@@ -1,5 +1,6 @@
%undefine _package_note_file
%global __provides_exclude_from ^(%{_libdir}/pkgconfig)/.*$
+%global __requires_exclude_from ^(%{_libdir}/pkgconfig)/.*$
# Cuda and others are only available on some arches
%if 0%{?el7}
2 years, 2 months
[compat-ffmpeg4] Remove pkgconfig provides from devel
by Leigh Scott
commit 1913274ce717791ea38a434119915a9aecccedc6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 21:45:16 2022 +0100
Remove pkgconfig provides from devel
compat-ffmpeg4.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec
index f11e757..7c65778 100644
--- a/compat-ffmpeg4.spec
+++ b/compat-ffmpeg4.spec
@@ -1,4 +1,5 @@
%undefine _package_note_file
+%global __provides_exclude_from ^(%{_libdir}/pkgconfig)/.*$
# Cuda and others are only available on some arches
%if 0%{?el7}
@@ -46,7 +47,7 @@
Summary: Digital VCR and streaming server
Name: compat-ffmpeg4
Version: 4.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
Source0: %{url}/releases/ffmpeg-%{version}.tar.xz
@@ -330,6 +331,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/
%changelog
+* Sun Sep 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 4.4.2-6
+- Remove pkgconfig provides from devel
+
* Sun Sep 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 4.4.2-5
- Use standard location for pkgconfig and development libs
2 years, 2 months
[tvheadend/f36] Fix compat-ffmpeg4 build requires
by Leigh Scott
commit 5a1842b5e5d47ffbbb21a09b3bc1a46c0779a46c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 20:55:52 2022 +0100
Fix compat-ffmpeg4 build requires
tvheadend.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index 564106c..93a717b 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -37,7 +37,7 @@ Patch5: %{name}-4.3-crypto_policies.patch
Patch6: %{name}-4.3-libavresample.patch
BuildRequires: bzip2
-BuildRequires: compat-ffmpeg4
+BuildRequires: compat-ffmpeg4-devel
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: gzip
2 years, 2 months
[tvheadend/f37] Fix compat-ffmpeg4 build requires
by Leigh Scott
commit 9488ce9aa5ad2425194d3ee134714c0ef7b1c3e9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 20:55:52 2022 +0100
Fix compat-ffmpeg4 build requires
tvheadend.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index b5a006a..062d64e 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -37,7 +37,7 @@ Patch5: %{name}-4.3-crypto_policies.patch
Patch6: %{name}-4.3-libavresample.patch
BuildRequires: bzip2
-BuildRequires: compat-ffmpeg4
+BuildRequires: compat-ffmpeg4-devel
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: gzip
2 years, 2 months