Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (5)
......@@ -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"])
......
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
......@@ -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
......
......@@ -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=()
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......