build system: simplify checks for iOS and tvOS

Almost always, we support all features on both OS so a new, shared
check is introduced. It cannot be applied to xrOS which lacks OpenGL.

configure.ac

@@ -116,6 +116,7 @@ HAVE_WIN64="0"
 HAVE_IOS="0"
 HAVE_OSX="0"
 HAVE_TVOS="0"
+HAVE_IOS_OR_TVOS="0"
 HAVE_XROS="0"
 
 dnl  Set x86 asm flags and defines
@@ -218,6 +219,7 @@ int foo() { return my_array[0]; }
              yes
              #endif],
              [HAVE_IOS="1"
+             HAVE_IOS_OR_TVOS="1"
              ac_cv_func_wordexp=no],
              [HAVE_OSX="1"])
 
@@ -227,6 +229,7 @@ int foo() { return my_array[0]; }
              yes
              #endif],
              [HAVE_TVOS="1"
+             HAVE_IOS_OR_TVOS="1"
              HAVE_IOS="0"
              HAVE_OSX="0"
              HAVE_XROS="0"
@@ -242,6 +245,7 @@ int foo() { return my_array[0]; }
              HAVE_IOS="0"
              HAVE_OSX="0"
              HAVE_TVOS="0"
+             HAVE_IOS_OR_TVOS="0"
              ac_cv_func_fork=no
              ],)
 
@@ -486,6 +490,7 @@ AM_CONDITIONAL([HAVE_DARWIN],  [test "${SYS}" = "darwin"])
 AM_CONDITIONAL([HAVE_IOS],     [test "${HAVE_IOS}" = "1"])
 AM_CONDITIONAL([HAVE_OSX],     [test "${HAVE_OSX}" = "1"])
 AM_CONDITIONAL([HAVE_TVOS],    [test "${HAVE_TVOS}" = "1"])
+AM_CONDITIONAL([HAVE_IOS_OR_TVOS], [test "${HAVE_IOS_OR_TVOS}" = "1"])
 AM_CONDITIONAL([HAVE_XROS],    [test "${HAVE_XROS}" = "1"])
 
 AM_CONDITIONAL([HAVE_LIBANL],  [test "${HAVE_LIBANL}" = "1"])

modules/audio_output/Makefile.am

@@ -128,10 +128,7 @@ libaudiounit_ios_plugin_la_SOURCES = audio_output/audiounit_ios.m \
 	audio_output/coreaudio_common.c audio_output/coreaudio_common.h
 libaudiounit_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(aoutdir)' \
 	-Wl,-framework,Foundation,-framework,CoreAudio,-framework,AudioToolbox,-framework,UIKit,-framework,AVFoundation
-if HAVE_IOS
-aout_LTLIBRARIES += libaudiounit_ios_plugin.la
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 aout_LTLIBRARIES += libaudiounit_ios_plugin.la
 endif
 if HAVE_XROS

modules/misc/Makefile.am

@@ -54,11 +54,10 @@ endif
 libuikit_inhibit_plugin_la_SOURCES = misc/inhibit/uikit-inhibit.m
 libuikit_inhibit_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit,-framework,Foundation
 libuikit_inhibit_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
-if HAVE_IOS
+if HAVE_IOS_OR_TVOS
 misc_LTLIBRARIES += libuikit_inhibit_plugin.la
 endif
-
-if HAVE_TVOS
+if HAVE_XROS
 misc_LTLIBRARIES += libuikit_inhibit_plugin.la
 endif
 

modules/video_filter/Makefile.am

@@ -121,7 +121,7 @@ libci_filters_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
 video_filter_LTLIBRARIES += libci_filters_plugin.la
 endif
 
-if HAVE_IOS
+if HAVE_IOS_OR_TVOS
 libci_filters_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
 video_filter_LTLIBRARIES += libci_filters_plugin.la
 endif
@@ -141,13 +141,7 @@ endif
 endif
 endif
 
-if HAVE_IOS
-libopengl_filter_plugin_la_LIBADD = libvlc_opengles.la
-libopengl_filter_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libopengl_filter_plugin.la
-endif
-
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 libopengl_filter_plugin_la_LIBADD = libvlc_opengles.la
 libopengl_filter_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
 video_filter_LTLIBRARIES += libopengl_filter_plugin.la
@@ -196,12 +190,7 @@ if HAVE_OSX
 video_filter_LTLIBRARIES += libglblend_plugin.la
 libglblend_plugin_la_LIBADD = libvlc_opengl.la
 endif
