diff options
| author | Sukneet Basuta | 2012-06-02 04:18:54 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 17:09:25 +0400 |
| commit | 455db19daa066c9a2e4fc70f4e48ff407fe1b61e (patch) | |
| tree | 08af1d36716ac879986ca26c2e16fc65c498b343 | |
| parent | 7d41b18da405b6694802f5e0e6b7f45ea33dbba8 (diff) | |
qt4: add config_query to build webkit with or without HTML5 video support
DEPENDS: change optional_depends gst-plugins-base to depends if phonon or HTML5 video selected
add depends icu if webkit selected
PRE_BUILD: add ENABLE_VIDEO=0 to WebCore.pro if HTML5 video is not selected, so gstreamer, qtmultimedia, or Phonon are not needed
(cherry picked from commit 0a49c76567adc3776235cce2fdde588343704ccf)
| -rwxr-xr-x | x11-toolkits/qt4/CONFIGURE | 6 | ||||
| -rwxr-xr-x | x11-toolkits/qt4/DEPENDS | 12 | ||||
| -rw-r--r-- | x11-toolkits/qt4/HISTORY | 10 | ||||
| -rwxr-xr-x | x11-toolkits/qt4/PRE_BUILD | 6 |
4 files changed, 27 insertions, 7 deletions
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE index dc02c5d13e..83c4783e6d 100755 --- a/x11-toolkits/qt4/CONFIGURE +++ b/x11-toolkits/qt4/CONFIGURE @@ -56,6 +56,12 @@ config_query_option QT_WEBKIT 'Build the WebKit module?' y \ '-webkit' \ '-no-webkit' && +if [[ $QT_WEBKIT == '-webkit' ]]; then + message "${MESSAGE_COLOR}Note that HTML5 Video requires either" + message "Multimedia support or Phonon to be built.${DEFAULT_COLOR}" + config_query QT_WEBKIT_VIDEO 'Build Webkit with HTML5 video support?' y +fi && + config_query_option QT_MEDIA 'Build Multimedia support?' y \ '-multimedia' \ '-no-multimedia' && diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS index d71d81edf9..d6fa036d3b 100755 --- a/x11-toolkits/qt4/DEPENDS +++ b/x11-toolkits/qt4/DEPENDS @@ -78,12 +78,12 @@ optional_depends glib2 \ '-no-glib' \ 'glib support' && -# qt4 only compiles with gstreamer if there phonon build too -if [[ $QT_PHONON == "-phonon -phonon-backend" ]]; then -optional_depends gst-plugins-base \ - '-gstreamer' \ - '-no-gstreamer' \ - 'video streaming' +if [[ $QT_PHONON == "-phonon -phonon-backend" || $QT_WEBKIT_VIDEO == "y" ]]; then + depends gst-plugins-base +fi && + +if [[ $QT_WEBKIT == "-webkit" ]]; then + depends icu fi && optional_depends nas \ diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index 51f0d19a83..713ad6be96 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,13 @@ +2012-06-02 Sukneet Basuta <sukneet@sourcemage.org> + * CONFIGURE: add config_query to build webkit with or without + HTML5 video support + * DEPENDS: change optional_depends gst-plugins-base to depends + if phonon or HTML5 video selected + add depends icu if webkit selected + * PRE_BUILD: add ENABLE_VIDEO=0 to WebCore.pro if HTML5 video + is not selected, so gstreamer, qtmultimedia, or phonon are + not needed + 2012-05-29 Arjan Bouter <abouter@sourcemage.org> * PRE_BUILD: added a fix for icu diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD index 5f9e084526..b62fd90594 100755 --- a/x11-toolkits/qt4/PRE_BUILD +++ b/x11-toolkits/qt4/PRE_BUILD @@ -38,4 +38,8 @@ sed -i "s/-lgds/-lfbclient/" config.tests/unix/ibase/ibase.pro \ # fix icu support echo "fixing icu support" && sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri + src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri && + +if [[ $QT_WEBKIT_VIDEO == n ]]; then + sed -i '1iDEFINES += ENABLE_VIDEO=0' src/3rdparty/webkit/Source/WebCore/WebCore.pro +fi |