[vlc/f31] Switch to gitlab snapshot
by Nicolas Chauvet
commit 9f9918e723e05951fc5ed55eaea27d2f9c2126cc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Apr 5 15:03:49 2020 +0200
Switch to gitlab snapshot
.gitignore | 1 +
sources | 2 +-
vlc.spec | 56 ++++++++++++++++++++++++++++++++------------------------
3 files changed, 34 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d32910..bd25b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
vlc-*.tar.xz
+vlc-*.tar.gz
diff --git a/sources b/sources
index 4ce1d9b..a635077 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-3.0.9-20200402-0222.tar.xz) = b83d99d780713b21fceab88ea794e5e620d756728e69f9578536bd12d66315aa9b3ab48ec65988e1bb83b0dd51f5b49aba4fddbd67f6faea6e13d9e6e5a5c272
+SHA512 (vlc-8b5cff4.tar.gz) = 868bf13a61407775a272448bad84c9d4fea761a94feaf61de428357ff4e69d18ad416b1911286c921b82c4574ae8029524c11b3a6c7d48c2d0b627a3b57d0dc8
diff --git a/vlc.spec b/vlc.spec
index b5f9b31..a0d6d05 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,11 +1,6 @@
-%global vlc_date 20200402
+%global commit0 8b5cff44981b3af508678b7eb687944e8f2688ea
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
#global vlc_rc -rc9
-%global vlc_tag -%{?vlc_date}-0222
-%if 0%{?vlc_tag:1}
-%global vlc_url https://nightlies.videolan.org/build/source/
-%else
-%global vlc_url https://download.videolan.org/pub/videolan/vlc/
-%endif
%global _with_bootstrap 1
@@ -21,7 +16,7 @@
%endif
%global _with_a52dec 1
-%global _with_libdvbpsi 1
+%global _with_libdvbpsi 1
%global _with_libmad 1
%global _with_libmpeg2 1
%global _with_twolame 1
@@ -54,19 +49,28 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.9
-Release: 34%{?dist}
+Release: 35%{?dist}
License: GPLv2+
URL: https://www.videolan.org
-Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
+%if 0%{?commit0:1}
+Source0: https://code.videolan.org/videolan/vlc-3.0/-/archive/%{commit0}/vlc-%{sho...
+%global vlc_setup vlc-3.0-%{?commit0}
+%elif 0%{?vlc_rc:1}
+Source0: https://download.videolan.org/pub/videolan/testing/vlc/%{version}%{?vlc_r...
+%global vlc_setup vlc-%{version}%{?vlc_rc}
+%else
+Source0: https://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}....
+%global vlc_setup vlc-%{version}
+%endif
Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16.p...
Patch2: Fix_aom_abi_break.patch
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
# Revert commit for f30
# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=bb98c9a1bda897...
-Patch4: buildfix_for_old_dav1d.patch
+Patch4: buildfix_for_old_dav1d.patch
BuildRequires: desktop-file-utils
-BuildRequires: libappstream-glib
-BuildRequires: fontpackages-devel
+BuildRequires: libappstream-glib
+BuildRequires: fontpackages-devel
%{?_with_bootstrap:
BuildRequires: bison
@@ -221,8 +225,8 @@ BuildRequires: raspberrypi-vc-devel
BuildRequires: raspberrypi-vc-static
}
-%if 0%{?rhel} == 7
-BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
+%if 0%{?el7}
+BuildRequires: devtoolset-8-toolchain, devtoolset-8-libatomic-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 8
@@ -299,7 +303,7 @@ VLC media player extras modules.
%prep
-%setup -q -n %{name}-%{version}%{?vlc_rc}
+%setup -q -n %{vlc_setup}
%{?_with_rpi:
%patch0 -p1
}
@@ -311,10 +315,7 @@ VLC media player extras modules.
%if 0%{?el7}
# Lower opus requirement - rfbz#5585
sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac
-%endif
-
-%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
+. /opt/rh/devtoolset-8/enable
%endif
%{?_with_bootstrap:
@@ -322,10 +323,12 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
}
+touch src/revision.txt
+
%build
-%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
+%if 0%{?el7}
+. /opt/rh/devtoolset-8/enable
%endif
%configure \
@@ -336,8 +339,9 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--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 \
+ --disable-rpath \
--with-binary-version=%{version} \
--enable-lua \
%{?_with_live555:--enable-live555} \
@@ -472,7 +476,7 @@ fi || :
%files
-%doc AUTHORS ChangeLog NEWS README THANKS
+%doc AUTHORS NEWS README THANKS
%license COPYING
%{_datadir}/metainfo/vlc.appdata.xml
%{_datadir}/applications/*%{name}.desktop
@@ -574,6 +578,10 @@ fi || :
%changelog
+* Sun Apr 05 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.9-35
+- Switch to gitlab snapshot
+- Switch to devtoolset-8 for el7
+
* Thu Apr 02 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.9-34
- Update to 20200402
- Enable make tests
4 years, 7 months
[vlc/f31] Update for qt5-qtwayland and phonon for el8
by Nicolas Chauvet
commit 4ebbb77b4dacabdbd46483f50289512fc8dd4a18
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 2 16:06:05 2020 +0200
Update for qt5-qtwayland and phonon for el8
vlc.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 8919217..b5f9b31 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -59,8 +59,8 @@ License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16.p...
-Patch2: Fix_aom_abi_break.patch
-Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
+Patch2: Fix_aom_abi_break.patch
+Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
# Revert commit for f30
# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=bb98c9a1bda897...
Patch4: buildfix_for_old_dav1d.patch
@@ -225,7 +225,7 @@ BuildRequires: raspberrypi-vc-static
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: phonon-qt5-devel
BuildRequires: phonon-qt5-backend-gstreamer
%else
@@ -237,7 +237,7 @@ Provides: phonon-backend-vlc = 0.6.2-3
%{?_with_wayland:
# Fedora 25 Workstation default to wayland but not all
# Boolean deps will handle this better when allowed
-%if 0%{?fedora} >= 25
+%if 0%{?fedora} || 0%{?rhel} >= 8
Recommends: qt5-qtwayland%{_isa}
%endif
}
4 years, 7 months
[vlc/f31] Update to 20200402
by Nicolas Chauvet
commit 37450cdc7daf8973d0b17d107c1193166a19ead2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 2 15:35:40 2020 +0200
Update to 20200402
sources | 2 +-
vlc.spec | 21 +++++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/sources b/sources
index 8313376..4ce1d9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-3.0.9-20200306-0223.tar.xz) = ca85dfab616d72572f83e67dc7b2b4e683237e0df2b2a4cec0c261c903932aa87dc7339dc6adfc45cf10eb1ca3f61e55058849e700f29144901cfafb1f6705dd
+SHA512 (vlc-3.0.9-20200402-0222.tar.xz) = b83d99d780713b21fceab88ea794e5e620d756728e69f9578536bd12d66315aa9b3ab48ec65988e1bb83b0dd51f5b49aba4fddbd67f6faea6e13d9e6e5a5c272
diff --git a/vlc.spec b/vlc.spec
index 0061557..8919217 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,6 +1,6 @@
-%global vlc_date 20200306
+%global vlc_date 20200402
#global vlc_rc -rc9
-%global vlc_tag -%{?vlc_date}-0223
+%global vlc_tag -%{?vlc_date}-0222
%if 0%{?vlc_tag:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -54,12 +54,11 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.9
-Release: 33%{?dist}
+Release: 34%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
-Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16.p...
-Patch1: libplacebo_patch_1.patch
+Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16.p...
Patch2: Fix_aom_abi_break.patch
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
# Revert commit for f30
@@ -304,12 +303,15 @@ VLC media player extras modules.
%{?_with_rpi:
%patch0 -p1
}
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%if 0%{?fedora} == 30
%patch4 -p1
%endif
+%if 0%{?el7}
+# Lower opus requirement - rfbz#5585
+sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac
+%endif
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
@@ -421,6 +423,9 @@ rm -rf %{buildroot}%{_datadir}/kde4
%find_lang %{name}
+%check
+make check
+
%ldconfig_scriptlets core
@@ -569,6 +574,10 @@ fi || :
%changelog
+* Thu Apr 02 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.9-34
+- Update to 20200402
+- Enable make tests
+
* Fri Mar 06 2020 leigh123linux <leigh123linux(a)googlemail.com> - 1:3.0.9-33
- Update to current snapshot
4 years, 7 months
[vlc/f31] ifarch asdcplib
by Nicolas Chauvet
commit f1bcb0094f05a23a519c3e93ade92110cc4b3bc7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 31 22:19:04 2020 +0200
ifarch asdcplib
vlc.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 2937f84..0061557 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -30,7 +30,9 @@
%global _with_freerdp 1
%global _with_dav1d 1
%global _with_aom 1
+%ifarch x86_64 ppc64le aarch64
%global _with_asdcp 1
+%endif
%if 0%{?fedora} || 0%{?el8}
%global _with_bluray 1
4 years, 7 months
[vlc/f31] Enable aom dav1d asdcp for all
by Nicolas Chauvet
commit c661432af9934aeb0069efa0a78aec0e90e139fa
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 31 22:16:36 2020 +0200
Enable aom dav1d asdcp for all
vlc.spec | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 825572c..2937f84 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -28,18 +28,16 @@
%global _with_fluidsynth 1
%global _with_schroedinger 1
%global _with_freerdp 1
+%global _with_dav1d 1
+%global _with_aom 1
+%global _with_asdcp 1
%if 0%{?fedora} || 0%{?el8}
-%global _with_aom 1
%global _with_bluray 1
-%global _with_dav1d 1
%global _with_wayland 1
%endif
%if 0%{?fedora}
-%ifarch x86_64
-%global _with_asdcp 1
-%endif
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
4 years, 7 months
[vlc/f32] Update to 3.0.9.2
by Nicolas Chauvet
Summary of changes:
1ea37c8... Update to 3.0.9.2 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[vlc] Update to 3.0.9.2
by Nicolas Chauvet
commit 1ea37c8af1dd9a8ae3da651d0ac91b13e4c9a97b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 10 11:23:04 2020 +0200
Update to 3.0.9.2
Fix_aom_abi_break.patch | 11 -----------
sources | 2 +-
vlc.spec | 28 +++++++++++++++++++---------
3 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/sources b/sources
index a635077..5220d8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-8b5cff4.tar.gz) = 868bf13a61407775a272448bad84c9d4fea761a94feaf61de428357ff4e69d18ad416b1911286c921b82c4574ae8029524c11b3a6c7d48c2d0b627a3b57d0dc8
+SHA512 (vlc-3.0.9.2.tar.xz) = c1009871449b3547ee8fec0c6e95fcf8f7b0328aa85c0c9670aa38ce11d083bae74584ec501b131232cd00fda707d6269ffa5f42c95aa04fe84b44045ca44409
diff --git a/vlc.spec b/vlc.spec
index 8432a0b..0dbb7a7 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-%global commit0 8b5cff44981b3af508678b7eb687944e8f2688ea
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#global commit0 8b5cff44981b3af508678b7eb687944e8f2688ea
+#global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
#global vlc_rc -rc9
%global _with_bootstrap 1
@@ -48,8 +48,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
-Version: 3.0.9
-Release: 36%{?dist}
+Version: 3.0.9.2
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
@@ -66,7 +66,6 @@ Source0: https://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version
%endif
Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16.p...
Patch1: 0001-vlc-3x-dvdread-nav-Fix-cases-where-DVD-_VERSION-are-.patch
-Patch2: Fix_aom_abi_break.patch
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
# Revert commit for f30
# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=bb98c9a1bda897...
@@ -139,9 +138,7 @@ BuildRequires: libmtp-devel >= 1.0.0
%{?_with_projectm:BuildRequires: libprojectM-devel}
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
-%if ! 0%{?el8}
BuildRequires: libssh2-devel
-%endif
BuildRequires: libsysfs-devel
BuildRequires: libshout-devel
BuildRequires: libsmbclient-devel
@@ -182,7 +179,7 @@ BuildRequires: pcre-devel
BuildRequires: pkgconfig(libarchive) >= 3.1.0
BuildRequires: pkgconfig(libpulse) >= 0.9.8
BuildRequires: pkgconfig(libsecret-1) >= 0.18
-BuildRequires: pkgconfig(microdns)
+BuildRequires: pkgconfig(microdns) >= 0.1.2
BuildRequires: pkgconfig(protobuf-lite) >= 2.5
BuildRequires: pkgconfig(Qt5Core) >= 5.5
BuildRequires: pkgconfig(Qt5Gui) >= 5.5
@@ -190,6 +187,9 @@ BuildRequires: pkgconfig(Qt5Svg) >= 5.5
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.5
BuildRequires: pkgconfig(soxr)
BuildRequires: pkgconfig(speexdsp) >= 1.0.5
+%if 0%{?fedora} > 30 && 0%{?rhel}
+BuildRequires: pkgconfig(srt)
+%endif
%{?_with_wayland:
BuildRequires: pkgconfig(wayland-client) >= 1.5.91
BuildRequires: pkgconfig(wayland-egl)
@@ -292,6 +292,10 @@ Summary: VLC media player core
Provides: vlc-nox = %{epoch}:%{version}-%{release}
%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
%{?lua_version:Requires: lua(abi) = %{lua_version}}
+Requires: libmicrodns%{?_isa} > 0.1.2-1
+%if 0%{?fc31}
+Requires: srt-libs%{?_isa} > 1.4.1-1
+%endif
%description core
VLC media player core components
@@ -311,8 +315,9 @@ VLC media player extras modules.
%{?_with_rpi:
%patch0 -p1
}
+%if 0%{?rhel}
%patch1 -p1
-%patch2 -p1
+%endif
%patch3 -p1
%if 0%{?fedora} == 30
%patch4 -p1
@@ -591,6 +596,11 @@ fi || :
%changelog
+* Wed Apr 08 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.9.2-1
+- Update to 3.0.9.2
+- Enable srt
+- Enable libssh2 even on el8
+
* Sun Apr 05 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.9-36
- Lower libopus requirement for el7 - rfbz#5585
- Add patch to build with libdvdread/libdvdnav for rhel
4 years, 7 months
[qmplay2] Rebuild for new libcdio version
by Leigh Scott
commit 5f754c98514ddf1eb4da20f4525b428ae1258094
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 10 07:47:13 2020 +0100
Rebuild for new libcdio version
qmplay2.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qmplay2.spec b/qmplay2.spec
index eef64dc..0174693 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -3,7 +3,7 @@
Name: qmplay2
Version: 19.12.19
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Qt based media player, streamer and downloader
License: LGPLv3+
URL: http://zaps166.sourceforge.net/?app=QMPlay2
@@ -121,6 +121,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_includedir}/%{pname}
%changelog
+* Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 19.12.19-4
+- Rebuild for new libcdio version
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 19.12.19-3
- Rebuild for ffmpeg-4.3 git
4 years, 7 months
[vcdimager] Rebuild for new libcdio version
by Leigh Scott
commit 4adbc191ec8b1fe81dde6c47b0d59f365bd099c0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 10 07:45:01 2020 +0100
Rebuild for new libcdio version
vcdimager.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vcdimager.spec b/vcdimager.spec
index a0d418b..440db77 100644
--- a/vcdimager.spec
+++ b/vcdimager.spec
@@ -1,7 +1,7 @@
Summary: VideoCD (pre-)mastering and ripping tool
Name: vcdimager
Version: 2.0.1
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.gnu.org/software/vcdimager/
@@ -107,6 +107,9 @@ fi
%changelog
+* Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.1-8
+- Rebuild for new libcdio version
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 7 months
[xine-lib] Rebuild for new libcdio version
by Leigh Scott
commit 737c9f2d7f3f92eeb634f938aa3cdd2b3188b0f9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 10 07:43:43 2020 +0100
Rebuild for new libcdio version
xine-lib.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 60f0029..a43980a 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -38,7 +38,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.10
-Release: 4%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 5%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -341,6 +341,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.10-5
+- Rebuild for new libcdio version
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.2.10-4
- Rebuild for ffmpeg-4.3 git
4 years, 7 months