[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib/ffmpeg: fix compilation for xrOS

Felix Paul Kühne (@fkuehne) gitlab at videolan.org
Wed Mar 20 06:37:19 UTC 2024



Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
d18141d0 by Felix Paul Kühne at 2024-03-20T05:59:45+00:00
contrib/ffmpeg: fix compilation for xrOS

- - - - -
47cdb055 by Felix Paul Kühne at 2024-03-20T05:59:45+00:00
Packaging: write our own meson crossfile for appleOS

We need to set CFLAGS that are not transfered through the regular prozess.

- - - - -
72b31289 by Felix Paul Kühne at 2024-03-20T05:59:45+00:00
Packaging: add support for xrOS

- - - - -
004ec1a9 by Felix Paul Kühne at 2024-03-20T05:59:45+00:00
build system: add support for xrOS

- - - - -
bb5723b7 by Felix Paul Kühne at 2024-03-20T05:59:45+00:00
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.

- - - - -


10 changed files:

- configure.ac
- + contrib/src/ffmpeg/avcodec-fix-compilation-visionos.patch
- contrib/src/ffmpeg/rules.mak
- extras/package/apple/build.conf
- extras/package/apple/build.sh
- modules/audio_output/Makefile.am
- modules/misc/Makefile.am
- modules/video_filter/Makefile.am
- modules/video_output/Makefile.am
- modules/video_output/opengl/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -116,6 +116,8 @@ 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
 X86ASMFLAGS=""
@@ -217,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"])
 
@@ -226,8 +229,23 @@ 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"
+             ac_cv_func_fork=no
+             ],)
+
+    AC_EGREP_CPP(yes,
+            [#import <TargetConditionals.h>
+             #if TARGET_OS_VISION
+             yes
+             #endif],
+             [HAVE_XROS="1"
+             HAVE_IOS="0"
+             HAVE_OSX="0"
+             HAVE_TVOS="0"
+             HAVE_IOS_OR_TVOS="0"
              ac_cv_func_fork=no
              ],)
 
@@ -472,6 +490,8 @@ 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"])
 


=====================================
contrib/src/ffmpeg/avcodec-fix-compilation-visionos.patch
=====================================
@@ -0,0 +1,13 @@
+diff -ru ffmpeg/libavcodec/videotoolbox.c ffmpeg/libavcodec/videotoolbox.c
+--- ffmpeg/libavcodec/videotoolbox.c	2023-11-11 01:25:17
++++ ffmpeg/libavcodec/videotoolbox.c	2024-03-17 11:32:05
+@@ -784,7 +784,9 @@
+     CFDictionarySetValue(buffer_attributes, kCVPixelBufferWidthKey, w);
+     CFDictionarySetValue(buffer_attributes, kCVPixelBufferHeightKey, h);
+ #if TARGET_OS_IPHONE
++#ifndef TARGET_OS_VISION
+     CFDictionarySetValue(buffer_attributes, kCVPixelBufferOpenGLESCompatibilityKey, kCFBooleanTrue);
++#endif
+ #else
+     CFDictionarySetValue(buffer_attributes, kCVPixelBufferIOSurfaceOpenGLTextureCompatibilityKey, kCFBooleanTrue);
+ #endif


=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -227,6 +227,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz .sum-ffmpeg
 	$(APPLY) $(SRC)/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch
 	$(APPLY) $(SRC)/ffmpeg/0011-avcodec-videotoolboxenc-disable-calls-on-unsupported.patch
+	$(APPLY) $(SRC)/ffmpeg/avcodec-fix-compilation-visionos.patch
 	$(MOVE)
 
 .ffmpeg: ffmpeg


=====================================
extras/package/apple/build.conf
=====================================
@@ -16,6 +16,8 @@ export VLC_DEPLOYMENT_TARGET_MACOSX="10.11"
 export VLC_DEPLOYMENT_TARGET_IOS="9.0"
 # tvOS deployment target
 export VLC_DEPLOYMENT_TARGET_TVOS="11.0"
+# xrOS deployment target
+export VLC_DEPLOYMENT_TARGET_XROS="1.0"
 
 #
 # Contrib options
@@ -94,6 +96,11 @@ export VLC_CONTRIB_OPTIONS_TVOS=(
     --disable-aom
 )
 
+# Additional contrib bootstrap options for iOS
+export VLC_CONTRIB_OPTIONS_XROS=(
+    --disable-aom
+)
+
 #
 # VLC options
 #
@@ -142,6 +149,9 @@ export VLC_CONFIG_OPTIONS_IOS=()
 # Additional configure options for tvOS
 export VLC_CONFIG_OPTIONS_TVOS=()
 
+# Additional configure options for xrOS
+export VLC_CONFIG_OPTIONS_XROS=()
+
 #
 # VLC module options
 #
@@ -218,3 +228,6 @@ export VLC_MODULE_REMOVAL_LIST_IOS=()
 
 # Additional modules to remove for tvOS
 export VLC_MODULE_REMOVAL_LIST_TVOS=()
+
+# Additional modules to remove for xrOS
+export VLC_MODULE_REMOVAL_LIST_XROS=()


=====================================
extras/package/apple/build.sh
=====================================
@@ -198,7 +198,13 @@ set_deployment_target()
         VLC_DEPLOYMENT_TARGET_CFLAG="${VLC_DEPLOYMENT_TARGET_CFLAG}-simulator"
     fi
     VLC_DEPLOYMENT_TARGET_LDFLAG="-Wl,-platform_version,${VLC_DEPLOYMENT_TARGET_LDFLAG},${VLC_DEPLOYMENT_TARGET},${VLC_APPLE_SDK_VERSION}"
-    VLC_DEPLOYMENT_TARGET_CFLAG="${VLC_DEPLOYMENT_TARGET_CFLAG}-version-min=${VLC_DEPLOYMENT_TARGET}"
+
+    # xrOS does not support the minimal version flag in clang 15.x (yet ?)
+    if [ "$VLC_HOST_OS" != "xros" ]; then
+        VLC_DEPLOYMENT_TARGET_CFLAG="${VLC_DEPLOYMENT_TARGET_CFLAG}-version-min=${VLC_DEPLOYMENT_TARGET}"
+    else
+	    VLC_DEPLOYMENT_TARGET_CFLAG=""
+    fi
 }
 
 # Validates the architecture and sets VLC_HOST_ARCH
