- added patch for asdcplib 2.12.2+; release 5

diff --git a/vlc-asdcplib.patch b/vlc-asdcplib.patch
new file mode 100644 (file)
index 0000000..b00f1a5
--- /dev/null
+++ b/vlc-asdcplib.patch
@@ -0,0 +1,73 @@
+--- vlc-3.0.18/modules/access/dcp/dcp.cpp.orig 2021-06-13 11:32:34.000000000 +0200
++++ vlc-3.0.18/modules/access/dcp/dcp.cpp      2023-10-08 20:01:38.354956576 +0200
+@@ -324,6 +324,7 @@ static int Open( vlc_object_t *obj )
+     p_sys->p_dcp = p_dcp;
+ 
+ 
++    Kumu::FileReaderFactory defaultFactory;
+     /* handle the DCP directory, saving the paths for audio and video file, returning error if unsuccessful */
+     if( ( retval = dcpInit( p_demux ) ) )
+         goto error;
+@@ -332,7 +333,7 @@ static int Open( vlc_object_t *obj )
+     EssenceType_t essInter;
+     for ( size_t i = 0; i < ( p_sys->p_dcp->video_reels.size() ); i++ )
+     {
+-        EssenceType( p_sys->p_dcp->video_reels[i].filename.c_str(), essInter );
++        EssenceType( p_sys->p_dcp->video_reels[i].filename.c_str(), essInter, defaultFactory );
+         if ( i == 0 )
+         {
+             p_sys->PictureEssType = essInter;
+@@ -358,7 +359,7 @@ static int Open( vlc_object_t *obj )
+             case ESS_JPEG_2000_S: {
+                 JP2K::PictureDescriptor PicDesc;
+                 if (p_sys->PictureEssType == ESS_JPEG_2000_S) {     /* 3D JPEG2000 */
+-                    JP2K::MXFSReader * p_PicMXFSReader = new ( nothrow ) JP2K::MXFSReader();
++                    JP2K::MXFSReader * p_PicMXFSReader = new ( nothrow ) JP2K::MXFSReader(defaultFactory);
+ 
+                     if( !p_PicMXFSReader) {
+                         retval = VLC_ENOMEM;
+@@ -376,7 +377,7 @@ static int Open( vlc_object_t *obj )
+                     videoReader.p_PicMXFSReader = p_PicMXFSReader;
+                     p_sys->v_videoReader.push_back(videoReader);
+                 } else {                                            /* 2D JPEG2000 */
+-                    JP2K::MXFReader *p_PicMXFReader = new ( nothrow ) JP2K::MXFReader();
++                    JP2K::MXFReader *p_PicMXFReader = new ( nothrow ) JP2K::MXFReader(defaultFactory);
+                     if( !p_PicMXFReader ) {
+                         retval = VLC_ENOMEM;
+                         goto error;
+@@ -419,7 +420,7 @@ static int Open( vlc_object_t *obj )
+             }
+             case ESS_MPEG2_VES: {
+ 
+-                MPEG2::MXFReader *p_VideoMXFReader = new ( nothrow ) MPEG2::MXFReader();
++                MPEG2::MXFReader *p_VideoMXFReader = new ( nothrow ) MPEG2::MXFReader(defaultFactory);
+ 
+                 videoReader_t videoReader;
+                 videoReader.p_VideoMXFReader = p_VideoMXFReader;
+@@ -489,7 +490,7 @@ static int Open( vlc_object_t *obj )
+ 
+     if( !p_sys->p_dcp->audio_reels.empty() )
+     {
+-        EssenceType( p_sys->p_dcp->audio_reels[0].filename.c_str(), AudioEssType );
++        EssenceType( p_sys->p_dcp->audio_reels[0].filename.c_str(), AudioEssType, defaultFactory );
+ 
+         if ( (AudioEssType == ESS_PCM_24b_48k) || (AudioEssType == ESS_PCM_24b_96k) ) {
+             PCM::AudioDescriptor AudioDesc;
+@@ -498,7 +499,7 @@ static int Open( vlc_object_t *obj )
+             {
+                 if ( i != 0 )
+                 {
+-                    EssenceType( p_sys->p_dcp->audio_reels[i].filename.c_str(), AudioEssTypeCompare );
++                    EssenceType( p_sys->p_dcp->audio_reels[i].filename.c_str(), AudioEssTypeCompare, defaultFactory );
+                     if ( AudioEssTypeCompare != AudioEssType )
+                     {
+                         msg_Err( p_demux, "Integrity check failed : different audio essence types in %s",
+@@ -507,7 +508,7 @@ static int Open( vlc_object_t *obj )
+                         goto error;
+                     }
+                 }
+-                PCM::MXFReader *p_AudioMXFReader = new ( nothrow ) PCM::MXFReader();
++                PCM::MXFReader *p_AudioMXFReader = new ( nothrow ) PCM::MXFReader(defaultFactory);
+ 
+                 if( !p_AudioMXFReader ) {
+                     retval = VLC_ENOMEM;

diff --git a/vlc.spec b/vlc.spec
index d7c5bf2cebe842ad5f4e3c25ddd23e427da479a0..7b8d87653faf79ba9f47e412f309b2af517f75d8 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -71,7 +71,7 @@ Summary:      VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
 Version:       3.0.18
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       https://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
@@ -82,6 +82,7 @@ Patch2:               %{name}-mpc.patch
 Patch3:                xmas-sucks.patch
 Patch4:                no-cache.patch
 Patch5:                %{name}-fdk_aac.patch
+Patch6:                %{name}-asdcplib.patch
 Patch7:                %{name}-vsxu.patch
 Patch8:                qt-5.15.patch
 Patch9:                x32.patch
@@ -106,7 +107,7 @@ BuildRequires:      a52dec-libs-devel >= 0.7.3
 BuildRequires: aom-devel
 BuildRequires: aribb24-devel >= 1.0.1
 BuildRequires: aribb25-devel >= 0.2.6
-BuildRequires: asdcplib-devel
+BuildRequires: asdcplib-devel >= 2.12.2
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 %{?with_bonjour:BuildRequires: avahi-devel >= 0.6}
@@ -430,6 +431,7 @@ Akcje klienta VLC dla Solid.
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1