2011-03-03 Alexis Menard <alexis.menard@openbossa.org>
authorandreas.kling@nokia.com <andreas.kling@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Mar 2011 21:03:04 +0000 (21:03 +0000)
committerandreas.kling@nokia.com <andreas.kling@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Mar 2011 21:03:04 +0000 (21:03 +0000)
        Reviewed by Andreas Kling.

        When building with DEFINES+=USE_GSTREAMER=1 we don't want to define ENABLE_QT_MULTIMEDIA to 1.
        Also add the new files added after https://bugs.webkit.org/show_bug.cgi?id=54870 to support GRefPtr
        for GstElement.

        * WebCore.pro:
        * features.pri:

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.pro
Source/WebCore/features.pri

index 3dab606d9afe4d53b762af27632508ad3ae34c2c..33c21f17b6240fa35b244e9c0de5f9f622ca7a76 100644 (file)
@@ -1,3 +1,14 @@
+2011-03-03  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        When building with DEFINES+=USE_GSTREAMER=1 we don't want to define ENABLE_QT_MULTIMEDIA to 1.
+        Also add the new files added after https://bugs.webkit.org/show_bug.cgi?id=54870 to support GRefPtr
+        for GstElement.
+
+        * WebCore.pro:
+        * features.pri:
+
 2011-03-03  Anders Carlsson  <andersca@apple.com>
 
         Try to fix the Windows build again.
index 834254bb80bc6043fe71ff5a3466ac59a980f60c..f60c769e2e213a687ef5c4a633e1248b5c0b4e7e 100644 (file)
@@ -2884,6 +2884,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
     contains(DEFINES, USE_GSTREAMER=1) {
         HEADERS += \
             platform/graphics/gstreamer/GOwnPtrGStreamer.h \
+            platform/graphics/gstreamer/GRefPtrGStreamer.h \
             platform/graphics/gstreamer/GStreamerGWorld.h \
             platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h \
             platform/graphics/gstreamer/VideoSinkGStreamer.h \
@@ -2893,6 +2894,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             platform/graphics/gstreamer/ImageGStreamer.h
         SOURCES += \
             platform/graphics/gstreamer/GOwnPtrGStreamer.cpp \
+            platform/graphics/gstreamer/GRefPtrGStreamer.cpp \
             platform/graphics/gstreamer/GStreamerGWorld.cpp \
             platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp \
             platform/graphics/gstreamer/VideoSinkGStreamer.cpp \
index 98be15f48be4152e17ce8dd1367f539b16348eba..499f78b4db22cb8b60bd077ed6b83c537cd45b9d 100644 (file)
@@ -151,7 +151,12 @@ contains(MOBILITY_CONFIG, sensors) {
     DEFINES -= ENABLE_VIDEO=1
     DEFINES += ENABLE_VIDEO=0
 
-    contains(MOBILITY_CONFIG, multimedia) {
+    contains(DEFINES, USE_GSTREAMER=1) {
+        DEFINES -= ENABLE_VIDEO=0
+        DEFINES += ENABLE_VIDEO=1
+        DEFINES -= ENABLE_QT_MULTIMEDIA=1
+        DEFINES += ENABLE_QT_MULTIMEDIA=0
+    } else:contains(MOBILITY_CONFIG, multimedia) {
         DEFINES -= ENABLE_VIDEO=0
         DEFINES += ENABLE_VIDEO=1
         DEFINES -= ENABLE_QT_MULTIMEDIA=0