* [Buildroot] [PATCH v10 01/13] libglib2: Bump libglib2 to 2.36.1
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 02/13] gdk-pixbuf: bump to version 2.28.1 Spenser Gilliland
` (11 subsequent siblings)
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
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
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 12eb344..168e5ea 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -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
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index a1bd8b5..d1619a1 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -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)
diff --git a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
index 5563544..43c7e16 100644
--- a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
+++ b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
@@ -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" <s.martin49@gmail.com>
+Signed-off-by: "Spenser Gilliland" <spenser@gillilanding.com>
---
---- 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
}
diff --git a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
deleted file mode 100644
index b483827..0000000
--- a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Fetch from http://git.gnome.org/browse/glib/patch/?id=03611f7c0670ea14eedbc121972aed7ce60bb9ee
-
-This patch is already included upstream, from the glib-2.32.4 release.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
-From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001
-From: Simon Feltman <s.feltman@gmail.com>
-Date: Thu, 14 Jun 2012 06:20:17 +0000
-Subject: Updated codegen to work with python3.
-
-Most changes were just replacing usage of "has_key" with "in".
-Also updated the sorting function which was simplified and
-changed to a "key" function instead of "cmp" (which is no longer
-supported in python3. Verified everything builds with
-python 2.7 and 3.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678066
----
-diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
-index 41ea8fa..bca3490 100644
---- a/gio/gdbus-2.0/codegen/codegen.py
-+++ b/gio/gdbus-2.0/codegen/codegen.py
-@@ -304,11 +304,8 @@ class CodeGenerator:
- #
- # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5
- # for discussion
-- keys = function_pointers.keys()
-- if len(keys) > 0:
-- keys.sort(cmp=utils.my_version_cmp)
-- for key in keys:
-- self.h.write('%s'%function_pointers[key])
-+ for key in sorted(function_pointers.keys(), key=utils.version_cmp_key):
-+ self.h.write('%s'%function_pointers[key])
-
- self.h.write('};\n')
- self.h.write('\n')
-@@ -1022,11 +1019,9 @@ class CodeGenerator:
- value = '@get_%s: '%(p.name_lower)
- value += 'Getter for the #%s:%s property.'%(i.camel_name, p.name_hyphen)
- doc_bits[key] = value
-- keys = doc_bits.keys()
-- if len(keys) > 0:
-- keys.sort(cmp=utils.my_version_cmp)
-- for key in keys:
-- self.c.write(' * %s\n'%doc_bits[key])
-+ for key in sorted(doc_bits.keys(), key=utils.version_cmp_key):
-+ self.c.write(' * %s\n'%doc_bits[key])
-+
- self.c.write(self.docbook_gen.expand(
- ' *\n'
- ' * Virtual table for the D-Bus interface #%s.\n'
-diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py
-index 4ceef57..00581f1 100644
---- a/gio/gdbus-2.0/codegen/codegen_docbook.py
-+++ b/gio/gdbus-2.0/codegen/codegen_docbook.py
-@@ -259,14 +259,12 @@ class DocbookCodeGenerator:
- self.expand_member_dict[key] = value
- # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
- # is evaluated before #org.foo.Iface:Media ...
-- self.expand_member_dict_keys = self.expand_member_dict.keys()
-- self.expand_member_dict_keys.sort(reverse=True)
-- self.expand_iface_dict_keys = self.expand_iface_dict.keys()
-- self.expand_iface_dict_keys.sort(reverse=True)
-+ self.expand_member_dict_keys = sorted(self.expand_member_dict.keys(), reverse=True)
-+ self.expand_iface_dict_keys = sorted(self.expand_iface_dict.keys(), reverse=True)
-
- def generate(self):
- for i in self.ifaces:
-- self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w')
-+ self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w')
- self.out.write(''%())
- self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%())
- self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%())
-diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
-index 76c838c..735cc1f 100755
---- a/gio/gdbus-2.0/codegen/codegen_main.py
-+++ b/gio/gdbus-2.0/codegen/codegen_main.py
-@@ -184,8 +184,8 @@ def codegen_main():
-
- c_code = opts.generate_c_code
- if c_code:
-- h = file(c_code + '.h', 'w')
-- c = file(c_code + '.c', 'w')
-+ h = open(c_code + '.h', 'w')
-+ c = open(c_code + '.c', 'w')
- gen = codegen.CodeGenerator(all_ifaces,
- opts.c_namespace,
- opts.interface_prefix,
-diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py
-index 5fabd44..7b9d216 100644
---- a/gio/gdbus-2.0/codegen/parser.py
-+++ b/gio/gdbus-2.0/codegen/parser.py
-@@ -152,12 +152,12 @@ class DBusXMLParser:
- self.state = DBusXMLParser.STATE_IGNORED
-
- # assign docs, if any
-- if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-+ if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
- self._cur_object.doc_string = self.doc_comment_body
-- if self.doc_comment_params.has_key('short_description'):
-+ if 'short_description' in self.doc_comment_params:
- short_description = self.doc_comment_params['short_description']
- self._cur_object.doc_string_brief = short_description
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_INTERFACE:
-@@ -185,16 +185,16 @@ class DBusXMLParser:
- self.state = DBusXMLParser.STATE_IGNORED
-
- # assign docs, if any
-- if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-+ if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
- self._cur_object.doc_string = self.doc_comment_body
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_METHOD:
- if name == DBusXMLParser.STATE_ARG:
- self.state = DBusXMLParser.STATE_ARG
- arg_name = None
-- if attrs.has_key('name'):
-+ if 'name' in attrs:
- arg_name = attrs['name']
- arg = dbustypes.Arg(arg_name, attrs['type'])
- direction = attrs['direction']
-@@ -215,18 +215,18 @@ class DBusXMLParser:
-
- # assign docs, if any
- if self.doc_comment_last_symbol == old_cur_object.name:
-- if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-+ if 'name' in attrs and attrs['name'] in self.doc_comment_params:
- doc_string = self.doc_comment_params[attrs['name']]
- if doc_string != None:
- self._cur_object.doc_string = doc_string
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_SIGNAL:
- if name == DBusXMLParser.STATE_ARG:
- self.state = DBusXMLParser.STATE_ARG
- arg_name = None
-- if attrs.has_key('name'):
-+ if 'name' in attrs:
- arg_name = attrs['name']
- arg = dbustypes.Arg(arg_name, attrs['type'])
- self._cur_object.args.append(arg)
-@@ -241,11 +241,11 @@ class DBusXMLParser:
-
- # assign docs, if any
- if self.doc_comment_last_symbol == old_cur_object.name:
-- if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-+ if 'name' in attrs and attrs['name'] in self.doc_comment_params:
- doc_string = self.doc_comment_params[attrs['name']]
- if doc_string != None:
- self._cur_object.doc_string = doc_string
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_PROPERTY:
-diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
-index 94bd05c..239b64e 100644
---- a/gio/gdbus-2.0/codegen/utils.py
-+++ b/gio/gdbus-2.0/codegen/utils.py
-@@ -97,15 +97,8 @@ def lookup_brief_docs(annotations):
- else:
- return s
-
--# I'm sure this could be a lot more elegant if I was
--# more fluent in python...
--def my_version_cmp(a, b):
-- if len(a[0]) > 0 and len(b[0]) > 0:
-- va = distutils.version.LooseVersion(a[0])
-- vb = distutils.version.LooseVersion(b[0])
-- ret = va.__cmp__(vb)
-- else:
-- ret = cmp(a[0], b[0])
-- if ret != 0:
-- return ret
-- return cmp(a[1], b[1])
-+def version_cmp_key(key):
-+ # If the 'since' version is empty put a 0 in its place as this will
-+ # allow LooseVersion to work and will always compare lower.
-+ v = key[0] if key[0] else '0'
-+ return (distutils.version.LooseVersion(v), key[1])
---
-cgit v0.9.0.2
diff --git a/package/libglib2/libglib2-no-tests.patch b/package/libglib2/libglib2-no-tests.patch
deleted file mode 100644
index 81b5af2..0000000
--- a/package/libglib2/libglib2-no-tests.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Add a --disable-tests option to the configure script
-
-Disabling the build of tests has two benefits:
- * Prevents the build of a lot of code that doesn't build on noMMU
- platforms.
- * Reduces the build time.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: libglib2-2.30.3/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/Makefile.am 2012-03-11 22:43:28.000000000 +0100
-+++ libglib2-2.30.3/Makefile.am 2013-03-09 17:32:01.000000000 +0100
-@@ -6,7 +6,11 @@
-
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio $(TEST_SUBDIR) po docs
- DIST_SUBDIRS = $(SUBDIRS) build
-
- bin_SCRIPTS = glib-gettextize
-Index: libglib2-2.30.3/gio/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/gio/Makefile.am 2012-03-11 22:44:19.000000000 +0100
-+++ libglib2-2.30.3/gio/Makefile.am 2013-03-09 17:32:38.000000000 +0100
-@@ -282,7 +282,11 @@
-
- endif
-
--SUBDIRS += tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS += $(TEST_SUBDIR)
-
- libgio_2_0_la_SOURCES = \
- gappinfo.c \
-Index: libglib2-2.30.3/configure.ac
-===================================================================
---- libglib2-2.30.3.orig/configure.ac 2013-03-09 17:30:55.000000000 +0100
-+++ libglib2-2.30.3/configure.ac 2013-03-09 17:37:27.000000000 +0100
-@@ -234,11 +234,18 @@
- [AC_HELP_STRING([--disable-rebuilds],
- [disable all source autogeneration rules])],,
- [enable_rebuilds=yes])
-+AC_ARG_ENABLE(tests,
-+ [AC_HELP_STRING([--disable-tests],
-+ [disable all tests])],
-+ enable_tests=${enableval},
-+ enable_tests=yes)
-
- if test "x$enable_threads" != "xyes"; then
- enable_threads=no
- fi
-
-+AM_CONDITIONAL(BUILD_TESTS, [test x$enable_tests = xyes])
-+
- AC_MSG_CHECKING([whether to enable garbage collector friendliness])
- if test "x$enable_gc_friendly" = "xyes"; then
- AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default])
-Index: libglib2-2.30.3/glib/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/glib/Makefile.am 2012-03-11 22:43:28.000000000 +0100
-+++ libglib2-2.30.3/glib/Makefile.am 2013-03-09 18:02:59.000000000 +0100
-@@ -42,7 +42,11 @@
- gregex_h =
- endif
-
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . $(TEST_SUBDIR)
-
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
-
-Index: libglib2-2.30.3/gobject/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/gobject/Makefile.am 2012-03-11 22:43:29.000000000 +0100
-+++ libglib2-2.30.3/gobject/Makefile.am 2013-03-09 18:03:40.000000000 +0100
-@@ -4,7 +4,11 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
-
--SUBDIRS = . tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = . $(TEST_SUBDIR)
-
- BUILT_SOURCES=
- CLEANFILES=
-Index: libglib2-2.30.3/gthread/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/gthread/Makefile.am 2012-03-11 22:43:29.000000000 +0100
-+++ libglib2-2.30.3/gthread/Makefile.am 2013-03-09 18:04:16.000000000 +0100
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
-
--SUBDIRS = . tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = . $(TEST_SUBDIR)
- DIST_SUBDIRS = tests
-
- AM_CPPFLAGS = \
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c7ffdce..8a63bd9 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -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
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 02/13] gdk-pixbuf: bump to version 2.28.1
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 01/13] libglib2: Bump libglib2 to 2.36.1 Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 03/13] libgtk2: bump to version 2.24.18 and drop DirectFB Spenser Gilliland
` (10 subsequent siblings)
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
---
package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 49d3840..87775bb 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -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)
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 03/13] libgtk2: bump to version 2.24.18 and drop DirectFB
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 01/13] libglib2: Bump libglib2 to 2.36.1 Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 02/13] gdk-pixbuf: bump to version 2.28.1 Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-08 22:38 ` Peter Korsgaard
2013-06-07 23:18 ` [Buildroot] [PATCH v10 04/13] libsoup: bump to version 2.43.1 Spenser Gilliland
` (9 subsequent siblings)
12 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
* 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(-)
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 88f4cc1..462b0b6 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -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
diff --git a/package/libgtk2/libgtk2-reduce-dependencies.patch b/package/libgtk2/libgtk2-reduce-dependencies.patch
index 5bb9db9..e9be429 100644
--- a/package/libgtk2/libgtk2-reduce-dependencies.patch
+++ b/package/libgtk2/libgtk2-reduce-dependencies.patch
@@ -3,21 +3,23 @@ dependencies on graphic backends such as X.org or DirectFB. Gtk does
not fully build in this mode, but it builds sufficiently to build the
host tools that are needed to build the target Gtk.
+Changes:
+ Ported to 2.24.18
+
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
---
- configure.in | 34 +++++++++++++++++++++++++++-------
- 1 file changed, 27 insertions(+), 7 deletions(-)
-
-Index: b/configure.in
+Index: libgtk2-2.24.18/configure.ac
===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -259,12 +259,12 @@
+--- libgtk2-2.24.18.orig/configure.ac 2013-05-13 07:02:44.000000000 -0500
++++ libgtk2-2.24.18/configure.ac 2013-05-27 02:12:09.947030335 -0500
+@@ -258,12 +258,13 @@
gdktarget=x11
fi
-AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
-+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
++AC_ARG_WITH(gdktarget,
++ [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
@@ -27,7 +29,7 @@ Index: b/configure.in
*) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
esac
-@@ -374,11 +374,15 @@
+@@ -372,11 +373,15 @@
## annoying to construct
PKG_CHECK_MODULES(BASE_DEPENDENCIES,
[glib-2.0 >= glib_required_version dnl
@@ -37,16 +39,16 @@ Index: b/configure.in
gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
+if test "x$gdktarget" != "xnone"; then
-+ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
-+ [atk >= atk_required_version dnl
-+ pango >= pango_required_version dnl
-+ cairo >= cairo_required_version])
++ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
++ [atk >= atk_required_version dnl
++ pango >= pango_required_version dnl
++ cairo >= cairo_required_version])
+fi
+
## In addition to checking that cairo is present, we also need to
## check that the correct cairo backend is there. E.g. if the GDK
## target is win32 we need the cairo-win32 backend and so on.
-@@ -389,8 +393,11 @@
+@@ -387,8 +392,11 @@
if test "x$cairo_backend" = "xx11"; then
cairo_backend=xlib
fi
@@ -54,13 +56,13 @@ Index: b/configure.in
- [cairo-$cairo_backend >= cairo_required_version])
+
+if test "x$gdktarget" != "xnone"; then
-+ PKG_CHECK_MODULES(CAIRO_BACKEND,
-+ [cairo-$cairo_backend >= cairo_required_version])
++ PKG_CHECK_MODULES(CAIRO_BACKEND,
++ [cairo-$cairo_backend >= cairo_required_version])
+fi
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
-@@ -1281,6 +1288,7 @@
+@@ -1279,6 +1287,7 @@
AM_CONDITIONAL(USE_DIRECTFB, false)
fi
@@ -68,7 +70,7 @@ Index: b/configure.in
# Check for Pango flags
-@@ -1326,6 +1334,8 @@
+@@ -1324,6 +1333,8 @@
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
fi
@@ -77,16 +79,15 @@ Index: b/configure.in
GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
#
-@@ -1344,6 +1354,8 @@
+@@ -1341,6 +1352,7 @@
+ AC_SUBST(GDK_DEP_LIBS)
AC_SUBST(GDK_DEP_CFLAGS)
-
+if test "x$gdktarget" != "xnone"; then
-+
+
########################################
# Check for Accessibility Toolkit flags
- ########################################
-@@ -1374,6 +1386,10 @@
+@@ -1372,6 +1384,10 @@
fi
GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
@@ -97,7 +98,7 @@ Index: b/configure.in
if test "x$gdktarget" = "xx11"; then
GTK_PACKAGES="$GTK_PACKAGES pangoft2"
fi
-@@ -1529,6 +1545,8 @@
+@@ -1533,6 +1549,8 @@
gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
@@ -106,7 +107,7 @@ Index: b/configure.in
AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
*** Can't find cairo-pdf.h. You must build Cairo with the pdf
*** backend enabled.]))
-@@ -1543,6 +1561,8 @@
+@@ -1547,6 +1565,8 @@
*** svg backend enabled.]))
fi
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 8192958..8ac455b 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -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
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 04/13] libsoup: bump to version 2.43.1
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (2 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 03/13] libgtk2: bump to version 2.24.18 and drop DirectFB Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-08 22:38 ` Peter Korsgaard
2013-06-07 23:18 ` [Buildroot] [PATCH v10 05/13] webkit: bump to version 1.9.6 Spenser Gilliland
` (8 subsequent siblings)
12 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
---
package/libsoup/Config.in | 1 +
package/libsoup/libsoup.mk | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 57b425f..2ed08d9 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -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
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 2f7233a..c9d90e8 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -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
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 05/13] webkit: bump to version 1.9.6
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (3 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 04/13] libsoup: bump to version 2.43.1 Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-08 22:38 ` Peter Korsgaard
2013-06-07 23:18 ` [Buildroot] [PATCH v10 06/13] gstreamer1: Add gstreamer version 1.1.1 package Spenser Gilliland
` (7 subsequent siblings)
12 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
Remove 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
diff --git a/package/webkit/webkit-bison-2-6-compat.patch b/package/webkit/webkit-bison-2-6-compat.patch
deleted file mode 100644
index 7a94164..0000000
--- a/package/webkit/webkit-bison-2-6-compat.patch
+++ /dev/null
@@ -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 <thomas.petazzoni@free-electrons.com>
-
-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 <alexis.menard@openbossa.org>
-+
-+ 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 <pnormand@igalia.com>
-
- 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($$);
- }
- ;
-
diff --git a/package/webkit/webkit-disable-docrebase.patch b/package/webkit/webkit-disable-docrebase.patch
new file mode 100644
index 0000000..77b9d1c
--- /dev/null
+++ b/package/webkit/webkit-disable-docrebase.patch
@@ -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 <spenser@gillilanding.com>
+----
+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
+
diff --git a/package/webkit/webkit-disable-tests.patch b/package/webkit/webkit-disable-tests.patch
new file mode 100644
index 0000000..6fa6daa
--- /dev/null
+++ b/package/webkit/webkit-disable-tests.patch
@@ -0,0 +1,80 @@
+This prevents the Webkit test suites from being built.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: webkit-1.9.6/GNUmakefile.am
+===================================================================
+--- webkit-1.9.6.orig/GNUmakefile.am 2012-08-06 03:17:24.000000000 -0500
++++ webkit-1.9.6/GNUmakefile.am 2013-05-28 10:08:53.645129501 -0500
+@@ -282,11 +282,14 @@
+ include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
+
+ include Source/WebKit2/GNUmakefile.am
+-include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+ include Tools/MiniBrowser/gtk/GNUmakefile.am
++
++if ENABLE_TESTS
++include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+ include Tools/WebKitTestRunner/GNUmakefile.am
+ include Source/ThirdParty/gtest/GNUmakefile.am
+ include Tools/TestWebKitAPI/GNUmakefile.am
++endif # ENABLE_TESTS
+ # [GTK] Refactor the translations now that we have webkit2
+ # https://bugs.webkit.org/show_bug.cgi?id=55153
+
+Index: webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am
+===================================================================
+--- webkit-1.9.6.orig/Source/WebKit/gtk/GNUmakefile.am 2012-07-19 05:02:29.000000000 -0500
++++ webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am 2013-05-28 10:09:49.277130516 -0500
+@@ -413,6 +413,7 @@
+ dist_resources_DATA = \
+ $(shell ls $(srcdir)/Source/WebKit/gtk/resources/*.html)
+
++if ENABLE_TESTS
+ # Build unit tests
+ webkit_tests_cflags = \
+ -fno-strict-aliasing \
+@@ -613,6 +614,8 @@
+ Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
+ Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
+
++endif # ENABLE_TESTS
++
+ # Project-wide clean rules
+ # Files that will be cleaned
+ CLEANFILES += \
+Index: webkit-1.9.6/configure.ac
+===================================================================
+--- webkit-1.9.6.orig/configure.ac 2012-08-06 08:45:10.000000000 -0500
++++ webkit-1.9.6/configure.ac 2013-05-28 10:07:55.817128445 -0500
+@@ -516,6 +516,14 @@
+ AC_SUBST(CAIRO_CFLAGS)
+ AC_SUBST(CAIRO_LIBS)
+
++# check wheter to build tests
++AC_MSG_CHECKING([wheter to build tests])
++AC_ARG_ENABLE(tests,
++ AC_HELP_STRING([--enable-tests],
++ [turn on tests [default=no]]),
++ [],[enable_debug="no"])
++AC_MSG_RESULT([$enable_tests])
++
+ # check whether to build with debugging enabled
+ AC_MSG_CHECKING([whether to do a debug build])
+ AC_ARG_ENABLE(debug,
+@@ -1423,6 +1431,7 @@
+ AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
+
+ # WebKit feature conditionals
++AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"])
+ AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
+ AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])
+ AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
+@@ -1534,6 +1543,7 @@
+ WebKit was configured with the following options:
+
+ Build configuration:
++ Enable tests (slow) : $enable_tests
+ Enable debugging (slow) : $enable_debug
+ Compile with debug symbols (slow) : $enable_debug_symbols
+ Enable debug features (slow) : $enable_debug_features
diff --git a/package/webkit/webkit-execinfo_h.patch b/package/webkit/webkit-execinfo_h.patch
new file mode 100644
index 0000000..404986b
--- /dev/null
+++ b/package/webkit/webkit-execinfo_h.patch
@@ -0,0 +1,28 @@
+Fixes uclibc build as uclibc does not include backtrace functionality
+
+Signed-of-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+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
diff --git a/package/webkit/webkit-fix-build-issue-with-old-gtk.patch b/package/webkit/webkit-fix-build-issue-with-old-gtk.patch
deleted file mode 100644
index 2b20bae..0000000
--- a/package/webkit/webkit-fix-build-issue-with-old-gtk.patch
+++ /dev/null
@@ -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 <thomas.petazzoni@free-electrons.com>
-
-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)
- {
diff --git a/package/webkit/webkit-fix-build-with-gcc-4-6.patch b/package/webkit/webkit-fix-build-with-gcc-4-6.patch
deleted file mode 100644
index 181c7f5..0000000
--- a/package/webkit/webkit-fix-build-with-gcc-4-6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe:
-Removed the ChangeLog part.
-
-From: "commit-queue at webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Mon, 18 Apr 2011 06:53:23 +0000
-Subject: [PATCH] 2011-04-17 Thierry Reding
- <thierry.reding@avionic-design.de>
-
- Reviewed by Adam Barth.
-
- Fix build with GCC 4.6.
-
- * dom/make_names.pl: Execute preprocessor without the -P option. The
- preprocessor in GCC 4.6 eats empty lines, effectively breaking the
- parsing performed by this script. Dropping the -P option when invoking
- the preprocessor keeps the empty lines but as a side-effect also adds
- additional linemarkers.
-
- From the cpp manpage:
-
- -P Inhibit generation of linemarkers in the output from the
- preprocessor. This might be useful when running the preprocessor
- on something that is not C code, and will be sent to a program
- which might be confused by the linemarkers.
-
- The linemarkers are not problematic, however, because the script
- properly handles them by ignoring all lines starting with a #.
-
-diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl
-index 836137e..50386e0 100755
---- a/WebCore/dom/make_names.pl
-+++ b/WebCore/dom/make_names.pl
-@@ -54,7 +54,7 @@ if ($ENV{CC}) {
- } else {
- $gccLocation = "/usr/bin/gcc";
- }
--my $preprocessor = $gccLocation . " -E -P -x c++";
-+my $preprocessor = $gccLocation . " -E -x c++";
-
- GetOptions(
- 'tags=s' => \$tagsFile,
---
-1.7.11.4
-
diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
deleted file mode 100644
index a15226e..0000000
--- a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001
-From: Stephan Hoffmann <sho@relinux.de>
-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 <sho@relinux.de>
----
- 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
-
diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB.patch b/package/webkit/webkit-fix-compilation-on-DirectFB.patch
deleted file mode 100644
index 256f8a1..0000000
--- a/package/webkit/webkit-fix-compilation-on-DirectFB.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 91a2bf4c3a21720a27223ba293ba90f58c349959 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <llandwerlin@gmail.com>
-Date: Sun, 11 Apr 2010 14:38:57 +0200
-Subject: [PATCH] Fix compilation with DirectFB
-
-Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
----
- GNUmakefile.am | 2 ++
- WebCore/plugins/PluginView.h | 6 +++---
- WebCore/plugins/gtk/PluginViewGtk.cpp | 17 ++++++++---------
- 3 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/GNUmakefile.am b/GNUmakefile.am
-index 3bdfe53..8626bbb 100644
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -122,8 +122,10 @@ corekit_cppflags += \
-
- # For the Gtk port we want to use XP_UNIX both in X11 and Mac
- if !TARGET_WIN32
-+if !TARGET_DIRECTFB
- corekit_cppflags += -DXP_UNIX
- endif
-+endif
-
- # Default compiler flags
- global_cflags += \
-diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
-index 21a25f6..8116864 100644
---- a/WebCore/plugins/PluginView.h
-+++ b/WebCore/plugins/PluginView.h
-@@ -22,7 +22,7 @@
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
- #ifndef PluginView_h
-@@ -312,7 +312,7 @@ namespace WebCore {
- bool m_haveInitialized;
- bool m_isWaitingToStart;
-
--#if defined(XP_UNIX)
-+#if defined(XP_UNIX) || PLATFORM(DIRECTFB)
- bool m_needsXEmbed;
- #endif
-
-@@ -340,7 +340,7 @@ public:
-
- private:
-
--#if defined(XP_UNIX) || OS(SYMBIAN)
-+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(DIRECTFB)
- void setNPWindowIfNeeded();
- #elif defined(XP_MACOSX)
- NP_CGContext m_npCgContext;
-diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
-index 8de63e0..039a845 100644
---- a/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -23,7 +23,7 @@
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
- #include "config.h"
-@@ -45,6 +45,7 @@
- #include "Image.h"
- #include "KeyboardEvent.h"
- #include "MouseEvent.h"
-+#include "NotImplemented.h"
- #include "Page.h"
- #include "PlatformKeyboardEvent.h"
- #include "PlatformMouseEvent.h"
-@@ -137,7 +138,7 @@ void PluginView::updatePluginWidget()
- if (!m_isWindowed) {
- if (m_drawable)
- XFreePixmap(GDK_DISPLAY(), m_drawable);
--
-+
- m_drawable = XCreatePixmap(GDK_DISPLAY(), getRootWindow(m_parentFrame.get()),
- m_windowRect.width(), m_windowRect.height(),
- ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth);
-@@ -571,7 +572,7 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
-
- //FIXME - read the file data into buffer
- FILE* fileHandle = fopen((filename.utf8()).data(), "r");
--
-+
- if (fileHandle == 0)
- return NPERR_FILE_NOT_FOUND;
-
-@@ -706,6 +707,7 @@ void PluginView::forceRedraw()
- gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
- }
-
-+#if defined(XP_UNIX)
- static Display* getPluginDisplay()
- {
- // The plugin toolkit might have a different X connection open. Since we're
-@@ -713,14 +715,9 @@ static Display* getPluginDisplay()
- // plugins, so we can return that. We might want to add other implementations here
- // later.
-
--#if defined(XP_UNIX)
- return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
--#else
-- return 0;
--#endif
- }
-
--#if defined(XP_UNIX)
- static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
- {
- *visual = 0;
-@@ -794,9 +791,9 @@ bool PluginView::platformStart()
- }
-
- if (m_isWindowed) {
--#if defined(XP_UNIX)
- GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
-
-+#if defined(XP_UNIX)
- if (m_needsXEmbed) {
- // If our parent is not anchored the startup process will
- // fail miserably for XEmbed plugins a bit later on when
-@@ -817,7 +814,9 @@ bool PluginView::platformStart()
- #endif
- } else {
- setPlatformWidget(0);
-+#if defined(XP_UNIX)
- m_pluginDisplay = getPluginDisplay();
-+#endif
- }
-
- show();
---
-1.7.0.4
-
diff --git a/package/webkit/webkit-fix-pool.patch b/package/webkit/webkit-fix-pool.patch
deleted file mode 100644
index 5a66a82..0000000
--- a/package/webkit/webkit-fix-pool.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Fixup pool and add sparc support
-Nixed from gentoo
-
---- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
-+++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
- : m_freeList(pool())
- , m_isDoneWithInitialFreeList(false)
- {
-- memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+ memset(m_pool, 0, sizeof(m_pool));
- }
-
- Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
- }
-
- private:
-- Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+ Node* pool() { return reinterpret_cast<Node*>(m_pool); }
- Node* pastPool() { return pool() + m_poolSize; }
-
- bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
- Node* m_freeList;
- bool m_isDoneWithInitialFreeList;
- static const size_t m_poolSize = 256;
-- union {
-- char pool[sizeof(Node) * m_poolSize];
-- double forAlignment;
-- } m_pool;
-+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
- };
-
- template<typename ValueArg> struct ListHashSetNode {
---- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp
-+++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
-@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
- if (string->length() != length)
- return false;
-
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
- // FIXME: perhaps we should have a more abstract macro that indicates when
- // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
- const UChar* stringCharacters = string->characters();
- for (unsigned i = 0; i != length; ++i) {
- if (*stringCharacters++ != *characters++)
---- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
-+++ webkit-1.2.1/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@ namespace WebCore {
-
- // FIXME: perhaps we should have a more abstract macro that indicates when
- // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
- const UChar* aChars = a->characters();
- const UChar* bChars = b->characters();
-- for (unsigned i = 0; i != aLength; ++i) {
-+ for (unsigned i = 0; i != aLength; ++i)
- if (*aChars++ != *bChars++)
- return false;
-- }
-+
- return true;
- #else
- /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/package/webkit/webkit-pthread_getattr_np.patch b/package/webkit/webkit-pthread_getattr_np.patch
deleted file mode 100644
index 8027e37..0000000
--- a/package/webkit/webkit-pthread_getattr_np.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Patch WebKit because pthread_getattr_np is not implemented in uClibc
-
-Define UCLIBC_USE_PROC_SELF_MAPS etc. as a workaround for uClibc. This
-code was in the qtoipa webkit but appears to have been removed from
-more recent versions of webkit.
-
-See: http://bugreports.qt.nokia.com/browse/QTBUG-6551
-Credit for fix: http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&p=545066#545066
-
-Signed-off-by: Paul Jones <paul@pauljones.id.au>
-
-Index: webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp
-===================================================================
---- webkit-1.2.3.orig/JavaScriptCore/runtime/Collector.cpp 2010-07-22 17:16:19.000000000 +0200
-+++ webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp 2010-07-22 17:25:02.000000000 +0200
-@@ -75,6 +75,19 @@
- #endif
- #include <unistd.h>
-
-+#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have
-+// pthread_getattr_np or pthread_attr_getstack.
-+#if __UCLIBC_MAJOR__ == 0 && \
-+ (__UCLIBC_MINOR__ < 9 || \
-+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \
-+ defined(__LINUXTHREADS_OLD__)
-+#define UCLIBC_USE_PROC_SELF_MAPS 1
-+#include <stdio_ext.h>
-+extern int *__libc_stack_end;
-+#endif
-+#endif
-+
- #if OS(SOLARIS)
- #include <thread.h>
- #else
-@@ -610,6 +622,36 @@
- get_thread_info(find_thread(NULL), &threadInfo);
- return threadInfo.stack_end;
- #elif OS(UNIX)
-+#ifdef UCLIBC_USE_PROC_SELF_MAPS
-+ // Read /proc/self/maps and locate the line whose address
-+ // range contains __libc_stack_end.
-+ FILE *file = fopen("/proc/self/maps", "r");
-+ if (!file)
-+ return 0;
-+ __fsetlocking(file, FSETLOCKING_BYCALLER);
-+ char *line = NULL;
-+ size_t lineLen = 0;
-+ while (!feof_unlocked(file)) {
-+ if (getdelim(&line, &lineLen, '\n', file) <= 0)
-+ break;
-+ long from;
-+ long to;
-+ if (sscanf (line, "%lx-%lx", &from, &to) != 2)
-+ continue;
-+ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
-+ fclose(file);
-+ free(line);
-+#ifdef _STACK_GROWS_UP
-+ return (void *)from;
-+#else
-+ return (void *)to;
-+#endif
-+ }
-+ }
-+ fclose(file);
-+ free(line);
-+ return 0;
-+#else
- static void* stackBase = 0;
- static size_t stackSize = 0;
- static pthread_t stackThread;
-@@ -631,6 +673,7 @@
- stackThread = thread;
- }
- return static_cast<char*>(stackBase) + stackSize;
-+#endif
- #elif OS(WINCE)
- if (g_stackBase)
- return g_stackBase;
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index c0a14c1..9aa8390 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -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))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 05/13] webkit: bump to version 1.9.6
2013-06-07 23:18 ` [Buildroot] [PATCH v10 05/13] webkit: bump to version 1.9.6 Spenser Gilliland
@ 2013-06-08 22:38 ` Peter Korsgaard
0 siblings, 0 replies; 23+ messages in thread
From: Peter Korsgaard @ 2013-06-08 22:38 UTC (permalink / raw)
To: buildroot
>>>>> "Spenser" == Spenser Gilliland <spenser@gillilanding.com> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 06/13] gstreamer1: Add gstreamer version 1.1.1 package
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (4 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 05/13] webkit: bump to version 1.9.6 Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-12 5:51 ` Arnout Vandecappelle
2013-06-07 23:18 ` [Buildroot] [PATCH v10 07/13] gstreamer: update Config.in with gstreamer1 info Spenser Gilliland
` (6 subsequent siblings)
12 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
This 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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index dd74863..0351fd0 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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"
diff --git a/package/multimedia/gstreamer1/Config.in b/package/multimedia/gstreamer1/Config.in
new file mode 100644
index 0000000..96b32e9
--- /dev/null
+++ b/package/multimedia/gstreamer1/Config.in
@@ -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.
+
+ 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.
+
+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"
+ 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
+
+
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
new file mode 100644
index 0000000..90cf0f6
--- /dev/null
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -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))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 06/13] gstreamer1: Add gstreamer version 1.1.1 package
2013-06-07 23:18 ` [Buildroot] [PATCH v10 06/13] gstreamer1: Add gstreamer version 1.1.1 package Spenser Gilliland
@ 2013-06-12 5:51 ` Arnout Vandecappelle
0 siblings, 0 replies; 23+ messages in thread
From: Arnout Vandecappelle @ 2013-06-12 5:51 UTC (permalink / raw)
To: buildroot
Hi Spenser,
On 08/06/13 01:18, Spenser Gilliland wrote:
> This patch adds the gstreamer version 1.x series to buildroot.
Missing SoB
> ---
> 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
>
> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
> index dd74863..0351fd0 100644
> --- a/package/multimedia/Config.in
> +++ b/package/multimedia/Config.in
> @@ -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.
> source "package/multimedia/gst-ffmpeg/Config.in"
> source "package/multimedia/gst-dsp/Config.in"
> source "package/multimedia/gst-fsl-plugins/Config.in"
> diff --git a/package/multimedia/gstreamer1/Config.in b/package/multimedia/gstreamer1/Config.in
> new file mode 100644
> index 0000000..96b32e9
> --- /dev/null
> +++ b/package/multimedia/gstreamer1/Config.in
> @@ -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.
> +
> + 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.
> +
> +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"
> + 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
> +
> +
> diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
> new file mode 100644
> index 0000000..90cf0f6
> --- /dev/null
> +++ b/package/multimedia/gstreamer1/gstreamer1.mk
> @@ -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+
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
> +
> +# 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))
>
--
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 07/13] gstreamer: update Config.in with gstreamer1 info.
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (5 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 06/13] gstreamer1: Add gstreamer version 1.1.1 package Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-12 5:52 ` Arnout Vandecappelle
2013-06-07 23:18 ` [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins Spenser Gilliland
` (5 subsequent siblings)
12 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
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(-)
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 4b4d80f..55fd016 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -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/
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 07/13] gstreamer: update Config.in with gstreamer1 info.
2013-06-07 23:18 ` [Buildroot] [PATCH v10 07/13] gstreamer: update Config.in with gstreamer1 info Spenser Gilliland
@ 2013-06-12 5:52 ` Arnout Vandecappelle
0 siblings, 0 replies; 23+ messages in thread
From: Arnout Vandecappelle @ 2013-06-12 5:52 UTC (permalink / raw)
To: buildroot
On 08/06/13 01:18, Spenser Gilliland wrote:
> 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(-)
>
> diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
> index 4b4d80f..55fd016 100644
> --- a/package/multimedia/gstreamer/Config.in
> +++ b/package/multimedia/gstreamer/Config.in
> @@ -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
> + Gstreamer is incompatible with Gstreamer 1.X.
>
> http://gstreamer.freedesktop.org/
>
>
--
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (6 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 07/13] gstreamer: update Config.in with gstreamer1 info Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-12 6:21 ` Arnout Vandecappelle
2013-06-07 23:18 ` [Buildroot] [PATCH v10 09/13] gst1-plugins-good: add gstreamer1 good plugins Spenser Gilliland
` (4 subsequent siblings)
12 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
Adds 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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 0351fd0..253fd17 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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"
diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/multimedia/gst1-plugins-base/Config.in
new file mode 100644
index 0000000..2a95846
--- /dev/null
+++ b/package/multimedia/gst1-plugins-base/Config.in
@@ -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/
+
+if BR2_PACKAGE_GST1_PLUGINS_BASE
+
+comment "dependency-less plugins"
+
+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"
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
+ bool "playback"
+ default y
+
+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
+ bool "volume (mandatory for audio playback)"
+ default y
+
+comment "plugins with external dependencies (there may be more available)"
+
+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
+
diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
new file mode 100644
index 0000000..63c4955
--- /dev/null
+++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
@@ -0,0 +1,204 @@
+################################################################################
+#
+# gst1-plugins-base
+#
+################################################################################
+
+GST1_PLUGINS_BASE_VERSION = 1.1.1
+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
+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"
+
+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 += \
+ --disable-x \
+ --disable-xshm \
+ --disable-xvideo
+endif
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_BASE_DEPENDENCIES += orc
+GST1_PLUGINS_BASE_CONF_OPT += --enable-orc
+endif
+
+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))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins
2013-06-07 23:18 ` [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins Spenser Gilliland
@ 2013-06-12 6:21 ` Arnout Vandecappelle
2013-06-12 19:19 ` Spenser Gilliland
0 siblings, 1 reply; 23+ messages in thread
From: Arnout Vandecappelle @ 2013-06-12 6:21 UTC (permalink / raw)
To: buildroot
On 08/06/13 01:18, Spenser Gilliland wrote:
> Adds gstreamer 1.X base plugins.
Missing SoB.
Protip: git config --global format.signoff true
> ---
> 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
>
> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
> index 0351fd0..253fd17 100644
> --- a/package/multimedia/Config.in
> +++ b/package/multimedia/Config.in
> @@ -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.
> source "package/multimedia/gst-plugins-good/Config.in"
> source "package/multimedia/gst-plugins-bad/Config.in"
> source "package/multimedia/gst-plugins-ugly/Config.in"
> diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/multimedia/gst1-plugins-base/Config.in
> new file mode 100644
> index 0000000..2a95846
> --- /dev/null
> +++ b/package/multimedia/gst1-plugins-base/Config.in
> @@ -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/
> +
> +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.
> +
> +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"
> +
> +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.
> +
> +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
> + 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?
> +
> +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
> +
> diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
> new file mode 100644
> index 0000000..63c4955
> --- /dev/null
> +++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
> @@ -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?
> +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.
> +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?
> +
> +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 += \
> + --disable-x \
> + --disable-xshm \
> + --disable-xvideo
> +endif
I would actually make configure options for ximagesink and xvimagesink
(--enable-x and --enable-xvideo).
> +
> +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
> +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))
>
--
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins
2013-06-12 6:21 ` Arnout Vandecappelle
@ 2013-06-12 19:19 ` Spenser Gilliland
2013-06-13 5:57 ` Arnout Vandecappelle
0 siblings, 1 reply; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-12 19:19 UTC (permalink / raw)
To: buildroot
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.
On Wed, Jun 12, 2013 at 1:21 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 08/06/13 01:18, Spenser Gilliland wrote:
>>
>> 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.
>
>> ---
>> 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
>>
>> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
>> index 0351fd0..253fd17 100644
>> --- a/package/multimedia/Config.in
>> +++ b/package/multimedia/Config.in
>> @@ -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.
>
>
>> source "package/multimedia/gst-plugins-good/Config.in"
>> source "package/multimedia/gst-plugins-bad/Config.in"
>> source "package/multimedia/gst-plugins-ugly/Config.in"
>> diff --git a/package/multimedia/gst1-plugins-base/Config.in
>> b/package/multimedia/gst1-plugins-base/Config.in
>> new file mode 100644
>> index 0000000..2a95846
>> --- /dev/null
>> +++ b/package/multimedia/gst1-plugins-base/Config.in
>> @@ -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/
>> +
>> +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.
>
>> +
>> +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"
>> +
>> +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.
Good to know. I'll add this to the next patch series.
> There's also a gdp and a gst_v4l plugin for which no config option exists.
I cannot find either of these options in the ./configure --help output
are you sure they are available?
>
>
>> +
>> +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
>> + 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?
I've updated the wording to "plugins which have unpackaged
dependencies are not shown" .
>
>> +
>> +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
>> +
>> diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
>> b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
>> new file mode 100644
>> index 0000000..63c4955
>> --- /dev/null
>> +++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
>> @@ -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?
>
>
>> +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.
>
>
>> +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
>
>> +
>> +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 += \
>> + --disable-x \
>> + --disable-xshm \
>> + --disable-xvideo
>> +endif
>
>
> I would actually make configure options for ximagesink and xvimagesink
> (--enable-x and --enable-xvideo).
As X already consumes a large amount of
>
>> +
>> +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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins
2013-06-12 19:19 ` Spenser Gilliland
@ 2013-06-13 5:57 ` Arnout Vandecappelle
2013-06-13 15:10 ` Spenser Gilliland
0 siblings, 1 reply; 23+ messages in thread
From: Arnout Vandecappelle @ 2013-06-13 5:57 UTC (permalink / raw)
To: buildroot
On 12/06/13 21:19, Spenser Gilliland wrote:
> On Wed, Jun 12, 2013 at 1:21 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 08/06/13 01:18, Spenser Gilliland wrote:
[snip]
>> There's also a gdp and a gst_v4l plugin 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).
>
>>
>>
>>> +
>>> +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
>>> + 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?
>
> 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]
>>> +# 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
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.
>
>>
>>> +
>>> +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 += \
>>> + --disable-x \
>>> + --disable-xshm \
>>> + --disable-xvideo
>>> +endif
>>
>>
>> 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.
>>
>>> +
>>> +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.
Yes, good idea.
Regards,
Arnout
>
> Thanks,
> Spenser
>
>
> --
> Spenser Gilliland
> Computer Engineer
> Doctoral Candidate
>
--
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins
2013-06-13 5:57 ` Arnout Vandecappelle
@ 2013-06-13 15:10 ` Spenser Gilliland
0 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-13 15:10 UTC (permalink / raw)
To: buildroot
Arnout,
>>>> +comment "plugins with external dependencies (there may be more
>>>> available)"
>>>
>>>
>>>
>>> What does "there may be more available" mean?
>>
>>
>> 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.
>
>>>> +# 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
>
>
> 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.
>
Sounds good to me.
>>> 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.
>>> 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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v10 09/13] gst1-plugins-good: add gstreamer1 good plugins
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (7 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 08/13] gst1-plugins-base: add gstreamer1 base plugins Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 10/13] gst1-plugins-bad: add gstreamer1 bad plugins Spenser Gilliland
` (3 subsequent siblings)
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
Adds 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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 253fd17..d39436b 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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"
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
new file mode 100644
index 0000000..2c27fe8
--- /dev/null
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -0,0 +1,214 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD
+ bool "gst1-plugins-good"
+ depends on BR2_PACKAGE_GSTREAMER1
+ select BR2_PACKAGE_GST1_PLUGINS_BASE
+ help
+ A set of well-supported plug-ins for GStreamer under the preferred
+ license.
+
+ http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_GOOD
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG
+ bool "jpeg (JPEG support)"
+ select BR2_PACKAGE_JPEG
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG
+ bool "png (PNG support)"
+ select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2
+ bool "bz2 support"
+ depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
+ select BR2_PACKAGE_BZIP2
+ help
+ Enable bz2 support for the following plugins:
+ matroska
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB
+ bool "zlib support"
+ depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QTDEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
+ select BR2_PACKAGE_ZLIB
+ help
+ Enable zlib support for the following plugins:
+ id3demux, qtdemux, matroska
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA
+ bool "alpha"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG
+ bool "apetag"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX
+ bool "audiofx"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS
+ bool "audioparsers"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE
+ bool "auparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT
+ bool "autodetect"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI
+ bool "avi (*.avi video)"
+ default y
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER
+ bool "cutter"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS
+ bool "debugutils"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE
+ bool "deinterlace"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV
+ bool "effectv"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER
+ bool "equalizer"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV
+ bool "flv"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX
+ bool "flx"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM
+ bool "goom"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1
+ bool "goom2k1"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX
+ bool "id3demux (*.mp3 audio)"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX
+ bool "icydemux"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE
+ bool "imagefreeze"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE
+ bool "interleave"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4
+ bool "isomp4"
+ default y
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW
+ bool "law"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL
+ bool "level"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
+ bool "matroska"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE
+ bool "monoscope"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE
+ bool "multifile"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART
+ bool "multipart"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN
+ bool "replaygain"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP
+ bool "rtp"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER
+ bool "rtpmanager"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
+ bool "rtsp"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE
+ bool "shapewipe"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE
+ bool "smpte"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM
+ bool "spectrum"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP
+ depends on BR2_INET_IPV6
+ bool "udp"
+
+comment "udp requires a toolchain with IPv6 support"
+ depends on !BR2_INET_IPV6
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX
+ bool "videobox"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP
+ bool "videocrop"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER
+ bool "videofilter"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER
+ bool "videomixer"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC
+ bool "wavenc"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE
+ bool "wavparse (*.wav audio)"
+ default y
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M
+ bool "y4m"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2
+ bool "v4l2"
+
+comment "plugins with external dependencies"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO
+ bool "cairo"
+ select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_CAIRO_PNG
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC
+ bool "flac (libFLAC)"
+ select BR2_PACKAGE_FLAC
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
+ bool "gdkpixbuf"
+ select BR2_PACKAGE_GDK_PIXBUF
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS
+ bool "ossaudio (OSS audio)"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4
+ bool "oss4 (Open Sound System 4)"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
+ depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
+ depends on BR2_LARGEFILE # pulseaudio -> libsndfile
+ select BR2_PACKAGE_PULSEAUDIO
+ bool "pulseaudio"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
+ bool "souphttpsrc (http client)"
+ select BR2_PACKAGE_LIBSOUP
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
+ bool "speex"
+ select BR2_PACKAGE_SPEEX
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK
+ bool "wavpack (*.wv audio)"
+ select BR2_PACKAGE_WAVPACK
+
+endif
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
new file mode 100644
index 0000000..ee65f75
--- /dev/null
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -0,0 +1,403 @@
+###############################################################################
+#
+# gst1-plugins-good
+#
+###############################################################################
+
+GST1_PLUGINS_GOOD_VERSION = 1.1.1
+GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
+GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
+GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
+GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+
+
+GST1_PLUGINS_GOOD_CONF_OPT = \
+ --disable-debug \
+ --disable-valgrind \
+ --disable-examples \
+ --disable-directsound \
+ --disable-sunaudio \
+ --disable-osx_audio \
+ --disable-osx_video \
+ --disable-aalib \
+ --disable-aalibtest \
+ --disable-libcaca \
+ --disable-esd \
+ --disable-esdtest \
+ --disable-shout2
+
+# Options which require currently unpackaged libraries
+GST1_PLUGINS_GOOD_CONF_OPT += \
+ --disable-jack \
+ --disable-libdv \
+ --disable-dv1394 \
+ --disable-taglib \
+ --disable-vpx
+
+GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
+
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
+GST1_PLUGINS_GOOD_CONF_OPT += \
+ --enable-x \
+ --enable-xshm \
+ --enable-xvideo
+else
+GST1_PLUGINS_GOOD_CONF_OPT += \
+ --disable-x \
+ --disable-xshm \
+ --disable-xvideo
+endif
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-orc
+GST1_PLUGINS_GOOD_DEPENDENCIES += orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
+GST1_PLUGINS_GOOD_DEPENDENCIES += jpeg
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-libpng
+GST1_PLUGINS_GOOD_DEPENDENCIES += libpng
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-libpng
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-bz2
+GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-bz2
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-zlib
+GST1_PLUGINS_GOOD_DEPENDENCIES += zlib
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-alpha
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-alpha
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-apetag
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-apetag
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-audiofx
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-audiofx
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-audioparsers
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-audioparsers
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-auparse
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-auparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-autodetect
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-autodetect
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-avi
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-avi
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-cutter
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-cutter
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-debugutils
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-debugutils
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-deinterlace
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-deinterlace
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-effectv
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-effectv
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-equalizer
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-equalizer
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-flv
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-flv
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-flx
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-flx
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-goom
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-goom
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-id3demux
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-id3demux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-icydemux
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-interleave
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-interleave
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-isomp4
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-isomp4
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-law
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-law
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-level
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-level
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-matroska
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-matroska
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-monoscope
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-monoscope
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-multifile
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-multifile
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-multipart
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-multipart
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-replaygain
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-replaygain
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtp
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtpmanager
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtpmanager
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtsp
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-smpte
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-smpte
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-spectrum
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-spectrum
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-udp
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-udp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videobox
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videobox
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videocrop
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videocrop
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videomixer
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videomixer
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavenc
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-y4m
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-y4m
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-gst_v4l2
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-gst_v4l2
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-cairo
+GST1_PLUGINS_GOOD_DEPENDENCIES += cairo
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-cairo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-flac
+GST1_PLUGINS_GOOD_DEPENDENCIES += flac
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-flac
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST1_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-oss
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-oss
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-pulse
+GST1_PLUGINS_GOOD_DEPENDENCIES += pulseaudio
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-pulse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-soup
+GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-soup
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-speex
+GST1_PLUGINS_GOOD_DEPENDENCIES += speex
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-speex
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+endif
+
+$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 10/13] gst1-plugins-bad: add gstreamer1 bad plugins
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (8 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 09/13] gst1-plugins-good: add gstreamer1 good plugins Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 11/13] gst1-plugins-ugly: add gstreamer1 ugly plugins Spenser Gilliland
` (2 subsequent siblings)
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
Adds 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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index d39436b..ca40e57 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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"
diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
new file mode 100644
index 0000000..e92f78f
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -0,0 +1,325 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
+ bool "gst1-plugins-bad"
+ depends on BR2_PACKAGE_GSTREAMER1
+ select BR2_PACKAGE_GST1_PLUGINS_BASE
+ help
+ A set of plug-ins for GStreamer that may be of poor quality or
+ lacking some features.
+
+ http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_BAD
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC
+ bool "adpcmdec"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC
+ bool "adpcmenc"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF
+ bool "aiff"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX
+ bool "asfmux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT
+ bool "autoconvert"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS
+ bool "audiovisualizers"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER
+ bool "bayer"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2
+ bool "camerabin2"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE
+ bool "cdxaparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS
+ bool "coloreffects"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC
+ bool "dataurisrc"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP
+ bool "dccp"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
+ bool "debugutils"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
+ depends on BR2_INSTALL_LIBSTDCPP
+ bool "decklink"
+
+comment "decklink requires a toolchain with C++ support enabled"
+ depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTMF
+ bool "dtmf"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
+ bool "dvdsuboverlay"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU
+ bool "dvdspu"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY
+ bool "faceoverlay"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL
+ bool "festival"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
+ bool "fieldanalysis"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB
+ bool "freeverb"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R
+ bool "frei0r"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS
+ bool "gaudieffects"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM
+ bool "geometrictransform"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GSETTINGS
+ bool "gsettings"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE
+ bool "hdvparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
+ bool "hls"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG
+ bool "id3tag"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER
+ bool "inter"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE
+ bool "interlace"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE
+ bool "ivfparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR
+ bool "jp2kdecimator"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT
+ bool "jpegformat"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB
+ bool "librfb"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LINSYS
+ bool "linsys"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
+ bool "liveadder"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX
+ bool "mpegdemux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX
+ bool "mpegpsmux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
+ bool "mpegtsdemux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX
+ bool "mpegtsmux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE
+ bool "mve"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF
+ bool "mxf"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NSF
+ bool "nsf"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX
+ bool "nuvdemux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT
+ bool "patchdetect"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE
+ bool "pcapparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM
+ bool "pnm"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE
+ bool "rawparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL
+ bool "real"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE
+ bool "removesilence"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPMUX
+ bool "rtpmux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPVP8
+ bool "rtpvp8"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCALETEMPO
+ bool "scaletempo"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI
+ bool "sdi"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP
+ bool "sdp"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP
+ bool "segmentclip"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN
+ bool "siren"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH
+ bool "smooth"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED
+ bool "speed"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO
+ bool "stereo"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC
+ bool "subenc"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA
+ bool "tta"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS
+ bool "videofilters"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
+ bool "videomeasure"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS
+ bool "videoparsers"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
+ bool "videosignal"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC
+ bool "vmnc"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M
+ bool "y4m"
+
+comment "plugins with external dependencies (there may be more available)"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM
+ bool "shm"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK
+ bool "apexsink"
+ select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
+ bool "bz2"
+ select BR2_PACKAGE_BZIP2
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO
+ bool "cdaudio"
+ select BR2_PACKAGE_LIBCDAUDIO
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CELT
+ bool "celt"
+ select BR2_PACKAGE_CELT051
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL
+ bool "curl"
+ select BR2_PACKAGE_LIBCURL
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
+ bool "directfb"
+ select BR2_PACKAGE_DIRECTFB
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
+ bool "wayland"
+ select BR2_PACKAGE_WAYLAND
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
+ bool "dvb"
+ select BR2_PACKAGE_DVB_APPS
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
+ bool "fbdev"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD
+ bool "faad"
+ select BR2_PACKAGE_FAAD2
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
+ bool "libmms"
+ select BR2_PACKAGE_LIBMMS
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
+ bool "mpeg2enc"
+ select BR2_PACKAGE_LIBMPEG2
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123
+ bool "mpg123"
+ select BR2_PACKAGE_MPG123
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK
+ bool "musepack"
+ select BR2_PACKAGE_MUSEPACK
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON
+ bool "neon"
+ select BR2_PACKAGE_NEON
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
+ bool "opencv"
+ select BR2_PACKAGE_OPENCV
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
+ bool "opus"
+ select BR2_PACKAGE_OPUS
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES
+ bool "eglgles"
+ depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
+ bool "rsvg"
+ depends on BR2_INSTALL_LIBSTDCPP
+ select BR2_PACKAGE_LIBRSVG
+
+comment "rsvg plugin requires a toolchain with C++ support"
+ depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL
+ bool "sdl"
+ select BR2_PACKAGE_SDL
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE
+ bool "sndfile"
+ select BR2_PACKAGE_LIBSNDFILE
+ depends on BR2_LARGEFILE
+
+comment "gst-plugins-bad-plugin-sndfile requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD
+ bool "vcd"
+
+endif
+
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-dist-opencv-headers.patch b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-dist-opencv-headers.patch
new file mode 100644
index 0000000..86b09fe
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-dist-opencv-headers.patch
@@ -0,0 +1,214 @@
+This patch fixes an error in the packaging where the new
+gstskindetect.h or gstretinex.h header files were not included in the
+tarball.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: gst1-plugins-bad-1.1.1/ext/opencv/Makefile.am
+===================================================================
+--- gst1-plugins-bad-1.1.1.orig/ext/opencv/Makefile.am
++++ gst1-plugins-bad-1.1.1/ext/opencv/Makefile.am
+@@ -57,6 +57,8 @@ noinst_HEADERS = gstopencvvideofilter.h
+ gstfacedetect.h \
+ gsthanddetect.h \
+ gstpyramidsegment.h \
++ gstskindetect.h \
++ gstretinex.h \
+ gsttemplatematch.h \
+ gsttextoverlay.h \
+ gstmotioncells.h \
+Index: gst1-plugins-bad-1.1.1/ext/opencv/gstretinex.h
+===================================================================
+--- /dev/null
++++ gst1-plugins-bad-1.1.1/ext/opencv/gstretinex.h
+@@ -0,0 +1,93 @@
++/*
++ * GStreamer
++ * Copyright (C) 2013 Miguel Casas-Sanchez <miguelecasassanchez@gmail.com>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Alternatively, the contents of this file may be used under the
++ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
++ * which case the following provisions apply instead of the ones
++ * mentioned above:
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifndef __GST_RETINEX_H__
++#define __GST_RETINEX_H__
++
++#include <gst/gst.h>
++#include <gst/video/video.h>
++#include <gst/video/gstvideofilter.h>
++
++#include <cv.h>
++
++G_BEGIN_DECLS
++/* #defines don't like whitespacey bits */
++#define GST_TYPE_RETINEX \
++ (gst_retinex_get_type())
++#define GST_RETINEX(obj) \
++ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RETINEX,GstRetinex))
++#define GST_RETINEX_CLASS(klass) \
++ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RETINEX,GstRetinexClass))
++#define GST_IS_RETINEX(obj) \
++ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RETINEX))
++#define GST_IS_RETINEX_CLASS(klass) \
++ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RETINEX))
++typedef struct _GstRetinex GstRetinex;
++typedef struct _GstRetinexClass GstRetinexClass;
++
++struct _GstRetinex
++{
++ GstVideoFilter element;
++ gint width, height;
++ gint method;
++ gint scales, current_scales;
++
++ double *weights;
++ double *sigmas;
++
++ IplImage *cvRGBin;
++ IplImage *cvRGBout;
++ IplImage *cvA, *cvB, *cvC, *cvD;
++};
++
++struct _GstRetinexClass
++{
++ GstVideoFilterClass parent_class;
++};
++
++GType gst_retinex_get_type (void);
++
++gboolean gst_retinex_plugin_init (GstPlugin * plugin);
++
++G_END_DECLS
++#endif /* __GST_RETINEX_H__ */
+Index: gst1-plugins-bad-1.1.1/ext/opencv/gstskindetect.h
+===================================================================
+--- /dev/null
++++ gst1-plugins-bad-1.1.1/ext/opencv/gstskindetect.h
+@@ -0,0 +1,92 @@
++/*
++ * GStreamer
++ * Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
++ * Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
++ * Copyright (C) 2008 Michael Sheldon <mike@mikeasoft.com>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Alternatively, the contents of this file may be used under the
++ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
++ * which case the following provisions apply instead of the ones
++ * mentioned above:
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifndef __GST_SKIN_DETECT_H__
++#define __GST_SKIN_DETECT_H__
++
++#include <gst/gst.h>
++#include <cv.h>
++#include <gstopencvvideofilter.h>
++
++G_BEGIN_DECLS
++/* #defines don't like whitespacey bits */
++#define GST_TYPE_SKIN_DETECT \
++ (gst_skin_detect_get_type())
++#define GST_SKIN_DETECT(obj) \
++ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SKIN_DETECT,GstSkinDetect))
++#define GST_SKIN_DETECT_CLASS(klass) \
++ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SKIN_DETECT,GstSkinDetectClass))
++#define GST_IS_SKIN_DETECT(obj) \
++ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SKIN_DETECT))
++#define GST_IS_SKIN_DETECT_CLASS(klass) \
++ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SKIN_DETECT))
++typedef struct _GstSkinDetect GstSkinDetect;
++typedef struct _GstSkinDetectClass GstSkinDetectClass;
++
++struct _GstSkinDetect
++{
++ GstOpencvVideoFilter element;
++
++ gboolean postprocess;
++ gint method;
++ gint width, height;
++
++ IplImage *cvChA, *cvRGB, *cvSkin;
++ IplImage *cvHSV, *cvH, *cvH2, *cvS, *cvV, *cvSkinPixels1;
++ IplImage *cvR, *cvG, *cvB, *cvAll, *cvR2, *cvRp, *cvGp, *cvRp2, *cvGp2,
++ *cvdraft, *cvSkinPixels2;
++};
++
++struct _GstSkinDetectClass
++{
++ GstOpencvVideoFilterClass parent_class;
++};
++
++GType gst_skin_detect_get_type (void);
++
++gboolean gst_skin_detect_plugin_init (GstPlugin * plugin);
++
++G_END_DECLS
++#endif /* __GST_SKIN_DETECT_H__ */
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
new file mode 100644
index 0000000..ebf4567
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
@@ -0,0 +1,17 @@
+Use newer version of gettext to match current buildroot gettext.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+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@
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
new file mode 100644
index 0000000..53384c2
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -0,0 +1,690 @@
+###############################################################################
+#
+# gst1-plugins-bad
+#
+###############################################################################
+
+GST1_PLUGINS_BAD_VERSION = 1.1.1
+GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
+GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
+GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
+# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
+# enabled.
+GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
+
+GST1_PLUGINS_BAD_AUTORECONF = YES
+GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4
+
+GST1_PLUGINS_BAD_CONF_OPT = \
+ --disable-examples \
+ --disable-debug \
+ --disable-valgrind \
+ --disable-directsound \
+ --disable-direct3d \
+ --disable-directdraw \
+ --disable-direct3d9 \
+ --disable-directshow \
+ --disable-android_media \
+ --disable-apple_media \
+ --disable-osx_video \
+ --disable-sdltest \
+ --disable-wininet \
+ --disable-acm
+
+# Options which require currently unpackaged libraries
+GST1_PLUGINS_BAD_CONF_OPT += \
+ --disable-avc \
+ --disable-quicktime \
+ --disable-opensles \
+ --disable-uvch264 \
+ --disable-assrender \
+ --disable-voamrwbenc \
+ --disable-voaacenc \
+ --disable-chromaprint \
+ --disable-cog \
+ --disable-dc1394 \
+ --disable-dirac \
+ --disable-dts \
+ --disable-resindvd \
+ --disable-faac \
+ --disable-flite \
+ --disable-gsm \
+ --disable-jasper \
+ --disable-kate \
+ --disable-ladspa \
+ --disable-lv2 \
+ --disable-modplug \
+ --disable-mimic \
+ --disable-mplex \
+ --disable-musicbrainz \
+ --disable-mythtv \
+ --disable-nas \
+ --disable-ofa \
+ --disable-openal \
+ --disable-pvr \
+ --disable-timidity \
+ --disable-teletextdec \
+ --disable-wildmidi \
+ --disable-soundtouch \
+ --disable-spc \
+ --disable-gme \
+ --disable-swfdec \
+ --disable-xvid \
+ --disable-vdpau \
+ --disable-schro \
+ --disable-zbar \
+ --disable-rtmp \
+ --disable-spandsp \
+ --disable-sndio
+
+GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_BAD_DEPENDENCIES += orc
+GST1_PLUGINS_BAD_CONF_OPT += --enable-orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-adpcmdec
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmenc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-adpcmenc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-aiff
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-aiff
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-asfmux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-asfmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-audiovisualizers
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-autoconvert
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-bayer
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-bayer
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-camerabin2
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-cdxaparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-cdxaparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dataurisrc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dataurisrc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dccp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dccp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-debugutils
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-debugutils
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-decklink
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-decklink
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTMF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dtmf
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dtmf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dvbsuboverlay
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dvdspu
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dvdspu
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-faceoverlay
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-faceoverlay
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-festival
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-festival
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-fieldanalysis
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-freeverb
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-freeverb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-frei0r
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-frei0r
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-gaudieffects
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-gaudieffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-geometrictransform
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-geometrictransform
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-gdp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-gdp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GSETTINGS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-gsettings
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-gsettings
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-hdvparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-hls
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-hls
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-id3tag
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-id3tag
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-inter
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-inter
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-interlace
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-interlace
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-ivfparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-jp2kdecimator
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-jpegformat
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-librfb
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-librfb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LINSYS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-linsys
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-linsys
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-liveadder
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-liveadder
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegdemux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegpsmux
+GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegtsdemux
+GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegtsdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegtsmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mve
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mve
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mxf
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mxf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NSF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-nsf
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-nsf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-nuvdemux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-nuvdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-patchdetect
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-patchdetect
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-pcapparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-pcapparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-pnm
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-pnm
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rawparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rawparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-real
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-real
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-removesilence
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-removesilence
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rtpmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPVP8),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rtpvp8
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rtpvp8
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCALETEMPO),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-scaletempo
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-scaletempo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sdi
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sdi
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sdp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sdp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-segmentclip
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-segmentclip
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-siren
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-siren
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-smooth
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-smooth
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-speed
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-speed
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-subenc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-subenc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-stereo
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-stereo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-tta
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-tta
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videofilters
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videofilters
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videomeasure
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videoparsers
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videoparsers
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videosignal
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videosignal
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-vmnc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-vmnc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-y4m
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-y4m
+endif
+
+# plugins with deps
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-shm
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-shm
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-apexsink
+GST1_PLUGINS_BAD_DEPENDENCIES += openssl
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-apexsink
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-bz2
+GST1_PLUGINS_BAD_DEPENDENCIES += bzip2
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-bz2
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
+GST1_PLUGINS_BAD_DEPENDENCIES += libcdaudio
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CELT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-celt
+GST1_PLUGINS_BAD_DEPENDENCIES += celt051
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-celt
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-curl
+GST1_PLUGINS_BAD_DEPENDENCIES += libcurl
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-curl
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-directfb
+GST1_PLUGINS_BAD_DEPENDENCIES += directfb
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-directfb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-wayland
+GST1_PLUGINS_BAD_DEPENDENCIES += wayland
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-wayland
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST1_PLUGINS_BAD_DEPENDENCIES += faad2
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-faad
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-fbdev
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-fbdev
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-libmms
+GST1_PLUGINS_BAD_DEPENDENCIES += libmms
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-libmms
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpeg2enc
+GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpeg2enc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpg123
+GST1_PLUGINS_BAD_DEPENDENCIES += mpg123
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpg123
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-musepack
+GST1_PLUGINS_BAD_DEPENDENCIES += musepack
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-musepack
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-neon
+GST1_PLUGINS_BAD_DEPENDENCIES += neon
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-neon
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-opencv
+GST1_PLUGINS_BAD_DEPENDENCIES += opencv
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-opencv
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-opus
+GST1_PLUGINS_BAD_DEPENDENCIES += opus
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-opus
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rsvg
+GST1_PLUGINS_BAD_DEPENDENCIES += librsvg
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rsvg
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-eglgles
+GST1_PLUGINS_BAD_DEPENDENCIES += libegl libgles
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+# RPI has odd locations for several required headers.
+GST1_PLUGINS_BAD_CONF_OPT += --with-egl-window-system=rpi
+GST1_PLUGINS_BAD_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
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-eglgles
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y)
+GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sdl
+GST1_PLUGINS_BAD_DEPENDENCIES += sdl
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sndfile
+GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sndfile
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dvb
+GST1_PLUGINS_BAD_DEPENDENCIES += dvb-apps
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dvb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-vcd
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-vcd
+endif
+
+# Add GPL license if GPL licensed plugins enabled.
+ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
+GST1_PLUGINS_BAD_LICENSE += GPL
+endif
+
+# Add Unknown license if Unknown licensed plugins enabled.
+ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y)
+GST1_PLUGINS_BAD_LICENSE += UNKNOWN
+endif
+
+# Use the following command to extract license info for plugins.
+# # find . -name 'plugin-*.xml' | xargs grep license
+
+$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 11/13] gst1-plugins-ugly: add gstreamer1 ugly plugins
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (9 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 10/13] gst1-plugins-bad: add gstreamer1 bad plugins Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 12/13] gst1-plugins-good: add libvpx support Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 13/13] gst-omx: add gst-omx package Spenser Gilliland
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
Adds 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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index ca40e57..a0927e9 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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"
diff --git a/package/multimedia/gst1-plugins-ugly/Config.in b/package/multimedia/gst1-plugins-ugly/Config.in
new file mode 100644
index 0000000..c4a3c87
--- /dev/null
+++ b/package/multimedia/gst1-plugins-ugly/Config.in
@@ -0,0 +1,49 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_UGLY
+ bool "gst1-plugins-ugly"
+ depends on BR2_PACKAGE_GSTREAMER1
+ select BR2_PACKAGE_GST1_PLUGINS_BASE
+ help
+ A set of well-supported plug-ins for GStreamer, but might pose
+ problems for distributors.
+
+ http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_UGLY
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX
+ bool "asfdemux"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC
+ bool "dvdlpcmdec"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB
+ bool "dvdsub"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX
+ bool "xingmux"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA
+ bool "realmedia"
+
+comment "plugins with external dependencies (there may be more available)"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
+ bool "lame (*.mp3 audio encoder)"
+ select BR2_PACKAGE_LAME
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD
+ bool "dvdread"
+ select BR2_PACKAGE_LIBDVDREAD
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD
+ bool "mad (*.mp3 audio)"
+ select BR2_PACKAGE_LIBID3TAG
+ select BR2_PACKAGE_LIBMAD
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC
+ bool "mpeg2dec"
+ select BR2_PACKAGE_LIBMPEG2
+
+endif
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
new file mode 100644
index 0000000..f30a8d6
--- /dev/null
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -0,0 +1,104 @@
+###############################################################################
+#
+# gst1-plugins-ugly
+#
+###############################################################################
+
+GST1_PLUGINS_UGLY_VERSION = 1.1.1
+GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
+GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
+GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
+# GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled.
+GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+
+
+GST1_PLUGINS_UGLY_CONF_OPT = \
+ --disable-examples \
+ --disable-debug \
+ --disable-valgrind
+
+GST_PLUGINS_BAD1_CONF_OPT += \
+ --disable-a52dec \
+ --disable-amrnb \
+ --disable-amrwb \
+ --disable-cdio \
+ --disable-sidplay \
+ --disable-twolame \
+ --disable-x264
+
+GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-orc
+GST1_PLUGINS_UGLY_DEPENDENCIES += orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-asfdemux
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-asfdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdlpcmdec
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdlpcmdec
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdsub
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdsub
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGL1_PLUGIN_XINGMUX),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-xingmux
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-xingmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-realmedia
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-realmedia
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-lame
+GST1_PLUGINS_UGLY_DEPENDENCIES += lame
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-lame
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdread
+GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread
+GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdread
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-mad
+GST1_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
+GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-mad
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-mpeg2dec
+GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
+GST1_PLUGINS_ULGY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
+endif
+
+# Add GPL license if GPL plugins enabled.
+ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y)
+GST1_PLUGINS_UGLY_LICENSE += GPLv2
+endif
+
+# Use the following command to extract license info for plugins.
+# # find . -name 'plugin-*.xml' | xargs grep license
+
+$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 12/13] gst1-plugins-good: add libvpx support
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (10 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 11/13] gst1-plugins-ugly: add gstreamer1 ugly plugins Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
2013-06-07 23:18 ` [Buildroot] [PATCH v10 13/13] gst-omx: add gst-omx package Spenser Gilliland
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
adds 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(-)
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
index 2c27fe8..bdfe0b9 100644
--- a/package/multimedia/gst1-plugins-good/Config.in
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -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
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index ee65f75..31d38f8 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -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
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v10 13/13] gst-omx: add gst-omx package
2013-06-07 23:18 [Buildroot] [PATCH v10 00/13] add Gstreamer 1.X for gst-omx support Spenser Gilliland
` (11 preceding siblings ...)
2013-06-07 23:18 ` [Buildroot] [PATCH v10 12/13] gst1-plugins-good: add libvpx support Spenser Gilliland
@ 2013-06-07 23:18 ` Spenser Gilliland
12 siblings, 0 replies; 23+ messages in thread
From: Spenser Gilliland @ 2013-06-07 23:18 UTC (permalink / raw)
To: buildroot
gst-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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index a0927e9..68dfa13 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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"
diff --git a/package/multimedia/gst-omx/Config.in b/package/multimedia/gst-omx/Config.in
new file mode 100644
index 0000000..b6ea116
--- /dev/null
+++ b/package/multimedia/gst-omx/Config.in
@@ -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
diff --git a/package/multimedia/gst-omx/gst-omx-config-files.patch b/package/multimedia/gst-omx/gst-omx-config-files.patch
new file mode 100644
index 0000000..f484521
--- /dev/null
+++ b/package/multimedia/gst-omx/gst-omx-config-files.patch
@@ -0,0 +1,127 @@
+Change config files to match default buildroot install
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+---
+Index: gst-omx-1.0.0/config/bellagio/gstomx.conf
+===================================================================
+--- gst-omx-1.0.0.orig/config/bellagio/gstomx.conf 2013-03-12 04:12:09.000000000 -0500
++++ gst-omx-1.0.0/config/bellagio/gstomx.conf 2013-05-21 17:50:14.545692908 -0500
+@@ -1,6 +1,6 @@
+ [omxmpeg4videodec]
+ type-name=GstOMXMPEG4VideoDec
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.video_decoder.mpeg4
+ rank=256
+ in-port-index=0
+@@ -9,7 +9,7 @@
+
+ [omxh264dec]
+ type-name=GstOMXH264Dec
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.video_decoder.avc
+ rank=256
+ in-port-index=0
+@@ -18,7 +18,7 @@
+
+ [omxmpeg4videoenc]
+ type-name=GstOMXMPEG4VideoEnc
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.video_encoder.mpeg4
+ rank=0
+ in-port-index=0
+@@ -27,7 +27,7 @@
+
+ [omxaacenc]
+ type-name=GstOMXAACEnc
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.audio_encoder.aac
+ rank=0
+ in-port-index=0
+Index: gst-omx-1.0.0/config/rpi/gstomx.conf
+===================================================================
+--- gst-omx-1.0.0.orig/config/rpi/gstomx.conf 2013-05-21 17:51:39.965693635 -0500
++++ gst-omx-1.0.0/config/rpi/gstomx.conf 2013-05-21 17:52:07.781693871 -0500
+@@ -1,6 +1,6 @@
+ [omxmpeg2videodec]
+ type-name=GstOMXMPEG2VideoDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -9,7 +9,7 @@
+
+ [omxmpeg4videodec]
+ type-name=GstOMXMPEG4VideoDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -18,7 +18,7 @@
+
+ [omxh263dec]
+ type-name=GstOMXH263Dec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -27,7 +27,7 @@
+
+ [omxh264dec]
+ type-name=GstOMXH264Dec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -36,7 +36,7 @@
+
+ [omxtheoradec]
+ type-name=GstOMXTheoraDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -45,7 +45,7 @@
+
+ [omxvp8dec]
+ type-name=GstOMXVP8Dec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -54,7 +54,7 @@
+
+ [omxmjpegdec]
+ type-name=GstOMXMJPEGDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -63,7 +63,7 @@
+
+ [omxvc1dec]
+ type-name=GstOMXWMVDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_encode
+ rank=256
+ in-port-index=130
+@@ -73,7 +73,7 @@
+
+ [omxh264enc]
+ type-name=GstOMXH264Enc
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_encode
+ rank=256
+ in-port-index=200
diff --git a/package/multimedia/gst-omx/gst-omx.mk b/package/multimedia/gst-omx/gst-omx.mk
new file mode 100644
index 0000000..00abecb
--- /dev/null
+++ b/package/multimedia/gst-omx/gst-omx.mk
@@ -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))
--
1.7.1
^ permalink raw reply related [flat|nested] 23+ messages in thread