[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:11:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8cded870946b4d3825d2c38c61425096702b12f1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 8 14:28:22 2010 +0000
2010-09-08 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Support to enable HTML5's Video based on gstreamer in WebKit-EFL
https://bugs.webkit.org/show_bug.cgi?id=44098
To support video of HTML5 based on gstreamer, add cmake files for gstreamer.
* cmake/FindGStreamer-App.cmake: Added.
* cmake/FindGStreamer-Base.cmake: Added.
* cmake/FindGStreamer-Interfaces.cmake: Added.
* cmake/FindGStreamer-Pbutils.cmake: Added.
* cmake/FindGStreamer-Plugins-Base.cmake: Added.
* cmake/FindGStreamer-Video.cmake: Added.
* cmake/FindGStreamer.cmake: Added.
* cmake/OptionsEfl.cmake:
2010-09-08 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Support to enable HTML5's Video based on gstreamer in WebKit-EFL
https://bugs.webkit.org/show_bug.cgi?id=44098
To support video of HTML5 based on gstreamer, add files regarding gstreamer to
CMakeListsEfl.txt.
* CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66980 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 0e70798..fe273ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-08 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Support to enable HTML5's Video based on gstreamer in WebKit-EFL
+ https://bugs.webkit.org/show_bug.cgi?id=44098
+
+ To support video of HTML5 based on gstreamer, add cmake files for gstreamer.
+
+ * cmake/FindGStreamer-App.cmake: Added.
+ * cmake/FindGStreamer-Base.cmake: Added.
+ * cmake/FindGStreamer-Interfaces.cmake: Added.
+ * cmake/FindGStreamer-Pbutils.cmake: Added.
+ * cmake/FindGStreamer-Plugins-Base.cmake: Added.
+ * cmake/FindGStreamer-Video.cmake: Added.
+ * cmake/FindGStreamer.cmake: Added.
+ * cmake/OptionsEfl.cmake:
+
2010-09-08 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 91b6b23..530acf3 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -122,6 +122,22 @@ IF (WTF_USE_ICU_UNICODE)
)
ENDIF ()
+IF (ENABLE_VIDEO)
+ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/graphics/gstreamer"
+ )
+ LIST(APPEND WebCore_SOURCES
+ platform/graphics/gstreamer/DataSourceGStreamer.cpp
+ platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
+ platform/graphics/gstreamer/GStreamerGWorld.cpp
+ platform/graphics/gstreamer/ImageGStreamerCairo.cpp
+ platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+ platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
+ platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+ platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+ )
+ENDIF ()
+
LIST(APPEND WebCore_LIBRARIES
${Cairo_LIBRARIES}
${ECORE_X_LIBRARIES}
@@ -147,6 +163,15 @@ IF (WTF_USE_CURL)
)
ENDIF ()
+IF (ENABLE_VIDEO)
+ LIST(APPEND WebCore_LIBRARIES
+ ${GStreamer-App_LIBRARIES}
+ ${GStreamer-Interfaces_LIBRARIES}
+ ${GStreamer-Pbutils_LIBRARIES}
+ ${GStreamer-Video_LIBRARIES}
+ )
+ENDIF ()
+
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
${Cairo_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
@@ -160,6 +185,16 @@ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
${SQLITE_INCLUDE_DIRS}
)
+IF (ENABLE_VIDEO)
+ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${GStreamer-App_INCLUDE_DIRS}
+ ${GStreamer-Interfaces_INCLUDE_DIRS}
+ ${GStreamer-Pbutils_INCLUDE_DIRS}
+ ${GStreamer-Video_INCLUDE_DIRS}
+ )
+ENDIF ()
+
+
IF (ENABLE_GLIB_SUPPORT)
LIST(APPEND WebCore_LIBRARIES
${GDK_LIBRARIES}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9cbdf2c..466d609 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-08 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Support to enable HTML5's Video based on gstreamer in WebKit-EFL
+ https://bugs.webkit.org/show_bug.cgi?id=44098
+
+ To support video of HTML5 based on gstreamer, add files regarding gstreamer to
+ CMakeListsEfl.txt.
+
+ * CMakeListsEfl.txt:
+
2010-09-08 Jan E Hanssen <jhanssen at sencha.com>
Reviewed by Dirk Schulze.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index cff1822..d8d8cc9 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -31,6 +31,16 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
)
ENDIF()
+IF (ENABLE_VIDEO)
+LIST(APPEND WebKit_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/graphics/gstreamer"
+ ${GStreamer-App_INCLUDE_DIRS}
+ ${GStreamer-Interfaces_INCLUDE_DIRS}
+ ${GStreamer-Pbutils_INCLUDE_DIRS}
+ ${GStreamer-Video_INCLUDE_DIRS}
+)
+ENDIF()
+
LIST(APPEND WebKit_SOURCES
efl/WebCoreSupport/ChromeClientEfl.cpp
efl/WebCoreSupport/ContextMenuClientEfl.cpp
diff --git a/cmake/FindGStreamer-App.cmake b/cmake/FindGStreamer-App.cmake
new file mode 100644
index 0000000..7193db0
--- /dev/null
+++ b/cmake/FindGStreamer-App.cmake
@@ -0,0 +1,34 @@
+# - Try to find GStreamer-App
+# Once done, this will define
+#
+# GStreamer-App_FOUND - system has GStreamer
+# GStreamer-App_INCLUDE_DIRS - the GStreamer include directories
+# GStreamer-App_LIBRARIES - link these to use GStreamer
+
+include(LibFindMacros)
+
+# Dependencies
+libfind_package(GStreamer-App GStreamer)
+libfind_package(GStreamer-App GStreamer-Base)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer-App_PKGCONF gstreamer-app-0.10)
+
+# Include dir
+find_path(GStreamer-App_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer-App_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer-App_LIBRARY
+ NAMES gstapp-0.10
+ PATHS ${GStreamer-App_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer-App_PROCESS_INCLUDES GStreamer-App_INCLUDE_DIR GStreamer_INCLUDE_DIR GStreamer-Base_INCLUDE_DIR)
+set(GStreamer-App_PROCESS_LIBS GStreamer-App_LIBRARY GStreamer_LIBRARIES GStreamer-Base_LIBRARIES)
+libfind_process(GStreamer-App)
diff --git a/cmake/FindGStreamer-Base.cmake b/cmake/FindGStreamer-Base.cmake
new file mode 100644
index 0000000..e73da05
--- /dev/null
+++ b/cmake/FindGStreamer-Base.cmake
@@ -0,0 +1,33 @@
+# - Try to find GStreamer-Base
+# Once done, this will define
+#
+# GStreamer-Base_FOUND - system has GStreamer-Base
+# GStreamer-Base_INCLUDE_DIRS - the GStreamer-Base include directories
+# GStreamer-Base_LIBRARIES - link these to use GStreamer-Base
+
+include(LibFindMacros)
+
+# Dependencies
+libfind_package(GStreamer-Base GStreamer)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer-Base_PKGCONF gstreamer-base-0.10)
+
+# Include dir
+find_path(GStreamer-Base_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer-Base_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer-Base_LIBRARY
+ NAMES gstbase-0.10
+ PATHS ${GStreamer-Base_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer-Base_PROCESS_INCLUDES GStreamer-Base_INCLUDE_DIR GStreamer_INCLUDE_DIR)
+set(GStreamer-Base_PROCESS_LIBS GStreamer-Base_LIBRARY GStreamer_LIBRARIES)
+libfind_process(GStreamer-Base)
diff --git a/cmake/FindGStreamer-Interfaces.cmake b/cmake/FindGStreamer-Interfaces.cmake
new file mode 100644
index 0000000..9483545
--- /dev/null
+++ b/cmake/FindGStreamer-Interfaces.cmake
@@ -0,0 +1,33 @@
+# - Try to find GStreamer-Interfaces
+# Once done, this will define
+#
+# GStreamer-Interfaces_FOUND - system has GStreamer-Interfaces
+# GStreamer-Interfaces_INCLUDE_DIRS - the GStreamer-Interfaces include directories
+# GStreamer-Interfaces_LIBRARIES - link these to use GStreamer-Interfaces
+
+include(LibFindMacros)
+
+# Dependencies
+libfind_package(GStreamer-Interfaces GStreamer)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer-Interfaces_PKGCONF gstreamer-interfaces-0.10)
+
+# Include dir
+find_path(GStreamer-Interfaces_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer-Interfaces_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer-Interfaces_LIBRARY
+ NAMES gstinterfaces-0.10
+ PATHS ${GStreamer-Interfaces_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer-Interfaces_PROCESS_INCLUDES GStreamer-Interfaces_INCLUDE_DIR GStreamer_INCLUDE_DIR)
+set(GStreamer-Interfaces_PROCESS_LIBS GStreamer-Interfaces_LIBRARY GStreamer_LIBRARIES)
+libfind_process(GStreamer-Interfaces)
diff --git a/cmake/FindGStreamer-Pbutils.cmake b/cmake/FindGStreamer-Pbutils.cmake
new file mode 100644
index 0000000..c1c3103
--- /dev/null
+++ b/cmake/FindGStreamer-Pbutils.cmake
@@ -0,0 +1,33 @@
+# - Try to find GStreamer-Pbutils
+# Once done, this will define
+#
+# GStreamer-Pbutils_FOUND - system has GStreamer-Pbutils
+# GStreamer-Pbutils_INCLUDE_DIRS - the GStreamer-Pbutils include directories
+# GStreamer-Pbutils_LIBRARIES - link these to use GStreamer-Pbutils
+
+include(LibFindMacros)
+
+# Dependencies
+libfind_package(GStreamer-Pbutils GStreamer)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer-Pbutils_PKGCONF gstreamer-pbutils-0.10)
+
+# Include dir
+find_path(GStreamer-Pbutils_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer-Pbutils_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer-Pbutils_LIBRARY
+ NAMES gstpbutils-0.10
+ PATHS ${GStreamer-Pbutils_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer-Pbutils_PROCESS_INCLUDES GStreamer-Pbutils_INCLUDE_DIR GStreamer_INCLUDE_DIR)
+set(GStreamer-Pbutils_PROCESS_LIBS GStreamer-Pbutils_LIBRARY GStreamer_LIBRARY)
+libfind_process(GStreamer-Pbutils)
diff --git a/cmake/FindGStreamer-Plugins-Base.cmake b/cmake/FindGStreamer-Plugins-Base.cmake
new file mode 100644
index 0000000..931a7d9
--- /dev/null
+++ b/cmake/FindGStreamer-Plugins-Base.cmake
@@ -0,0 +1,33 @@
+# - Try to find GStreamer-Plugins-Base
+# Once done, this will define
+#
+# GStreamer-Plugins-Base_FOUND - system has GStreamer-Plugins-Base
+# GStreamer-Plugins-Base_INCLUDE_DIRS - the GStreamer-Plugins-Base include directories
+# GStreamer-Plugins-Base_LIBRARIES - link these to use GStreamer-Plugins-Base
+
+include(LibFindMacros)
+
+# Dependencies
+libfind_package(GStreamer-Plugins-Base GStreamer)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer-Plugins-Base_PKGCONF gstreamer-plugins-base-0.10)
+
+# Include dir
+find_path(GStreamer-Plugins-Base_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer-Plugins-Base_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer-Plugins-Base_LIBRARY
+ NAMES gstreamer-0.10
+ PATHS ${GStreamer-Plugins-Base_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer-Plugins-Base_PROCESS_INCLUDES GStreamer-Plugins-Base_INCLUDE_DIR GStreamer_INCLUDE_DIR)
+set(GStreamer-Plugins-Base_PROCESS_LIBS GStreamer-Plugins-Base_LIBRARY GStreamer_LIBRARIES)
+libfind_process(GStreamer-Plugins-Base)
diff --git a/cmake/FindGStreamer-Video.cmake b/cmake/FindGStreamer-Video.cmake
new file mode 100644
index 0000000..1617947
--- /dev/null
+++ b/cmake/FindGStreamer-Video.cmake
@@ -0,0 +1,34 @@
+# - Try to find GStreamer-Video
+# Once done, this will define
+#
+# GStreamer-Video_FOUND - system has GStreamer-Video
+# GStreamer-Video_INCLUDE_DIRS - the GStreamer-Video include directories
+# GStreamer-Video_LIBRARIES - link these to use GStreamer-Video
+
+include(LibFindMacros)
+
+# Dependencies
+libfind_package(GStreamer-Video GStreamer)
+libfind_package(GStreamer-Video GStreamer-Base)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer-Video_PKGCONF gstreamer-video-0.10)
+
+# Include dir
+find_path(GStreamer-Video_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer-Video_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer-Video_LIBRARY
+ NAMES gstvideo-0.10
+ PATHS ${GStreamer-Video_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer-Video_PROCESS_INCLUDES GStreamer-Video_INCLUDE_DIR GStreamer_INCLUDE_DIR GStreamer-Base_INCLUDE_DIR)
+set(GStreamer-Video_PROCESS_LIBS GStreamer-Video_LIBRARY GStreamer_LIBRARIES GStreamer-Base_LIBRARIES)
+libfind_process(GStreamer-Video)
diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
new file mode 100644
index 0000000..7fe8364
--- /dev/null
+++ b/cmake/FindGStreamer.cmake
@@ -0,0 +1,31 @@
+# - Try to find GStreamer
+# Once done, this will define
+#
+# GStreamer_FOUND - system has GStreamer
+# GStreamer_INCLUDE_DIRS - the GStreamer include directories
+# GStreamer_LIBRARIES - link these to use GStreamer
+
+include(LibFindMacros)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(GStreamer_PKGCONF gstreamer-0.10)
+
+# Include dir
+find_path(GStreamer_INCLUDE_DIR
+ NAMES gst/gst.h
+ PATHS ${GStreamer_PKGCONF_INCLUDE_DIRS}
+ PATH_SUFFIXES gstreamer-0.10
+)
+
+# Finally the library itself
+find_library(GStreamer_LIBRARY
+ NAMES gstreamer-0.10
+ PATHS ${GStreamer_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(GStreamer_PROCESS_INCLUDES GStreamer_INCLUDE_DIR)
+set(GStreamer_PROCESS_LIBS GStreamer_LIBRARY)
+libfind_process(GStreamer)
+
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index bd6236b..6b4c2f4 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -113,10 +113,27 @@ ELSE ()
ADD_DEFINITIONS(-DWTF_USE_CURL=1)
ENDIF ()
+IF (ENABLE_VIDEO)
+ SET(ENABLE_GLIB_SUPPORT 1)
+ MESSAGE("Forcing Glib support")
+ENDIF()
+
IF (ENABLE_GLIB_SUPPORT)
FIND_PACKAGE(GDK 2.10 REQUIRED)
FIND_PACKAGE(Glib REQUIRED)
FIND_PACKAGE(Gthread REQUIRED)
ENDIF ()
+IF (ENABLE_VIDEO)
+ FIND_PACKAGE(GStreamer REQUIRED)
+ FIND_PACKAGE(GStreamer-App REQUIRED)
+ FIND_PACKAGE(GStreamer-Base REQUIRED)
+ FIND_PACKAGE(GStreamer-Pbutils REQUIRED)
+ FIND_PACKAGE(GStreamer-Interfaces REQUIRED)
+ FIND_PACKAGE(GStreamer-Plugins-Base REQUIRED)
+ FIND_PACKAGE(GStreamer-Video REQUIRED)
+ SET(WTF_USE_GSTREAMER 1)
+ ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
+ENDIF()
+
SET(CPACK_SOURCE_GENERATOR TBZ2)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list