[vlc-commits] [Git][videolan/vlc][master] 2 commits: video_filter: Makefile: refactor glblend for tvOS

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
c74900b8 by Alexandre Janniaux at 2021-10-12T15:40:45+00:00
video_filter: Makefile: refactor glblend for tvOS

The plugin wasn't enabled on tvOS due to the forgotten case.

- - - - -
17bce901 by Alexandre Janniaux at 2021-10-12T15:40:45+00:00
opengl: Makefile.am: refactor to enable draw on tvOS

The plugin wasn't enabled on tvOS due to the forgotten case.

- - - - -


2 changed files:

- modules/video_filter/Makefile.am
- modules/video_output/opengl/Makefile.am


Changes:

=====================================
modules/video_filter/Makefile.am
=====================================
@@ -194,10 +194,14 @@ libglblend_plugin_la_LIBADD = libvlc_opengl.la
 video_filter_LTLIBRARIES += libglblend_plugin.la
 endif
 
-if HAVE_IOS
+if HAVE_DARWIN
+video_filter_LTLIBRARIES += libglblend_plugin.la
+if HAVE_OSX
+libglblend_plugin_la_LIBADD = libvlc_opengl.la
+else
 libglblend_plugin_la_LIBADD = libvlc_opengles.la
 libglblend_plugin_la_CFLAGS += -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libglblend_plugin.la
+endif
 endif
 
 if HAVE_ANDROID


=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -78,15 +78,17 @@ if HAVE_GL
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengl.la $(GL_LIBS)
 vout_LTLIBRARIES += libglfilter_draw_plugin.la
 endif
+
+if HAVE_DARWIN
+vout_LTLIBRARIES += libglfilter_draw_plugin.la
 if HAVE_OSX
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengl.la
-vout_LTLIBRARIES += libglfilter_draw_plugin.la
-endif
-if HAVE_IOS
+else
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengles.la $(GLES2_LIBS)
 libglfilter_draw_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-vout_LTLIBRARIES += libglfilter_draw_plugin.la
 endif
+endif
+
 if HAVE_ANDROID
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengles.la $(GLES2_LIBS)
 libglfilter_draw_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/668ef74e5971e1d90666194964c8af046e7fe442...17bce90118c15dc8e0c47f56604d034304701946

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/668ef74e5971e1d90666194964c8af046e7fe442...17bce90118c15dc8e0c47f56604d034304701946
You're receiving this email because of your account on code.videolan.org.