@@ -25,9 +25,9 @@

 %bcond_with opengles

 %endif

 Name:           vlc-beta

-Version:        20210905.3f3296b03f

+Version:        0

 Release:        0

-Summary:        Video Lan Client multimedia player

+Summary:        Snapshot of vlc.git#master

 License:        GPL-2.0+ and LGPL-2.1+

 Group:          Productivity/Multimedia/Video/Players

 Url:            http://www.videolan.org

@@ -117,7 +117,10 @@

 BuildRequires:  gcc-c++

 BuildRequires:  flex

 BuildRequires:  bison

-BuildRequires:  gettext-devel >= 0.19.8

+%if 0%{?suse_version} > 1500

+BuildRequires:  gettext-devel >= 0.21

+BuildRequires:  gettext-tools

+%endif

 BuildRequires:  libtool

 BuildRequires:  pkg-config

 BuildRequires:  pkgconfig(zlib)

@@ -296,12 +299,15 @@

 #

 export VLC_COMPILE_BY='X'

 export VLC_COMPILE_HOST='X'

-export BUILDCC=gcc

-export CC=gcc

-export CXX=g++

-test -x "$(type -p gcc-8)" && export BUILDCC="$_"

-test -x "$(type -p gcc-8)" && export CC="$_"

-test -x "$(type -p g++-8)" && export CXX="$_"

+test -x "$(type -p gcc)"    && BUILDCC="$_"

+test -x "$(type -p gcc)"    && CC="$_"

+test -x "$(type -p g++)"    && CXX="$_"

+test -x "$(type -p gcc-11)" && BUILDCC="$_"

+test -x "$(type -p gcc-11)" && CC="$_"

+test -x "$(type -p g++-11)" && CXX="$_"

+export BUILDCC="$(readlink -f ${BUILDCC})"

+export CC="$(readlink -f ${CC})"

+export CXX="$(readlink -f ${CXX})"

 CFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'

 CXXFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'

 ./bootstrap

@@ -317,16 +323,15 @@

    --disable-cprof \

    --disable-coverage \

    --disable-mod \

+   --disable-nls \

    --disable-opencv \

    --without-sanitizer \

    --enable-optimizations \

    --disable-fdkaac \

-   --disable-mmx \

    --disable-sse \

    --disable-neon \

    --disable-altivec \

 %ifarch %ix86 x86_64

-   --enable-mmx \

    --enable-sse \

 %endif

 %ifarch aarch64

@@ -491,7 +496,10 @@

    --disable-medialibrary \

    --with-kde-solid=%{_datadir}/kde4/apps/solid \

    --enable-vlc \

-   --enable-nls

+%if 0%{?suse_version} > 1500

+   --enable-nls \

+%endif

+   %nil

 %make_build --no-print-directory

@@ -511,7 +519,10 @@

     ln -s vlc.1 $i.1

     popd

 done

+> %{name}.lang

+%if 0%{?suse_version} > 1500

 %find_lang %{name}

+%endif

 ls -l %{buildroot}/%{_libdir}/%{name}/plugins/plugins.dat

 > %{buildroot}/%{_libdir}/%{name}/plugins/plugins.dat

​

@@ -20,9 +20,9 @@

      const struct pl_hook *hook;

      char *hook_path;

 +#endif

- } vout_display_sys_t;

- // Display callbacks

+ #if PL_API_VER >= 185

+     struct pl_dovi_metadata dovi_metadata;

 @@ -204,8 +206,10 @@ static void Close(vout_display_t *vd)

      free(sys->lut_path);

  #endif

@@ -34,12 +34,14 @@

      vlc_placebo_Release(sys->pl);

  }

-@@ -229,6 +233,8 @@ static void PictureRender(vout_display_t *vd, picture_t *pic,

+@@ -229,6 +233,10 @@ static void PictureRender(vout_display_t *vd, picture_t *pic,

      struct pl_image img = {

          .num_planes = pic->i_planes,

++#if PL_API_VER < 192

 +        .width      = pic->format.i_visible_width,

 +        .height     = pic->format.i_visible_height,

++#endif

          .color      = vlc_placebo_ColorSpace(vd->fmt),

          .repr       = vlc_placebo_ColorRepr(vd->fmt),

          .src_rect = {

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

 @@ -572,8 +580,10 @@ vlc_module_begin ()

      add_shortcut ("libplacebo", "pl")

-     add_module ("pl-gpu", "libplacebo gpu", NULL, PROVIDER_TEXT, PROVIDER_LONGTEXT)

+     add_module ("pl-gpu", "libplacebo gpu", "any", PROVIDER_TEXT, PROVIDER_LONGTEXT)

 +#if PL_API_VER >= 58

      set_section("Custom shaders", NULL)

​