Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Workaround to prevent WebCoreMovieObserver confusion.
Browse files Browse the repository at this point in the history
The solution is for the static build script to disable QuickTime video.
In many cases, video support for a headless engine is not so useful.

http://code.google.com/p/phantomjs/issues/detail?id=321
  • Loading branch information
ariya committed Dec 30, 2011
1 parent 9997b87 commit ea95d57
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions deploy/build-mac.sh
Expand Up @@ -36,6 +36,7 @@ mv qt-everywhere-opensource-src-$QT_VERSION Qt-$QT_VERSION
cd $QT_FOLDER
patch configure ../allow-static-qtwebkit.patch
patch -p1 < ../qapplication_skip_qtmenu.patch
patch -p1 < ../disable_quicktime_video.patch

rm -rf src/3rdparty/webkit/Source/WebKit/qt/tests

Expand Down
19 changes: 19 additions & 0 deletions deploy/disable_quicktime_video.patch
@@ -0,0 +1,19 @@
diff --git a/src/3rdparty/webkit/Source/WebCore/features.pri b/src/3rdparty/webkit/Source/WebCore/features.pri
index f04d0b4..5e4bfbe 100644
--- a/src/3rdparty/webkit/Source/WebCore/features.pri
+++ b/src/3rdparty/webkit/Source/WebCore/features.pri
@@ -163,10 +163,10 @@ symbian|maemo5|maemo6 {
DEFINES += ENABLE_VIDEO=0

mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- DEFINES -= ENABLE_VIDEO=0
- DEFINES += ENABLE_VIDEO=1
- DEFINES += WTF_USE_QTKIT=1
- DEFINES -= WTF_USE_QTKIT=0
+ # DEFINES -= ENABLE_VIDEO=0
+ # DEFINES += ENABLE_VIDEO=1
+ # DEFINES += WTF_USE_QTKIT=1
+ # DEFINES -= WTF_USE_QTKIT=0
} else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
!contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
DEFINES -= ENABLE_VIDEO=0

0 comments on commit ea95d57

Please sign in to comment.