@@ -31,8 +31,7 @@

 Release:        0

 Summary:        Snapshot of vlc.git#master

 License:        GPL-2.0+ and LGPL-2.1+

-Group:          Productivity/Multimedia/Video/Players

-Url:            http://www.videolan.org

+URL:            https://code.videolan.org/videolan/vlc

 Source0:        %name-%version.tar

 Source1:        %name.changes

 Source3:        %name-rpmlintrc

@@ -86,163 +85,161 @@

 Provides:       vlc-beta-qt-debuginfo = %version-%release

 BuildRequires:  bash

-BuildRequires:  flex

 BuildRequires:  bison

-%if 0%{?suse_version} > 1500

+BuildRequires:  ffmpeg-7-libavcodec-devel

+BuildRequires:  ffmpeg-7-libavformat-devel

+BuildRequires:  ffmpeg-7-libavutil-devel

+BuildRequires:  ffmpeg-7-libpostproc-devel

+BuildRequires:  ffmpeg-7-libswscale-devel

+BuildRequires:  flex

 BuildRequires:  gettext-devel >= 0.21

 BuildRequires:  gettext-tools

-%endif

+BuildRequires:  libgcrypt-devel >= 1.6.0

 BuildRequires:  libtool

 BuildRequires:  pkg-config

-%if %{with vlc_medialibrary}

-BuildRequires:  pkgconfig(medialibrary)

+%if 0%{?suse_version} > 1500

+BuildRequires:  pkgconfig(KF6WindowSystem)

 %endif

-BuildRequires:  pkgconfig(zlib)

-BuildRequires:  pkgconfig(libidn)

+BuildRequires:  pkgconfig(Qt6Core)

+BuildRequires:  pkgconfig(Qt6Gui)

+BuildRequires:  pkgconfig(Qt6Qml)

+BuildRequires:  pkgconfig(Qt6QmlModels)

+BuildRequires:  pkgconfig(Qt6QmlWorkerScript)

+BuildRequires:  pkgconfig(Qt6Quick)

+BuildRequires:  pkgconfig(Qt6QuickControls2)

+BuildRequires:  pkgconfig(Qt6QuickLayouts)

+BuildRequires:  pkgconfig(Qt6QuickTemplates2)

+BuildRequires:  pkgconfig(Qt6ShaderTools)

+BuildRequires:  pkgconfig(Qt6Svg)

+BuildRequires:  pkgconfig(Qt6WaylandClient)

+BuildRequires:  pkgconfig(Qt6Widgets)

+BuildRequires:  pkgconfig(alsa) >= 1.0.24

+BuildRequires:  pkgconfig(avahi-client) >= 0.6

+BuildRequires:  pkgconfig(caca) >= 0.99.beta14

+BuildRequires:  pkgconfig(cairo) >= 1.13.1

+BuildRequires:  pkgconfig(dav1d)

 BuildRequires:  pkgconfig(dbus-1) >= 1.6.0

-BuildRequires:  pkgconfig(libsystemd)

-BuildRequires:  pkgconfig(lua) >= 5.1

-BuildRequires:  pkgconfig(libarchive) >= 3.1.0

-BuildRequires:  pkgconfig(live555) >= 2015.01.27

-BuildRequires:  pkgconfig(libdc1394-2) >= 2.1.0

-BuildRequires:  pkgconfig(libraw1394) >= 2.0.1

-BuildRequires:  pkgconfig(libavc1394) >= 0.5.3

-BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28

 BuildRequires:  pkgconfig(dvdnav) >= 6.0.0

 BuildRequires:  pkgconfig(dvdread) >= 6.0.0

-BuildRequires:  pkgconfig(libplacebo)

-BuildRequires:  pkgconfig(vulkan) >= 1.0.26

-BuildRequires:  pkgconfig(libbluray)

-%if %{with vlc_opencv}

-BuildRequires:  pkgconfig(opencv) > 2.0

