[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2061b52a3bd1bc5bbc0fd7dfbde41b02dcf31c30
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 23:09:55 2010 +0000

    2010-12-03  Xan Lopez  <xlopez at igalia.com>
    
            Unreviewed build fix for GTK+.
    
            Add configure.ac-fu for WebAudio.
    
            * configure.ac:
    
    WebCore:
    
    2010-12-03  Xan Lopez  <xlopez at igalia.com>
    
            Unreviewed build fix.
    
            The JS code generator includes headers unconditionally, so we need
            to generate them unconditionally and disable the feature. The
            WebAudio files hadn't been added to our sources list.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73309 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 42e9967..31926a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-03  Xan Lopez  <xlopez at igalia.com>
+
+        Unreviewed build fix for GTK+.
+
+        Add configure.ac-fu for WebAudio.
+
+        * configure.ac:
+
 2010-12-02  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a81fe4..5beec67 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03  Xan Lopez  <xlopez at igalia.com>
+
+        Unreviewed build fix.
+
+        The JS code generator includes headers unconditionally, so we need
+        to generate them unconditionally and disable the feature. The
+        WebAudio files hadn't been added to our sources list.
+
+        * GNUmakefile.am:
+
 2010-12-03  Patrick Gansterer  <paroga at webkit.org>
 
         Unreviewed build fix.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 6ced55f..89e2a93 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -118,6 +118,10 @@ webcore_built_sources += \
 	DerivedSources/WebCore/JSArrayBufferView.h \
 	DerivedSources/WebCore/JSAttr.cpp \
 	DerivedSources/WebCore/JSAttr.h \
+	DerivedSources/WebCore/JSAudioContext.cpp \
+	DerivedSources/WebCore/JSAudioContext.h \
+	DerivedSources/WebCore/JSAudioPannerNode.cpp \
+	DerivedSources/WebCore/JSAudioPannerNode.h \
 	DerivedSources/WebCore/JSBarInfo.cpp \
 	DerivedSources/WebCore/JSBarInfo.h \
 	DerivedSources/WebCore/JSBeforeLoadEvent.cpp \
@@ -4570,10 +4574,12 @@ DerivedSources/WebCore/XLinkNames.cpp : $(WebCore)/dom/make_names.pl $(WebCore)/
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
 
 # ----
-# Web Audio Support - disable for now.
+# Web Audio Support
 # ----
-FEATURE_DEFINES += ENABLE_WEB_AUDIO=0
-webcore_cppflags += -DENABLE_WEB_AUDIO=0
+if ENABLE_WEB_AUDIO
+FEATURE_DEFINES += ENABLE_WEB_AUDIO=1
+webcore_cppflags += -DENABLE_WEB_AUDIO=1
+endif
 
 # ----
 # Web Sockets Support
diff --git a/configure.ac b/configure.ac
index bb703b4..9e2df40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,6 +635,14 @@ AC_ARG_ENABLE(web_sockets,
               [],[enable_web_sockets="yes"])
 AC_MSG_RESULT([$enable_web_sockets])
 
+# check whether to enable Web Audio support
+AC_MSG_CHECKING([whether to enable Web Audio support])
+AC_ARG_ENABLE(web_audio,
+              AC_HELP_STRING([--enable-web-audio],
+                             [enable support for Web Audio [default=no]]),
+              [],[enable_web_audio="no"])
+AC_MSG_RESULT([$enable_web_audio])
+
 # check whether to enable Web Timing support
 AC_MSG_CHECKING([whether to enable Web Timing support])
 AC_ARG_ENABLE(web_timing,
@@ -957,6 +965,7 @@ AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
 AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
 AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
+AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
 
@@ -1023,6 +1032,7 @@ Features:
  SVG as image support                                     : $enable_svg_as_image
  SVG use element support                                  : $enable_svg_use
  WML support                                              : $enable_wml
+ Web Audio support                                        : $enable_web_audio
  Web Sockets support                                      : $enable_web_sockets
  Web Timing support                                       : $enable_web_timing
  Web Workers support                                      : $enable_workers

-- 
WebKit Debian packaging