@@ -307,6 +313,17 @@ validate_sdk_name()
             VLC_HOST_OS="macosx"
             set_deployment_target "$VLC_DEPLOYMENT_TARGET_MACOSX"
             ;;
+        xros*)
+            VLC_HOST_PLATFORM="xrOS"
+            VLC_HOST_OS="xros"
+            set_deployment_target "$VLC_DEPLOYMENT_TARGET_XROS"
+            ;;
+        xrsimulator*)
+            VLC_HOST_PLATFORM="xr-Simulator"
+            VLC_HOST_PLATFORM_SIMULATOR="yes"
+            VLC_HOST_OS="xros"
+            set_deployment_target "$VLC_DEPLOYMENT_TARGET_XROS"
+            ;;
         watch*)
             abort_err "Building for watchOS is not supported by this script"
             ;;
@@ -409,6 +426,46 @@ write_config_mak()
     vlcSetSymbolEnvironment ac_var_to_export_ac_var >&3
 }
 
+# Write crossfile.meson for contribs
+# Globals:
+#   VLC_HOST_CC
+#   VLC_HOST_CXX
+#   VLC_HOST_AR
+#   VLC_HOST_STRIP
+#   VLC_APPLE_SDK_PATH
+#   VLC_HOST_ARCH
+write_crossfile_meson()
+{
+    local meson_host_arch=$VLC_HOST_ARCH
+    if [ $meson_host_arch = "arm64" ]; then
+        meson_host_arch="aarch64"
+    fi
+    echo "Creating crossfile.meson..."
+    test -e crossfile.meson && unlink crossfile.meson
+    exec 3>crossfile.meson || return $?
+
+    printf "# This file was automatically generated by the appleOS build script!\n\n" >&3
+    printf "[binaries]\n" >&3
+    printf "c = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
+    printf "cpp = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
+    printf "objc = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
+    printf "objcpp = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
+    printf "ar = ['%s']\n" "${VLC_HOST_AR}" >&3
+    printf "strip = ['%s']\n" "${VLC_HOST_STRIP}" >&3
+    printf "pkgconfig = 'pkg-config'\n" >&3
+    printf "windres = 'windres'\n" >&3
+    printf "\n[properties]\n" >&3
+    printf "needs_exe_wrapper = true\n" >&3
+    printf "\n[host_machine]\n" >&3
+    printf "system = 'darwin'\n" >&3
+    printf "cpu_family = '%s'\n" "${meson_host_arch}" >&3
+    printf "endian = 'little'\n" >&3
+    printf "cpu = '%s'\n"  "${meson_host_arch}" >&3
+    printf "\n[cmake]\n" >&3
+    printf "CMAKE_C_COMPILER = '%s'\n" "${VLC_HOST_CC}" >&3
+    printf "CMAKE_CXX_COMPILER = '%s'\n" "${VLC_HOST_CXX}" >&3
+}
+
 # Generate the source file with the needed array for
 # the static VLC module list. This has to be compiled
 # and linked into the static library
