[vlc] Update patch
by Nicolas Chauvet
commit 46051cf58e3e0356e73cac237e18ebe71042f83b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 19 11:13:53 2021 +0100
Update patch
ffmpeg45.patch | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 125 insertions(+), 8 deletions(-)
---
diff --git a/ffmpeg45.patch b/ffmpeg45.patch
index df4c3c8..a4eaa02 100644
--- a/ffmpeg45.patch
+++ b/ffmpeg45.patch
@@ -1,7 +1,7 @@
-From cde283fef6dc1f70fd46fe891642f3e07edbc433 Mon Sep 17 00:00:00 2001
+From e51408a0549371efae3792aa40f5c2d992d8b4d4 Mon Sep 17 00:00:00 2001
From: Ilkka Ollakka <ileoo(a)videolan.org>
Date: Wed, 7 Jul 2021 12:37:58 +0000
-Subject: [PATCH 1/2] avcodec: remove use of av_init_packet as it is deprecated
+Subject: [PATCH 1/4] avcodec: remove use of av_init_packet as it is deprecated
in new ffmpeg major version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -14,7 +14,7 @@ Also use av_packet_free instead of unref.
Use av_packet_clone and AVPacket * in vlc_av_packet_t.
(cherry picked from commit 16fd46fa506424134beb53ec88be3eea1b42a221)
-Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
+Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
---
modules/codec/avcodec/audio.c | 12 +++++++-----
modules/codec/avcodec/encoder.c | 25 ++++++++++++++-----------
@@ -151,7 +151,7 @@ index 5cac6339d6..a17ba985e1 100644
msg_Warn(dec, "cannot decode one subtitle (%zu bytes)",
block->i_buffer);
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
-index b99eb56e4a..e175cef3a6 100644
+index b99eb56e4a..2b1e3ad314 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1015,14 +1015,18 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error
@@ -216,7 +216,7 @@ index b99eb56e4a..e175cef3a6 100644
- i_used = ret != AVERROR(EAGAIN) ? pkt.size : 0;
- av_packet_unref( &pkt );
+ i_used = ret != AVERROR(EAGAIN) ? pkt->size : 0;
-+ av_packet_unref( pkt );
++ av_packet_free( &pkt );
}
AVFrame *frame = av_frame_alloc();
@@ -290,10 +290,10 @@ index 48878c712b..405a6f6933 100644
GitLab
-From 149141346ddb419aa7c34fb59803c1db4035ced7 Mon Sep 17 00:00:00 2001
+From c70bb79bb84a59d2bb37ddffb4c3098f76c3f71b Mon Sep 17 00:00:00 2001
From: Ilkka Ollakka <ileoo(a)videolan.org>
Date: Fri, 18 Jun 2021 10:23:35 +0300
-Subject: [PATCH 2/2] avcodec/subtitle: stop using removed setter for pkt
+Subject: [PATCH 2/4] avcodec/subtitle: stop using removed setter for pkt
timebase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -302,7 +302,7 @@ Content-Transfer-Encoding: 8bit
Removed from ffmpeg repo in commit 23bb78d2ea4f0e3a0835744d59708efed50abccc.
(cherry picked from commit e7190e7a70e9701754c50348f5b6357759440657)
-Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
+Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
---
modules/codec/avcodec/subtitle.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
@@ -325,3 +325,120 @@ index a17ba985e1..d3afe4270b 100644
--
GitLab
+
+From ab36b209ff07d5465a4958201521a9c2345fd918 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni(a)videolabs.io>
+Date: Wed, 8 Apr 2020 15:07:15 +0200
+Subject: [PATCH 3/4] avcodec: remove deprecation warning for av*_register_all
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From doc/APIchanges:
+
+ 2018-02-06 - 0694d87024 - lavf 58.9.100 - avformat.h
+ Deprecate use of av_register_input_format(), av_register_output_format(),
+ av_register_all(), av_iformat_next(), av_oformat_next().
+ Add av_demuxer_iterate(), and av_muxer_iterate().
+
+ 2018-02-06 - 36c85d6e77 - lavc 58.10.100 - avcodec.h
+ Deprecate use of avcodec_register(), avcodec_register_all(),
+ av_codec_next(), av_register_codec_parser(), and av_parser_next().
+ Add av_codec_iterate() and av_parser_iterate().
+
+They are no-op since those updates. If compiling with a recent release,
+just don't call av*_register_all to prevent warnings.
+
+(cherry picked from commit 21d5a1933275edb7f67d05ea62a762464e07c2cb)
+Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
+---
+ modules/codec/avcodec/avcommon.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
+index 8c8298014f..158c01e320 100644
+--- a/modules/codec/avcodec/avcommon.h
++++ b/modules/codec/avcodec/avcommon.h
+@@ -97,6 +97,7 @@ static inline void vlc_init_avutil(vlc_object_t *obj)
+
+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+ # include <libavformat/avformat.h>
++# include <libavformat/version.h>
+ static inline void vlc_init_avformat(vlc_object_t *obj)
+ {
+ vlc_avcodec_lock();
+@@ -105,7 +106,9 @@ static inline void vlc_init_avformat(vlc_object_t *obj)
+
+ avformat_network_init();
+
++#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100))
+ av_register_all();
++#endif
+
+ vlc_avcodec_unlock();
+ }
+@@ -113,13 +116,16 @@ static inline void vlc_init_avformat(vlc_object_t *obj)
+
+ #ifdef HAVE_LIBAVCODEC_AVCODEC_H
+ # include <libavcodec/avcodec.h>
++# include <libavcodec/version.h>
+ static inline void vlc_init_avcodec(vlc_object_t *obj)
+ {
+ vlc_avcodec_lock();
+
+ vlc_init_avutil(obj);
+
++#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100))
+ avcodec_register_all();
++#endif
+
+ vlc_avcodec_unlock();
+ }
+--
+GitLab
+
+
+From 8a0afbf54ba5b694deb5dcba7a63959fb222f93a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi(a)remlab.net>
+Date: Tue, 14 Apr 2020 19:25:07 +0300
+Subject: [PATCH 4/4] avcodec: fix flawed logic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Cannot find any codec.
+
+Regression from 21d5a1933275edb7f67d05ea62a762464e07c2cb.
+
+(cherry picked from commit 067dcd0a1974b00a92e900b0e5c976349ad13859)
+Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
+---
+ modules/codec/avcodec/avcommon.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
+index 158c01e320..ff5dba06c9 100644
+--- a/modules/codec/avcodec/avcommon.h
++++ b/modules/codec/avcodec/avcommon.h
+@@ -106,7 +106,7 @@ static inline void vlc_init_avformat(vlc_object_t *obj)
+
+ avformat_network_init();
+
+-#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100))
++#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100))
+ av_register_all();
+ #endif
+
+@@ -123,7 +123,7 @@ static inline void vlc_init_avcodec(vlc_object_t *obj)
+
+ vlc_init_avutil(obj);
+
+-#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100))
++#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100))
+ avcodec_register_all();
+ #endif
+
+--
+GitLab
+
+
3 years
[vlc] Update to snapshot
by Nicolas Chauvet
commit 3d5a5922200b72d209049b3b82c584db6aadb4ff
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Nov 15 14:58:08 2021 +0100
Update to snapshot
vlc.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index dbea93c..ed8b4f5 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-#global commit0 170157402b9c9ee5651838499549328c6715b5fe
-#global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global commit0 a108715f1d0f6e7c878a5b9ba01c799f08dc78f3
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
#global vlc_rc -rc9
%global _with_bootstrap 1
@@ -50,13 +50,13 @@
Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
-Version: 3.0.16
-Release: 7%{?dist}
+Version: 3.0.17
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortco...
-%global vlc_setup vlc-3.0-%{?commit0}
+%global vlc_setup vlc-%{?commit0}
%else
Source0: https://download.videolan.org/pub/videolan/%{?vlc_rc:testing/}vlc/%{versi...
%global vlc_setup vlc-%{version}%{?vlc_rc}
@@ -623,6 +623,9 @@ fi || :
%changelog
+* Thu Nov 11 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.17-1
+- Update to 3.x snapshot
+
* Tue Nov 09 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.16-7
- Rebuilt for new ffmpeg snapshot
3 years
[zoneminder/el7: 3/3] Merge branch 'master' into el7
by Andrew Bauer
commit eed12ccf484f9bab5451edabef095cdb191e5623
Merge: 13e71f8 3adc6c3
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Thu Nov 18 14:40:13 2021 -0600
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 8 +++++++-
3 files changed, 9 insertions(+), 2 deletions(-)
---
3 years
[zoneminder] 1.36.11 release
by Andrew Bauer
commit 3adc6c3d87bc6333173ee7dcba80032f770ed255
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Thu Nov 18 14:39:08 2021 -0600
1.36.11 release
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b5e8f0..9cb325f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
/zoneminder-1.36.5.tar.gz
/zoneminder-1.36.8.tar.gz
/zoneminder-1.36.10.tar.gz
+/zoneminder-1.36.11.tar.gz
diff --git a/sources b/sources
index b0a816f..19942ab 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) = 26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1
SHA512 (crud-3.2.0.tar.gz) = 57e80ced18ab0810941bae43790ba67e399e1299e3c56d3785247195883640ef4e89d1cf0c67f1886cd3ed8f858e88f6af8632b181ce0912dd92c78c53757748
SHA512 (RtspServer-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz) = 33409d1c5ddf506210e14f35ed59135368cf8ebf7d53b47fd86779d6225d27fa09e1a0a02898d651fecaac103891efb4ad35d4dee3081deb07e2e7a944a70560
-SHA512 (zoneminder-1.36.10.tar.gz) = 1bb42e45c89cdf78564933b2155d6eca950cc50bc4ef963cf52e95f4a76eb26f0e04d8c9013c9a5009bfb88616b5063566d6c6a51e8850cc991f39e1fbc33a97
+SHA512 (zoneminder-1.36.11.tar.gz) = 1b306612c918843571c956bcb2dc6b5b8216c43a84eb0a37fe475cf540a7da864813fb089c1dbd6eb292bd007a2f6d2539e76722c9ef581ac7acbd5206e61622
diff --git a/zoneminder.spec b/zoneminder.spec
index 7d0c84c..2fc907e 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -36,8 +36,8 @@
%global _hardened_build 1
Name: zoneminder
-Version: 1.36.10
-Release: 2%{?dist}
+Version: 1.36.11
+Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# jQuery is under the MIT license: https://jquery.org/license/
@@ -430,6 +430,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
+* Thu Nov 18 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.11-1
+- 1.36.11 release
+
* Fri Nov 12 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.36.10-2
- Rebuilt for new ffmpeg snapshot
3 years
[chromium-freeworld] fix
by Leigh Scott
commit 097a2d1d63db6ff7c782dc248f4c095297c66444
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Nov 18 07:35:27 2021 +0000
fix
chromium-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 18182b1..49bbb27 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -333,7 +333,7 @@ find -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__
third_party/fdlibm \
%if !%{system_ffmpeg}
third_party/ffmpeg \
- third_party/opus
+ third_party/opus \
%endif
third_party/fft2d \
third_party/flatbuffers \
3 years