+BuildRequires:  pkgconfig(egl)

+BuildRequires:  pkgconfig(faad2)

+%if %{with fdk_aac}

+BuildRequires:  pkgconfig(fdk-aac)

 %endif

-BuildRequires:  pkgconfig(smbclient)

-BuildRequires:  pkgconfig(libssh2)

-BuildRequires:  pkgconfig(libnfs) >= 1.10.0

-BuildRequires:  pkgconfig(libv4l2)

-#uildRequires:  pkgconfig(ffnvcodec)

-BuildRequires:  pkgconfig(libcddb) >= 0.9.5

-BuildRequires:  pkgconfig(libvncclient) >= 0.9.9

+BuildRequires:  pkgconfig(ffnvcodec)

+BuildRequires:  pkgconfig(flac)

+BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2

+BuildRequires:  pkgconfig(fontconfig) >= 2.11

 BuildRequires:  pkgconfig(freerdp2)

+BuildRequires:  pkgconfig(freetype2)

+BuildRequires:  pkgconfig(fribidi)

+BuildRequires:  pkgconfig(gbm)

+BuildRequires:  pkgconfig(gl)

+BuildRequires:  pkgconfig(gnutls) >= 3.5.0

+BuildRequires:  pkgconfig(gtk+-3.0)

+BuildRequires:  pkgconfig(harfbuzz)

+BuildRequires:  pkgconfig(jack) >= 1.9.7

+BuildRequires:  pkgconfig(kate) >= 0.3.0

+BuildRequires:  pkgconfig(libarchive) >= 3.1.0

+BuildRequires:  pkgconfig(libass) >= 0.9.8

+BuildRequires:  pkgconfig(libavc1394) >= 0.5.3

+BuildRequires:  pkgconfig(libbluray)

+BuildRequires:  pkgconfig(libcddb) >= 0.9.5

+%if 0%{?suse_version} > 1500

+BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0

+%endif

+BuildRequires:  pkgconfig(libdc1394-2) >= 2.1.0

+BuildRequires:  pkgconfig(libdrm) >= 2.4.83

 BuildRequires:  pkgconfig(libdvbpsi) >= 1.2.0

-BuildRequires:  pkgconfig(libgme)

-BuildRequires:  pkgconfig(ogg) >= 1.0

-BuildRequires:  pkgconfig(vorbis) >= 1.1

-BuildRequires:  pkgconfig(shout) >= 2.1

 BuildRequires:  pkgconfig(libebml) >= 1.3.6

+BuildRequires:  pkgconfig(libebur128) >= 1.2.4

+BuildRequires:  pkgconfig(libgme)

+BuildRequires:  pkgconfig(libidn)

+BuildRequires:  pkgconfig(libjpeg)

 BuildRequires:  pkgconfig(libmatroska)

 BuildRequires:  pkgconfig(libmodplug)

-BuildRequires:  pkgconfig(shine) >= 3.0.0

-BuildRequires:  pkgconfig(mad)

 BuildRequires:  pkgconfig(libmpg123)

-BuildRequires:  ffmpeg-6-libavutil-devel

-BuildRequires:  ffmpeg-6-libavcodec-devel

+BuildRequires:  pkgconfig(libmtp) >= 1.0.0

+BuildRequires:  pkgconfig(libnfs) >= 1.10.0

+BuildRequires:  pkgconfig(libnotify)

+BuildRequires:  pkgconfig(libpipewire-0.3)

+BuildRequires:  pkgconfig(libplacebo)

+BuildRequires:  pkgconfig(libpng)

+BuildRequires:  pkgconfig(libpulse) >= 6.0

+BuildRequires:  pkgconfig(libraw1394) >= 2.0.1

+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0

+BuildRequires:  pkgconfig(libsecret-1) >= 0.18

+BuildRequires:  pkgconfig(libssh2)

+BuildRequires:  pkgconfig(libsystemd)

+BuildRequires:  pkgconfig(libudev) >= 142

