[vlc/el7: 9/9] Merge branch 'master' into el7
by Nicolas Chauvet
commit c442cb728e648d4ec7ff8677780844eaca251010
Merge: 6dd569e 0909abc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 18 10:14:59 2019 +0200
Merge branch 'master' into el7
vlc.spec | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
---
4 years, 11 months
[vlc/el7] (9 commits) ...Merge branch 'master' into el7
by Nicolas Chauvet
Summary of changes:
756a26b... Fixup for arm asdcplib (*)
fb5405f... Move asdcp plugin to extras (*)
ace4871... Update changelog (*)
4463e72... fixup ascdbuild not fixed on i686 (*)
f4c50d3... Fix typo (*)
55920a2... Avoid files listed twice (*)
0b439d6... Rework with/without options (*)
0909abc... Update changelog (*)
c442cb7... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[vlc] Update changelog
by Nicolas Chauvet
commit 0909abc5a7b3d3234b07e487ffa38448fa1c24d0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 18 10:14:00 2019 +0200
Update changelog
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 2165a87..189f2ac 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -51,7 +51,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -551,6 +551,10 @@ fi || :
%changelog
+* Tue Jun 18 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.7.1-4
+- Avoid files listed twice
+- Rework with/without options
+
* Mon Jun 17 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.7.1-3
- Move asdcp plugin to extras
4 years, 11 months
[vlc] Rework with/without options
by Nicolas Chauvet
commit 0b439d6a0e16cc5b8e86954b2f71723bea5016cc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 18 10:13:07 2019 +0200
Rework with/without options
vlc.spec | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 82c12a9..2165a87 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -6,39 +6,44 @@
%else
%global vlc_url https://download.videolan.org/pub/videolan/vlc/
%endif
-%global _with_bootstrap 1
+
+%global _with_bootstrap 1
+
%if 0%{?!_without_freeworld:1}
-%global _with_a52dec 1
%global _with_faad2 1
%global _with_ffmpeg 1
%global _with_libdca 1
-%global _with_libdvbpsi 1
-%global _with_libmad 1
-%global _with_libmpeg2 1
-%global _with_twolame 1
%global _with_x264 1
%global _with_x265 1
%global _with_xvidcore 1
%global _with_live555 1
%global _with_vaapi 1
%endif
-%global _with_bluray 1
-%if 0%{?fedora} && 0%{?fedora} < 28
-%global _with_opencv 1
-%endif
+
+%global _with_a52dec 1
+%global _with_libdvbpsi 1
+%global _with_libmad 1
+%global _with_libmpeg2 1
+%global _with_twolame 1
%global _with_fluidsynth 1
+%global _with_schroedinger 1
+%global _with_freerdp 1
+
%if 0%{?fedora}
%global _with_aom 1
+%global _with_bluray 1
%global _with_dav1d 1
-%global _with_freerdp 1
-%global _with_schroedinger 1
%global _with_wayland 1
+%ifarch x86_64
+%global _with_asdcp 1
%endif
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
-%ifarch x86_64
-%global _with_asdcp 1
+%endif
+
+%if 0%{?el7}
+%global _with_opencv 1
%endif
4 years, 11 months
[vlc] Avoid files listed twice
by Nicolas Chauvet
commit 55920a2a4c0650a4e4c98e537e6495ac20ffb29e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 18 08:31:40 2019 +0200
Avoid files listed twice
vlc.spec | 6 ------
1 file changed, 6 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 931b679..82c12a9 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -500,8 +500,6 @@ fi || :
%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
}
-%dir %{_libdir}/vlc/plugins/gui
-%{_libdir}/vlc/plugins/gui/libncurses_plugin.so
%exclude %{_libdir}/vlc/plugins/gui/libqt_plugin.so
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_opencv:
@@ -516,10 +514,6 @@ fi || :
%exclude %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
%exclude %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so
%ghost %{_libdir}/vlc/plugins/plugins.dat
-%dir %{_libdir}/vlc/
-%dir %{_libdir}/vlc/plugins
-%dir %{_libdir}/vlc/plugins/vdpau
-%{_libdir}/vlc/plugins/vdpau/libvdpau_*_plugin.so
%{_libdir}/vlc/vlc-cache-gen
%{_libdir}/vlc/plugins
%{_mandir}/man1/vlc*.1*
4 years, 11 months
[vlc/el7] Fix typo
by Nicolas Chauvet
commit 6dd569e2bee374c56cf0ce7a3f79bb61f9c5af5f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jun 17 14:58:21 2019 +0200
Fix typo
vlc.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 04ff22c..931b679 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -486,7 +486,7 @@ fi || :
%{_libdir}/vlc/libvlc_vdpau.so*
%{_libdir}/vlc/libvlc_xcb_events.so*
%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
-%{?_with_ascdp:
+%{?_with_asdcp:
%exclude %{_libdir}/vlc/plugins/access/libdcp_plugin.so
}
%{?_with_vcdimager:
@@ -538,7 +538,7 @@ fi || :
%{?_with_crystalhd:
%{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
}
-%{?_with_ascdp:
+%{?_with_asdcp:
%{_libdir}/vlc/plugins/access/libdcp_plugin.so
}
4 years, 11 months
[vlc/el7] fixup ascdbuild not fixed on i686
by Nicolas Chauvet
commit 6140a60291169dc0b110c53c4c93e19c174d35d3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jun 17 11:00:20 2019 +0200
fixup ascdbuild not fixed on i686
vlc.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 8c9ea40..04ff22c 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -36,6 +36,8 @@
%endif
%ifarch x86_64 i686
%global _with_crystalhd 1
+%endif
+%ifarch x86_64
%global _with_asdcp 1
%endif
4 years, 11 months
[vlc/el7] Update changelog
by Nicolas Chauvet
commit 6896b62601eb44d8343d527680d6a184bae84f57
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jun 17 10:29:07 2019 +0200
Update changelog
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index c3aca1e..8c9ea40 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -44,7 +44,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -550,6 +550,9 @@ fi || :
%changelog
+* Mon Jun 17 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.7.1-3
+- Move asdcp plugin to extras
+
* Wed Jun 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:3.0.7.1-2
- Enable asdcplib
4 years, 11 months
[vlc/el7] Move asdcp plugin to extras
by Nicolas Chauvet
commit 0bb30940cbecf2bfa607f77bfed53a4fcc0eb669
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jun 17 10:28:46 2019 +0200
Move asdcp plugin to extras
vlc.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 0b22623..c3aca1e 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -36,6 +36,7 @@
%endif
%ifarch x86_64 i686
%global _with_crystalhd 1
+%global _with_asdcp 1
%endif
@@ -65,9 +66,7 @@ BuildRequires: gcc-c++
%{?_with_aom:BuildRequires: libaom-devel}
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
-%ifnarch i686 %{arm}
-BuildRequires: asdcplib-devel
-%endif
+%{?_with_asdcp:BuildRequires: asdcplib-devel}
BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel
%{?_with_dav1d:BuildRequires: libdav1d-devel}
@@ -485,6 +484,9 @@ fi || :
%{_libdir}/vlc/libvlc_vdpau.so*
%{_libdir}/vlc/libvlc_xcb_events.so*
%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
+%{?_with_ascdp:
+%exclude %{_libdir}/vlc/plugins/access/libdcp_plugin.so
+}
%{?_with_vcdimager:
%exclude %{_libdir}/vlc/plugins/access/libvcd_plugin.so
%exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
@@ -534,6 +536,9 @@ fi || :
%{?_with_crystalhd:
%{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
}
+%{?_with_ascdp:
+%{_libdir}/vlc/plugins/access/libdcp_plugin.so
+}
%files devel
%dir %{_includedir}/vlc
4 years, 11 months
[vlc/el7] Fixup for arm asdcplib
by Nicolas Chauvet
commit 680a8cee9d1ba22ccc736f5070c593d68a4d7149
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jun 12 19:14:37 2019 +0200
Fixup for arm asdcplib
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 592ace0..0b22623 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -65,7 +65,7 @@ BuildRequires: gcc-c++
%{?_with_aom:BuildRequires: libaom-devel}
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
-%ifnarch i686 armv7hl
+%ifnarch i686 %{arm}
BuildRequires: asdcplib-devel
%endif
BuildRequires: avahi-devel
4 years, 11 months