[vlc] Fixup patch7
by Nicolas Chauvet
commit 22fbe106c4eae93b78701c6b402c02020404f0f0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jul 28 18:04:26 2020 +0200
Fixup patch7
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index df23ebe..6029aac 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -330,7 +330,7 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac
. /opt/rh/devtoolset-%{dts_ver}/enable
%endif
%if 0%{?fedora}
-%patch6 -p1
+%patch7 -p1
%endif
%{?_with_bootstrap:
4 years, 3 months
[vlc/f31: 12/12] Merge branch 'master' into f31
by Nicolas Chauvet
commit afaec7b053d3d0f5b20b3d1444cdb1884ef13c54
Merge: a18d81a 04d2efe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jul 28 17:46:57 2020 +0200
Merge branch 'master' into f31
0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch | 13 +-
...ead-nav-Fix-cases-where-DVD-_VERSION-are-.patch | 75 --
...port-for-thread-callbacks-for-older-gcryp.patch | 94 +++
mmal_16.patch => mmal_17.patch | 920 +++++++++++++++------
sources | 2 +-
vlc.spec | 26 +-
6 files changed, 795 insertions(+), 335 deletions(-)
---
4 years, 3 months
[vlc/f31] (12 commits) ...Merge branch 'master' into f31
by Nicolas Chauvet
Summary of changes:
114522d... Update mmal_17.patch (*)
e525055... Update to 3.0.11 wip (*)
6c002dc... Reverse opencv condition (*)
07f9d56... Update gnutls patch (*)
12d4d16... Wrap ldconfig calls for el7 (*)
658016f... Add spatialaudio (*)
7e046ad... Remove patch (*)
57baa21... Drop patch for DVD support (*)
908d00c... Apply gcrypt downgrade patch (*)
d41695f... Add gcrypt downgrade patch (*)
04d2efe... Update to 3.0.11.1 (*)
afaec7b... Merge branch 'master' into f31
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[vlc/f32] (11 commits) ...Update to 3.0.11.1
by Nicolas Chauvet
Summary of changes:
114522d... Update mmal_17.patch (*)
e525055... Update to 3.0.11 wip (*)
6c002dc... Reverse opencv condition (*)
07f9d56... Update gnutls patch (*)
12d4d16... Wrap ldconfig calls for el7 (*)
658016f... Add spatialaudio (*)
7e046ad... Remove patch (*)
57baa21... Drop patch for DVD support (*)
908d00c... Apply gcrypt downgrade patch (*)
d41695f... Add gcrypt downgrade patch (*)
04d2efe... Update to 3.0.11.1 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[vlc] Update to 3.0.11.1
by Nicolas Chauvet
commit 04d2efe6b3a9f855d585e790b3f3bc1f7e6a428f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 27 18:13:50 2020 +0200
Update to 3.0.11.1
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index bc903cf..2605a0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-3.0.11.tar.xz) = 8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444
+SHA512 (vlc-3.0.11.1.tar.xz) = 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b
diff --git a/vlc.spec b/vlc.spec
index 6923543..df23ebe 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,4 +1,4 @@
-%global commit0 f5ec9e0acaa5e5bc7c5e7cf09019185b0da3bd37
+#global commit0 f5ec9e0acaa5e5bc7c5e7cf09019185b0da3bd37
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
#global vlc_rc -rc9
@@ -50,8 +50,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
-Version: 3.0.11
-Release: 7%{?dist}
+Version: 3.0.11.1
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
@@ -596,6 +596,9 @@ fi || :
%changelog
+* Mon Jul 27 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.11.1-1
+- Update to 3.0.11.1
+
* Sat Jul 18 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.11-7
- Rebuilt
4 years, 3 months
[vlc] Add gcrypt downgrade patch
by Nicolas Chauvet
commit d41695f8bd5fa6fb2f9f61c56785e753abb6be03
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jul 18 19:12:11 2020 +0200
Add gcrypt downgrade patch
...port-for-thread-callbacks-for-older-gcryp.patch | 94 ++++++++++++++++++++++
1 file changed, 94 insertions(+)
---
diff --git a/Restore-support-for-thread-callbacks-for-older-gcryp.patch b/Restore-support-for-thread-callbacks-for-older-gcryp.patch
new file mode 100644
index 0000000..819f0d0
--- /dev/null
+++ b/Restore-support-for-thread-callbacks-for-older-gcryp.patch
@@ -0,0 +1,94 @@
+From 43332a4fa12ff79f284749177dc0743a495caea6 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Sat, 18 Jul 2020 15:19:31 +0200
+Subject: [PATCH 1/1] Restore support for thread callbacks for older gcrypt
+
+---
+ include/vlc_gcrypt.h | 64 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 64 insertions(+)
+
+diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h
+index a04e1b1d86..4c7f1e86b0 100644
+--- a/include/vlc_gcrypt.h
++++ b/include/vlc_gcrypt.h
+@@ -25,6 +25,67 @@
+
+ #include <errno.h>
+
++#if GCRYPT_VERSION_NUMBER < 0x010600
++#ifdef LIBVLC_USE_PTHREAD
++/**
++ * If possible, use gcrypt-provided thread implementation. This is so that
++ * other non-VLC components (inside the process) can also use gcrypt safely.
++ */
++GCRY_THREAD_OPTION_PTHREAD_IMPL;
++# define gcry_threads_vlc gcry_threads_pthread
++#else
++
++/**
++ * gcrypt thread option VLC implementation
++ */
++
++static int gcry_vlc_mutex_init( void **p_sys )
++{
++ vlc_mutex_t *p_lock = (vlc_mutex_t *)malloc( sizeof( vlc_mutex_t ) );
++ if( p_lock == NULL)
++ return ENOMEM;
++
++ vlc_mutex_init( p_lock );
++ *p_sys = p_lock;
++ return VLC_SUCCESS;
++}
++
++static int gcry_vlc_mutex_destroy( void **p_sys )
++{
++ vlc_mutex_t *p_lock = (vlc_mutex_t *)*p_sys;
++ vlc_mutex_destroy( p_lock );
++ free( p_lock );
++ return VLC_SUCCESS;
++}
++
++static int gcry_vlc_mutex_lock( void **p_sys )
++{
++ vlc_mutex_lock( (vlc_mutex_t *)*p_sys );
++ return VLC_SUCCESS;
++}
++
++static int gcry_vlc_mutex_unlock( void **lock )
++{
++ vlc_mutex_unlock( (vlc_mutex_t *)*lock );
++ return VLC_SUCCESS;
++}
++
++static const struct gcry_thread_cbs gcry_threads_vlc =
++{
++ GCRY_THREAD_OPTION_USER,
++ NULL,
++ gcry_vlc_mutex_init,
++ gcry_vlc_mutex_destroy,
++ gcry_vlc_mutex_lock,
++ gcry_vlc_mutex_unlock,
++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
++};
++#endif
++#endif
++
++/**
++ * Initializes gcrypt with proper locking.
++ */
+ static inline void vlc_gcrypt_init (void)
+ {
+ /* This would need a process-wide static mutex with all libraries linking
+@@ -37,6 +98,9 @@ static inline void vlc_gcrypt_init (void)
+ vlc_global_lock (VLC_GCRYPT_MUTEX);
+ if (!done)
+ {
++#if GCRYPT_VERSION_NUMBER < 0x010600
++ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
++#endif
+ /* The suggested way for an application to make sure that global_init
+ * has been called is by using gcry_check_version. (see global_init
+ * comments in gcrypt sources) */
+--
+2.25.4
+
4 years, 3 months
[vlc] Apply gcrypt downgrade patch
by Nicolas Chauvet
commit 908d00cbb61227e018b454b927e3a916b92bf3c4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jul 18 19:11:50 2020 +0200
Apply gcrypt downgrade patch
vlc.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 5769339..6923543 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -64,8 +64,9 @@ Source0: https://download.videolan.org/pub/videolan/%{?vlc_rc:testing}/vlc/%{ver
Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_17.p...
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
Patch5: Lower-libgcrypt-to-1.5.3.patch
+Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch
# Patch based on https://code.videolan.org/videolan/vlc/commit/0e0b070c26d197e848f1548fca4...
-Patch6: replace_deprecated_luaL_checkint.patch
+Patch7: replace_deprecated_luaL_checkint.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -319,6 +320,7 @@ VLC media player extras modules.
%patch3 -p1
%if 0%{?el7}
%patch5 -p1
+%patch6 -p1
# Lower opus requirement - rfbz#5585
sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac
sed -i -e 's/opus_multistream_surround_encoder_create/opus_multistream_encoder_create/g' modules/codec/opus.c
4 years, 3 months
[vlc] Remove patch
by Nicolas Chauvet
commit 7e046ad603e7e452466032e5c3387545c33743c0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jul 15 17:22:44 2020 +0200
Remove patch
...ead-nav-Fix-cases-where-DVD-_VERSION-are-.patch | 75 ----------------------
1 file changed, 75 deletions(-)
4 years, 3 months
[vlc] Add spatialaudio
by Nicolas Chauvet
commit 658016f145ab521006c5ba0f8dc473b1c900f6d9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jul 15 16:19:25 2020 +0200
Add spatialaudio
vlc.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/vlc.spec b/vlc.spec
index f64b89a..ad60d68 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -185,6 +185,7 @@ BuildRequires: pkgconfig(Qt5Gui) >= 5.5
BuildRequires: pkgconfig(Qt5Svg) >= 5.5
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.5
BuildRequires: pkgconfig(soxr)
+BuildRequires: pkgconfig(spatialaudio)
BuildRequires: pkgconfig(speexdsp) >= 1.0.5
BuildRequires: pkgconfig(srt)
%{?_with_wayland:
4 years, 3 months