[vlc-devel] [vlc-commits] qt: add DirectCompositor compositor

[Konstantin Pavlov]

Hi Pierre,

On Tue, May 19, 2020 at 02:52:51PM +0000, Pierre Lamot wrote:
> vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Tue Mar 24 09:52:50 2020 +0100| [3d6013c5e12ae90fdb38f55ec9aa64f148583780] | committer: Pierre Lamot
> 
> qt: add DirectCompositor compositor
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d6013c5e12ae90fdb38f55ec9aa64f148583780
> ---
> 
>  modules/gui/qt/Makefile.am                         |  21 +-
>  modules/gui/qt/maininterface/compositor.cpp        |  18 +
>  modules/gui/qt/maininterface/compositor_dcomp.cpp  | 294 +++++++++
>  modules/gui/qt/maininterface/compositor_dcomp.hpp  |  82 +++
>  .../qt/maininterface/compositor_dcomp_error.hpp    |  66 ++
>  .../maininterface/compositor_dcomp_uisurface.cpp   | 702 +++++++++++++++++++++
>  .../maininterface/compositor_dcomp_uisurface.hpp   | 182 ++++++
>  .../gui/qt/maininterface/main_interface_win32.cpp  |   2 +-
>  8 files changed, 1364 insertions(+), 3 deletions(-)
> 
> diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
> index e2886bec50..655b9402a9 100644
> --- a/modules/gui/qt/Makefile.am
> +++ b/modules/gui/qt/Makefile.am
> @@ -45,7 +45,7 @@ libqt_plugin_la_CXXFLAGS += $(WAYLAND_CLIENT_CFLAGS)
>  libqt_plugin_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
>  endif
>  if HAVE_WIN32
> -libqt_plugin_la_LIBADD += $(LIBCOM) -lcomctl32 -luuid
> +libqt_plugin_la_LIBADD += $(LIBCOM) -lcomctl32 -luuid -ld3d11
>  endif
>  if UPDATE_CHECK
>  libqt_plugin_la_CPPFLAGS += -DUPDATE_CHECK
> @@ -214,7 +214,17 @@ libqt_plugin_la_SOURCES = \
>  	gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp
>  if HAVE_WIN32
>  libqt_plugin_la_SOURCES += \
> -	gui/qt/maininterface/main_interface_win32.cpp gui/qt/maininterface/main_interface_win32.hpp
> +	gui/qt/maininterface/main_interface_win32.cpp \
> +	gui/qt/maininterface/main_interface_win32.hpp
> +
> +if HAVE_DCOMP
> +libqt_plugin_la_SOURCES += \
> +	gui/qt/maininterface/compositor_dcomp.cpp \
> +	gui/qt/maininterface/compositor_dcomp.hpp \
> +	gui/qt/maininterface/compositor_error.hpp \

There is no such file in this commit, so make dist fails now:

make[4]: Entering directory '/home/thresh/projects/videolan/vlc/modules'
make[4]: *** No rule to make target
'gui/qt/maininterface/compositor_error.hpp', needed by 'distdir-am'.
Stop.

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh