[Bf-blender-cvs] [efd5e3c2540] master: Remove quicktime support
Aaron Carlisle
noreply at git.blender.org
Fri Sep 22 22:41:42 CEST 2017
Commit: efd5e3c25401b43cbd7f909418835bb570db1ab3
Author: Aaron Carlisle
Date: Fri Sep 22 16:11:24 2017 -0400
Branches: master
https://developer.blender.org/rBefd5e3c25401b43cbd7f909418835bb570db1ab3
Remove quicktime support
It has been deprecated since at least macOS 10.9 and fully removed in 10.12.
I am unsure if we should remove it only in 2.8. But you cannot build blender with it supported when using a modern xcode version anyway so I would tend towards just removing it also for 2.79 if that ever happens.
Reviewers: mont29, dfelinto, juicyfruit, brecht
Reviewed By: mont29, brecht
Subscribers: Blendify, brecht
Maniphest Tasks: T52807
Differential Revision: https://developer.blender.org/D2333
===================================================================
M CMakeLists.txt
M build_files/buildbot/slave_compile.py
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_lite.cmake
M build_files/cmake/config/blender_release.cmake
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_apple.cmake
M build_files/cmake/platform/platform_apple_xcode.cmake
M doc/doxygen/doxygen.source.h
M intern/ghost/CMakeLists.txt
M release/scripts/startup/bl_ui/properties_render.py
M source/blender/CMakeLists.txt
M source/blender/blenkernel/BKE_global.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/writeavi.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/render/CMakeLists.txt
M source/blender/editors/space_file/filelist.c
M source/blender/imbuf/CMakeLists.txt
M source/blender/imbuf/IMB_imbuf_types.h
M source/blender/imbuf/intern/IMB_anim.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/filetype.c
M source/blender/imbuf/intern/util.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/rna_scene.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app_build_options.c
D source/blender/quicktime/CMakeLists.txt
D source/blender/quicktime/apple/qtkit_export.m
D source/blender/quicktime/apple/qtkit_import.m
D source/blender/quicktime/quicktime_export.h
D source/blender/quicktime/quicktime_import.h
M source/blender/render/CMakeLists.txt
M source/blender/render/intern/source/initrender.c
M source/blender/windowmanager/CMakeLists.txt
M source/blenderplayer/CMakeLists.txt
M source/creator/creator_args.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ca1eda8ebb..7a357721387 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,10 +334,6 @@ option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd
option(WITH_ALEMBIC "Enable Alembic Support" OFF)
option(WITH_ALEMBIC_HDF5 "Enable Legacy Alembic Support (not officially supported)" OFF)
-if(APPLE)
- option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
-endif()
-
# 3D format support
# Disable opencollada when we don't have precompiled libs
option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" ${_init_OPENCOLLADA})
@@ -738,10 +734,6 @@ if(WITH_AUDASPACE)
endif()
endif()
-if(APPLE)
- apple_check_quicktime()
-endif()
-
#-----------------------------------------------------------------------------
# Check for valid directories
# ... a partial checkout may cause this.
@@ -1759,4 +1751,3 @@ endif()
if(0)
print_all_vars()
endif()
-
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index d99e66f7871..84f924b2dd9 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -72,7 +72,6 @@ if 'cmake' in builder:
# Set up OSX architecture
if builder.endswith('x86_64_10_6_cmake'):
cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
- cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF')
cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6')
cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 62e2ce1636d..35eba1e6a41 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -66,9 +66,7 @@ elseif(WIN32)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
elseif(APPLE)
set(WITH_JACK ON CACHE BOOL "" FORCE)
- set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
# include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
-# apple_check_quicktime()
endif()
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 537134eb357..98818d4ab50 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -56,7 +56,3 @@ set(WITH_SDL OFF CACHE BOOL "" FORCE)
set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE)
set(WITH_X11_XF86VMODE OFF CACHE BOOL "" FORCE)
-if(APPLE)
- set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
-endif()
-
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 3e2e26e6a44..3cdbfdfcf3b 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -67,9 +67,7 @@ elseif(WIN32)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
elseif(APPLE)
set(WITH_JACK ON CACHE BOOL "" FORCE)
- set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
# include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
-# apple_check_quicktime()
endif()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 6303119773d..06f47b9402b 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -403,9 +403,6 @@ function(setup_liblinks
if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
target_link_libraries(${target} ${SDL_LIBRARY})
endif()
- if(WITH_CODEC_QUICKTIME)
- target_link_libraries(${target} ${QUICKTIME_LIBRARIES})
- endif()
if(WITH_IMAGE_TIFF)
target_link_libraries(${target} ${TIFF_LIBRARY})
endif()
@@ -715,10 +712,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
endif()
- if(WITH_CODEC_QUICKTIME)
- list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
- endif()
-
if(WITH_MOD_BOOLEAN)
list(APPEND BLENDER_SORTED_LIBS extern_carve)
endif()
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index b4e99865af0..d067077d550 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -199,13 +199,6 @@ set(PLATFORM_CFLAGS "-pipe -funsigned-char")
set(PLATFORM_LINKFLAGS
"-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio"
)
-if(WITH_CODEC_QUICKTIME)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
- if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
- # libSDL still needs 32bit carbon quicktime
- endif()
-endif()
if(WITH_CXX11)
list(APPEND PLATFORM_LINKLIBS c++)
diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake
index e76a7783939..c380bfb9bf9 100644
--- a/build_files/cmake/platform/platform_apple_xcode.cmake
+++ b/build_files/cmake/platform/platform_apple_xcode.cmake
@@ -124,12 +124,3 @@ if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
-
-macro(apple_check_quicktime)
- # QuickTime framework is no longer available in SDK 10.12+
- if(WITH_CODEC_QUICKTIME AND ${OSX_SYSTEM} VERSION_GREATER 10.11)
- set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
- message(STATUS "QuickTime not supported by SDK ${OSX_SYSTEM}, disabling WITH_CODEC_QUICKTIME")
- endif()
-endmacro()
-
diff --git a/doc/doxygen/doxygen.source.h b/doc/doxygen/doxygen.source.h
index 3ef20466664..67e231212c7 100644
--- a/doc/doxygen/doxygen.source.h
+++ b/doc/doxygen/doxygen.source.h
@@ -160,9 +160,6 @@
* merged in docs.
*/
-/** \defgroup quicktime QuickTime
- * \ingroup blender
-
/** \defgroup gui GUI */
/** \defgroup wm Window Manager
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index e549a48d4b9..31e92c94eed 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -168,10 +168,6 @@ elseif(APPLE AND NOT WITH_X11)
)
endif()
- if(WITH_CODEC_QUICKTIME)
- add_definitions(-DWITH_QUICKTIME)
- endif()
-
elseif(WITH_X11)
list(APPEND INC_SYS
${X11_X11_INCLUDE_PATH}
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 6101c715991..2f3adf546b8 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -410,37 +410,6 @@ class RENDER_PT_output(RenderButtonsPanel, Panel):
if rd.use_multiview:
layout.template_image_views(image_settings)
- if file_format == 'QUICKTIME':
- quicktime = rd.quicktime
-
- split = layout.split()
- col = split.column()
- col.prop(quicktime, "codec_type", text="Video Codec")
- col.prop(quicktime, "codec_spatial_quality", text="Quality")
-
- # Audio
- col.prop(quicktime, "audiocodec_type", text="Audio Codec")
- if quicktime.audiocodec_type != 'No audio':
- split = layout.split()
- if quicktime.audiocodec_type == 'LPCM':
- split.prop(quicktime, "audio_bitdepth", text="")
-
- split.prop(quicktime, "audio_samplerate", text="")
-
- split = layout.split()
- col = split.column()
- if quicktime.audiocodec_type == 'AAC':
- col.prop(quicktime, "audio_bitrate")
-
- subsplit = split.split()
- col = subsplit.column()
-
- if quicktime.audiocodec_type == 'AAC':
- col.prop(quicktime, "audio_codec_isvbr")
-
- col = subsplit.column()
- col.prop(quicktime, "audio_resampling_hq")
-
class RENDER_PT_encoding(RenderButtonsPanel, Panel):
bl_label = "Encoding"
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 6f2b78e0845..818d4cd3d89 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -138,10 +138,6 @@ if(WITH_CODEC_AVI)
add_subdirectory(avi)
endif()
-if(WITH_CODEC_QUICKTIME)
- add_subdirectory(quicktime)
-endif()
-
if(WITH_PYTHON)
add_subdirectory(python)
endif()
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 830518906ab..790c8051ace 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -83,8 +83,6 @@ typedef struct Global {
/* debug flag, G_DEBUG, G_DEBUG_PYTHON & friends, set python or command line args */
int debug;
- bool have_quicktime;
-
/* this variable is written to / read from FileGlobal->fileflags */
int fileflags;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index b7ecb85819e..481aff3cfa6 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -42,7 +42,6 @@ struct Base;
struct EvaluationContext;
struct Main;
struct Object;
-struct QuicktimeCodecData;
struct RenderData;
struct SceneRenderLayer;
struct Scene;
@@ -64,7 +63,6 @@ struct Main;
struct Base *_setlooper_base_step(struct Scene **sce_iter, struct Base *base);
void free_avicodecdata(struct AviCodecData *acd);
-void free_qtcodecdata(struct QuicktimeCodecData *acd);
void BKE_scene_free(struct Scene *sce);
void BKE_scene_init(struct Scene *sce);
@@ -178,4 +176,3 @@ int BKE_scene_multiview_num_videos_get(const struct RenderData *rd);
#endif
#endif
-
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list