[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61157] trunk/blender: Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Nov 6 02:45:16 CET 2013
Revision: 61157
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61157
Author: blendix
Date: 2013-11-06 01:45:15 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.
The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/SConstruct
trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
trunk/blender/build_files/scons/config/darwin-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/linux-config.py
trunk/blender/build_files/scons/config/linuxcross-config.py
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-mingw-config.py
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/intern/ghost/SConscript
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/render/SConscript
trunk/blender/source/blender/editors/render/render_ops.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/quicktime/SConscript
trunk/blender/source/blender/quicktime/quicktime_export.h
trunk/blender/source/blender/quicktime/quicktime_import.h
Removed Paths:
-------------
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/CMakeLists.txt 2013-11-06 01:45:15 UTC (rev 61157)
@@ -218,7 +218,7 @@
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-if(APPLE OR (WIN32 AND NOT UNIX))
+if(APPLE)
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
endif()
@@ -380,11 +380,7 @@
add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
- option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
- if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
- set(USE_QTKIT ON CACHE BOOL "ON" FORCE) # no Quicktime in 64bit
- endif()
endif()
@@ -491,14 +487,6 @@
set(WITH_X11_XINPUT OFF)
endif()
-if(MINGW)
- if(WITH_CODEC_QUICKTIME)
- message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
- "because it is currently unsupported, remove this "
- "line if youre a developer who wants to add support.")
- endif()
-endif()
-
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
TEST_STDBOOL_SUPPORT()
@@ -1029,13 +1017,6 @@
set(SDL_LIBPATH ${SDL}/lib)
endif()
- if(WITH_CODEC_QUICKTIME)
- set(QUICKTIME ${LIBDIR}/QTDevWin)
- set(QUICKTIME_INCLUDE_DIRS ${QUICKTIME}/CIncludes)
- set(QUICKTIME_LIBRARIES qtmlClient)
- set(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
- endif()
-
if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
add_definitions(-D__SSE__ -D__MMX__)
endif()
@@ -1613,15 +1594,12 @@
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(USE_QTKIT)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
+ 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()
- elseif(WITH_CODEC_QUICKTIME)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
endif()
# XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/SConstruct 2013-11-06 01:45:15 UTC (rev 61157)
@@ -342,9 +342,6 @@
else:
env.Append(CCFLAGS=['-fopenmp'])
-if env['USE_QTKIT'] == True:
- env.Append(CPPFLAGS=['-DUSE_QTKIT'])
-
#check for additional debug libnames
if env.has_key('BF_DEBUG_LIBS'):
Modified: trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-i386.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-i386.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -45,6 +45,7 @@
else:
XCODE_BUNDLE=XCODE_SELECT_PATH
+
# Default target OSX settings per architecture
# Can be customized
@@ -332,10 +333,7 @@
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
if WITH_BF_QUICKTIME:
- if USE_QTKIT:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
- else:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
if not WITH_OSX_STATICPYTHON:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python']
Modified: trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -45,6 +45,7 @@
else:
XCODE_BUNDLE=XCODE_SELECT_PATH
+
# Default target OSX settings per architecture
# Can be customized
@@ -332,10 +333,7 @@
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
if WITH_BF_QUICKTIME:
- if USE_QTKIT:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
- else:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
if not WITH_OSX_STATICPYTHON:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python']
Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/darwin-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -45,6 +45,7 @@
else:
XCODE_BUNDLE=XCODE_SELECT_PATH
+
# Default target OSX settings per architecture
# Can be customized
@@ -333,10 +334,7 @@
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
if WITH_BF_QUICKTIME:
- if USE_QTKIT:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
- else:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
if not WITH_OSX_STATICPYTHON:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python']
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -90,11 +90,6 @@
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
-### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
WITH_BF_ICONV = True
BF_ICONV = LIBDIR + "/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/linux-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -100,10 +100,6 @@
BF_FREETYPE_LIB = 'freetype'
#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
WITH_BF_ICONV = False
BF_ICONV = "/usr"
BF_ICONV_INC = '${BF_ICONV}/include'
Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -101,10 +101,6 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
WITH_BF_ICONV = False
BF_ICONV = LIBDIR + "/gcc/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -112,10 +112,6 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
WITH_BF_ICONV = False
BF_ICONV = LIBDIR + "/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -133,12 +133,6 @@
BF_FREETYPE_LIB = 'freetype2ST'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = LIBDIR + '/QTDevWin'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
-BF_QUICKTIME_LIB = 'qtmlClient'
-BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
-
WITH_BF_OPENJPEG = True
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py 2013-11-05 23:37:09 UTC (rev 61156)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py 2013-11-06 01:45:15 UTC (rev 61157)
@@ -111,8 +111,6 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = False
-
WITH_BF_ICONV = False
BF_ICONV = LIBDIR + "/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list