Diff
Modified: trunk/Source/WebCore/ChangeLog (124616 => 124617)
--- trunk/Source/WebCore/ChangeLog 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Source/WebCore/ChangeLog 2012-08-03 15:51:56 UTC (rev 124617)
@@ -1,3 +1,19 @@
+2012-08-03 Philippe Normand <[email protected]>
+
+ 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 <[email protected]>
Initialize the Event Names' string from read only memory
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (124616 => 124617)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2012-08-03 15:51:56 UTC (rev 124617)
@@ -28,7 +28,7 @@
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);
}
@@ -48,7 +48,7 @@
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);
}
@@ -68,7 +68,7 @@
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);
}
@@ -102,7 +102,7 @@
template <> GRefPtr<GstTask> adoptGRef(GstTask* ptr)
{
- ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
+ ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
return GRefPtr<GstTask>(ptr, GRefPtrAdopt);
}
@@ -122,7 +122,7 @@
template <> GRefPtr<GstBus> adoptGRef(GstBus* ptr)
{
- ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
+ ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
return GRefPtr<GstBus>(ptr, GRefPtrAdopt);
}
@@ -142,7 +142,7 @@
template <> GRefPtr<GstElementFactory> adoptGRef(GstElementFactory* ptr)
{
- ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
+ ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
return GRefPtr<GstElementFactory>(ptr, GRefPtrAdopt);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp (124616 => 124617)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp 2012-08-03 15:51:56 UTC (rev 124617)
@@ -105,12 +105,3 @@
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
-}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h (124616 => 124617)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h 2012-08-03 15:51:56 UTC (rev 124617)
@@ -32,5 +32,4 @@
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
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (124616 => 124617)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-08-03 15:51:56 UTC (rev 124617)
@@ -854,7 +854,7 @@
#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
Modified: trunk/Tools/ChangeLog (124616 => 124617)
--- trunk/Tools/ChangeLog 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Tools/ChangeLog 2012-08-03 15:51:56 UTC (rev 124617)
@@ -1,5 +1,17 @@
2012-08-03 Philippe Normand <[email protected]>
+ 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 <[email protected]>
+
[GTK][jhbuild] Switch to GStreamer 0.11 build
https://bugs.webkit.org/show_bug.cgi?id=91727
Modified: trunk/Tools/Scripts/webkitdirs.pm (124616 => 124617)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-08-03 15:51:56 UTC (rev 124617)
@@ -2090,11 +2090,6 @@
# 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()) {
Modified: trunk/Tools/gtk/jhbuild.modules (124616 => 124617)
--- trunk/Tools/gtk/jhbuild.modules 2012-08-03 15:22:29 UTC (rev 124616)
+++ trunk/Tools/gtk/jhbuild.modules 2012-08-03 15:51:56 UTC (rev 124617)
@@ -19,11 +19,6 @@
<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>
@@ -41,12 +36,6 @@
href=""
<repository type="tarball" name="freedesktop.org"
href=""
- <repository type="git" name="gstreamer"
- href=""
- <repository type="git" name="entropywave"
- href=""
- <repository type="tarball" name="xiph"
- href=""
<autotools id="make" autogen-sh="configure">
<branch repo="ftp.gnu.org"
@@ -234,67 +223,4 @@
</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>
