[ffmpeg/f31] Update changelog
by Nicolas Chauvet
commit f99ddfb4cca431dae5b53e92b18d79c791adf041
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 10 13:25:33 2020 +0200
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 9045508..8558c26 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -84,7 +84,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.2
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -428,6 +428,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Fri Apr 10 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.2-5
+- Enable libsrt by default
+
* Fri Mar 13 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.2.2-2
- rebuilt
4 years, 7 months
[ffmpeg/f31] Enable libsrt by default
by Nicolas Chauvet
commit 67d58eb65f7f956b2bf0fb712b47a226c9e6c99f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 10 13:18:10 2020 +0200
Enable libsrt by default
ffmpeg.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 3bc7daf..9045508 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -12,6 +12,7 @@
%global _without_dav1d 1
%global _without_frei0r 1
%global _without_opus 1
+%global _without_srt 1
%global _without_vpx 1
%endif
@@ -132,6 +133,7 @@ BuildRequires: libmodplug-devel
BuildRequires: librsvg2-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
+%{!?_without_srt:BuildRequires: srt-devel > 1.3.0}
BuildRequires: libssh-devel
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
@@ -284,6 +286,7 @@ This package contains development files for %{name}
%{?_with_rubberband:--enable-librubberband} \\\
%{?_with_smb:--enable-libsmbclient} \\\
%{?_with_snappy:--enable-libsnappy} \\\
+ %{!?_without_srt:--enable-libsrt} \\\
--enable-libsoxr \\\
--enable-libspeex \\\
--enable-libssh \\\
4 years, 7 months
[ffmpeg/f32] Update changelog
by Nicolas Chauvet
commit 7da73f01c6b6a1f2729dc37c17c5ac2229c09c70
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 10 13:25:33 2020 +0200
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7596a14..947a3e5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -84,7 +84,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.2
-Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -428,6 +428,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Fri Apr 10 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.2-5
+- Enable libsrt by default
+
* Thu Mar 12 2020 leigh123linux <leigh123linux(a)googlemail.com> - 4.2.2-4
- Rebuilt for i686
4 years, 7 months
[ffmpeg/f32] Enable libsrt by default
by Nicolas Chauvet
commit 2b906ac1fe789a1032230b312f9473904581a01d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 10 13:18:10 2020 +0200
Enable libsrt by default
ffmpeg.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index bd6dae0..7596a14 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -12,6 +12,7 @@
%global _without_dav1d 1
%global _without_frei0r 1
%global _without_opus 1
+%global _without_srt 1
%global _without_vpx 1
%endif
@@ -132,6 +133,7 @@ BuildRequires: libmodplug-devel
BuildRequires: librsvg2-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
+%{!?_without_srt:BuildRequires: srt-devel > 1.3.0}
BuildRequires: libssh-devel
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
@@ -284,6 +286,7 @@ This package contains development files for %{name}
%{?_with_rubberband:--enable-librubberband} \\\
%{?_with_smb:--enable-libsmbclient} \\\
%{?_with_snappy:--enable-libsnappy} \\\
+ %{!?_without_srt:--enable-libsrt} \\\
--enable-libsoxr \\\
--enable-libspeex \\\
--enable-libssh \\\
4 years, 7 months
[vlc/f31] Update to 3.0.9.2
by Nicolas Chauvet
commit 20400d3f20e3cb04ce5e8a0152044d17dd22a6a3
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
[vlc/f31] More fixes for el7
by Nicolas Chauvet
commit 51c2fb904f34b96614dd53fd9af5de3312459fe4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 6 17:33:07 2020 +0200
More fixes for el7
vlc.spec | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index c7cebaf..8432a0b 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -71,6 +71,7 @@ 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
+Patch5: Lower-libgcrypt-to-1.5.3.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -317,10 +318,13 @@ VLC media player extras modules.
%patch4 -p1
%endif
%if 0%{?el7}
+%patch5 -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
sed -i -e 's/ header.channel_mapping,//' modules/codec/opus.c
+# Lower taglib
+sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac
. /opt/rh/devtoolset-8/enable
%endif
@@ -434,6 +438,9 @@ rm -rf %{buildroot}%{_datadir}/kde4
%find_lang %{name}
%check
+%if 0%{?el7}
+. /opt/rh/devtoolset-8/enable
+%endif
make check
4 years, 7 months
[vlc/f31] Fix for el7
by Nicolas Chauvet
commit 553a816a9b7f67aaf1412ef3a8c6650e3d789b92
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 6 17:33:03 2020 +0200
Fix for el7
Lower-libgcrypt-to-1.5.3.patch | 44 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
---
diff --git a/Lower-libgcrypt-to-1.5.3.patch b/Lower-libgcrypt-to-1.5.3.patch
new file mode 100644
index 0000000..3b86e3b
--- /dev/null
+++ b/Lower-libgcrypt-to-1.5.3.patch
@@ -0,0 +1,44 @@
+From fefc0d51b9d3ec6046a73cf317b31870048d1fc2 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Mon, 6 Apr 2020 09:08:08 +0200
+Subject: [PATCH] Lower libgcrypt to 1.5.3
+
+Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1dfe2fce9b..cdac533e10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4038,14 +4038,14 @@ AC_ARG_ENABLE(libgcrypt,
+ AC_ARG_VAR([GCRYPT_CFLAGS], [C compiler flags for gcrypt])
+ AC_ARG_VAR([GCRYPT_LIBS], [linker flags flags for gcrypt])
+
+-# require libgcrypt >= 1.6.0
++# require libgcrypt >= 1.5.3
+ AS_IF([test "${enable_libgcrypt}" != "no"], [
+- AC_CACHE_CHECK([for gcrypt 1.6.0 or later], [ac_cv_lib_gcrypt], [
++ AC_CACHE_CHECK([for gcrypt 1.5.3 or later], [ac_cv_lib_gcrypt], [
+ VLC_SAVE_FLAGS
+ CFLAGS="${CFLAGS} ${GCRYPT_CFLAGS}"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ [#include <gcrypt.h>
+-#if GCRYPT_VERSION_NUMBER < 0x010600
++#if GCRYPT_VERSION_NUMBER < 0x010503
+ #error
+ #endif]])], [
+ ac_cv_lib_gcrypt=yes
+@@ -4059,7 +4059,7 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
+ AC_DEFINE([HAVE_GCRYPT], 1, [Defined if having gcrypt])
+ ], [
+ AS_IF([test "${enable_libgcrypt}" = "yes"], [
+- AC_MSG_ERROR([libgcrypt version 1.6.0 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
++ AC_MSG_ERROR([libgcrypt version 1.5.3 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
+ ])
+ ])
+ ])
+--
+2.25.1
+
4 years, 7 months
[vlc/f31] Update changelog
by Nicolas Chauvet
commit c3b856842c5ce41256de64b4ed851721aa94788d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Apr 5 18:26:49 2020 +0200
Update changelog
vlc.spec | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index a0d6d05..c7cebaf 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -49,20 +49,23 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.9
-Release: 35%{?dist}
+Release: 36%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%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}
+%else
+%if 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
+%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
@@ -191,12 +194,12 @@ BuildRequires: pkgconfig(wayland-client) >= 1.5.91
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols)
}
-%{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10}
-BuildRequires: sqlite-devel
+%{?_with_schroedinger:BuildRequires: pkgconfig(schroedinger-1.0)}
+BuildRequires: pkgconfig(sqlite3)
%{?_with_sidplay:BuildRequires: pkgconfig(libsidplay2)}
-BuildRequires: speex-devel >= 1.1.5
-BuildRequires: taglib-devel
-%{?_with_twolame:BuildRequires: twolame-devel}
+BuildRequires: pkgconfig(speex)
+BuildRequires: pkgconfig(taglib)
+%{?_with_twolame:BuildRequires: pkgconfig(twolame)}
%{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21}
%{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028}
%{?_with_x265:BuildRequires: x265-devel}
@@ -307,6 +310,7 @@ VLC media player extras modules.
%{?_with_rpi:
%patch0 -p1
}
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%if 0%{?fedora} == 30
@@ -315,6 +319,8 @@ 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
+sed -i -e 's/opus_multistream_surround_encoder_create/opus_multistream_encoder_create/g' modules/codec/opus.c
+sed -i -e 's/ header.channel_mapping,//' modules/codec/opus.c
. /opt/rh/devtoolset-8/enable
%endif
@@ -578,6 +584,10 @@ fi || :
%changelog
+* 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
+
* 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
4 years, 7 months
[vlc/f31] Add patch for dvdnav/read
by Nicolas Chauvet
commit b4886f38af6f2be339e79ae34d895340843967a5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Apr 5 18:24:16 2020 +0200
Add patch for dvdnav/read
...ead-nav-Fix-cases-where-DVD-_VERSION-are-.patch | 75 ++++++++++++++++++++++
1 file changed, 75 insertions(+)
---
diff --git a/0001-vlc-3x-dvdread-nav-Fix-cases-where-DVD-_VERSION-are-.patch b/0001-vlc-3x-dvdread-nav-Fix-cases-where-DVD-_VERSION-are-.patch
new file mode 100644
index 0000000..94eed8a
--- /dev/null
+++ b/0001-vlc-3x-dvdread-nav-Fix-cases-where-DVD-_VERSION-are-.patch
@@ -0,0 +1,75 @@
+From 92b65796875fbd30c3ae4c98a924b735ede60038 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Thu, 2 Apr 2020 16:25:56 +0200
+Subject: [PATCH] vlc-3x: dvdread/nav: Fix cases where DVD*_VERSION* are
+ undefined
+
+With libdvdread/nav 5.0.3 (as in EL7/8) DVDREAD_VERSION_CODE is undefined
+leading to a comparison error. Use the older version notation for vlc-3.x
+instead.
+
+Also DVDNAV_VERSION is undefined there leading to a warning as it will
+assume VERSION = 0. Use a #if defined to clear that warning.
+
+Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
+---
+ modules/access/dvdnav.c | 6 +++---
+ modules/access/dvdread.c | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
+index 61a9157111..86954e0d96 100644
+--- a/modules/access/dvdnav.c
++++ b/modules/access/dvdnav.c
+@@ -191,7 +191,7 @@ static int EventMouse( vlc_object_t *, char const *,
+ static int EventIntf( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+-#if DVDNAV_VERSION >= 60100
++#if defined(DVDNAV_VERSION) && DVDNAV_VERSION >= 60100
+ static void DvdNavLog( void *foo, dvdnav_logger_level_t i, const char *p, va_list z)
+ {
+ msg_GenericVa( (demux_t*)foo, i, p, z );
+@@ -367,7 +367,7 @@ static int AccessDemuxOpen ( vlc_object_t *p_this )
+
+ /* Open dvdnav */
+ psz_path = ToLocale( psz_file );
+-#if DVDNAV_VERSION >= 60100
++#if defined(DVDNAV_VERSION) && DVDNAV_VERSION >= 60100
+ dvdnav_logger_cb cbs;
+ cbs.pf_log = DvdNavLog;
+ if( dvdnav_open2( &p_dvdnav, p_demux, &cbs, psz_path ) != DVDNAV_STATUS_OK )
+@@ -479,7 +479,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
+ };
+
+ /* Open dvdnav with stream callbacks */
+-#if DVDNAV_VERSION >= 60100
++#if defined(DVDNAV_VERSION) && DVDNAV_VERSION >= 60100
+ dvdnav_logger_cb cbs;
+ cbs.pf_log = DvdNavLog;
+ if( dvdnav_open_stream2( &p_dvdnav, p_demux,
+diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
+index 442b3a0e49..5fe184193b 100644
+--- a/modules/access/dvdread.c
++++ b/modules/access/dvdread.c
+@@ -157,7 +157,7 @@ static int DvdReadSeek ( demux_t *, int );
+ static void DvdReadHandleDSI( demux_t *, uint8_t * );
+ static void DvdReadFindCell ( demux_t * );
+
+-#if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
++#if defined(DVDREAD_VERSION) && DVDREAD_VERSION >= 60100
+ static void DvdReadLog( void *foo, dvd_logger_level_t i, const char *p, va_list z )
+ {
+ demux_t *p_demux = (demux_t*)foo;
+@@ -200,7 +200,7 @@ static int Open( vlc_object_t *p_this )
+
+ /* Open dvdread */
+ const char *psz_path = ToLocale( psz_file );
+-#if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
++#if defined(DVDREAD_VERSION) && DVDREAD_VERSION >= 60100
+ dvd_logger_cb cbs;
+ cbs.pf_log = DvdReadLog;
+ dvd_reader_t *p_dvdread = DVDOpen2( p_demux, &cbs, psz_path );
+--
+2.25.1
+
4 years, 7 months