+BuildRequires:  pkgconfig(libupnp)

+BuildRequires:  pkgconfig(libv4l2)

 BuildRequires:  pkgconfig(libva) >= 0.38

 BuildRequires:  pkgconfig(libva-drm)

+BuildRequires:  pkgconfig(libva-wayland)

 BuildRequires:  pkgconfig(libva-x11)

-BuildRequires:  ffmpeg-6-libavformat-devel

-BuildRequires:  ffmpeg-6-libswscale-devel

-BuildRequires:  ffmpeg-6-libpostproc-devel

-BuildRequires:  pkgconfig(faad2)

-BuildRequires:  pkgconfig(rav1e)

-BuildRequires:  pkgconfig(dav1d)

-BuildRequires:  pkgconfig(vpx) >= 1.5.0

-BuildRequires:  pkgconfig(twolame)

-%if %{with fdk_aac}

-BuildRequires:  pkgconfig(fdk-aac)

+BuildRequires:  pkgconfig(libvncclient) >= 0.9.9

+BuildRequires:  pkgconfig(libxml-2.0) >= 2.5

+BuildRequires:  pkgconfig(lirc)

+BuildRequires:  pkgconfig(live555) >= 2015.01.27

+BuildRequires:  pkgconfig(lua) >= 5.1

+BuildRequires:  pkgconfig(mad)

+%if %{with vlc_medialibrary}

+BuildRequires:  pkgconfig(medialibrary)

+%endif

+BuildRequires:  pkgconfig(ncursesw)

+BuildRequires:  pkgconfig(ogg) >= 1.0

+%if %{with vlc_opencv}

+BuildRequires:  pkgconfig(opencv) > 2.0

 %endif

-BuildRequires:  pkgconfig(flac)

-BuildRequires:  pkgconfig(vorbisenc) >= 1.1

-BuildRequires:  pkgconfig(speex) >= 1.0.5

 BuildRequires:  pkgconfig(opus) >= 1.0.3

+BuildRequires:  pkgconfig(protobuf-lite)

+BuildRequires:  pkgconfig(python3)

+BuildRequires:  pkgconfig(rav1e)

+BuildRequires:  pkgconfig(samplerate)

+BuildRequires:  pkgconfig(schroedinger-1.0) >= 1.0.10

+BuildRequires:  pkgconfig(shine) >= 3.0.0

+BuildRequires:  pkgconfig(shout) >= 2.1

+BuildRequires:  pkgconfig(smbclient)

+BuildRequires:  pkgconfig(soxr) >= 0.1.2

+BuildRequires:  pkgconfig(speex) >= 1.0.5

+BuildRequires:  pkgconfig(taglib) >= 1.11

 BuildRequires:  pkgconfig(theoradec) >= 1.0

 BuildRequires:  pkgconfig(theoraenc)

-BuildRequires:  pkgconfig(schroedinger-1.0) >= 1.0.10

-BuildRequires:  pkgconfig(libpng)

-BuildRequires:  pkgconfig(libjpeg)

-BuildRequires:  pkgconfig(x265)

-BuildRequires:  pkgconfig(x264) >= 0.86

-BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2

-BuildRequires:  pkgconfig(libass) >= 0.9.8

-BuildRequires:  pkgconfig(kate) >= 0.3.0

-BuildRequires:  pkgconfig(gbm)

-BuildRequires:  pkgconfig(gl)

-BuildRequires:  pkgconfig(egl)

-BuildRequires:  pkgconfig(xcb) >= 1.6

-BuildRequires:  pkgconfig(xcb-render)

-BuildRequires:  pkgconfig(xcb-shm) >= 1.9.2

-BuildRequires:  pkgconfig(xcb-composite)

-BuildRequires:  pkgconfig(xproto)

-BuildRequires:  pkgconfig(xcursor)

-BuildRequires:  pkgconfig(xcb-randr) >= 1.3

-BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4

-BuildRequires:  pkgconfig(xcb-damage)

