add Gstreamer 1.X for gst-omx support
v10 cover add Gstreamer 1.X for gst-omx support
This patch adds gst-omx support to buildroot. Thus, making it possible to use gstreamer applications which utilize hardware acceleration on OpenMAX supported systems.
To add gst-omx, libglib2 is bumped to 2.36.1 and gstreamer1 is added.
In addition, the patches include the libvpx library and enablement in gstreamer. This is meant to give an example of how to add support in the future.
To test this patch series on the Raspberry Pi, select the eglgles plugin in gst1-plugins-bad and select gst-omx. To decode a 720p h264 encoded .mov file, the following gst-launch pipeline can be used.
Sample file: http://download.blender.org/peach/trailer/trailer_720p.mov
# gst-launch-1.0 filesrc location=/path/to/file \ # ! qtdemux ! h264parse ! omx264dec ! eglglessink
v9 -> v10:
- Bump to gstreamer version 1.1.1 which due to poor packaging required a patch to reinclude some header files.
- Add licensing information.
- Cleanup headers and whitespace changes.
v8 -> v9:
- Fix webkit build failures due to libglib2 bump.
- bump gdk-pixbuf to 2.28.1
- bump libgtk2 to 2.24.18
- bump libsoup to 2.43.1
- bump webkit to 1.9.6
v7 -> v8:
- Incoporate threads patch and rebase on top of master.
v6 -> v7:
- Additional verification complete with both RPi and Bellagio.
- Moved additional includes to the gst-omx and gst-plugins bad packages for openmax and eglgles.
- A patch was added that ensures that the config files point to the correct location.
v5 -> v6:
- Combined libglib patches to allow git-bisect
- added libopenmax virtual package for gst-omx (and future omx packages)
v4 -> v5:
- added gst-omx as a new package
- combined glib bump to 2.36.1 with gstreamer 1.x and gst-omx (libglib 2.32.1 is required for gstreamer 1.X)
v3 -> v4:
- uses new style if/endif syntax and removes depends properties for config elements in gstreamer1
v2 -> v3:
- fixes issues found while building with all/none plugins enabled
- change naming from gst-plugins-<blah>1 to gst1-plugins-<blah>
- options which require currently unpackged libraries are disabled
v1 -> v2:
- completed patch by adding good/bad/ugly plguins.
Spenser Gilliland (13):
libglib2: Bump libglib2 to 2.36.1
gdk-pixbuf: bump to version 2.28.1
libgtk2: bump to version 2.24.18 and drop DirectFB
libsoup: bump to version 2.43.1
webkit: bump to version 1.9.6
gstreamer1: Add gstreamer version 1.1.1 package
gstreamer: update Config.in with gstreamer1 info.
gst1-plugins-base: add gstreamer1 base plugins
gst1-plugins-good: add gstreamer1 good plugins
gst1-plugins-bad: add gstreamer1 bad plugins
gst1-plugins-ugly: add gstreamer1 ugly plugins
gst1-plugins-good: add libvpx support
gst-omx: add gst-omx package
package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- package/glib-networking/glib-networking.mk | 4 +- package/glibmm/glibmm.mk | 2 +- ...ib2-0004-fix-build-when-no-thread-support.patch | 18 +- ...b2-make-codegen-python2-python3-compliant.patch | 192 ------ package/libglib2/libglib2-no-tests.patch | 117 ---- package/libglib2/libglib2.mk | 10 +- package/libgtk2/Config.in | 13 +- package/libgtk2/libgtk2-reduce-dependencies.patch | 51 +- package/libgtk2/libgtk2.mk | 27 +- package/libsoup/Config.in | 1 + package/libsoup/libsoup.mk | 6 +- package/multimedia/Config.in | 6 + package/multimedia/gst-omx/Config.in | 11 + .../multimedia/gst-omx/gst-omx-config-files.patch | 127 ++++ package/multimedia/gst-omx/gst-omx.mk | 37 + package/multimedia/gst1-plugins-bad/Config.in | 325 +++++++++ .../gst1-plugins-bad-dist-opencv-headers.patch | 214 ++++++ .../gst1-plugins-bad-use-gettext-0.18.patch | 17 + .../gst1-plugins-bad/gst1-plugins-bad.mk | 690 ++++++++++++++++++++ package/multimedia/gst1-plugins-base/Config.in | 106 +++ .../gst1-plugins-base/gst1-plugins-base.mk | 204 ++++++ package/multimedia/gst1-plugins-good/Config.in | 218 ++++++ .../gst1-plugins-good/gst1-plugins-good.mk | 409 ++++++++++++ package/multimedia/gst1-plugins-ugly/Config.in | 49 ++ .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 104 +++ package/multimedia/gstreamer/Config.in | 3 +- package/multimedia/gstreamer1/Config.in | 41 ++ package/multimedia/gstreamer1/gstreamer1.mk | 38 ++ package/webkit/webkit-bison-2-6-compat.patch | 672 ------------------- package/webkit/webkit-disable-docrebase.patch | 26 + package/webkit/webkit-disable-tests.patch | 80 +++ package/webkit/webkit-execinfo_h.patch | 28 + .../webkit-fix-build-issue-with-old-gtk.patch | 22 - package/webkit/webkit-fix-build-with-gcc-4-6.patch | 45 -- .../webkit-fix-compilation-on-DirectFB-2.patch | 33 - .../webkit-fix-compilation-on-DirectFB.patch | 144 ---- package/webkit/webkit-fix-pool.patch | 67 -- package/webkit/webkit-pthread_getattr_np.patch | 80 --- package/webkit/webkit.mk | 31 +- 40 files changed, 2815 insertions(+), 1455 deletions(-) delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch delete mode 100644 package/libglib2/libglib2-no-tests.patch create mode 100644 package/multimedia/gst-omx/Config.in create mode 100644 package/multimedia/gst-omx/gst-omx-config-files.patch create mode 100644 package/multimedia/gst-omx/gst-omx.mk create mode 100644 package/multimedia/gst1-plugins-bad/Config.in create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad-dist-opencv-headers.patch create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk create mode 100644 package/multimedia/gst1-plugins-base/Config.in create mode 100644 package/multimedia/gst1-plugins-base/gst1-plugins-base.mk create mode 100644 package/multimedia/gst1-plugins-good/Config.in create mode 100644 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk create mode 100644 package/multimedia/gst1-plugins-ugly/Config.in create mode 100644 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk create mode 100644 package/multimedia/gstreamer1/Config.in create mode 100644 package/multimedia/gstreamer1/gstreamer1.mk delete mode 100644 package/webkit/webkit-bison-2-6-compat.patch create mode 100644 package/webkit/webkit-disable-docrebase.patch create mode 100644 package/webkit/webkit-disable-tests.patch create mode 100644 package/webkit/webkit-execinfo_h.patch delete mode 100644 package/webkit/webkit-fix-build-issue-with-old-gtk.patch delete mode 100644 package/webkit/webkit-fix-build-with-gcc-4-6.patch delete mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch delete mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB.patch delete mode 100644 package/webkit/webkit-fix-pool.patch delete mode 100644 package/webkit/webkit-pthread_getattr_np.patch
PATCH v10 1/13 libglib2: Bump libglib2 to 2.36.1
This patch bumps libglib2 to version 2.36.1. In addition this bumps glibmm and glib-networking to 2.36.1.
--- package/glib-networking/glib-networking.mk | 4 +- package/glibmm/glibmm.mk | 2 +- ...ib2-0004-fix-build-when-no-thread-support.patch | 18 +- ...b2-make-codegen-python2-python3-compliant.patch | 192 -------------------- package/libglib2/libglib2-no-tests.patch | 117 ------------ package/libglib2/libglib2.mk | 10 +- 6 files changed, 19 insertions(+), 324 deletions(-) delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch delete mode 100644 package/libglib2/libglib2-no-tests.patch
package/glib-networking/glib-networking.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_MAJOR_VERSION = 2.30 -GLIB_NETWORKING_MINOR_VERSION = 2 +GLIB_NETWORKING_MAJOR_VERSION = 2.36 +GLIB_NETWORKING_MINOR_VERSION = 1 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION) GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
package/glibmm/glibmm.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GLIBMM_VERSION_MAJOR = 2.30 +GLIBMM_VERSION_MAJOR = 2.36 GLIBMM_VERSION_MINOR = 1 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).$(GLIBMM_VERSION_MINOR) GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch +10 -8
@@ -1,27 +1,29 @@ Fix gio/gcancellable.c build when thread support is disabled +Changes: + Updated for 2.36.1 + Signed-off-by: "Samuel Martin" <[email protected]> +Signed-off-by: "Spenser Gilliland" <[email protected]> --- ---- a/gio/gcancellable.c 2013-05-14 23:08:25.514461348 +0200 -+++ b/gio/gcancellable.c 2013-05-14 23:10:23.347789625 +0200 -@@ -270,8 +270,10 @@ g_cancellable_reset (GCancellable *cance +--- libglib2-2.36.1.orig/gio/gcancellable.c 2013-03-13 08:39:09.000000000 -0500 ++++ libglib2-2.36.1/gio/gcancellable.c 2013-05-26 10:49:32.366019891 -0500 +@@ -267,7 +267,9 @@ while (priv->cancelled_running) { priv->cancelled_running_waiting = TRUE; +#if defined(G_THREADS_ENABLED) - g_cond_wait (cancellable_cond, - g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable))); + g_cond_wait (&cancellable_cond, &cancellable_mutex); +#endif } if (priv->cancelled) -@@ -619,8 +621,10 @@ g_cancellable_disconnect (GCancellable +@@ -620,7 +622,9 @@ while (priv->cancelled_running) { priv->cancelled_running_waiting = TRUE; +#if defined(G_THREADS_ENABLED) - g_cond_wait (cancellable_cond, - g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable))); + g_cond_wait (&cancellable_cond, &cancellable_mutex); +#endif }
package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch deleted +0 -192
192 lines not on this page · raw message
package/libglib2/libglib2-no-tests.patch deleted +0 -117
117 lines not on this page · raw message
package/libglib2/libglib2.mk +6 -4
@@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.30 -LIBGLIB2_VERSION_MINOR = 3 +LIBGLIB2_VERSION_MAJOR = 2.36 +LIBGLIB2_VERSION_MINOR = 1 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
@@ -47,6 +47,8 @@ LIBGLIB2_CONF_ENV = \ ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \ ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \ + ac_cv_func_newlocale=no ac_cv_func_uselocale=no \ + ac_cv_func_strtod_l=no ac_cv_func_strtoll_l=no ac_cv_func_strtoull_l=no \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) # old uClibc versions don't provide qsort_r
@@ -67,9 +69,9 @@ HOST_LIBGLIB2_CONF_OPT = \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \ - --disable-tests + --disable-modular-tests -LIBGLIB2_CONF_OPT += --disable-tests +LIBGLIB2_CONF_OPT += --disable-modular-tests ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) LIBGLIB2_CONF_OPT += --with-threads=none --disable-threads endif
Signature · 1 line
1.7.1
PATCH v10 2/13 gdk-pixbuf: bump to version 2.28.1
In reply to Spenser Gilliland--- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/gdk-pixbuf/gdk-pixbuf.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GDK_PIXBUF_MAJOR_VERSION = 2.24 +GDK_PIXBUF_MAJOR_VERSION = 2.28 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).1 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_MAJOR_VERSION)
Signature · 1 line
1.7.1
PATCH v10 3/13 libgtk2: bump to version 2.24.18 and drop DirectFB
In reply to Spenser Gilliland* Drop DirectFB support from libgtk2
* bump libgtk2 to version 2.24.18
--- package/libgtk2/Config.in | 13 ++--- package/libgtk2/libgtk2-reduce-dependencies.patch | 51 +++++++++++---------- package/libgtk2/libgtk2.mk | 27 ++++------- 3 files changed, 40 insertions(+), 51 deletions(-)
package/libgtk2/Config.in +5 -8
@@ -8,11 +8,11 @@ config BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_FONTCONFIG if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRENDER + depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango help
@@ -29,6 +29,3 @@ config BR2_PACKAGE_LIBGTK2_DEMO comment "libgtk2 requires a toolchain with WCHAR and C++ support" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP - -comment "WARNING: Libgtk2 directfb backend is deprecated" - depends on BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_XORG7
package/libgtk2/libgtk2-reduce-dependencies.patch +26 -25
120 lines not on this page · raw message
package/libgtk2/libgtk2.mk +9 -18
@@ -5,7 +5,7 @@ ################################################################################ LIBGTK2_VERSION_MAJOR = 2.24 -LIBGTK2_VERSION_MINOR = 10 +LIBGTK2_VERSION_MINOR = 18 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR) LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
@@ -74,19 +74,14 @@ LIBGTK2_CONF_OPT = --disable-glibtest \ LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf -ifeq ($(BR2_PACKAGE_DIRECTFB),y) - LIBGTK2_CONF_OPT += --with-gdktarget=directfb - LIBGTK2_DEPENDENCIES += directfb -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) - LIBGTK2_CONF_OPT += \ - --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --with-gdktarget=x11 - LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \ - xlib_libXext xlib_libXrender +# Xorg dependencies +LIBGTK2_CONF_OPT += \ + --with-x \ + --x-includes=$(STAGING_DIR)/usr/include/X11 \ + --x-libraries=$(STAGING_DIR)/usr/lib \ + --with-gdktarget=x11 +LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \ + xlib_libXext xlib_libXrender ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) LIBGTK2_CONF_OPT += --enable-xinerama
@@ -122,10 +117,6 @@ ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) LIBGTK2_DEPENDENCIES += xlib_libXdamage endif -else - LIBGTK2_CONF_OPT += --without-x -endif - ifeq ($(BR2_PACKAGE_LIBPNG),y) LIBGTK2_DEPENDENCIES += libpng else
Signature · 1 line
1.7.1
PATCH v10 3/13 libgtk2: bump to version 2.24.18 and drop DirectFB
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Spenser" == Spenser Gilliland <[email protected]> writes:
Spenser> * Drop DirectFB support from libgtk2
Spenser> * bump libgtk2 to version 2.24.18
Committed with some whitespace fixes in the patch.
You forgot to sign off on this series, but as you already did the 9 times before, I've added your SOB myself - Hopefully that's OK.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v10 4/13 libsoup: bump to version 2.43.1
In reply to Spenser Gilliland--- package/libsoup/Config.in | 1 + package/libsoup/libsoup.mk | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
package/libsoup/Config.in +1 -0
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_SQLITE help libsoup is an HTTP client/server library. It uses GObject and the GLib main loop, to integrate well with GNOME
package/libsoup/libsoup.mk +3 -3
@@ -4,10 +4,10 @@ # ################################################################################ -LIBSOUP_MAJOR_VERSION = 2.36 +LIBSOUP_MAJOR_VERSION = 2.43 LIBSOUP_MINOR_VERSION = 1 LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION) -LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2 +LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) LIBSOUP_INSTALL_STAGING = YES
@@ -19,7 +19,7 @@ endif LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome -LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2 +LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2 sqlite ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) LIBSOUP_DEPENDENCIES += glib-networking
Signature · 1 line
1.7.1
PATCH v10 4/13 libsoup: bump to version 2.43.1
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Spenser" == Spenser Gilliland <[email protected]> writes:
Spenser> ---
Spenser> package/libsoup/Config.in | 1 + Spenser> package/libsoup/libsoup.mk | 6 +++---
Spenser> 2 files changed, 4 insertions(+), 3 deletions(-)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v10 5/13 webkit: bump to version 1.9.6
In reply to Spenser GillilandRemove bison-2.6-compat patch as it has been incorporated upstream. Remove fix build issue with old gtk as gtk has been bumped to a newer version.
Remove fix-build-with-gcc-4-6 as it has incorporated upstream. Remove directfb patches due to depreciation
Remove pool patch as it is no longer required
Remove pthread_getattr_np as webkit no longer uses this function.
--- package/webkit/webkit-bison-2-6-compat.patch | 672 -------------------- package/webkit/webkit-disable-docrebase.patch | 26 + package/webkit/webkit-disable-tests.patch | 80 +++ package/webkit/webkit-execinfo_h.patch | 28 + .../webkit-fix-build-issue-with-old-gtk.patch | 22 - package/webkit/webkit-fix-build-with-gcc-4-6.patch | 45 -- .../webkit-fix-compilation-on-DirectFB-2.patch | 33 - .../webkit-fix-compilation-on-DirectFB.patch | 144 ----- package/webkit/webkit-fix-pool.patch | 67 -- package/webkit/webkit-pthread_getattr_np.patch | 80 --- package/webkit/webkit.mk | 31 +- 11 files changed, 153 insertions(+), 1075 deletions(-) delete mode 100644 package/webkit/webkit-bison-2-6-compat.patch create mode 100644 package/webkit/webkit-disable-docrebase.patch create mode 100644 package/webkit/webkit-disable-tests.patch create mode 100644 package/webkit/webkit-execinfo_h.patch delete mode 100644 package/webkit/webkit-fix-build-issue-with-old-gtk.patch delete mode 100644 package/webkit/webkit-fix-build-with-gcc-4-6.patch delete mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch delete mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB.patch delete mode 100644 package/webkit/webkit-fix-pool.patch delete mode 100644 package/webkit/webkit-pthread_getattr_np.patch
package/webkit/webkit-bison-2-6-compat.patch deleted +0 -672
@@ -1,672 +0,0 @@ -Bison 2.6 compatibility fix - -Taken from upstream at http://trac.webkit.org/changeset/124099, with -minor adaptations. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: webkit-1.2.7/WebCore/ChangeLog -=================================================================== ---- webkit-1.2.7.orig/WebCore/ChangeLog 2010-12-28 13:27:37.000000000 +0100 -+++ webkit-1.2.7/WebCore/ChangeLog 2012-12-15 15:48:40.000000000 +0100 -@@ -1,3 +1,28 @@ -+2012-07-30 Alexis Menard <[email protected]> -+ -+ Build fix with newer bison 2.6. -+ https://bugs.webkit.org/show_bug.cgi?id=92264 -+ -+ Reviewed by Adam Barth. -+ -+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html -+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS -+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe -+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. -+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release -+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. -+ -+ No new tests : build fix and the patch should not trigger any regressions -+ -+ * css/CSSGrammar.y: -+ * css/CSSParser.cpp: -+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. -+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h -+ therefore including this file within the namespace {} declarations leads to xpathyyparse being -+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp -+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs -+ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same. -+ - 2010-06-21 Philippe Normand <[email protected]> - - Reviewed by Xan Lopez. -Index: webkit-1.2.7/WebCore/css/CSSParser.cpp -=================================================================== ---- webkit-1.2.7.orig/WebCore/css/CSSParser.cpp 2010-12-28 13:24:33.000000000 +0100 -+++ webkit-1.2.7/WebCore/css/CSSParser.cpp 2012-12-15 17:29:57.000000000 +0100 -@@ -81,7 +81,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -@@ -226,7 +226,7 @@ - m_defaultNamespace = starAtom; // Reset the default namespace. - - setupParser("", string, ""); -- cssyyparse(this); -+ ::cssyyparse(this); - m_rule = 0; - } - -@@ -235,7 +235,7 @@ - m_styleSheet = sheet; - m_allowNamespaceDeclarations = false; - setupParser("@-webkit-rule{", string, "} "); -- cssyyparse(this); -+ ::cssyyparse(this); - return m_rule.release(); - } - -@@ -243,7 +243,7 @@ - { - m_styleSheet = sheet; - setupParser("@-webkit-keyframe-rule{ ", string, "} "); -- cssyyparse(this); -+ ::cssyyparse(this); - return m_keyframe.release(); - } - -@@ -257,7 +257,7 @@ - m_id = id; - m_important = important; - -- cssyyparse(this); -+ ::cssyyparse(this); - - m_rule = 0; - -@@ -304,7 +304,7 @@ - m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet()); - - setupParser("@-webkit-decls{color:", string, "} "); -- cssyyparse(this); -+ ::cssyyparse(this); - m_rule = 0; - - return (m_numParsedProperties && m_parsedProperties[0]->m_id == CSSPropertyColor); -@@ -319,7 +319,7 @@ - - setupParser("@-webkit-selector{", string, "}"); - -- cssyyparse(this); -+ ::cssyyparse(this); - - m_selectorListForParseSelector = 0; - } -@@ -330,7 +330,7 @@ - m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet()); - - setupParser("@-webkit-decls{", string, "} "); -- cssyyparse(this); -+ ::cssyyparse(this); - m_rule = 0; - - bool ok = false; -@@ -354,7 +354,7 @@ - // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token. - // instead insert one " " (which is WHITESPACE in CSSGrammar.y) - setupParser("@-webkit-mediaquery ", string, "} "); -- cssyyparse(this); -+ ::cssyyparse(this); - - bool ok = false; - if (m_mediaQuery) { -@@ -5191,7 +5191,7 @@ - nameValuePair += variableValue; - - setupParser("@-webkit-variables-decls{", nameValuePair, "} "); -- cssyyparse(this); -+ ::cssyyparse(this); - m_rule = 0; - - bool ok = false; -Index: webkit-1.2.7/WebCore/css/CSSGrammar.y -=================================================================== ---- webkit-1.2.7.orig/WebCore/css/CSSGrammar.y 2010-09-10 15:20:33.000000000 +0200 -+++ webkit-1.2.7/WebCore/css/CSSGrammar.y 2012-12-15 15:48:40.000000000 +0100 -@@ -51,14 +51,13 @@ - #define YYMAXDEPTH 10000 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -85,7 +84,7 @@ - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -Index: webkit-1.2.7/WebCore/xml/XPathParser.cpp -=================================================================== ---- webkit-1.2.7.orig/WebCore/xml/XPathParser.cpp 2010-09-10 15:20:33.000000000 +0200 -+++ webkit-1.2.7/WebCore/xml/XPathParser.cpp 2012-12-15 15:56:37.000000000 +0100 -@@ -35,20 +35,18 @@ - #include "XPathEvaluator.h" - #include "XPathException.h" - #include "XPathNSResolver.h" -+#include "XPathPath.h" - #include "XPathStep.h" - #include <wtf/StdLibExtras.h> - --int xpathyyparse(void*); -- -+using namespace WebCore; - using namespace WTF; - using namespace Unicode; - --namespace WebCore { --namespace XPath { -- --class LocationPath; -+using namespace XPath; - --#include "XPathGrammar.h" -+extern int xpathyyparse(WebCore::XPath::Parser*); -+#include "XPathGrammar.h" - - Parser* Parser::currentParser = 0; - -@@ -630,7 +628,5 @@ - delete t; - } - --} --} - - #endif // ENABLE(XPATH) -Index: webkit-1.2.7/WebCore/xml/XPathGrammar.y -=================================================================== ---- webkit-1.2.7.orig/WebCore/xml/XPathGrammar.y 2010-02-05 17:26:58.000000000 +0100 -+++ webkit-1.2.7/WebCore/xml/XPathGrammar.y 2012-12-15 15:48:40.000000000 +0100 -@@ -36,6 +36,7 @@ - #include "XPathParser.h" - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableReference.h" - #include <wtf/FastMalloc.h> - -@@ -46,8 +47,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 10000 --#define YYPARSE_PARAM parserParameter --#define PARSER static_cast<Parser*>(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -55,6 +54,7 @@ - %} - - %pure_parser -+%parse-param { WebCore::XPath::Parser* parser } - - %union - { -@@ -73,7 +73,7 @@ - %{ - - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } --static void xpathyyerror(const char*) { } -+static void xpathyyerror(void*, const char*) { } - - %} - -@@ -120,7 +120,7 @@ - Expr: - OrExpr - { -- PARSER->m_topExpr = $1; -+ parser->m_topExpr = $1; - } - ; - -@@ -140,7 +140,7 @@ - '/' - { - $$ = new LocationPath; -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - '/' RelativeLocationPath -@@ -152,7 +152,7 @@ - { - $$ = $2; - $$->insertFirstStep($1); -- PARSER->unregisterParseNode($1); -+ parser->unregisterParseNode($1); - } - ; - -@@ -161,22 +161,22 @@ - { - $$ = new LocationPath; - $$->appendStep($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->registerParseNode($$); - } - | - RelativeLocationPath '/' Step - { - $$->appendStep($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - | - RelativeLocationPath DescendantOrSelf Step - { - $$->appendStep($2); - $$->appendStep($3); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); - } - ; - -@@ -185,58 +185,58 @@ - { - if ($2) { - $$ = new Step(Step::ChildAxis, *$1, *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, *$1); -- PARSER->deleteNodeTest($1); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($1); -+ parser->registerParseNode($$); - } - | - NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($2) { - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NodeTest OptionalPredicateList - { - if ($3) { - $$ = new Step($1, *$2, *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, *$2); -- PARSER->deleteNodeTest($2); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($2); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($3) { - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($2); -- PARSER->registerParseNode($$); -+ parser->deleteString($2); -+ parser->registerParseNode($$); - } - | - AbbreviatedStep -@@ -261,23 +261,23 @@ - else if (*$1 == "comment") - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' LITERAL ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); -- PARSER->deleteString($1); -- PARSER->deleteString($3); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->deleteString($3); -+ parser->registerNodeTest($$); - } - ; - -@@ -295,14 +295,14 @@ - { - $$ = new Vector<Predicate*>; - $$->append(new Predicate($1)); -- PARSER->unregisterParseNode($1); -- PARSER->registerPredicateVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerPredicateVector($$); - } - | - PredicateList Predicate - { - $$->append(new Predicate($2)); -- PARSER->unregisterParseNode($2); -+ parser->unregisterParseNode($2); - } - ; - -@@ -317,7 +317,7 @@ - SLASHSLASH - { - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -325,13 +325,13 @@ - '.' - { - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - DOTDOT - { - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -339,8 +339,8 @@ - VARIABLEREFERENCE - { - $$ = new VariableReference(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - '(' Expr ')' -@@ -351,15 +351,15 @@ - LITERAL - { - $$ = new StringExpression(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - NUMBER - { - $$ = new Number($1->toDouble()); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FunctionCall -@@ -371,8 +371,8 @@ - $$ = createFunction(*$1); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FUNCTIONNAME '(' ArgumentList ')' -@@ -380,9 +380,9 @@ - $$ = createFunction(*$1, *$3); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->deleteExpressionVector($3); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->deleteExpressionVector($3); -+ parser->registerParseNode($$); - } - ; - -@@ -391,14 +391,14 @@ - { - $$ = new Vector<Expression*>; - $$->append($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerExpressionVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerExpressionVector($$); - } - | - ArgumentList ',' Argument - { - $$->append($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - ; - -@@ -414,9 +414,9 @@ - $$ = new Union; - $$->addSubExpression($1); - $$->addSubExpression($3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -432,9 +432,9 @@ - { - $3->setAbsolute(true); - $$ = new Path(static_cast<Filter*>($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - FilterExpr DescendantOrSelf RelativeLocationPath -@@ -442,10 +442,10 @@ - $3->insertFirstStep($2); - $3->setAbsolute(true); - $$ = new Path(static_cast<Filter*>($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -455,9 +455,9 @@ - PrimaryExpr PredicateList - { - $$ = new Filter($1, *$2); -- PARSER->unregisterParseNode($1); -- PARSER->deletePredicateVector($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->deletePredicateVector($2); -+ parser->registerParseNode($$); - } - ; - -@@ -467,9 +467,9 @@ - OrExpr OR AndExpr - { - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -479,9 +479,9 @@ - AndExpr AND EqualityExpr - { - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -491,9 +491,9 @@ - EqualityExpr EQOP RelationalExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -503,9 +503,9 @@ - RelationalExpr RELOP AdditiveExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -515,17 +515,17 @@ - AdditiveExpr PLUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - AdditiveExpr MINUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -535,9 +535,9 @@ - MultiplicativeExpr MULOP UnaryExpr - { - $$ = new NumericOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -548,8 +548,8 @@ - { - $$ = new Negative; - $$->addSubExpression($2); -- PARSER->unregisterParseNode($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($2); -+ parser->registerParseNode($$); - } - ; -
package/webkit/webkit-disable-docrebase.patch new file +26 -0
@@ -0,0 +1,26 @@ +This patch prevents documentation from being rebased or installed. This +prevents an error when gtk-doc --rebase is called. + +Signed-off-by: Spenser Gilliland <[email protected]> +---- +Index: webkit-1.9.6/Tools/GNUmakefile.am +=================================================================== +--- webkit-1.9.6.orig/Tools/GNUmakefile.am 2012-08-06 07:34:49.000000000 -0500 ++++ webkit-1.9.6/Tools/GNUmakefile.am 2013-05-28 21:29:54.135112927 -0500 +@@ -262,6 +262,8 @@ + Tools/Scripts/webkit-build-directory \ + Tools/Scripts/webkitdirs.pm + ++if ENABLE_GTK_DOC ++ + docs: docs-build.stamp + .PHONY : docs + DISTCLEANFILES += docs-build.stamp +@@ -362,7 +364,6 @@ + rm -rf $${installdir} + endif + +-if ENABLE_GTK_DOC + all: docs-build.stamp + endif +
package/webkit/webkit-disable-tests.patch new file +80 -0
80 lines not on this page · raw message
package/webkit/webkit-execinfo_h.patch new file +28 -0
@@ -0,0 +1,28 @@ +Fixes uclibc build as uclibc does not include backtrace functionality + +Signed-of-by: Spenser Gilliland <[email protected]> +---- +Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp +=================================================================== +--- webkit-1.9.6.orig/Source/WTF/wtf/Assertions.cpp ++++ webkit-1.9.6/Source/WTF/wtf/Assertions.cpp +@@ -61,8 +61,10 @@ + #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) + #include <cxxabi.h> + #include <dlfcn.h> ++#if !defined(__UCLIBC__) + #include <execinfo.h> + #endif ++#endif + + #if OS(ANDROID) + #include "android/log.h" +@@ -268,7 +270,7 @@ void WTFReportArgumentAssertionFailure(c + + void WTFGetBacktrace(void** stack, int* size) + { +-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) ++#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) && !defined(__UCLIBC__) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined
package/webkit/webkit-fix-build-issue-with-old-gtk.patch deleted +0 -22
@@ -1,22 +0,0 @@ -The WebKit code conditionally calls getRootCoords() when the Gtk -version is old (i.e < 2.17.3), but fails to declare the prototype of -this function (which is implemented after its call site). This build -failure has probably been missed due to the fact that not many people -try to compile recent WebKit versions with old Gtk. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp -=================================================================== ---- webkit-1.2.3.orig/WebKitTools/DumpRenderTree/gtk/EventSender.cpp 2010-07-19 20:42:27.000000000 +0200 -+++ webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp 2010-07-19 20:42:57.000000000 +0200 -@@ -86,6 +86,9 @@ - static void sendOrQueueEvent(GdkEvent event); - static void dispatchEvent(GdkEvent event); - static guint getStateFlags(); -+#if !GTK_CHECK_VERSION(2,17,3) -+static void getRootCoords(GtkWidget* view, int* rootX, int* rootY); -+#endif - - static JSValueRef getDragModeCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception) - {
package/webkit/webkit-fix-build-with-gcc-4-6.patch deleted +0 -45
45 lines not on this page · raw message
package/webkit/webkit-fix-compilation-on-DirectFB-2.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001 -From: Stephan Hoffmann <[email protected]> -Date: Thu, 27 Dec 2012 18:08:29 +0100 -Subject: [PATCH] Fix test for presence of X11 - -The test in GNUmakefile.in checking for presence of X11 and -enabling the XP_UNIX define succeeds even when X11 is not -present and Webkit is built for DirectFB. - -Because of this X11-headers are included and the build fails. - -Signed-off-by: Stephan Hoffmann <[email protected]> ---- - GNUmakefile.in | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/GNUmakefile.in b/GNUmakefile.in -index f14f27b..3ac811f 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -88,7 +88,8 @@ noinst_PROGRAMS = Programs/minidom$(EXEEXT) \ - $(am__EXEEXT_1) - - # For the Gtk port we want to use XP_UNIX both in X11 and Mac -- at TARGET_WIN32_FALSE@am__append_1 = -DXP_UNIX -+ at TARGET_X11_TRUE@am__append_1 = -DXP_UNIX -+ at TARGET_QUARTZ_TRUE@am__append_1 = -DXP_UNIX - @USE_ICU_UNICODE_TRUE at am__append_2 = \ - @USE_ICU_UNICODE_TRUE@ -DWTF_USE_ICU_UNICODE=1 - --- -1.7.0.4 -
package/webkit/webkit-fix-compilation-on-DirectFB.patch deleted +0 -144
144 lines not on this page · raw message
package/webkit/webkit-fix-pool.patch deleted +0 -67
67 lines not on this page · raw message
package/webkit/webkit-pthread_getattr_np.patch deleted +0 -80
80 lines not on this page · raw message
package/webkit/webkit.mk +19 -12
@@ -4,27 +4,34 @@ # ################################################################################ -WEBKIT_VERSION = 1.2.7 +WEBKIT_VERSION = 1.9.6 WEBKIT_SITE = http://www.webkitgtk.org/releases +WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.xz WEBKIT_INSTALL_STAGING = YES WEBKIT_DEPENDENCIES = host-flex host-bison host-gperf icu libcurl libxml2 \ libxslt libgtk2 sqlite enchant libsoup jpeg libgail +# webkit-disable-tests.patch changes configure.ac therefore autoreconf required +WEBKIT_AUTORECONF = YES +WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools + # Give explicit path to icu-config, and silence gazillions of warnings # with recent gcc versions. WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config \ - CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align" \ - CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align" - + CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align -Wno-sign-compare" \ + CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align -Wno-sign-compare" -ifeq ($(BR2_PACKAGE_XORG7),y) - WEBKIT_CONF_OPT += --with-target=x11 - WEBKIT_DEPENDENCIES += xlib_libXt -else - WEBKIT_CONF_OPT += --with-target=directfb - WEBKIT_DEPENDENCIES += directfb -endif +WEBKIT_CONF_OPT += \ + --with-gtk=2.0 \ + --disable-geolocation \ + --disable-webkit2 \ + --disable-glibtest \ + --disable-video \ + --disable-gtk-doc-html \ + --disable-tests -WEBKIT_CONF_OPT += --disable-video +# Xorg Dependencies +WEBKIT_CONF_OPT += --with-target=x11 +WEBKIT_DEPENDENCIES += xlib_libXt $(eval $(autotools-package))
Signature · 1 line
1.7.1
PATCH v10 5/13 webkit: bump to version 1.9.6
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Spenser" == Spenser Gilliland <[email protected]> writes:
Spenser> Remove bison-2.6-compat patch as it has been incorporated upstream. Spenser> Remove fix build issue with old gtk as gtk has been bumped to a newer Spenser> version.
Spenser> Remove fix-build-with-gcc-4-6 as it has incorporated upstream. Spenser> Remove directfb patches due to depreciation
Spenser> Remove pool patch as it is no longer required
Spenser> Remove pthread_getattr_np as webkit no longer uses this function.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v10 6/13 gstreamer1: Add gstreamer version 1.1.1 package
In reply to Spenser GillilandThis patch adds the gstreamer version 1.x series to buildroot.
--- package/multimedia/Config.in | 1 + package/multimedia/gstreamer1/Config.in | 41 +++++++++++++++++++++++++++ package/multimedia/gstreamer1/gstreamer1.mk | 38 +++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 0 deletions(-) create mode 100644 package/multimedia/gstreamer1/Config.in create mode 100644 package/multimedia/gstreamer1/gstreamer1.mk
package/multimedia/Config.in +1 -0
@@ -6,6 +6,7 @@ source "package/multimedia/faad2/Config.in" source "package/multimedia/flac/Config.in" source "package/multimedia/ffmpeg/Config.in" source "package/multimedia/gstreamer/Config.in" +source "package/multimedia/gstreamer1/Config.in" source "package/multimedia/gst-ffmpeg/Config.in" source "package/multimedia/gst-dsp/Config.in" source "package/multimedia/gst-fsl-plugins/Config.in"
package/multimedia/gstreamer1/Config.in new file +41 -0
41 lines not on this page · raw message
package/multimedia/gstreamer1/gstreamer1.mk new file +38 -0
@@ -0,0 +1,38 @@ +############################################################# +# +# gstreamer1 +# +############################################################# + +GSTREAMER1_VERSION = 1.1.1 +GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz +GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer +GSTREAMER1_INSTALL_STAGING = YES +GSTREAMER1_LICENSE_FILES = COPYING +GSTREAMER1_LICENSE = GPLv2 LGPLv2+ LGPLv2.1+ + +# Checking if unaligned memory access works correctly cannot be done when cross +# compiling. For the following architectures there is no information available +# in the configure script. +ifeq ($(BR2_avr32),y) +GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no +endif +ifeq ($(BR2_aarch64),y) +GSTREAMER1_CONF_ENV = as_cv_unaligned_access=yes +endif + +GSTREAMER1_CONF_OPT = \ + --disable-examples \ + --disable-tests \ + --disable-failing-tests \ + --disable-debug \ + --disable-valgrind \ + --disable-benchmarks \ + --disable-check \ + $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ + $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ + $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) + +GSTREAMER1_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex + +$(eval $(autotools-package))
Signature · 1 line
1.7.1
PATCH v10 6/13 gstreamer1: Add gstreamer version 1.1.1 package
Hi Spenser,
Quoted 1 line · Spenser Gilliland
This patch adds the gstreamer version 1.x series to buildroot.
Missing SoB
Quoted 13 lines
--- package/multimedia/Config.in | 1 + package/multimedia/gstreamer1/Config.in | 41 +++++++++++++++++++++++++++ package/multimedia/gstreamer1/gstreamer1.mk | 38 +++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 0 deletions(-)create mode 100644 package/multimedia/gstreamer1/Config.in create mode 100644
package/multimedia/gstreamer1/gstreamer1.mkpackage/multimedia/Config.in +0
-0
package/multimedia/Config.in source "package/multimedia/faad2/Config.in" · line 9
Quoted 4 lines
package/multimedia/Config.in +1
-0@@ -6,6 +6,7 @@ source "package/multimedia/faad2/Config.in" source "package/multimedia/flac/Config.in" source "package/multimedia/ffmpeg/Config.in" source "package/multimedia/gstreamer/Config.in" +source "package/multimedia/gstreamer1/Config.in"
I think this should come below the gst-0.10 packages (so below
gst-plugins-ugly) so they're more logically collected.
Quoted 9 lines
package/multimedia/Config.in +0
-0source "package/multimedia/gst-ffmpeg/Config.in" source "package/multimedia/gst-dsp/Config.in" source "package/multimedia/gst-fsl-plugins/Config.in"package/multimedia/gstreamer1/Config.in new file +0
-0
package/multimedia/gstreamer1/Config.in line 8
Quoted 8 lines
package/multimedia/gstreamer1/Config.in new file +8
-0@@ -0,0 +1,41 @@ +config BR2_PACKAGE_GSTREAMER1 + bool "gstreamer1" + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBGLIB2 + help + GStreamer is an open source multimedia framework. This 1.x version of + Gstreamer is incompatible with Gstreamer 0.1x.
Well, gstreamer 0.11 was actually an experimental pre-release branch
for 1.x (although there are still lots of incompatible changes between 0.11 and 1.0). I think it's more clear and accurate if you say it's incompatible with Gstreamer 0.10.
package/multimedia/gstreamer1/Config.in line 20
Quoted 12 lines
package/multimedia/gstreamer1/Config.in new file +12
-0+ + http://gstreamer.freedesktop.org/ + +if BR2_PACKAGE_GSTREAMER1 + +config BR2_PACKAGE_GSTREAMER1_GST_DEBUG + bool "enable gst-debug trace support" + default y + help + Enable support for the gst-debug tracing functionality in gstreamer. + This has limited CPU overhead, but does increase the rootfs size + somewhat.
I believe the disable-parse and disable-trace options have at least as
much impact on CPU and size overhead as the gst-debug, so it would make sense to export them as well. Although actually I expect the difference to be vanishingly small for any of them.
package/multimedia/gstreamer1/Config.in line 30
Quoted 10 lines
package/multimedia/gstreamer1/Config.in new file +10
-0+ +config BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY + bool "enable plugin registry" + default y + help + Enable support for the GStreamer plugin registry. This may increase + the launch-time for a GStreamer application. + +config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS + bool "install gst-launch gst-inspect"
"install gst-launch & gst-inspect"
Quoted 19 lines
package/multimedia/gstreamer1/Config.in new file +11
-0+ default y + help + Install the gst-launch and gst-inspect tools. This will take up + additional space on the target + +endif + +comment "gstreamer1 requires a toolchain with WCHAR and threads support" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +package/multimedia/gstreamer1/gstreamer1.mk new file +2
-0@@ -0,0 +1,38 @@ +############################################################# +#
package/multimedia/gstreamer1/gstreamer1.mk line 12
Quoted 10 lines
package/multimedia/gstreamer1/gstreamer1.mk new file +10
-0+# gstreamer1 +# +############################################################# + +GSTREAMER1_VERSION = 1.1.1 +GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz +GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer +GSTREAMER1_INSTALL_STAGING = YES +GSTREAMER1_LICENSE_FILES = COPYING +GSTREAMER1_LICENSE = GPLv2 LGPLv2+ LGPLv2.1+
I couldn't find any GPLv2 license headers except some tests and an m4
header (which we normally don't consider to be part of the code requiring a license).
Regards,
Arnout
Quoted 27 lines
package/multimedia/gstreamer1/gstreamer1.mk new file +26
-0+ +# Checking if unaligned memory access works correctly cannot be done when cross +# compiling. For the following architectures there is no information available +# in the configure script. +ifeq ($(BR2_avr32),y) +GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no +endif +ifeq ($(BR2_aarch64),y) +GSTREAMER1_CONF_ENV = as_cv_unaligned_access=yes +endif + +GSTREAMER1_CONF_OPT = \ + --disable-examples \ + --disable-tests \ + --disable-failing-tests \ + --disable-debug \ + --disable-valgrind \ + --disable-benchmarks \ + --disable-check \ + $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ + $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ + $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) + +GSTREAMER1_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex + +$(eval $(autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v10 7/13 gstreamer: update Config.in with gstreamer1 info.
In reply to Spenser GillilandUpdate the gstreamer1 Config.in with note about Gstreamer 0.1X being incompatible with gstreamer 1.X.
--- package/multimedia/gstreamer/Config.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
package/multimedia/gstreamer/Config.in +2 -1
@@ -4,7 +4,8 @@ config BR2_PACKAGE_GSTREAMER depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBGLIB2 help - GStreamer is an open source multimedia framework. + GStreamer is an open source multimedia framework. This 0.1x version of + Gstreamer is incompatible with Gstreamer 1.X. http://gstreamer.freedesktop.org/
Signature · 1 line
1.7.1
PATCH v10 7/13 gstreamer: update Config.in with gstreamer1 info.
Quoted 11 lines · Spenser Gilliland
Update the gstreamer1 Config.in with note about Gstreamer 0.1X being incompatible with gstreamer 1.X.
--- package/multimedia/gstreamer/Config.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)package/multimedia/gstreamer/Config.in +0
-0
package/multimedia/gstreamer/Config.in config BR2_PACKAGE_GSTREAMER · line 7
Quoted 5 lines
package/multimedia/gstreamer/Config.in +1
-1@@ -4,7 +4,8 @@ config BR2_PACKAGE_GSTREAMER depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBGLIB2 help - GStreamer is an open source multimedia framework. + GStreamer is an open source multimedia framework. This 0.1x version of
0.10. We'll never have a 0.11.
Regards,
Arnout
Quoted 5 lines
package/multimedia/gstreamer/Config.in +1
-0+ Gstreamer is incompatible with Gstreamer 1.X. http://gstreamer.freedesktop.org/
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v10 8/13 gst1-plugins-base: add gstreamer1 base plugins
In reply to Spenser GillilandAdds gstreamer 1.X base plugins.
--- package/multimedia/Config.in | 1 + package/multimedia/gst1-plugins-base/Config.in | 106 ++++++++++ .../gst1-plugins-base/gst1-plugins-base.mk | 204 ++++++++++++++++++++ 3 files changed, 311 insertions(+), 0 deletions(-) create mode 100644 package/multimedia/gst1-plugins-base/Config.in create mode 100644 package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
package/multimedia/Config.in +1 -0
@@ -12,6 +12,7 @@ source "package/multimedia/gst-dsp/Config.in" source "package/multimedia/gst-fsl-plugins/Config.in" source "package/multimedia/gst-omapfb/Config.in" source "package/multimedia/gst-plugins-base/Config.in" +source "package/multimedia/gst1-plugins-base/Config.in" source "package/multimedia/gst-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in"
package/multimedia/gst1-plugins-base/Config.in new file +106 -0
106 lines not on this page · raw message
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v10 8/13 gst1-plugins-base: add gstreamer1 base plugins
Quoted 1 line · Spenser Gilliland
Adds gstreamer 1.X base plugins.
Missing SoB.
Protip: git config --global format.signoff true
Quoted 13 lines
--- package/multimedia/Config.in | 1 + package/multimedia/gst1-plugins-base/Config.in | 106 ++++++++++ .../gst1-plugins-base/gst1-plugins-base.mk | 204 ++++++++++++++++++++ 3 files changed, 311 insertions(+), 0 deletions(-)create mode 100644 package/multimedia/gst1-plugins-base/Config.in create mode 100644
package/multimedia/gst1-plugins-base/gst1-plugins-base.mkpackage/multimedia/Config.in +0
-0
package/multimedia/Config.in source "package/multimedia/gst-dsp/Config.in" · line 15
Quoted 4 lines
package/multimedia/Config.in +1
-0@@ -12,6 +12,7 @@ source "package/multimedia/gst-dsp/Config.in" source "package/multimedia/gst-fsl-plugins/Config.in" source "package/multimedia/gst-omapfb/Config.in" source "package/multimedia/gst-plugins-base/Config.in" +source "package/multimedia/gst1-plugins-base/Config.in"
Same remark: keep all gst1 stuff together.
Quoted 13 lines
package/multimedia/Config.in +0
-0source "package/multimedia/gst-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in"package/multimedia/gst1-plugins-base/Config.in new file +4
-0@@ -0,0 +1,106 @@ +menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE + bool "gst1-plugins-base" + depends on BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
package/multimedia/gst1-plugins-base/Config.in line 14
Quoted 10 lines
package/multimedia/gst1-plugins-base/Config.in new file +10
-0+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 + help + A basic set of well-supported plug-ins for GStreamer. + + http://gstreamer.freedesktop.org/ + +if BR2_PACKAGE_GST1_PLUGINS_BASE + +comment "dependency-less plugins"
It would be nice if these plugins would get some help text explaining
what they are. Copy and past of the description in gst-inspect is probably sufficient.
Quoted 20 lines
package/multimedia/gst1-plugins-base/Config.in new file +20
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER + bool "adder" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + bool "app" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT + bool "audioconvert (mandatory for audio playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE + bool "audiorate" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE + bool "audioresample (mandatory for audio playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC + bool "audiotestsrc"
package/multimedia/gst1-plugins-base/Config.in line 44
Quoted 10 lines
package/multimedia/gst1-plugins-base/Config.in new file +10
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING + bool "encoding" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO + bool "gio" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK + bool "playback" + default y
I would add a "select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND"
here. I think that is the only required dependency of the playsinks.
There's also a gdp and a gst_v4l plugin for which no config option exists.
Quoted 19 lines
package/multimedia/gst1-plugins-base/Config.in new file +19
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE + bool "subparse" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP + bool "tcp" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND + bool "typefind" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC + bool "videotestsrc" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE + bool "videorate"
package/multimedia/gst1-plugins-base/Config.in line 73
Quoted 10 lines
package/multimedia/gst1-plugins-base/Config.in new file +10
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale (mandatory for video playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME + bool "volume (mandatory for audio playback)" + default y + +comment "plugins with external dependencies (there may be more available)"
What does "there may be more available" mean?
Quoted 39 lines
package/multimedia/gst1-plugins-base/Config.in new file +33
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA + bool "alsa (mandatory for audio playback)" + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_MIXER + select BR2_PACKAGE_ALSA_LIB_PCM + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG + bool "ogg (*.ogg audio/video)" + select BR2_PACKAGE_LIBOGG + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO + bool "pango font renderer" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_PANGO + +comment "pango plugin requires a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA + bool "theora (*.ogg video)" + select BR2_PACKAGE_LIBTHEORA + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR + bool "tremor" + select BR2_PACKAGE_TREMOR + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS + bool "vorbis (*.ogg audio)" + select BR2_PACKAGE_LIBVORBIS + +endif +package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +0
-0
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 7
Quoted 7 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +7
-0@@ -0,0 +1,204 @@ +################################################################################ +# +# gst1-plugins-base +# +################################################################################ + +GST1_PLUGINS_BASE_VERSION = 1.1.1
I could be wrong, but didn't gstreamer switch to simultaneous releases,
so we could use $(GSTREAMER1_VERSION) here instead?
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 11
Quoted 4 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +4
-0+GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz +GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base +GST1_PLUGINS_BASE_INSTALL_STAGING = YES +GST1_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
COPYING contains the GPL which isn't actually used by any source file
(only some old tests). So it can be left out.
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 19
Quoted 8 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +8
-0+GST1_PLUGINS_BASE_LICENSE = LGPLv2+ LGPLv2.1+ + +# freetype is only used by examples, but if it is not found +# and the host has a freetype-config script, then the host +# include dirs are added to the search path causing trouble +GST1_PLUGINS_BASE_CONF_ENV = + FT2_CONFIG=/bin/false \ + ac_cv_header_stdint_t="stdint.h"
Why is this necessary?
Quoted 19 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +19
-0+ +GST1_PLUGINS_BASE_CONF_OPT = \ + --disable-examples \ + --disable-oggtest \ + --disable-vorbistest \ + --disable-freetypetest \ + --disable-valgrind \ + --disable-debug + +# Options which require currently unpackaged libraries +GST1_PLUGINS_BASE_CONF_OPT += \ + --disable-cdparanoia \ + --disable-libvisual \ + --disable-iso-codes + +GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 48
Quoted 10 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +10
-0+GST1_PLUGINS_BASE_CONF_OPT += \ + --enable-x \ + --enable-xshm \ + --enable-xvideo +else +GST1_PLUGINS_BASE_CONF_OPT += \ + --disable-x \ + --disable-xshm \ + --disable-xvideo +endif
I would actually make configure options for ximagesink and xvimagesink
(--enable-x and --enable-xvideo).
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 54
Quoted 6 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +6
-0+ +ifeq ($(BR2_PACKAGE_ORC),y) +GST1_PLUGINS_BASE_DEPENDENCIES += orc +GST1_PLUGINS_BASE_CONF_OPT += --enable-orc +endif +
It would be nice if the plugins below could be kept alphabetic.
Regards,
Arnout
Quoted 151 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +150
-0+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA),y) +GST1_PLUGINS_BASE_DEPENDENCIES += alsa-lib +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-alsa +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-adder +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-adder +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-app +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-app +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-audioconvert +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-audioconvert +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-audiorate +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-audiorate +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-audioresample +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-audioresample +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-audiotestsrc +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-encoding +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-encoding +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-videoconvert +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-videoconvert +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-gio +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-gio +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-playback +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-playback +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-subparse +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-subparse +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-tcp +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-tcp +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-typefind +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-typefind +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-videotestsrc +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-videorate +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-videorate +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-videoscale +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-videoscale +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-volume +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-volume +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-ogg +GST1_PLUGINS_BASE_DEPENDENCIES += libogg +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-ogg +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-pango +GST1_PLUGINS_BASE_DEPENDENCIES += pango +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-pango +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-theora +GST1_PLUGINS_BASE_DEPENDENCIES += libtheora +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-theora +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-ivorbis +GST1_PLUGINS_BASE_DEPENDENCIES += tremor +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-ivorbis +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS),y) +GST1_PLUGINS_BASE_CONF_OPT += --enable-vorbis +GST1_PLUGINS_BASE_DEPENDENCIES += libvorbis +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-vorbis +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +GST1_PLUGINS_BASE_DEPENDENCIES += zlib +else +GST1_PLUGINS_BASE_CONF_OPT += --disable-zlib +endif + +$(eval $(autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v10 8/13 gst1-plugins-base: add gstreamer1 base plugins
Arnout,
Thanks for taking the time to review these patches. For your other two patch reviews, I have incorporated all changes into my next patch series.
Quoted 8 lines · Arnout Vandecappelle
Quoted 2 lines · Spenser Gilliland
Adds gstreamer 1.X base plugins.
Missing SoB.
Protip: git config --global format.signoff true
Usually, do this with git format-patch -s must have forgot to add the switch. I'll add this to my config.
Quoted 11 lines
Quoted 11 lines
--- package/multimedia/Config.in | 1 + package/multimedia/gst1-plugins-base/Config.in | 106 ++++++++++ .../gst1-plugins-base/gst1-plugins-base.mk | 204 ++++++++++++++++++++ 3 files changed, 311 insertions(+), 0 deletions(-)create mode 100644 package/multimedia/gst1-plugins-base/Config.in create mode 100644
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
Quoted 12 lines
package/multimedia/Config.in source "package/multimedia/gst-dsp/Config.in" · line 15
Quoted 9 lines
package/multimedia/Config.in +1
-0@@ -12,6 +12,7 @@ source "package/multimedia/gst-dsp/Config.in" source "package/multimedia/gst-fsl-plugins/Config.in" source "package/multimedia/gst-omapfb/Config.in" source "package/multimedia/gst-plugins-base/Config.in" +source "package/multimedia/gst1-plugins-base/Config.in"Same remark: keep all gst1 stuff together.
Will do.
Quoted 23 lines
Quoted 23 lines
package/multimedia/Config.in +0
-0source "package/multimedia/gst-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in"package/multimedia/gst1-plugins-base/Config.in new file +11
-0@@ -0,0 +1,106 @@ +menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE + bool "gst1-plugins-base" + depends on BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 + help + A basic set of well-supported plug-ins for GStreamer. + + http://gstreamer.freedesktop.org/ +
Quoted 8 lines
package/multimedia/gst1-plugins-base/Config.in line 14
Quoted 3 lines
package/multimedia/gst1-plugins-base/Config.in new file +3
-0+if BR2_PACKAGE_GST1_PLUGINS_BASE + +comment "dependency-less plugins"It would be nice if these plugins would get some help text explaining what
they are. Copy and past of the description in gst-inspect is probably sufficient.
Sounds reasonable. Will do.
Quoted 27 lines
Quoted 27 lines
package/multimedia/gst1-plugins-base/Config.in new file +26
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER + bool "adder" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + bool "app" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT + bool "audioconvert (mandatory for audio playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE + bool "audiorate" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE + bool "audioresample (mandatory for audio playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC + bool "audiotestsrc" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING + bool "encoding" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO + bool "gio"
Quoted 8 lines
package/multimedia/gst1-plugins-base/Config.in line 44
Quoted 4 lines
package/multimedia/gst1-plugins-base/Config.in new file +4
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK + bool "playback" + default yI would add a "select
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND" here.
I think that is the only required dependency of the playsinks.
Good to know. I'll add this to the next patch series.
Quoted 1 line
There's also a gdp and a
gst_v4lplugin for which no config option exists.
I cannot find either of these options in the ./configure --help output are you sure they are available?
Quoted 27 lines
Quoted 27 lines
package/multimedia/gst1-plugins-base/Config.in new file +25
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE + bool "subparse" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP + bool "tcp" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND + bool "typefind" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC + bool "videotestsrc" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE + bool "videorate" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale (mandatory for video playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
Quoted 8 lines
Quoted 5 lines
package/multimedia/gst1-plugins-base/Config.in new file +4
-0+ bool "volume (mandatory for audio playback)" + default y + +comment "plugins with external dependencies (there may be moreavailable)"
What does "there may be more available" mean?
I've updated the wording to "plugins which have unpackaged dependencies are not shown" .
Quoted 68 lines
Quoted 41 lines
package/multimedia/gst1-plugins-base/Config.in new file +33
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA + bool "alsa (mandatory for audio playback)" + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_MIXER + select BR2_PACKAGE_ALSA_LIB_PCM + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG + bool "ogg (*.ogg audio/video)" + select BR2_PACKAGE_LIBOGG + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO + bool "pango font renderer" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_PANGO + +comment "pango plugin requires a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA + bool "theora (*.ogg video)" + select BR2_PACKAGE_LIBTHEORA + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR + bool "tremor" + select BR2_PACKAGE_TREMOR + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS + bool "vorbis (*.ogg audio)" + select BR2_PACKAGE_LIBVORBIS + +endif +package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +0
-0package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 7
Quoted 9 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +7
-0@@ -0,0 +1,204 @@ +################################################################################ +# +# gst1-plugins-base +# +################################################################################ + +GST1_PLUGINS_BASE_VERSION = 1.1.1I could be wrong, but didn't gstreamer switch to simultaneous releases, so
we could use $(GSTREAMER1_VERSION) here instead?package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 11
Quoted 6 lines
+GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz +GST1_PLUGINS_BASE_SITE =
http://gstreamer.freedesktop.org/src/gst-plugins-basepackage/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +2
-0+GST1_PLUGINS_BASE_INSTALL_STAGING = YES +GST1_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIBCOPYING contains the GPL which isn't actually used by any source file (only
some old tests). So it can be left out.
Quoted 11 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 19
Quoted 8 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +8
-0+GST1_PLUGINS_BASE_LICENSE = LGPLv2+ LGPLv2.1+ + +# freetype is only used by examples, but if it is not found +# and the host has a freetype-config script, then the host +# include dirs are added to the search path causing trouble +GST1_PLUGINS_BASE_CONF_ENV = + FT2_CONFIG=/bin/false \ + ac_cv_header_stdint_t="stdint.h"Why is this necessary?
Not sure, this was in the gst-plugins-base and was simply copied to gst1-plugins-base.
The following two commits created these lines.
http://git.buildroot.net/buildroot/commit/package/multimedia/gst-plugins-base/gst-plugins-base.mk?id=8232850c51e07b99ba84769b492faa147290fdc7
http://git.buildroot.net/buildroot/commit/package/multimedia/gst-plugins-base/gst-plugins-base.mk?id=32d319e6f7242553c821c7a1eadfabd2719f5992
Quoted 26 lines
Quoted 26 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +25
-0+ +GST1_PLUGINS_BASE_CONF_OPT = \ + --disable-examples \ + --disable-oggtest \ + --disable-vorbistest \ + --disable-freetypetest \ + --disable-valgrind \ + --disable-debug + +# Options which require currently unpackaged libraries +GST1_PLUGINS_BASE_CONF_OPT += \ + --disable-cdparanoia \ + --disable-libvisual \ + --disable-iso-codes + +GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv +GST1_PLUGINS_BASE_CONF_OPT += \ + --enable-x \ + --enable-xshm \ + --enable-xvideo +else +GST1_PLUGINS_BASE_CONF_OPT += \
Quoted 8 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 48
Quoted 4 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +4
-0+ --disable-x \ + --disable-xshm \ + --disable-xvideo +endifI would actually make configure options for ximagesink and xvimagesink
(--enable-x and --enable-xvideo).
As X already consumes a large amount of
Quoted 10 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 54
Quoted 7 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +6
-0+ +ifeq ($(BR2_PACKAGE_ORC),y) +GST1_PLUGINS_BASE_DEPENDENCIES += orc +GST1_PLUGINS_BASE_CONF_OPT += --enable-orc +endif +It would be nice if the plugins below could be kept alphabetic.
How about if I keep them in the order of ./configure --help? That way its easy to spot when new ones are added and old ones removed.
Thanks,
Spenser
--
Spenser Gilliland
Computer Engineer
Doctoral Candidate
PATCH v10 8/13 gst1-plugins-base: add gstreamer1 base plugins
Quoted 2 lines · Spenser Gilliland
Quoted 1 line · Arnout Vandecappelle
On 08/06/13 01:18, Spenser Gilliland wrote:
[snip]
Quoted 4 lines
Quoted 1 line
There's also a gdp and a
gst_v4lplugin for which no config option exists.I cannot find either of these options in the ./configure --help output are you sure they are available?
Sorry my bad - I was looking at my local git clone, and it still had a
configure from 0.10 days (forgot to run autoregen).
Quoted 37 lines
Quoted 28 lines
Quoted 28 lines
package/multimedia/gst1-plugins-base/Config.in new file +25
-0+ +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE + bool "subparse" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP + bool "tcp" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND + bool "typefind" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC + bool "videotestsrc" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE + bool "videorate" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale (mandatory for video playback)" + default y + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUMEQuoted 8 lines
Quoted 5 lines
package/multimedia/gst1-plugins-base/Config.in new file +4
-0+ bool "volume (mandatory for audio playback)" + default y + +comment "plugins with external dependencies (there may be moreavailable)"
What does "there may be more available" mean?
Quoted 2 lines
I've updated the wording to "plugins which have unpackaged dependencies are not shown" .
I think that will make the line too long so you'd have to split it. But
actually, for other packages we never say things like that.
[snip]
Quoted 10 lines
Quoted 9 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 19
Quoted 6 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +6
-0+# freetype is only used by examples, but if it is not found +# and the host has a freetype-config script, then the host +# include dirs are added to the search path causing trouble +GST1_PLUGINS_BASE_CONF_ENV = + FT2_CONFIG=/bin/false \ + ac_cv_header_stdint_t="stdint.h"Why is this necessary?
Quoted 6 lines
Not sure, this was in the gst-plugins-base and was simply copied to gst1-plugins-base.
The following two commits created these lines.
http://git.buildroot.net/buildroot/commit/package/multimedia/gst-plugins-base/gst-plugins-base.mk?id=8232850c51e07b99ba84769b492faa147290fdc7
http://git.buildroot.net/buildroot/commit/package/multimedia/gst-plugins-base/gst-plugins-base.mk?id=32d319e6f7242553c821c7a1eadfabd2719f5992
I was only referring to the stdint - the other one has a proper comment.
But since nothing seems to have changed in the stdint.h detection code
since 0.10.25, I guess it's best to keep it.
Quoted 36 lines
Quoted 27 lines
Quoted 27 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +25
-0+ +GST1_PLUGINS_BASE_CONF_OPT = \ + --disable-examples \ + --disable-oggtest \ + --disable-vorbistest \ + --disable-freetypetest \ + --disable-valgrind \ + --disable-debug + +# Options which require currently unpackaged libraries +GST1_PLUGINS_BASE_CONF_OPT += \ + --disable-cdparanoia \ + --disable-libvisual \ + --disable-iso-codes + +GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv +GST1_PLUGINS_BASE_CONF_OPT += \ + --enable-x \ + --enable-xshm \ + --enable-xvideo +else +GST1_PLUGINS_BASE_CONF_OPT += \Quoted 8 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 48
Quoted 4 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +4
-0+ --disable-x \ + --disable-xshm \ + --disable-xvideo +endifI would actually make configure options for ximagesink and xvimagesink
(--enable-x and --enable-xvideo).
Quoted 1 line
As X already consumes a large amount of
I can complete that sentence :-)
Fair enough.
Quoted 11 lines
Quoted 10 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 54
Quoted 7 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +6
-0+ +ifeq ($(BR2_PACKAGE_ORC),y) +GST1_PLUGINS_BASE_DEPENDENCIES += orc +GST1_PLUGINS_BASE_CONF_OPT += --enable-orc +endif +It would be nice if the plugins below could be kept alphabetic.
Quoted 2 lines
How about if I keep them in the order of ./configure --help? That way its easy to spot when new ones are added and old ones removed.
Yes, good idea.
Regards,
Arnout
Quoted 10 lines
Thanks,
Spenser--
Spenser Gilliland
Computer Engineer
Doctoral Candidate
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v10 8/13 gst1-plugins-base: add gstreamer1 base plugins
Arnout,
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
+comment "plugins with external dependencies (there may be more available)"
What does "there may be more available" mean?
Quoted 7 lines
Quoted 2 lines
I've updated the wording to "plugins which have unpackaged dependencies are not shown" .
I think that will make the line too long so you'd have to split it. But
actually, for other packages we never say things like that.
The more I look at this the more I believe it should be removed. It was a hold over from the gst-plugins-base package. I'll remove it from the next patch series instead of the previously mentioned explanation.
Quoted 20 lines
Quoted 20 lines
Quoted 11 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk line 19
Quoted 7 lines
package/multimedia/gst1-plugins-base/gst1-plugins-base.mk new file +6
-0+# freetype is only used by examples, but if it is not found +# and the host has a freetype-config script, then the host +# include dirs are added to the search path causing trouble +GST1_PLUGINS_BASE_CONF_ENV = + FT2_CONFIG=/bin/false \ + ac_cv_header_stdint_t="stdint.h"Why is this necessary?
Not sure, this was in the gst-plugins-base and was simply copied to gst1-plugins-base.
The following two commits created these lines.
Quoted 8 lines
I was only referring to the stdint - the other one has a proper comment.
But since nothing seems to have changed in the
stdint.hdetection code
since 0.10.25, I guess it's best to keep it.
Sounds good to me.
Quoted 10 lines
Quoted 5 lines
Quoted 2 lines
I would actually make configure options for ximagesink and xvimagesink
(--enable-x and --enable-xvideo).As X already consumes a large amount of
I can complete that sentence :-)
Fair enough.
Oops, forgot to include the rest there but the point does get across in not to many words! :) Hopefully, I can get a second opinion on this but X is not a package you include on a bare minimal system; therefore, IMHO it's probably more important to implicitly enable support rather than explicitly.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
It would be nice if the plugins below could be kept alphabetic.
How about if I keep them in the order of ./configure --help? That way its easy to spot when new ones are added and old ones removed.
Yes, good idea.
Thanks, I'll make these adjustments in the next patch series. Thanks for the review!
Thanks,
Spenser
--
Spenser Gilliland
Computer Engineer
Doctoral Candidate
PATCH v10 9/13 gst1-plugins-good: add gstreamer1 good plugins
In reply to Spenser GillilandAdds gstreamer 1.X good plugins.
--- package/multimedia/Config.in | 1 + package/multimedia/gst1-plugins-good/Config.in | 214 +++++++++++ .../gst1-plugins-good/gst1-plugins-good.mk | 403 ++++++++++++++++++++ 3 files changed, 618 insertions(+), 0 deletions(-) create mode 100644 package/multimedia/gst1-plugins-good/Config.in create mode 100644 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
package/multimedia/Config.in +1 -0
@@ -14,6 +14,7 @@ source "package/multimedia/gst-omapfb/Config.in" source "package/multimedia/gst-plugins-base/Config.in" source "package/multimedia/gst1-plugins-base/Config.in" source "package/multimedia/gst-plugins-good/Config.in" +source "package/multimedia/gst1-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in" source "package/multimedia/lame/Config.in"
package/multimedia/gst1-plugins-good/Config.in new file +214 -0
214 lines not on this page · raw message
package/multimedia/gst1-plugins-good/gst1-plugins-good.mk new file +403 -0
403 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v10 10/13 gst1-plugins-bad: add gstreamer1 bad plugins
In reply to Spenser GillilandAdds gstreamer 1.X bad plugins
--- package/multimedia/Config.in | 1 + package/multimedia/gst1-plugins-bad/Config.in | 325 +++++++++ .../gst1-plugins-bad-dist-opencv-headers.patch | 214 ++++++ .../gst1-plugins-bad-use-gettext-0.18.patch | 17 + .../gst1-plugins-bad/gst1-plugins-bad.mk | 690 ++++++++++++++++++++ 5 files changed, 1247 insertions(+), 0 deletions(-) create mode 100644 package/multimedia/gst1-plugins-bad/Config.in create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad-dist-opencv-headers.patch create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
package/multimedia/Config.in +1 -0
@@ -16,6 +16,7 @@ source "package/multimedia/gst1-plugins-base/Config.in" source "package/multimedia/gst-plugins-good/Config.in" source "package/multimedia/gst1-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" +source "package/multimedia/gst1-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in" source "package/multimedia/lame/Config.in" source "package/multimedia/libvpx/Config.in"
package/multimedia/gst1-plugins-bad/Config.in new file +325 -0
325 lines not on this page · raw message
package/multimedia/gst1-plugins-bad/gst1-plugins-bad-dist-opencv-headers.patch new file +214 -0
214 lines not on this page · raw message
package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch new file +17 -0
@@ -0,0 +1,17 @@ +Use newer version of gettext to match current buildroot gettext. + +Signed-off-by: Spenser Gilliland <[email protected]> +---- +Index: gst1-plugins-bad-1.1.1/po/Makefile.in.in +=================================================================== +--- gst1-plugins-bad-1.1.1.orig/po/Makefile.in.in ++++ gst1-plugins-bad-1.1.1/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.17 +-GETTEXT_MACRO_VERSION = 0.17 ++GETTEXT_MACRO_VERSION = 0.18 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@
package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk new file +690 -0
690 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v10 11/13 gst1-plugins-ugly: add gstreamer1 ugly plugins
In reply to Spenser GillilandAdds gstreamer 1.X ugly plugins
--- package/multimedia/Config.in | 1 + package/multimedia/gst1-plugins-ugly/Config.in | 49 +++++++++ .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 104 ++++++++++++++++++++ 3 files changed, 154 insertions(+), 0 deletions(-) create mode 100644 package/multimedia/gst1-plugins-ugly/Config.in create mode 100644 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
package/multimedia/Config.in +1 -0
@@ -18,6 +18,7 @@ source "package/multimedia/gst1-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst1-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in" +source "package/multimedia/gst1-plugins-ugly/Config.in" source "package/multimedia/lame/Config.in" source "package/multimedia/libvpx/Config.in" source "package/multimedia/madplay/Config.in"
package/multimedia/gst1-plugins-ugly/Config.in new file +49 -0
49 lines not on this page · raw message
package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk new file +104 -0
104 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v10 12/13 gst1-plugins-good: add libvpx support
In reply to Spenser Gillilandadds libvpx support to gst1-plugins-good
--- package/multimedia/gst1-plugins-good/Config.in | 4 ++++ .../gst1-plugins-good/gst1-plugins-good.mk | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
package/multimedia/gst1-plugins-good/Config.in +4 -0
@@ -207,6 +207,10 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX bool "speex" select BR2_PACKAGE_SPEEX +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX + bool "vpx (webm)" + select BR2_PACKAGE_LIBVPX + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK bool "wavpack (*.wv audio)" select BR2_PACKAGE_WAVPACK
package/multimedia/gst1-plugins-good/gst1-plugins-good.mk +8 -2
@@ -30,8 +30,7 @@ GST1_PLUGINS_GOOD_CONF_OPT += \ --disable-jack \ --disable-libdv \ --disable-dv1394 \ - --disable-taglib \ - --disable-vpx + --disable-taglib GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
@@ -393,6 +392,13 @@ else GST1_PLUGINS_GOOD_CONF_OPT += --disable-speex endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y) +GST1_PLUGINS_GOOD_CONF_OPT += --enable-vpx +GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx +else +GST1_PLUGINS_GOOD_CONF_OPT += --disable-vpx +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y) GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavpack GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack
Signature · 1 line
1.7.1
PATCH v10 13/13 gst-omx: add gst-omx package
In reply to Spenser Gillilandgst-omx enables OpenMAX based accelerated video decode.
--- package/multimedia/Config.in | 1 + package/multimedia/gst-omx/Config.in | 11 ++ .../multimedia/gst-omx/gst-omx-config-files.patch | 127 ++++++++++++++++++++ package/multimedia/gst-omx/gst-omx.mk | 37 ++++++ 4 files changed, 176 insertions(+), 0 deletions(-) create mode 100644 package/multimedia/gst-omx/Config.in create mode 100644 package/multimedia/gst-omx/gst-omx-config-files.patch create mode 100644 package/multimedia/gst-omx/gst-omx.mk
package/multimedia/Config.in +1 -0
@@ -11,6 +11,7 @@ source "package/multimedia/gst-ffmpeg/Config.in" source "package/multimedia/gst-dsp/Config.in" source "package/multimedia/gst-fsl-plugins/Config.in" source "package/multimedia/gst-omapfb/Config.in" +source "package/multimedia/gst-omx/Config.in" source "package/multimedia/gst-plugins-base/Config.in" source "package/multimedia/gst1-plugins-base/Config.in" source "package/multimedia/gst-plugins-good/Config.in"
package/multimedia/gst-omx/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_GST_OMX + bool "gst-omx" + depends on BR2_PACKAGE_GSTREAMER1 && BR2_PACKAGE_HAS_OPENMAX + select BR2_PACKAGE_GST1_PLUGINS_BASE + help + GStreamer plug-in to use OpenMAX API. + + http://cgit.freedesktop.org/gstreamer/gst-omx + +comment "gst-omx requires a OpenMAX implementation" + depends on BR2_PACKAGE_GSTREAMER1 && !BR2_PACKAGE_HAS_OPENMAX
package/multimedia/gst-omx/gst-omx-config-files.patch new file +127 -0
127 lines not on this page · raw message
package/multimedia/gst-omx/gst-omx.mk new file +37 -0
@@ -0,0 +1,37 @@ +############################################################# +# +# gst-omx +# +############################################################# + +GST_OMX_VERSION = 1.0.0 +GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz +GST_OMX_SITE = http://gstreamer.freedesktop.org/src/gst-omx/ + +GST_OMX_LICENSE = LGPLv2.1 +GST_OMX_LICENSE_FILE = COPYING + +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +GST_OMX_CONF_OPT = \ + --with-omx-target=rpi +GST_OMX_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) \ + -I$(STAGING_DIR)/usr/include/IL \ + -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ + -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" +endif + +ifeq ($(BR2_PACKAGE_BELLAGIO),y) +GST_OMX_CONF_OPT = \ + --with-omx-target=bellagio +GST_OMX_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) \ + -DOMX_VERSION_MAJOR=1 \ + -DOMX_VERSION_MINOR=1 \ + -DOMX_VERSION_REVISION=2 \ + -DOMX_VERSION_STEP=0" +endif + +GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax + +$(eval $(autotools-package))
Signature · 1 line
1.7.1