Request 5293 (accepted)

Overview

Request 5293 (accepted)

- Update to 20210110.7c10ffdd52

Created by olh over 3 years ago
In state accepted

Submit vlc-beta

Submit package Staging / vlc-beta to package Essentials / vlc-beta

vlc-beta.changes Changed

vlc-beta.spec Changed

@@ -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 \

fix_freerdp2_detection.patch Changed

@@ -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 );

vlc-beta.patch Added

vlc.dvdread6.patch Deleted

vlc.libmodplug.patch Deleted

vlc-beta-20201009.4d79988692.tar.xz Deleted

vlc-beta-20210110.7c10ffdd52.tar.xz Added

Build Results
RPM Lint

Refresh

Comments for request 5293 0

Request History

olh created request over 3 years ago

- Update to 20210110.7c10ffdd52

olh accepted request over 3 years ago