New commits:
commit 61a8f46c8c921c48f7f7ec87c9695e9635ba6c7b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
openfst: => 1.3.2
commit 794074cf7179c1849a1857c1c0e1950800449633
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libcsv: => 3.0.2
commit 7c5283f59d2a23ebdbb01d786b717f9229594024
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pyutil: => 1.9.3
commit 0ef7c8fa37ecf2c3b4f4fc25d0176af3d7134c49
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
swig: => 2.0.7
commit 654bcd573ff41fa34a790c1421e0de331717fbc0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
webob: => 1.2
commit 092e78b852c1cce7711c01623d6ab1db9f92630f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/obnam: version 1.0
commit 18f97e04a644b0e1f875323ec3ccc000ccc7e9b4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/seivot: new spell, a tool for benchmarking backup programs
commit 422f76107a271322ef85af462a3fcc0e5881776d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/genbackupdata: new spell, a tool for generating test data for
backup programs
commit 278c7e23fd3af1fd50ad955f1ae4b13f7436e3c7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/larch: version 0.31
commit d5b4cf7d9a0545a6fd0810a7fab40e6be9d5adca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/ttystatus: version 0.18
commit 429816acf7320b4b5003ab21be3d13138dccaf29
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/python-tracing: version 0.6
commit 2579b18343cd873543ad7c3acf1a258c1e0b284e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/python-cliapp: version 0.29
commit 36fbebdcffacd487b478731c0fdbfe4914a3cfa7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
utils/extrautils: version 1.18
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/ChangeLog b/ChangeLog
index a7b8073..ec17d23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python-pypi/genbackupdata: new spell, a tool for generating test
data for
+ backup programs
+ * python-pypi/seivot: new spell, a tool for benchmarking backup
programs
+
2012-05-31 Julien "_kaze_" ROZO <julien AT rozo.org>
* utils/dfc: new spell, a df replacement with graphs and colors
+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 devel-xorg-modular grimoire by Treeve Jelbert (a0a82df92724ac24da2f4d0382b27ba7c71ec730),
Treeve Jelbert, 06/02/2012