Unreviewed, rolling out r124614.
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Aug 2012 15:51:56 +0000 (15:51 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Aug 2012 15:51:56 +0000 (15:51 +0000)
http://trac.webkit.org/changeset/124614
https://bugs.webkit.org/show_bug.cgi?id=91727

gstreamer core .po files mess up the build again

Source/WebCore:

* platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
(WTF::adoptGRef):
* platform/graphics/gstreamer/GStreamerVersioning.cpp:
(setGstElementClassMetadata):
* platform/graphics/gstreamer/GStreamerVersioning.h:
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(StreamingClient::didReceiveResponse):

Tools:

* Scripts/webkitdirs.pm:
(buildAutotoolsProject):
* gtk/jhbuild.modules:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@124617 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp
Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Tools/ChangeLog
Tools/Scripts/webkitdirs.pm
Tools/gtk/jhbuild.modules

index 345d896..f01716c 100644 (file)
@@ -1,3 +1,19 @@
+2012-08-03  Philippe Normand  <pnormand@igalia.com>
+
+        Unreviewed, rolling out r124614.
+        http://trac.webkit.org/changeset/124614
+        https://bugs.webkit.org/show_bug.cgi?id=91727
+
+        gstreamer core .po files mess up the build again
+
+        * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+        (WTF::adoptGRef):
+        * platform/graphics/gstreamer/GStreamerVersioning.cpp:
+        (setGstElementClassMetadata):
+        * platform/graphics/gstreamer/GStreamerVersioning.h:
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (StreamingClient::didReceiveResponse):
+
 2012-08-03  Benjamin Poulain  <bpoulain@apple.com>
 
         Initialize the Event Names' string from read only memory
 2012-08-03  Benjamin Poulain  <bpoulain@apple.com>
 
         Initialize the Event Names' string from read only memory
index 37468bc..062e3fc 100644 (file)
@@ -28,7 +28,7 @@ namespace WTF {
 
 template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
 {
 
 template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
 {
-    ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
+    ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
 }
 
     return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
 }
 
@@ -48,7 +48,7 @@ template <> void derefGPtr<GstElement>(GstElement* ptr)
 
 template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
 {
 
 template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
 {
-    ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
+    ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
 }
 
     return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
 }
 
@@ -68,7 +68,7 @@ template <> void derefGPtr<GstPad>(GstPad* ptr)
 
 template <> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr)
 {
 
 template <> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr)
 {
-    ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
+    ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     return GRefPtr<GstPadTemplate>(ptr, GRefPtrAdopt);
 }
 
     return GRefPtr<GstPadTemplate>(ptr, GRefPtrAdopt);
 }
 
@@ -102,7 +102,7 @@ template <> void derefGPtr<GstCaps>(GstCaps* ptr)
 
 template <> GRefPtr<GstTask> adoptGRef(GstTask* ptr)
 {
 
 template <> GRefPtr<GstTask> adoptGRef(GstTask* ptr)
 {
-    ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
+    ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     return GRefPtr<GstTask>(ptr, GRefPtrAdopt);
 }
 
     return GRefPtr<GstTask>(ptr, GRefPtrAdopt);
 }
 
@@ -122,7 +122,7 @@ template <> void derefGPtr<GstTask>(GstTask* ptr)
 
 template <> GRefPtr<GstBus> adoptGRef(GstBus* ptr)
 {
 
 template <> GRefPtr<GstBus> adoptGRef(GstBus* ptr)
 {
-    ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
+    ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     return GRefPtr<GstBus>(ptr, GRefPtrAdopt);
 }
 
     return GRefPtr<GstBus>(ptr, GRefPtrAdopt);
 }
 
@@ -142,7 +142,7 @@ template <> void derefGPtr<GstBus>(GstBus* ptr)
 
 template <> GRefPtr<GstElementFactory> adoptGRef(GstElementFactory* ptr)
 {
 
 template <> GRefPtr<GstElementFactory> adoptGRef(GstElementFactory* ptr)
 {
-    ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
+    ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     return GRefPtr<GstElementFactory>(ptr, GRefPtrAdopt);
 }
 
     return GRefPtr<GstElementFactory>(ptr, GRefPtrAdopt);
 }
 