-if HAVE_IOS
-video_filter_LTLIBRARIES += libglblend_plugin.la
-libglblend_plugin_la_LIBADD = libvlc_opengles.la
-libglblend_plugin_la_CFLAGS += -DUSE_OPENGL_ES2=1
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 video_filter_LTLIBRARIES += libglblend_plugin.la
 libglblend_plugin_la_LIBADD = libvlc_opengles.la
 libglblend_plugin_la_CFLAGS += -DUSE_OPENGL_ES2=1

modules/video_output/Makefile.am

@@ -43,12 +43,7 @@ if HAVE_OSX
 vout_LTLIBRARIES += libglinterop_cvpx_plugin.la
 libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
 endif
-if HAVE_IOS
-vout_LTLIBRARIES += libglinterop_cvpx_plugin.la
-libglinterop_cvpx_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
-libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 vout_LTLIBRARIES += libglinterop_cvpx_plugin.la
 libglinterop_cvpx_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
 libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
@@ -117,25 +112,14 @@ vout_LTLIBRARIES += libcvpx_gl_plugin.la
 libcvpx_gl_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
 libcvpx_gl_plugin_la_LIBADD += libvlc_opengl.la
 endif
-if HAVE_IOS
-vout_LTLIBRARIES += libcvpx_gl_plugin.la
-libcvpx_gl_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
-libcvpx_gl_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
-libcvpx_gl_plugin_la_LIBADD += libvlc_opengles.la
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 vout_LTLIBRARIES += libcvpx_gl_plugin.la
 libcvpx_gl_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
 libcvpx_gl_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
 libcvpx_gl_plugin_la_LIBADD += libvlc_opengles.la
 endif
 
-if HAVE_IOS
-vout_LTLIBRARIES += libvout_ios_plugin.la \
-	libuiview_window_plugin.la \
-	libcaeagl_ios_plugin.la
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 vout_LTLIBRARIES += \
 	libvout_ios_plugin.la \
 	libuiview_window_plugin.la \

modules/video_output/opengl/Makefile.am

@@ -72,12 +72,7 @@ if HAVE_OSX
 vout_LTLIBRARIES += libglinterop_sw_plugin.la
 libglinterop_sw_plugin_la_LIBADD = libvlc_opengl.la
 endif
-if HAVE_IOS
-vout_LTLIBRARIES += libglinterop_sw_plugin.la
-libglinterop_sw_plugin_la_LIBADD = libvlc_opengles.la
-libglinterop_sw_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 vout_LTLIBRARIES += libglinterop_sw_plugin.la
 libglinterop_sw_plugin_la_LIBADD = libvlc_opengles.la
 libglinterop_sw_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
@@ -122,12 +117,7 @@ if HAVE_OSX
 vout_LTLIBRARIES += libglfilter_draw_plugin.la
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengl.la
 endif
-if HAVE_IOS
-vout_LTLIBRARIES += libglfilter_draw_plugin.la
-libglfilter_draw_plugin_la_LIBADD = libvlc_opengles.la $(GLES2_LIBS)
-libglfilter_draw_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 vout_LTLIBRARIES += libglfilter_draw_plugin.la
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengles.la $(GLES2_LIBS)
 libglfilter_draw_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
@@ -155,7 +145,7 @@ libglfilter_mock_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
 noinst_LTLIBRARIES += libglfilter_mock_plugin.la
 endif
 
-if HAVE_IOS
+if HAVE_IOS_OR_TVOS
 libglfilter_mock_plugin_la_LIBADD += libvlc_opengles.la $(GLES2_LIBS)
 libglfilter_mock_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
 noinst_LTLIBRARIES += libglfilter_mock_plugin.la
@@ -189,12 +179,7 @@ if HAVE_OSX
 video_filter_LTLIBRARIES += libpl_scale_plugin.la
 libpl_scale_plugin_la_LIBADD += libvlc_opengl.la
 endif
-if HAVE_IOS
-video_filter_LTLIBRARIES += libpl_scale_plugin.la
-libpl_scale_plugin_la_LIBADD += libvlc_opengles.la
-libpl_scale_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2=1
-endif
-if HAVE_TVOS
+if HAVE_IOS_OR_TVOS
 video_filter_LTLIBRARIES += libpl_scale_plugin.la
 libpl_scale_plugin_la_LIBADD += libvlc_opengles.la
 libpl_scale_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2=1