@@ -572,6 +629,8 @@ if [ "$VLC_HOST_OS" = "ios" ]; then
 elif [ "$VLC_HOST_OS" = "tvos" ]; then
     export BUILDFORIOS="yes"
     export BUILDFORTVOS="yes"
+elif [ "$VLC_HOST_OS" = "xros" ]; then
+    export BUILDFORIOS="yes"
 fi
 
 # Default to "make" if there is no MAKE env variable
@@ -606,6 +665,8 @@ elif [ "$VLC_HOST_OS" = "ios" ]; then
     VLC_CONTRIB_OPTIONS+=( "${VLC_CONTRIB_OPTIONS_IOS[@]}" )
 elif [ "$VLC_HOST_OS" = "tvos" ]; then
     VLC_CONTRIB_OPTIONS+=( "${VLC_CONTRIB_OPTIONS_TVOS[@]}" )
+elif [ "$VLC_HOST_OS" = "xros" ]; then
+    VLC_CONTRIB_OPTIONS+=( "${VLC_CONTRIB_OPTIONS_XROS[@]}" )
 fi
 
 # Create dir to build contribs in
@@ -620,6 +681,9 @@ mkdir -p "$VLC_CONTRIB_INSTALL_DIR"
 # Set flag to error on partial availability
 write_config_mak "-Werror=partial-availability"
 
+# Write crossfile-meson with flags for the build and compiler overrides
+write_crossfile_meson
+
 if [ "$VLC_USE_BITCODE" -gt "0" ]; then
     VLC_CONTRIB_OPTIONS+=( "--enable-bitcode" )
 fi
@@ -683,6 +747,8 @@ elif [ "$VLC_HOST_OS" = "ios" ]; then
     VLC_CONFIG_OPTIONS+=( "${VLC_CONFIG_OPTIONS_IOS[@]}" )
 elif [ "$VLC_HOST_OS" = "tvos" ]; then
     VLC_CONFIG_OPTIONS+=( "${VLC_CONFIG_OPTIONS_TVOS[@]}" )
+elif [ "$VLC_HOST_OS" = "xros" ]; then
+    VLC_CONFIG_OPTIONS+=( "${VLC_CONFIG_OPTIONS_XROS[@]}" )
 fi
 
 if [ "$VLC_DISABLE_DEBUG" -gt "0" ]; then
@@ -748,6 +814,8 @@ elif [ "$VLC_HOST_OS" = "ios" ]; then
     VLC_MODULE_REMOVAL_LIST+=( "${VLC_MODULE_REMOVAL_LIST_IOS[@]}" )
 elif [ "$VLC_HOST_OS" = "tvos" ]; then
     VLC_MODULE_REMOVAL_LIST+=( "${VLC_MODULE_REMOVAL_LIST_TVOS[@]}" )
+elif [ "$VLC_HOST_OS" = "xros" ]; then
+    VLC_MODULE_REMOVAL_LIST+=( "${VLC_MODULE_REMOVAL_LIST_XROS[@]}" )
 fi
 
 for module in "${VLC_MODULE_REMOVAL_LIST[@]}"; do


=====================================
modules/audio_output/Makefile.am
=====================================
@@ -128,9 +128,9 @@ 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
+if HAVE_IOS_OR_TVOS
 aout_LTLIBRARIES += libaudiounit_ios_plugin.la
 endif