-BuildRequires:  pkgconfig(xcb-xfixes)

+BuildRequires:  pkgconfig(twolame)

 BuildRequires:  pkgconfig(vdpau) >= 0.6

-BuildRequires:  pkgconfig(libva-wayland)

+BuildRequires:  pkgconfig(vorbis) >= 1.1

+BuildRequires:  pkgconfig(vorbisenc) >= 1.1

+BuildRequires:  pkgconfig(vpx) >= 1.5.0

+BuildRequires:  pkgconfig(vulkan) >= 1.0.26

 BuildRequires:  pkgconfig(wayland-client)

 BuildRequires:  pkgconfig(wayland-cursor)

 BuildRequires:  pkgconfig(wayland-egl)

 BuildRequires:  pkgconfig(wayland-protocols) >= 1.15

 BuildRequires:  pkgconfig(wayland-scanner) >= 1.15

+BuildRequires:  pkgconfig(x264) >= 0.86

+BuildRequires:  pkgconfig(x265)

+BuildRequires:  pkgconfig(xcb) >= 1.6

+BuildRequires:  pkgconfig(xcb-composite)

+BuildRequires:  pkgconfig(xcb-damage)

+BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4

+BuildRequires:  pkgconfig(xcb-randr) >= 1.3

+BuildRequires:  pkgconfig(xcb-render)

+BuildRequires:  pkgconfig(xcb-shm) >= 1.9.2

+BuildRequires:  pkgconfig(xcb-xfixes)

+BuildRequires:  pkgconfig(xcb-xkb)

+BuildRequires:  pkgconfig(xcursor)

+BuildRequires:  pkgconfig(xext)

+BuildRequires:  pkgconfig(xinerama)

 BuildRequires:  pkgconfig(xkbcommon)

-BuildRequires:  pkgconfig(freetype2)

-BuildRequires:  pkgconfig(fontconfig) >= 2.11

-BuildRequires:  pkgconfig(fribidi)

-BuildRequires:  pkgconfig(harfbuzz)

-BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0

-BuildRequires:  pkgconfig(cairo) >= 1.13.1

-BuildRequires:  pkgconfig(libdrm) >= 2.4.83

-BuildRequires:  pkgconfig(caca) >= 0.99.beta14

-BuildRequires:  pkgconfig(libpulse) >= 6.0

-BuildRequires:  pkgconfig(alsa) >= 1.0.24

-BuildRequires:  pkgconfig(jack) >= 1.9.7

-BuildRequires:  pkgconfig(samplerate)

-BuildRequires:  pkgconfig(soxr) >= 0.1.2

-BuildRequires:  pkgconfig(libebur128) >= 1.2.4

-BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0

-%if 0%{?suse_version} > 1500

-BuildRequires:  pkgconfig(KF6WindowSystem)

-%endif

-BuildRequires:  pkgconfig(Qt6Core)

-BuildRequires:  pkgconfig(Qt6Gui)

-BuildRequires:  pkgconfig(Qt6Qml)

-BuildRequires:  pkgconfig(Qt6QmlModels)

-BuildRequires:  pkgconfig(Qt6QmlWorkerScript)

-BuildRequires:  pkgconfig(Qt6Quick)

-BuildRequires:  pkgconfig(Qt6QuickControls2)

-BuildRequires:  pkgconfig(Qt6QuickLayouts)

-BuildRequires:  pkgconfig(Qt6QuickTemplates2)

-BuildRequires:  pkgconfig(Qt6ShaderTools)

-BuildRequires:  pkgconfig(Qt6Svg)

-BuildRequires:  pkgconfig(Qt6WaylandClient)

-BuildRequires:  pkgconfig(Qt6Widgets)

+BuildRequires:  pkgconfig(xkbcommon-x11)

+BuildRequires:  pkgconfig(xpm)

+BuildRequires:  pkgconfig(xproto)

+BuildRequires:  pkgconfig(zlib)

+BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28

 BuildRequires:  qt6qmlimport(Qt5Compat.GraphicalEffects.1)

-#uildRequires:  qt6qmlimport(QtQml.Models)

 BuildRequires:  qt6qmlimport(QtQuick.Controls.6)

-#uildRequires:  qt6qmlimport(QtQuick.Layouts)

 BuildRequires:  qt6qmlimport(QtQuick.Window.2)

-BuildRequires:  pkgconfig(xpm)

-BuildRequires:  pkgconfig(xinerama)

-BuildRequires:  pkgconfig(xext)

-BuildRequires:  pkgconfig(xcb-xkb)

-BuildRequires:  pkgconfig(xkbcommon-x11)

-BuildRequires:  pkgconfig(ncursesw)

-BuildRequires:  pkgconfig(lirc)

-BuildRequires:  pkgconfig(avahi-client) >= 0.6

-BuildRequires:  pkgconfig(libudev) >= 142

-BuildRequires:  pkgconfig(libmtp) >= 1.0.0

-BuildRequires:  pkgconfig(libupnp)

-BuildRequires:  pkgconfig(libxml-2.0) >= 2.5

-BuildRequires:  libgcrypt-devel >= 1.6.0

-BuildRequires:  pkgconfig(gnutls) >= 3.5.0

-BuildRequires:  pkgconfig(taglib) >= 1.11

-BuildRequires:  pkgconfig(libsecret-1) >= 0.18

-BuildRequires:  pkgconfig(libnotify)

-BuildRequires:  pkgconfig(gtk+-3.0)

-%if 0%{?suse_version} > 1500

-BuildRequires:  pkgconfig(protobuf-lite)

-%endif

 BuildRequires:  fdupes

 BuildRequires:  update-desktop-files

@@ -252,11 +249,8 @@

 Requires:       qt6qmlimport(QtQuick.Window.2)

 %description

-VLC media player is a highly portable multimedia player for various

-audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...)

-as well as DVDs, VCDs, and various streaming protocols.

-It can also be used as a server to stream in unicast or multicast

-in IPv4 or IPv6 on a high-bandwidth network.

+VLC media player is a multimedia player.

+It can also be used as a server to stream in unicast or multicast.

 %prep

 %autosetup -p1

@@ -421,7 +415,6 @@

    --enable-x265 \

    --disable-x26410b \

    --enable-x264 \

-   --disable-mfx \

    --enable-fluidsynth \

    --disable-fluidlite \

    --enable-zvbi \

@@ -453,6 +446,7 @@

    --enable-caca \

    --disable-kva \

    --disable-mmal \

+   --enable-pipewire \

    --enable-pulse \

    --enable-alsa \

    --disable-oss \

@@ -463,10 +457,10 @@

    --enable-samplerate \

    --enable-soxr \

    --disable-kai \

-   --enable-chromaprint \

 %if 0%{?suse_version} > 1500

-   --enable-chromecast \

+   --enable-chromaprint \

 %endif

+   --enable-chromecast \

    --enable-qt \

    --enable-qt \

    --enable-skins2 \

@@ -508,9 +502,7 @@

 %endif

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

    --enable-vlc \

-%if 0%{?suse_version} > 1500

    --enable-nls \

-%endif

    %nil

 %make_build --no-print-directory

@@ -532,59 +524,25 @@

     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

+read s < <(stat -c %%s %buildroot%_libdir/%name/plugins/plugins.dat)

+fallocate --punch-hole --offset 0 --length "${s}" %buildroot%_libdir/%name/plugins/plugins.dat

+(

+echo '%%ghost %buildroot%_libdir/%name/plugins/plugins.dat'

+find %buildroot%_libdir/%name -type d -printf '%%%%dir %p\n'

+find %buildroot%_libdir/%name -type f -name "*.so" -printf '%p\n'

+)|sed 's|%buildroot||'|sort -u|tee -a %name.lang

 %post -p /sbin/ldconfig

 %postun -p /sbin/ldconfig

 %posttrans

