[tvheadend/f36] remove compat-ffmpeg4 export
by Leigh Scott
commit 5aeaeb0ed82d82cf78da505d363310b7cf7083ba
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 20:40:22 2022 +0100
remove compat-ffmpeg4 export
tvheadend.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index 2e62652..564106c 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -110,8 +110,6 @@ done
%build
export CFLAGS="$RPM_OPT_FLAGS -Wno-error=array-bounds -Wno-error=use-after-free -Wno-error=address"
echo "%{version}-%{release}" >rpm/version
-# Set pkgconfig path for compat-ffmpeg4...
-export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig/"
%configure \
--disable-dvbscan \
--disable-ffmpeg_static \
2 years, 2 months
[tvheadend] remove compat-ffmpeg4 export
by Leigh Scott
commit 2cfda2e3f8a6ec81c39f668d2dfeee3188d9b966
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 20:40:22 2022 +0100
remove compat-ffmpeg4 export
tvheadend.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index 576a96e..b5a006a 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -110,8 +110,6 @@ done
%build
export CFLAGS="$RPM_OPT_FLAGS -Wno-error=array-bounds -Wno-error=use-after-free -Wno-error=address"
echo "%{version}-%{release}" >rpm/version
-# Set pkgconfig path for compat-ffmpeg4...
-export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig/"
%configure \
--disable-dvbscan \
--disable-ffmpeg_static \
2 years, 2 months
[ffmpeg] Fixup for el
by Leigh Scott
commit 66205b18d64bc001bf4bc4dc8cd5dcc0e41aa150
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 20:03:05 2022 +0100
Fixup for el
ffmpeg.spec | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 942443d..c431d38 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -253,7 +253,7 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
-%if 0%{?fedora} < 38
+%if 0%{?fedora} && 0%{?fedora} < 38
Conflicts: libavcodec-free
Conflicts: libavfilter-free
Conflicts: libavformat-free
@@ -273,7 +273,7 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
-%if 0%{?fedora} < 38
+%if 0%{?fedora} && 0%{?fedora} < 38
Conflicts: libavdevice-free
%endif
Requires: %{name}-libs%{_isa} = %{version}-%{release}
@@ -416,7 +416,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}}
%{ff_configure}\
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
--libdir=%{_libdir}/%{name} \
--shlibdir=%{_libdir}/%{name} \
%else
@@ -481,7 +481,7 @@ rm -r %{buildroot}%{_datadir}/%{name}/examples
install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
echo -e "%{_libdir}/%{name}\n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
@@ -507,7 +507,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
%files libs
%doc CREDITS README.md
%license COPYING.*
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
%{_libdir}/%{name}/lib*.so.*
%exclude %{_libdir}/%{name}/libavdevice%{?build_suffix}.so.*
@@ -520,7 +520,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
}
%files -n libavdevice%{?flavor}
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
%{_libdir}/%{name}/libavdevice%{?build_suffix}.so.*
%else
%{_libdir}/libavdevice%{?build_suffix}.so.*
2 years, 2 months
[ffmpeg/f37] move libs to a subdirectory to allow parallel installation with ffmpeg-free
by Leigh Scott
commit 8fe3d55cf24613c705636f87009f2f78326574b8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 18:09:44 2022 +0100
move libs to a subdirectory to allow parallel installation with ffmpeg-free
ffmpeg.spec | 36 ++++++++++++++++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 767ef6d..942443d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -135,7 +135,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.1.1
-Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -253,6 +253,7 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
+%if 0%{?fedora} < 38
Conflicts: libavcodec-free
Conflicts: libavfilter-free
Conflicts: libavformat-free
@@ -260,6 +261,7 @@ Conflicts: libavutil-free
Conflicts: libpostproc-free
Conflicts: libswresample-free
Conflicts: libswscale-free
+%endif
%{?_with_vmaf:Recommends: vmaf-models}
%description libs
@@ -271,7 +273,9 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
+%if 0%{?fedora} < 38
Conflicts: libavdevice-free
+%endif
Requires: %{name}-libs%{_isa} = %{version}-%{release}
%description -n libavdevice%{?flavor}
@@ -301,7 +305,6 @@ This package contains development files for %{name}
--datadir=%{_datadir}/%{name} \\\
--docdir=%{_docdir}/%{name} \\\
--incdir=%{_includedir}/%{name} \\\
- --libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--optflags="%{optflags}" \\\
@@ -413,7 +416,13 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}}
%{ff_configure}\
+%if 0%{?fedora} > 37
+ --libdir=%{_libdir}/%{name} \
+ --shlibdir=%{_libdir}/%{name} \
+%else
+ --libdir=%{_libdir} \
--shlibdir=%{_libdir} \
+%endif
%if 0%{?_without_tools:1}
--disable-doc \
--disable-ffmpeg --disable-ffplay --disable-ffprobe \
@@ -472,6 +481,12 @@ rm -r %{buildroot}%{_datadir}/%{name}/examples
install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
+%if 0%{?fedora} > 37
+install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+echo -e "%{_libdir}/%{name}\n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
+mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
+%endif
+
%ldconfig_scriptlets libs
%ldconfig_scriptlets -n libavdevice%{?flavor}
@@ -492,14 +507,24 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%files libs
%doc CREDITS README.md
%license COPYING.*
+%if 0%{?fedora} > 37
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
+%{_libdir}/%{name}/lib*.so.*
+%exclude %{_libdir}/%{name}/libavdevice%{?build_suffix}.so.*
+%else
%{_libdir}/lib*.so.*
%exclude %{_libdir}/libavdevice%{?build_suffix}.so.*
+%endif
%{!?flavor:%{_mandir}/man3/lib*.3.*
%exclude %{_mandir}/man3/libavdevice.3*
}
%files -n libavdevice%{?flavor}
+%if 0%{?fedora} > 37
+%{_libdir}/%{name}/libavdevice%{?build_suffix}.so.*
+%else
%{_libdir}/libavdevice%{?build_suffix}.so.*
+%endif
%{!?flavor:%{_mandir}/man3/libavdevice.3*}
%files devel
@@ -508,10 +533,17 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%doc %{_docdir}/%{name}/*.{css,html}
%{_includedir}/%{name}
%{_libdir}/pkgconfig/lib*.pc
+%if 0%{?fedora} > 37
+%{_libdir}/%{name}/lib*.so
+%else
%{_libdir}/lib*.so
+%endif
%changelog
+* Sun Sep 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.1-2
+- move libs to a subdirectory to allow parallel installation with ffmpeg-free
+
* Thu Sep 01 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.1-1
- Update to 5.1.1 release
2 years, 2 months
[zoneminder/el7: 2/2] Merge branch 'master' into el7
by Andrew Bauer
commit 78ac2e6341fe3963508655d14120adfa821acbfb
Merge: 3e55e5f ff647ea
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Sep 4 12:11:17 2022 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
2 years, 2 months
[zoneminder/el8] 1.36.25 release
by Andrew Bauer
Summary of changes:
ff647ea... 1.36.25 release (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 2 months
[zoneminder/el9] 1.36.25 release
by Andrew Bauer
Summary of changes:
ff647ea... 1.36.25 release (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 2 months
[zoneminder/f35] 1.36.25 release
by Andrew Bauer
Summary of changes:
ff647ea... 1.36.25 release (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 2 months
