@@ -1,7 +1,7 @@

 -------------------------------------------------------------------

-Tue May 25 20:10:00 UTC 2021 - olaf@aepfle.de

+Fri Jul  2 14:14:14 UTC 2021 - olaf@aepfle.de

-- Update to 20210525.141e07e12f

+- Update to 20210702.6fe8644907

 -------------------------------------------------------------------

 Sun Jan 21 21:10:34 UTC 2018 - enzokiel@kabelmail.de

​

@@ -25,7 +25,7 @@

 %bcond_with opengles

 %endif

 Name:           vlc-beta

-Version:        20210525.141e07e12f

+Version:        20210702.6fe8644907

 Release:        0

 Summary:        Video Lan Client multimedia player

 License:        GPL-2.0+ and LGPL-2.1+

@@ -152,14 +152,14 @@

 BuildRequires:  pkgconfig(shine) >= 3.0.0

 BuildRequires:  pkgconfig(mad)

 BuildRequires:  pkgconfig(libmpg123)

-BuildRequires:  pkgconfig(libavutil) >= 55.9.0

-BuildRequires:  pkgconfig(libavcodec) >= 57.37.100

+BuildRequires:  pkgconfig(libavutil) >= 56

+BuildRequires:  pkgconfig(libavcodec) >= 58

 BuildRequires:  pkgconfig(libva) >= 0.38

 BuildRequires:  pkgconfig(libva-drm)

 BuildRequires:  pkgconfig(libva-x11)

-BuildRequires:  pkgconfig(libavformat) >= 53.21.0

-BuildRequires:  pkgconfig(libswscale) >= 0.5.0

-BuildRequires:  pkgconfig(libpostproc)

+BuildRequires:  pkgconfig(libavformat) >= 58

+BuildRequires:  pkgconfig(libswscale) >= 5

+BuildRequires:  pkgconfig(libpostproc) >= 55

 BuildRequires:  pkgconfig(faad2)

 %if 0%{?suse_version} > 1500

 BuildRequires:  pkgconfig(rav1e)

​

@@ -1,9 +1,51 @@

 control/cli/cli.c: In function 'Run':

 control/cli/cli.c:541:1: error: no return statement in function returning non-void [-Werror=return-type]

+--- a/configure.ac

++++ b/configure.ac

+@@ -2105,7 +2105,7 @@ AS_IF([test "$SYS" = "linux" -a "${enabl

+ dnl

+ dnl dvdread module: check for libdvdread

+ dnl

+-PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 6.0.0], [dvdread input module], [auto])

++PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread >= 6.0.0], [dvdread input module], [auto])

+ 

+ dnl

+ dnl libdvdnav plugin

+@@ -2443,7 +2443,7 @@ AC_ARG_ENABLE([mod],

+   AS_HELP_STRING([--disable-mod],

+     [do not use libmodplug (default auto)]))

+ if test "${enable_mod}" != "no" ; then

+-    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.9.0], [

++    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug], [

+           VLC_ADD_PLUGIN([mod])

+           VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])

+           VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod

+--- a/modules/access/live555.cpp

++++ b/modules/access/live555.cpp

+@@ -60,6 +60,7 @@

+ #include <liveMedia.hh>

+ #include <liveMedia_version.hh>

+ #include <Base64.hh>

++#include <NetAddress.hh>

+ 

+ extern "C" {

+ #include "../access/mms/asf.h"  /* Who said ugly ? */

+@@ -859,8 +860,10 @@ static int SessionsSetup( demux_t *p_dem

+             if( sub->readSource() == NULL ) continue;

+             if( !p_sys->b_multicast )

+             {

++                struct sockaddr_storage addr;

+                 /* We need different rollover behaviour for multicast */

+-                p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );

++                sub->getConnectionEndpointAddress( addr );

++                p_sys->b_multicast = IsMulticastAddress( addr );

+             }

+ 

+             tk = (live_track_t*)malloc( sizeof( live_track_t ) );

 --- a/modules/control/cli/cli.c

 +++ b/modules/control/cli/cli.c

-@@ -524,9 +524,8 @@ static void cli_client_delete(struct cli

+@@ -529,9 +529,8 @@ static void cli_client_delete(struct cli

      free(cl);

  }

@@ -14,7 +56,7 @@

      intf_sys_t *sys = intf->p_sys;

      assert(sys->pi_socket_listen != NULL);

-@@ -561,6 +560,13 @@ static void *Run(void *data)

+@@ -566,6 +565,13 @@ static void *Run(void *data)

      }

  }

@@ -28,23 +70,3 @@

  #else

  static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)

  {

---- a/configure.ac

-+++ b/configure.ac

-@@ -2113,7 +2113,7 @@ AS_IF([test "$SYS" = "linux" -a "${enabl

- dnl

- dnl dvdread module: check for libdvdread

- dnl

--PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 6.0.0], [dvdread input module], [auto])

-+PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread >= 6.0.0], [dvdread input module], [auto])

- 

- dnl

- dnl libdvdnav plugin

-@@ -2451,7 +2451,7 @@ AC_ARG_ENABLE([mod],

-   AS_HELP_STRING([--disable-mod],

-     [do not use libmodplug (default auto)]))

- if test "${enable_mod}" != "no" ; then

--    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.9.0], [

-+    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug], [

-           VLC_ADD_PLUGIN([mod])

-           VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])

-           VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod

​