index ce426ec..06a8c9e 100644 (file)
@@ -105,12 +105,3 @@ void setGstElementClassMetadata(GstElementClass* elementClass, const char* name,
     gst_element_class_set_details_simple(elementClass, name, longName, description, author);
 #endif
 }
     gst_element_class_set_details_simple(elementClass, name, longName, description, author);
 #endif
 }
-
-bool gstObjectIsFloating(GstObject* gstObject)
-{
-#ifdef GST_API_VERSION_1
-    return g_object_is_floating(G_OBJECT(gstObject));
-#else
-    return GST_OBJECT_IS_FLOATING(gstObject);
-#endif
-}
index ce7d2d4..6b21b63 100644 (file)
@@ -32,5 +32,4 @@ GstCaps* webkitGstGetPadCaps(GstPad*);
 bool getVideoSizeAndFormatFromCaps(GstCaps*, WebCore::IntSize&, GstVideoFormat&, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride);
 GstBuffer* createGstBuffer(GstBuffer*);
 void setGstElementClassMetadata(GstElementClass*, const char* name, const char* longName, const char* description, const char* author);
 bool getVideoSizeAndFormatFromCaps(GstCaps*, WebCore::IntSize&, GstVideoFormat&, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride);
 GstBuffer* createGstBuffer(GstBuffer*);
 void setGstElementClassMetadata(GstElementClass*, const char* name, const char* longName, const char* description, const char* author);
-bool gstObjectIsFloating(GstObject*);
 #endif // GStreamerVersioning_h
 #endif // GStreamerVersioning_h
