[vlc/el9] (14 commits) ...Use compat-ffmpeg4 for F36+
by Nicolas Chauvet
Summary of changes:
98c4ce0... Update to 3.0.17 (*)
88ad023... Fixup (*)
f633042... Fixup private headers usage (*)
4e98573... Update to 3.0.17.2 (rfbz#6241) (*)
3d97202... Drop deprecated libmp4v2 (*)
9d48235... Drop unused libdv (*)
74419de... Drop unused libtar (*)
ad0c8bd... Reverse condition (*)
f86d80f... Drop libdc1394 for el9+ (*)
9d2b877... Drop unused minizip (*)
b835a22... Update to 3.0.17.4 (*)
ccc8619... Condition lirc (*)
ca75b3e... Switch placebo fedora only for now (*)
6bcb482... Use compat-ffmpeg4 for F36+ (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 6 months
[vlc/f36] (10 commits) ...Use compat-ffmpeg4 for F36+
by Nicolas Chauvet
Summary of changes:
3d97202... Drop deprecated libmp4v2 (*)
9d48235... Drop unused libdv (*)
74419de... Drop unused libtar (*)
ad0c8bd... Reverse condition (*)
f86d80f... Drop libdc1394 for el9+ (*)
9d2b877... Drop unused minizip (*)
b835a22... Update to 3.0.17.4 (*)
ccc8619... Condition lirc (*)
ca75b3e... Switch placebo fedora only for now (*)
6bcb482... Use compat-ffmpeg4 for F36+ (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 6 months
[vlc] Use compat-ffmpeg4 for F36+
by Nicolas Chauvet
commit 6bcb482bf24fc1f09070927a94b65b283c54b728
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed May 11 12:22:09 2022 +0100
Use compat-ffmpeg4 for F36+
vlc.spec | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 2bacd27..e88023d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -104,7 +104,11 @@ BuildRequires: cdparanoia-devel
%{?_with_dav1d:BuildRequires: libdav1d-devel}
BuildRequires: pkgconfig(dbus-1)
%{?_with_faad2:BuildRequires: faad2-devel}
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
+%{?_with_ffmpeg:BuildRequires: compat-ffmpeg4-devel}
+%else
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
+%endif
BuildRequires: flac-devel
%{?_with_fluidsynth:BuildRequires: fluidsynth-devel}
BuildRequires: fribidi-devel
@@ -371,14 +375,18 @@ touch src/revision.txt
. /opt/rh/devtoolset-%{dts_ver}/enable
%endif
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
+export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig
+%endif
+
%configure \
--disable-dependency-tracking \
--disable-optimizations \
--disable-silent-rules \
- --with-default-font=%{_fontbasedir}/dejavu/DejaVuSans.ttf \
- --with-default-font-family=DejaVuSans \
- --with-default-monospace-font=%{_fontbasedir}/dejavu/DejaVuSansMono.ttf \
- --with-default-monospace-font-family=DejaVuSansMono \
+ --with-default-font=%{_fontbasedir}/dejavu/DejaVuSans.ttf \
+ --with-default-font-family=DejaVuSans \
+ --with-default-monospace-font=%{_fontbasedir}/dejavu/DejaVuSansMono.ttf \
+ --with-default-monospace-font-family=DejaVuSansMono \
--with-kde-solid=no \
--with-pic \
--disable-rpath \
2 years, 6 months
[vlc] Switch placebo fedora only for now
by Nicolas Chauvet
commit ca75b3efc0f3f2d96f766fbcac1ac183fd01bbe2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun May 15 16:31:39 2022 +0200
Switch placebo fedora only for now
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 5775c7d..2bacd27 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -156,7 +156,7 @@ BuildRequires: libtiff-devel
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(libjpeg)
# Not Yet in EL8
-%if ! 0%{?el8}
+%if 0%{?fedora}
BuildRequires: pkgconfig(libplacebo)
%endif
BuildRequires: pkgconfig(libudev)
2 years, 6 months
[vlc] Condition lirc
by Nicolas Chauvet
commit ccc8619ace27cfd3a92d32c0b9c2d41f31a7341d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun May 15 16:30:47 2022 +0200
Condition lirc
vlc.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 89f5c0a..5775c7d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -39,6 +39,7 @@
%endif
%if 0%{?fedora}
+%global _with_lirc 1
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
@@ -168,7 +169,7 @@ BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: lirc-devel
+%{?_with_lirc:BuildRequires: lirc-devel }
%{?_with_live555:BuildRequires: live555-devel >= 0-0.33}
BuildRequires: kernel-headers
BuildRequires: pkgconfig(gl)
2 years, 6 months
[vlc] Update to 3.0.17.4
by Nicolas Chauvet
commit b835a2257028606c01f0a9c8c68414108d8cf708
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun May 15 16:00:15 2022 +0200
Update to 3.0.17.4
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 28b8379..89f5c0a 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -54,7 +54,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
-Version: 3.0.17.2
+Version: 3.0.17.4
Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
@@ -620,6 +620,9 @@ fi || :
%changelog
+* Sun May 15 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.17.4-1
+- Update to 3.0.17.4
+
* Thu Mar 10 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.17.2-1
- Update to 3.0.17.2 (rfbz#6241)
2 years, 6 months
[vlc] Drop unused minizip
by Nicolas Chauvet
commit 9d2b8771cc1037d635fdb8e969a839598b408ee0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu May 5 19:34:51 2022 +0200
Drop unused minizip
vlc.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 2d6e8d5..28b8379 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -180,7 +180,6 @@ BuildRequires: lua5.1-devel, lua5.1
%else
BuildRequires: lua-devel
%endif
-BuildRequires: minizip-devel
%{?_with_libmpeg2:BuildRequires: libmpeg2-devel >= 0.3.2}
BuildRequires: ncurses-devel
%{?_with_opencv:BuildRequires: pkgconfig(opencv)}
2 years, 6 months
[vlc] Drop libdc1394 for el9+
by Nicolas Chauvet
commit f86d80f805e7efc4e6d7150cd3f695bb692e3637
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu May 5 16:43:05 2022 +0200
Drop libdc1394 for el9+
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 98df3b6..2d6e8d5 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -29,6 +29,10 @@
%global _with_asdcp 1
%endif
+%if 0%{?rhel} && 0%{?rhel} >= 9
+%global _without_libdc1394 1
+%endif
+
%if ! 0%{?el7}
%global _with_bluray 1
%global _with_wayland 1
@@ -121,7 +125,7 @@ BuildRequires: pkgconfig(libchromaprint)
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: pkgconfig(daaladec)
BuildRequires: pkgconfig(daalaenc)
-BuildRequires: libdc1394-devel >= 2.1.0
+%{!?_without_libdc1394:BuildRequires: libdc1394-devel}
%{?_with_libdca:BuildRequires: libdca-devel}
%{?_with_libdvbpsi:BuildRequires: libdvbpsi-devel}
BuildRequires: libdvdnav-devel
2 years, 6 months
[vlc] Reverse condition
by Nicolas Chauvet
commit ad0c8bd1c0cc5e51a3586a73bf55422362008f3e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu May 5 16:40:43 2022 +0200
Reverse condition
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 7219d63..98df3b6 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -29,7 +29,7 @@
%global _with_asdcp 1
%endif
-%if 0%{?fedora} || 0%{?el8}
+%if ! 0%{?el7}
%global _with_bluray 1
%global _with_wayland 1
%endif
2 years, 6 months