-if HAVE_TVOS
+if HAVE_XROS
 aout_LTLIBRARIES += libaudiounit_ios_plugin.la
 endif


=====================================
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
@@ -192,15 +186,15 @@ libglblend_plugin_la_LIBADD = libvlc_opengl.la
 video_filter_LTLIBRARIES += libglblend_plugin.la
 endif
 
-if HAVE_DARWIN
-video_filter_LTLIBRARIES += libglblend_plugin.la
 if HAVE_OSX
+video_filter_LTLIBRARIES += libglblend_plugin.la
 libglblend_plugin_la_LIBADD = libvlc_opengl.la
-else
+endif
+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
 endif
-endif
 
 if !HAVE_GL
 if HAVE_GLES2


=====================================
modules/video_output/Makefile.am
=====================================
@@ -39,17 +39,16 @@ libglinterop_cvpx_plugin_la_LIBADD = libvlc_vtutils.la
 libglinterop_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,Foundation,-framework,CoreVideo,-framework,IOSurface,-framework,Metal
 libglinterop_cvpx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-if HAVE_DARWIN
 if HAVE_OSX
+vout_LTLIBRARIES += libglinterop_cvpx_plugin.la
 libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
-else
-libglinterop_cvpx_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
-libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
 endif
+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
 endif
 
-
 if HAVE_OSX
 libwindow_macosx_plugin_la_SOURCES = video_output/window_macosx.m
 libwindow_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) \
@@ -108,29 +107,28 @@ libcvpx_gl_plugin_la_LDFLAGS = $(AM_LDFLAGS) \
     -Wl,-framework,Foundation,-framework,CoreFoundation,-framework,CoreVideo,-framework,Metal
 libcvpx_gl_plugin_la_LIBADD = libvlc_vtutils.la
 
-if HAVE_DARWIN
 if HAVE_OSX
+vout_LTLIBRARIES += libcvpx_gl_plugin.la
 libcvpx_gl_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
 libcvpx_gl_plugin_la_LIBADD += libvlc_opengl.la
-else
+endif
+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
-vout_LTLIBRARIES += libcvpx_gl_plugin.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 \
 	libcaeagl_ios_plugin.la
 endif
+if HAVE_XROS
+vout_LTLIBRARIES += \
+	libuiview_window_plugin.la
+endif
 
 libglinterop_gst_mem_plugin_la_SOURCES = video_output/opengl/interop_gst_mem.c \
 	video_output/opengl/interop.h codec/gstreamer/gst_mem.h


=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -67,15 +67,16 @@ libglinterop_sw_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
 endif
 endif
 
-if HAVE_DARWIN
-vout_LTLIBRARIES += libglinterop_sw_plugin.la
+
 if HAVE_OSX
+vout_LTLIBRARIES += libglinterop_sw_plugin.la
 libglinterop_sw_plugin_la_LIBADD = libvlc_opengl.la
-else
+endif
+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
 endif
-endif
 
 if HAVE_ANDROID
 libglinterop_sw_plugin_la_LIBADD = libvlc_opengles.la
@@ -112,15 +113,15 @@ 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
+vout_LTLIBRARIES += libglfilter_draw_plugin.la
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengl.la
-else
+endif
+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
 endif
-endif
 
 if !HAVE_GL
 if HAVE_GLES2
@@ -144,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
@@ -174,15 +175,15 @@ libpl_scale_plugin_la_LIBADD += libvlc_opengl.la
 video_filter_LTLIBRARIES += libpl_scale_plugin.la
 endif
 
-if HAVE_DARWIN
-video_filter_LTLIBRARIES += libpl_scale_plugin.la
 if HAVE_OSX
+video_filter_LTLIBRARIES += libpl_scale_plugin.la
 libpl_scale_plugin_la_LIBADD += libvlc_opengl.la
-else
+endif
+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
 endif
-endif
 
 if !HAVE_GL
 if HAVE_GLES2



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/296dac62beb47fc41490686ebd0bff7a03ae3431...bb5723b728fd6f4395ef1a08ed1f1d53b640abb4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/296dac62beb47fc41490686ebd0bff7a03ae3431...bb5723b728fd6f4395ef1a08ed1f1d53b640abb4
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance


More information about the vlc-commits mailing list