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

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

-Fri Oct  9 09:09:09 UTC 2020 - olaf@aepfle.de

+Sun Jan 10 10:10:10 UTC 2021 - olaf@aepfle.de

-- Update to 20201009.4d79988692

+- Update to 20210110.7c10ffdd52

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

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

​

@@ -28,7 +28,7 @@

 %bcond_with opengles

 %endif

 Name:           vlc-beta

-Version:        20201009.4d79988692

+Version:        20210110.7c10ffdd52

 Release:        0

 Summary:        Video Lan Client multimedia player

 License:        GPL-2.0+ and LGPL-2.1+

@@ -37,10 +37,9 @@

 Source:         %{name}-%{version}.tar.xz

 Source1:        %{name}.changes

 Source3:        %{name}-rpmlintrc

-Patch0:         vlc.hostname.patch

+Patch0:         vlc-beta.patch

 Patch1:         vlc.a52dec.patch

-Patch2:         vlc.dvdread6.patch

-Patch3:         vlc.libmodplug.patch

+Patch2:         vlc.hostname.patch

 Patch5:         fix_lib_version.patch

 Patch6:         fix_freerdp2_detection.patch

 Patch7:         fix_lua53_luaL_checkint.patch

@@ -98,7 +97,7 @@

 BuildRequires:  pkgconfig(libva-drm)

 BuildRequires:  pkgconfig(libva-x11)

 BuildRequires:  pkgconfig(libavformat) >= 53.21.0

-BuildRequires:  pkgconfig(libswscale)

+BuildRequires:  pkgconfig(libswscale) >= 0.5.0

 BuildRequires:  pkgconfig(libpostproc)

 BuildRequires:  pkgconfig(faad2)

 BuildRequires:  pkgconfig(rav1e)

@@ -262,14 +261,7 @@

 The all new Qt interface for the VLC VideoLAN Client.

 %prep

-%setup -q

-%patch0 -p1

-%patch1 -p1

-%patch2 -p1

-%patch3 -p1

-%patch5 -p1

-%patch6 -p1

-%patch7 -p1

+%autosetup -p1

 %build

 # fix builddate info

@@ -305,7 +297,6 @@

    --disable-coverage \

    --disable-mod \

    --disable-opencv \

-   --disable-sdl-image \

    --without-sanitizer \

    --enable-optimizations \

    --disable-fdkaac \

​

@@ -1,17 +1,17 @@

 --- a/configure.ac

 +++ b/configure.ac

-@@ -2009,7 +2009,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li

+@@ -2318,7 +2318,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li

  dnl  RDP/Remote Desktop access module

  dnl

 -PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )

-+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) )

++PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2], (RDP/Remote Desktop client support) )

  dnl

  dnl AVFoundation

 --- a/modules/access/rdp.c

 +++ b/modules/access/rdp.c

-@@ -144,6 +144,7 @@ static void desktopResizeHandler( rdpCon

+@@ -142,6 +142,7 @@ static void desktopResizeHandler( rdpCon

      vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context;

      demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;

      rdpGdi *p_gdi = p_context->gdi;

@@ -19,7 +19,7 @@

      if ( p_sys->es )

      {

-@@ -153,6 +154,26 @@ static void desktopResizeHandler( rdpCon

+@@ -151,6 +152,26 @@ static void desktopResizeHandler( rdpCon

      /* Now init and fill es format */

      vlc_fourcc_t i_chroma;

@@ -46,7 +46,7 @@

      switch( p_gdi->bytesPerPixel )

      {

          default:

-@@ -166,6 +187,7 @@ static void desktopResizeHandler( rdpCon

+@@ -164,6 +185,7 @@ static void desktopResizeHandler( rdpCon

              i_chroma = VLC_CODEC_RGB32;

              break;

      }

@@ -54,7 +54,7 @@

      es_format_t fmt;

      es_format_Init( &fmt, VIDEO_ES, i_chroma );

-@@ -176,7 +198,7 @@ static void desktopResizeHandler( rdpCon

+@@ -174,7 +196,7 @@ static void desktopResizeHandler( rdpCon

      fmt.video.i_height = p_gdi->height;

      fmt.video.i_frame_rate_base = 1000;

      fmt.video.i_frame_rate = 1000 * p_sys->f_fps;

@@ -63,7 +63,7 @@

      if ( p_sys->p_block )

          p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize );

-@@ -252,6 +274,12 @@ static bool postConnectHandler( freerdp

+@@ -250,6 +272,12 @@ static bool postConnectHandler( freerdp

      p_instance->update->BeginPaint = beginPaintHandler;

      p_instance->update->EndPaint = endPaintHandler;

@@ -76,7 +76,7 @@

      gdi_init( p_instance,

                  CLRBUF_16BPP |

  #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \

-@@ -259,6 +287,7 @@ static bool postConnectHandler( freerdp

+@@ -257,6 +285,7 @@ static bool postConnectHandler( freerdp

                  CLRBUF_24BPP |

  #endif

                  CLRBUF_32BPP, NULL );

​

@@ -0,0 +1,32 @@

+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]

+

+diff --git a/modules/control/cli/cli.c b/modules/control/cli/cli.c

+index 2fa1e7b90d..5de888d3af 100644

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

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

+@@ -503,9 +503,8 @@ static void cli_client_delete(struct cli_client *cl)

+     free(cl);

+ }

+ 

+-static void *Run(void *data)

++static void _Run(intf_thread_t *intf)

+ {

+-    intf_thread_t *intf = data;

+     intf_sys_t *sys = intf->p_sys;

+ 

+     assert(sys->pi_socket_listen != NULL);

+@@ -540,6 +539,13 @@ static void *Run(void *data)

+     }

+ }

+ 

++static void *Run(void *data)

++{

++    intf_thread_t *intf = data;

++    _Run(intf);

++    return NULL;

++}

++

+ #else

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

+ {

​

@@ -1,13 +0,0 @@

-diff --git a/configure.ac b/configure.ac

-index 4be9420a14..91fae4f71e 100644

---- a/configure.ac

-+++ b/configure.ac

-@@ -1898,7 +1898,7 @@ AS_IF([test "$SYS" = "linux" -a "${enable_linsys}" != "no"], [

- 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

​

@@ -1,11 +0,0 @@

---- a/configure.ac

-+++ b/configure.ac

-@@ -2324,7 +2324,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

​