Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (0a49c76567adc3776235cce2fdde588343704ccf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (0a49c76567adc3776235cce2fdde588343704ccf)
  • Date: Sat, 2 Jun 2012 03:18:05 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

x11-toolkits/qt4/CONFIGURE | 6 ++++++
x11-toolkits/qt4/DEPENDS | 12 ++++++------
x11-toolkits/qt4/HISTORY | 10 ++++++++++
x11-toolkits/qt4/PRE_BUILD | 6 +++++-
4 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 0a49c76567adc3776235cce2fdde588343704ccf
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

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

diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index dc02c5d..83c4783 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 d71d81e..d6fa036 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 51f0d19..713ad6b 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,13 @@
+2012-06-02 Sukneet Basuta <sukneet AT 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 AT sourcemage.org>
* PRE_BUILD: added a fix for icu

diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 5f9e084..b62fd90 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



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (0a49c76567adc3776235cce2fdde588343704ccf), Sukneet Basuta, 06/02/2012

Archive powered by MHonArc 2.6.24.

Top of Page