-%_libexecdir/%name/vlc-cache-gen %_libdir/%name/plugins

+exec %_libexecdir/%name/vlc-cache-gen %_libdir/%name/plugins

 %files -f %name.lang

-%dir %_libdir/%name/

-%dir %_libdir/%name/plugins

-%ifarch aarch64

-%dir %_libdir/%name/plugins/aarch64

-%endif

-%dir %_libdir/%name/plugins/access

-%dir %_libdir/%name/plugins/access/rtp

-%dir %_libdir/%name/plugins/access_output

-%dir %_libdir/%name/plugins/audio_filter

-%dir %_libdir/%name/plugins/audio_mixer

-%dir %_libdir/%name/plugins/audio_output

-%dir %_libdir/%name/plugins/codec

-%dir %_libdir/%name/plugins/control

-%dir %_libdir/%name/plugins/demux

-%dir %_libdir/%name/plugins/gui

-%dir %_libdir/%name/plugins/keystore

-%dir %_libdir/%name/plugins/logger

-%dir %_libdir/%name/plugins/lua

-%dir %_libdir/%name/plugins/meta_engine

-%dir %_libdir/%name/plugins/misc

-%dir %_libdir/%name/plugins/mux

-%dir %_libdir/%name/plugins/notify

-%dir %_libdir/%name/plugins/packetizer

-%dir %_libdir/%name/plugins/services_discovery

-%dir %_libdir/%name/plugins/spu

-%dir %_libdir/%name/plugins/stream_extractor

-%dir %_libdir/%name/plugins/stream_filter

-%dir %_libdir/%name/plugins/stream_out

-%dir %_libdir/%name/plugins/text_renderer

-%dir %_libdir/%name/plugins/vaapi

-%dir %_libdir/%name/plugins/vdpau

-%dir %_libdir/%name/plugins/video_chroma

-%dir %_libdir/%name/plugins/video_filter

-%dir %_libdir/%name/plugins/video_output

-%dir %_libdir/%name/plugins/video_splitter

-%dir %_libdir/%name/plugins/visualization

-%ghost %_libdir/%name/plugins/*.dat

 %_bindir/*

-%_datadir/%name/

+%_datadir/%name

 %_datadir/applications/*

 %_datadir/icons/*

 %_datadir/kde4

@@ -593,8 +551,6 @@

 %_includedir/*

 %_libdir/%name/*.so

 %_libdir/%name/*.so.*

-%_libdir/%name/plugins/*/*.so

-%_libdir/%name/plugins/*/*/*.so

 %_libdir/*.so

 %_libdir/*.so.*

 %_libdir/pkgconfig/*.pc

​

@@ -9,7 +9,7 @@

  LIBVLC_ABI_MINOR=0

  LIBVLC_ABI_MICRO=0

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

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

  dnl

  dnl dvdread module: check for libdvdread

  dnl

@@ -18,7 +18,7 @@

  dnl

  dnl libdvdnav plugin

-@@ -2525,7 +2525,7 @@ AC_ARG_ENABLE(mod,

+@@ -2545,7 +2545,7 @@ AC_ARG_ENABLE(mod,

    AS_HELP_STRING(--disable-mod,

      do not use libmodplug (default auto)))

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

@@ -27,7 +27,7 @@

            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

-@@ -4798,7 +4798,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",

+@@ -4900,7 +4900,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",

     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`

  )

  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)

@@ -59,7 +59,7 @@

  #else // _WIN32

 --- a/src/Makefile.am

 +++ b/src/Makefile.am

-@@ -568,7 +568,7 @@ libvlccore_la_LDFLAGS = \

+@@ -585,7 +585,7 @@ libvlccore_la_LDFLAGS = \

    $(LDFLAGS_libvlccore) \

    -no-undefined \

    -export-symbols $(srcdir)/libvlccore.sym \

​