[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: nettle: update to 3.9
Steve Lhomme (@robUx4)
gitlab at videolan.org
Thu Jun 8 16:52:34 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
e1d0a782 by Johannes Kauffmann at 2023-06-08T14:16:53+00:00
contrib: nettle: update to 3.9
- - - - -
8ae3870c by Johannes Kauffmann at 2023-06-08T14:16:53+00:00
contrib: ogg: update to 1.3.5
- - - - -
e3c25c0f by Johannes Kauffmann at 2023-06-08T14:16:53+00:00
contrib: ogg: avoid installing documentation
- - - - -
436526ec by Johannes Kauffmann at 2023-06-08T14:16:53+00:00
contrib: taglib: update to 1.13
- - - - -
c5851fd4 by Johannes Kauffmann at 2023-06-08T14:16:53+00:00
taglib: remove VLC path define check
It is no longer needed with contribs taglib updated to 1.13.
- - - - -
9 changed files:
- contrib/src/nettle/SHA512SUMS
- contrib/src/nettle/rules.mak
- contrib/src/ogg/SHA512SUMS
- − contrib/src/ogg/libogg-uint-macos.patch
- contrib/src/ogg/rules.mak
- − contrib/src/taglib/0001-FileTypeResolver-Fix-IOStream-usage-with-custom-reso.patch
- contrib/src/taglib/SHA512SUMS
- contrib/src/taglib/rules.mak
- modules/meta_engine/taglib.cpp
Changes:
=====================================
contrib/src/nettle/SHA512SUMS
=====================================
@@ -1 +1 @@
-9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437 nettle-3.7.3.tar.gz
+5e44f59b37ec1e92345fce0b963151d1f2aabf01b3a197b8d931067c51af4ba025059c6a07f2bcd19b17eb49d6ede98f5c200e58d340959826cda473459d2fba nettle-3.9.tar.gz
=====================================
contrib/src/nettle/rules.mak
=====================================
@@ -1,6 +1,6 @@
# Nettle
-NETTLE_VERSION := 3.7.3
+NETTLE_VERSION := 3.9
NETTLE_URL := $(GNU)/nettle/nettle-$(NETTLE_VERSION).tar.gz
ifeq ($(call need_pkg,"nettle >= 3.4.1"),)
=====================================
contrib/src/ogg/SHA512SUMS
=====================================
@@ -1 +1 @@
-09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c libogg-1.3.4.tar.xz
+5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7 libogg-1.3.5.tar.xz
=====================================
contrib/src/ogg/libogg-uint-macos.patch deleted
=====================================
@@ -1,33 +0,0 @@
-From c8fca6b4a02d695b1ceea39b330d4406001c03ed Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth at videolan.org>
-Date: Sat, 7 Sep 2019 00:46:59 -0400
-Subject: [PATCH 1/1] os_types: fix unsigned typedefs for MacOS
-
-This effectively reverts f8ce071e1040c766157d630d920d6165d35fe422 which was
-probably broken by 6449883ccacfee276ed9d99fa047342cdc51ab88.
----
- include/ogg/os_types.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h
-index eb8a322..e655a1d 100644
---- a/include/ogg/os_types.h
-+++ b/include/ogg/os_types.h
-@@ -72,11 +72,11 @@
-
- # include <sys/types.h>
- typedef int16_t ogg_int16_t;
-- typedef uint16_t ogg_uint16_t;
-+ typedef u_int16_t ogg_uint16_t;
- typedef int32_t ogg_int32_t;
-- typedef uint32_t ogg_uint32_t;
-+ typedef u_int32_t ogg_uint32_t;
- typedef int64_t ogg_int64_t;
-- typedef uint64_t ogg_uint64_t;
-+ typedef u_int64_t ogg_uint64_t;
-
- #elif defined(__HAIKU__)
-
---
-2.20.1
-
=====================================
contrib/src/ogg/rules.mak
=====================================
@@ -1,6 +1,6 @@
# libogg
-OGG_VERSION := 1.3.4
+OGG_VERSION := 1.3.5
OGG_URL := $(XIPH)/ogg/libogg-$(OGG_VERSION).tar.xz
#OGG_CVSROOT := :pserver:anoncvs at xiph.org:/usr/local/cvsroot
@@ -17,12 +17,13 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
$(UNPACK)
- $(APPLY) $(SRC)/ogg/libogg-uint-macos.patch
$(MOVE)
+OGG_CONF := -DINSTALL_DOCS:BOOL=OFF
+
.ogg: libogg toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS) $(CMAKE)
+ $(HOSTVARS) $(CMAKE) $(OGG_CONF)
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
contrib/src/taglib/0001-FileTypeResolver-Fix-IOStream-usage-with-custom-reso.patch deleted
=====================================
@@ -1,130 +0,0 @@
-From 62fdfd554aaa68fe765afd873e225d583cd31c29 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Wed, 9 Feb 2022 13:51:42 +0100
-Subject: [PATCH] FileTypeResolver: Add a StreamTypeResolver interface
-
----
- taglib/fileref.cpp | 22 ++++++++++++++++++++++
- taglib/fileref.h | 10 ++++++++++
- taglib/toolkit/taglib.h | 2 ++
- tests/test_fileref.cpp | 23 +++++++++++++++++++++++
- 4 files changed, 57 insertions(+)
-
-diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
-index f91209a0..b71d6571 100644
---- a/taglib/fileref.cpp
-+++ b/taglib/fileref.cpp
-@@ -84,6 +84,22 @@ namespace
- return 0;
- }
-
-+ File *detectByResolvers(IOStream* stream, bool readAudioProperties,
-+ AudioProperties::ReadStyle audioPropertiesStyle)
-+ {
-+ for(ResolverList::ConstIterator it = fileTypeResolvers.begin();
-+ it != fileTypeResolvers.end(); ++it) {
-+ if(const FileRef::StreamTypeResolver *streamResolver =
-+ dynamic_cast<const FileRef::StreamTypeResolver*>(*it)) {
-+ if(File *file = streamResolver->createFileFromStream(
-+ stream, readAudioProperties, audioPropertiesStyle))
-+ return file;
-+ }
-+ }
-+
-+ return 0;
-+ }
-+
- // Detect the file type based on the file extension.
-
- File* detectByExtension(IOStream *stream, bool readAudioProperties,
-@@ -480,6 +496,12 @@ void FileRef::parse(FileName fileName, bool readAudioProperties,
- void FileRef::parse(IOStream *stream, bool readAudioProperties,
- AudioProperties::ReadStyle audioPropertiesStyle)
- {
-+ // Try user-defined stream resolvers.
-+
-+ d->file = detectByResolvers(stream, readAudioProperties, audioPropertiesStyle);
-+ if(d->file)
-+ return;
-+
- // Try user-defined resolvers.
-
- d->file = detectByResolvers(stream->name(), readAudioProperties, audioPropertiesStyle);
-diff --git a/taglib/fileref.h b/taglib/fileref.h
-index 76e694e4..75d14926 100644
---- a/taglib/fileref.h
-+++ b/taglib/fileref.h
-@@ -108,6 +108,16 @@ namespace TagLib {
- audioPropertiesStyle = AudioProperties::Average) const = 0;
- };
-
-+ class TAGLIB_EXPORT StreamTypeResolver : public FileTypeResolver
-+ {
-+ TAGLIB_IGNORE_MISSING_DESTRUCTOR
-+ public:
-+ virtual File *createFileFromStream(IOStream *stream,
-+ bool readAudioProperties = true,
-+ AudioProperties::ReadStyle
-+ audioPropertiesStyle = AudioProperties::Average) const = 0;
-+ };
-+
- /*!
- * Creates a null FileRef.
- */
-diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
-index ffce61f7..2bb56994 100644
---- a/taglib/toolkit/taglib.h
-+++ b/taglib/toolkit/taglib.h
-@@ -54,6 +54,8 @@
- #define TAGLIB_DEPRECATED
- #endif
-
-+#define VLC_PATCHED_TAGLIB_IOSTREAM_RESOLVERS
-+
- #include <string>
-
- //! A namespace for all TagLib related classes and functions
-diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
-index 1fc5def9..b2631827 100644
---- a/tests/test_fileref.cpp
-+++ b/tests/test_fileref.cpp
-@@ -60,6 +60,20 @@ namespace
- return new Ogg::Vorbis::File(fileName);
- }
- };
-+
-+ class DummyStreamResolver : public FileRef::StreamTypeResolver
-+ {
-+ public:
-+ virtual File *createFile(FileName, bool, AudioProperties::ReadStyle) const
-+ {
-+ return 0;
-+ }
-+
-+ virtual File *createFileFromStream(IOStream *s, bool, AudioProperties::ReadStyle) const
-+ {
-+ return new MP4::File(s);
-+ }
-+ };
- }
-
- class TestFileRef : public CppUnit::TestFixture
-@@ -387,6 +401,15 @@ public:
- FileRef f(TEST_FILE_PATH_C("xing.mp3"));
- CPPUNIT_ASSERT(dynamic_cast<Ogg::Vorbis::File *>(f.file()) != NULL);
- }
-+
-+ DummyStreamResolver streamResolver;
-+ FileRef::addFileTypeResolver(&streamResolver);
-+
-+ {
-+ FileStream s(TEST_FILE_PATH_C("xing.mp3"));
-+ FileRef f(&s);
-+ CPPUNIT_ASSERT(dynamic_cast<MP4::File *>(f.file()) != NULL);
-+ }
- }
-
- };
---
-2.34.1
-
=====================================
contrib/src/taglib/SHA512SUMS
=====================================
@@ -1 +1 @@
-7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba taglib-1.12.tar.gz
+b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7 taglib-1.13.tar.gz
=====================================
contrib/src/taglib/rules.mak
=====================================
@@ -1,6 +1,6 @@
# TagLib
-TAGLIB_VERSION := 1.12
+TAGLIB_VERSION := 1.13
TAGLIB_URL := https://taglib.org/releases/taglib-$(TAGLIB_VERSION).tar.gz
PKGS += taglib
@@ -16,7 +16,6 @@ $(TARBALLS)/taglib-$(TAGLIB_VERSION).tar.gz:
taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
$(UNPACK)
$(APPLY) $(SRC)/taglib/0001-Implement-ID3v2-readStyle-avoid-worst-case.patch
- $(APPLY) $(SRC)/taglib/0001-FileTypeResolver-Fix-IOStream-usage-with-custom-reso.patch
$(MOVE)
TAGLIB_CONF := -DBUILD_BINDINGS=OFF
=====================================
modules/meta_engine/taglib.cpp
=====================================
@@ -96,8 +96,7 @@ using namespace TagLib;
#include <algorithm>
#include <limits>
-#if defined(VLC_PATCHED_TAGLIB_IOSTREAM_RESOLVERS) || \
- TAGLIB_VERSION >= VERSION_INT(1, 13, 0)
+#if TAGLIB_VERSION >= VERSION_INT(1, 13, 0)
#define USE_IOSTREAM_RESOLVER 1
#endif
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2c5ed7f7ed49136c820742f2c273841e6546906d...c5851fd495ed6de1d3712e64a2b1cc1e4e9059f4
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2c5ed7f7ed49136c820742f2c273841e6546906d...c5851fd495ed6de1d3712e64a2b1cc1e4e9059f4
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list