index fa435fd..38aaec1 100644 (file)
@@ -854,7 +854,7 @@ void StreamingClient::didReceiveResponse(ResourceHandle*, const ResourceResponse
 #endif
     else
 #ifdef GST_API_VERSION_1
 #endif
     else
 #ifdef GST_API_VERSION_1
-        gst_pad_push_event(GST_PAD_CAST(m_src->priv->srcpad), gst_event_new_tag(tags));
+        gst_pad_push_event(GST_PAD_CAST(m_src->priv->srcpad), gst_event_new_tag("WebKitWebSrc", tags));
 #else
         gst_element_found_tags_for_pad(GST_ELEMENT(m_src), m_src->priv->srcpad, tags);
 #endif
 #else
         gst_element_found_tags_for_pad(GST_ELEMENT(m_src), m_src->priv->srcpad, tags);
 #endif
index aef5234..827b0a6 100644 (file)
@@ -1,5 +1,17 @@
 2012-08-03  Philippe Normand  <pnormand@igalia.com>
 
 2012-08-03  Philippe Normand  <pnormand@igalia.com>
 
+        Unreviewed, rolling out r124614.
+        http://trac.webkit.org/changeset/124614
+        https://bugs.webkit.org/show_bug.cgi?id=91727
+
+        gstreamer core .po files mess up the build again
+
+        * Scripts/webkitdirs.pm:
+        (buildAutotoolsProject):
+        * gtk/jhbuild.modules:
+
+2012-08-03  Philippe Normand  <pnormand@igalia.com>
+
         [GTK][jhbuild] Switch to GStreamer 0.11 build
         https://bugs.webkit.org/show_bug.cgi?id=91727
 
         [GTK][jhbuild] Switch to GStreamer 0.11 build
         https://bugs.webkit.org/show_bug.cgi?id=91727
 
index 1d8612e..cc16e38 100755 (executable)
@@ -2090,11 +2090,6 @@ sub buildAutotoolsProject($@)
     # Enable unstable features when building through build-webkit.
     push @buildArgs, "--enable-unstable-features";
 
     # Enable unstable features when building through build-webkit.
     push @buildArgs, "--enable-unstable-features";
 
-    # Enable upcoming GStreamer 1.0 build support through build-webkit.
-    if ($project eq 'WebKit') {
-        push @buildArgs, "--with-gstreamer=1.0";
-    }
-
     # We might need to update jhbuild dependencies.
     my $needUpdate = 0;
     if (jhbuildConfigurationChanged()) {
     # We might need to update jhbuild dependencies.
     my $needUpdate = 0;
     if (jhbuildConfigurationChanged()) {
index c6adfd4..d6c4257 100644 (file)
       <dep package="libsoup"/>
       <dep package="at-spi2-core"/>
       <dep package="at-spi2-atk"/>
       <dep package="libsoup"/>
       <dep package="at-spi2-core"/>
       <dep package="at-spi2-atk"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-ffmpeg"/>
     </dependencies>
   </metamodule>
 
     </dependencies>
   </metamodule>
 
       href="http://cairographics.org"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://www.freedesktop.org"/>
       href="http://cairographics.org"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://www.freedesktop.org"/>
-  <repository type="git" name="gstreamer"
-      href="git://anongit.freedesktop.org/git/gstreamer/"/>
-  <repository type="git" name="entropywave"
-      href="git://code.entropywave.com/git/"/>
-  <repository type="tarball" name="xiph"
-              href="http://downloads.xiph.org/releases/"/>
 
   <autotools id="make" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
 
   <autotools id="make" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
     </dependencies>
   </autotools>
 
     </dependencies>
   </autotools>
 
-  <autotools id="orc">
-    <branch repo="entropywave" module="orc.git" checkoutdir="orc" tag="orc-0.4.16" />
-  </autotools>
-
-  <autotools id="gstreamer">
-    <branch repo="gstreamer" module="gstreamer" checkoutdir="gstreamer" revision="8d9a4b2e94fa806f5146482fb0261d890db38fd5"/>
-  </autotools>
-
-  <autotools id="libogg" autogen-sh="configure" >
-     <branch repo="xiph" module="ogg/libogg-1.3.0.tar.gz"
-             hash="sha256:a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780"
-             md5sum="0a7eb40b86ac050db3a789ab65fe21c2"
-             version="1.3.0"/>
-  </autotools>
-  <autotools id="libvorbis" autogen-sh="configure" autogenargs="--disable-examples" >
-     <branch repo="xiph" module="vorbis/libvorbis-1.3.3.tar.gz"
-             hash="sha256:6d747efe7ac4ad249bf711527882cef79fb61d9194c45b5ca5498aa60f290762"
-             md5sum="6b1a36f0d72332fae5130688e65efe1f"
-             version="1.3.3"/>
-  </autotools>
-  <autotools id="libtheora" autogen-sh="configure" autogenargs="--disable-examples">
-     <branch repo="xiph" module="theora/libtheora-1.1.1.tar.gz"
-             hash="sha256:40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b"
-             md5sum="bb4dc37f0dc97db98333e7160bfbb52b"
-             version="1.1.1"/>
-    <dependencies>
-      <dep package="libogg"/>
-      <dep package="libvorbis"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gst-plugins-base" autogenargs="--disable-examples">
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="libogg"/>
-      <dep package="libvorbis"/>
-      <dep package="libtheora"/>
-      <dep package="orc"/>
-    </dependencies>
-    <branch repo="gstreamer" module="gst-plugins-base" checkoutdir="gst-plugins-base" revision="39aa4dc674291f438606ccab6033225f7a886de4"/>
-  </autotools>
-
-  <autotools id="gst-plugins-good" autogenargs="--disable-examples">
-    <dependencies>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <branch repo="gstreamer" module="gst-plugins-good" checkoutdir="gst-plugins-good" revision="86c236a5f61725dc4e0fe22ba6681795bb5f1160"/>
-  </autotools>
-
-  <autotools id="gst-plugins-bad" autogenargs="--disable-examples">
-    <dependencies>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <branch repo="gstreamer" module="gst-plugins-bad" checkoutdir="gst-plugins-bad" revision="71902797f22d8ba502cbdfbcc495f67b3b0cdb3c"/>
-  </autotools>
-
-  <autotools id="gst-ffmpeg" autogenargs="--with-libav-extra-configure='--disable-yasm'">
-    <dependencies>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <branch repo="gstreamer" module="gst-ffmpeg" checkoutdir="gst-ffmpeg" revision="3d2d1beb77ccaced48faee3e0d3d6ef5005ccd2a"/>
-  </autotools>
-
 </moduleset>
 </moduleset>