Skip to contentSkip to conversation

libglib2: bumped version to 2.32.4

PATCH New bogdan at nimblex.org 6 participants 11 messages Dec 19, 2012

lore
Share & tools
lore

bogdan at nimblex.org

author
#0 lore raw

PATCH 1/4 libglib2: bumped version to 2.32.4

From: Sven Neumann <[email protected]>

Bump libglib2 to a newer stable version.

There are a few changes to the configure options necessary in order to make it compile cleanly and work correctly. The patch has been tested on ARM and i486. Some things might have to be adjusted for other platforms.

Signed-off-by Sven Neumann <[email protected]>
---
 ...b2-make-codegen-python2-python3-compliant.patch | 192 ---------------------
 ...glib2-xdgmime-return-early-for-empty-data.patch |  31 ++++
 package/libglib2/libglib2.mk                       |  15 +-
 3 files changed, 39 insertions(+), 199 deletions(-)
 delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
 create mode 100644 package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch
package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch deleted +0 -192
deleted file mode 100644
index b483827..0000000
@@ -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 <[email protected]>
----
-From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001
-From: Simon Feltman <[email protected]>
-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
package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch new file +31 -0
new file mode 100644
index 0000000..17fed92
@@ -0,0 +1,31 @@
+From 9689286b990709414227030a13ac2f287fed5a9c Mon Sep 17 00:00:00 2001
+From: Sven Neumann <[email protected]>
+Date: Mon, 9 Jul 2012 12:13:48 +0200
+Subject: [PATCH] xdgmime: return early for empty data
+
+Add a check for the data length to xdg_mime_get_mime_type_for_data()
+and return early for len == 0 instead of crashing later in
+cache_magic_matchlet_compare().
+
+Signed-off-by: Sven Neumann <[email protected]>
+---
+ gio/xdgmime/xdgmime.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c
+index 846be39..9e53500 100644
+--- a/gio/xdgmime/xdgmime.c
++++ b/gio/xdgmime/xdgmime.c
+@@ -467,6 +467,9 @@ xdg_mime_get_mime_type_for_data (const void *data,
+ {
+   const char *mime_type;
+ 
++  if (len == 0)
++    return XDG_MIME_TYPE_UNKNOWN;
++
+   xdg_mime_init ();
+ 
+   if (_caches)
+-- 
+1.7.9.5
+
package/libglib2/libglib2.mk +8 -7
index c3e510b..b476200 100644
@@ -3,8 +3,9 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.30
-LIBGLIB2_VERSION_MINOR = 3
+
+LIBGLIB2_VERSION_MAJOR = 2.32
+LIBGLIB2_VERSION_MINOR = 4
 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)

@@ -13,6 +14,7 @@ LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 LIBGLIB2_CONF_ENV = \
+		CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
 		ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \

@@ -40,8 +42,10 @@ LIBGLIB2_CONF_ENV = \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		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_posix_getgrgid_r=no \
+		ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=8 ac_cv_alignof_unsigned_long=4 \
+		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

@@ -54,9 +58,6 @@ endif
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
-		--disable-dtrace \
-		--disable-systemtap \
-		--disable-gcov
 
 LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
Signature · 1 line
1.7.12.1
#1 lore raw

PATCH 1/4 libglib2: bumped version to 2.32.4

Dear Bogdan, Sven,

Quoted 10 lines · bogdan at nimblex.org

From: Sven Neumann <[email protected]>

Bump libglib2 to a newer stable version.

There are a few changes to the configure options necessary in order to make it compile cleanly and work correctly. The patch has been tested on ARM and i486. Some things might have to be adjusted for other platforms.

Signed-off-by Sven Neumann <[email protected]>

[--snip--]

Quoted 29 lines
package/libglib2/libglib2.mk +3 -2
index c3e510b..b476200 100644
@@ -3,8 +3,9 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.30
-LIBGLIB2_VERSION_MINOR = 3
+
+LIBGLIB2_VERSION_MAJOR = 2.32
+LIBGLIB2_VERSION_MINOR = 4
 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)

package/libglib2/libglib2.mk +1 -0
@@ -13,6 +14,7 @@ LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR)
 LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 LIBGLIB2_CONF_ENV = \
+		CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
package/libglib2/libglib2.mk +0 -0
 		ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \

package/libglib2/libglib2.mk LIBGLIB2_CONF_ENV = \ · line 46

Quoted 7 lines
package/libglib2/libglib2.mk +0 -2
@@ -40,8 +42,10 @@ LIBGLIB2_CONF_ENV = \
 		ac_cv_func_working_mktime=yes
 		jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		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 \

Can you explain in detail why you removed these? Did you test that gst-inspect still works fine after that?

Quoted 10 lines
package/libglib2/libglib2.mk +4 -0
+		ac_cv_func_posix_getgrgid_r=no \
+		ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=8
 ac_cv_alignof_unsigned_long=4 \
+		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 \

package/libglib2/libglib2.mk +0 -0
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r

package/libglib2/libglib2.mk endif · line 59

Quoted 6 lines
package/libglib2/libglib2.mk +0 -3
@@ -54,9 +58,6 @@ endif
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
-		--disable-dtrace \
-		--disable-systemtap \
-		--disable-gcov

Why? According to the help message, these options seem to be disabled by default, but looking at the configure script, they rather seem to be auto if unset.

Best regards,
Beno?t

#2 lore raw

PATCH 1/4 libglib2: bumped version to 2.32.4

Hi,

Quoted 5 lines · Beno?t Th?baudeau

package/libglib2/libglib2.mk LIBGLIB2_CONF_ENV = \ · line 44

Quoted 2 lines
package/libglib2/libglib2.mk +0 -2
-		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 \

Can you explain in detail why you removed these? Did you test that gst-inspect still works fine after that?

No, actually you added this to buildroot way after we've done our changes to update libglib2. So the removal of these two lines is probably just an artefact from rebasing our old patch on top of current buildroot. I don't think we've removed them on purpose.

It's been a while since we've done the switch to libglib2. And as I said in the patch that Bogdan submitted, not all the changes are ready for inclusion in buildroot. But let me try to give some background on the changes that we've done. I've collected this from our buildroot git log, so bear with me if I don't remember all the details.

+ ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=4 ac_cv_alignof_unsigned_long=4 \

These are definitely not right for all platforms. But I found that the alignment checks in the glib configure script don't get the correct result when cross-compiling. So I've added this to force the correct values for our platforms (ARM and Geode).

+ CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \

This turned out to be necessary on our ARM platform. On ARMv5 atomic operations are not actually available as inlines but libgcc does still provide them as functions. Without tricking glib into using the functions it would use mutex-based fallbacks.

+ 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 \

The xlocale based implementations of g_ascii_strto{d,ll,ull} and g_ascii_formatd crash with uClibC. At least they did this with the version of uCLibC that we used back then (that was version 0.9.32 as far as I can see). So this change tricks the configure script into believing that this functionality was not available so that the good old home-grown code is used again as it was the case before 2.32.

So the submitted patch for libglib2 should not be taken as final. But I hope that this will nevertheless help to get libglib2 updated in buildroot for the next release.

Regards,
Sven

author
#3 lore raw

PATCH 2/4 gstreamer: port to gstreamer-1.0

In reply to bogdan at nimblex.org

From: Bogdan Radulescu <[email protected]>

Initial commit of updated gstreamer + plugins which compile

Signed-off-by Bogdan Radulescu <[email protected]>
---
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk        |   2 +-
 .../gst-plugins-base/gst-plugins-base-tremor.patch | 139 ---------------------
 .../gst-plugins-base/gst-plugins-base.mk           |   4 +-
 .../gst-plugins-good-linux36.patch                 |  37 ------
 .../gst-plugins-good/gst-plugins-good.mk           |   4 +-
 .../gst-plugins-ugly/gst-plugins-ugly.mk           |   4 +-
 package/multimedia/gstreamer/gstreamer.mk          |   4 +-
 7 files changed, 9 insertions(+), 185 deletions(-)
 delete mode 100644 package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
 delete mode 100644 package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk +1 -1
index ead490e..2570cea 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GST_FFMPEG_VERSION = 0.10.13
+GST_FFMPEG_VERSION = 0.11.2
 GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
 GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
 GST_FFMPEG_INSTALL_STAGING = YES
package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch deleted +0 -139

139 lines not on this page · raw message

package/multimedia/gst-plugins-base/gst-plugins-base.mk +2 -2
index b044516..f4aab00 100644
@@ -3,8 +3,8 @@
 # gst-plugins-base
 #
 #############################################################
-GST_PLUGINS_BASE_VERSION = 0.10.36
-GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
+GST_PLUGINS_BASE_VERSION = 1.0.3
+GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES
package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch deleted +0 -37
deleted file mode 100644
index 5d7cd93..0000000
@@ -1,37 +0,0 @@
-Fix building with Linux headers 3.6
-
-Signed-off-by: Markos Chandras <[email protected]>
-
-From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <[email protected]>
-Date: Thu, 09 Aug 2012 07:35:23 +0000
-Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
-
-This was unused apparently and removed in the kernel in commit:
-
- From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
- From: Sakari Ailus <[email protected]>
- Date: Wed, 2 May 2012 09:40:03 -0300
- Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
-
- Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
- tells the former is valid. The flag is used by no driver currently.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681491
----
-(limited to 'sys/v4l2/gstv4l2bufferpool.c')
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index 2e3a563..5aaed5a 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
-     GST_LOG_OBJECT (pool->v4l2elem, "  MMAP offset:  %u",
-         ret->vbuffer.m.offset);
-   GST_LOG_OBJECT (pool->v4l2elem, "  length:    %u", ret->vbuffer.length);
--  GST_LOG_OBJECT (pool->v4l2elem, "  input:     %u", ret->vbuffer.input);
- 
-   ret->mmap_length = ret->vbuffer.length;
-   data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
---
-cgit v0.9.0.2-2-gbebe
package/multimedia/gst-plugins-good/gst-plugins-good.mk +2 -2
index f64527d..1eefd45 100644
@@ -3,8 +3,8 @@
 # gst-plugins-good
 #
 #############################################################
-GST_PLUGINS_GOOD_VERSION = 0.10.31
-GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
+GST_PLUGINS_GOOD_VERSION = 1.0.3
+GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 
 GST_PLUGINS_GOOD_CONF_OPT = \
package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk +2 -2
index e23d774..c9bc653 100644
@@ -3,8 +3,8 @@
 # gst-plugins-ugly
 #
 #############################################################
-GST_PLUGINS_UGLY_VERSION = 0.10.19
-GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
+GST_PLUGINS_UGLY_VERSION = 1.0.3
+GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 
 GST_PLUGINS_UGLY_CONF_OPT = \
package/multimedia/gstreamer/gstreamer.mk +2 -2
index b87f029..0253da2 100644
@@ -4,8 +4,8 @@
 # gstreamer
 #
 #############################################################
-GSTREAMER_VERSION = 0.10.36
-GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
+GSTREAMER_VERSION = 1.0.3
+GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz
 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER_INSTALL_STAGING = YES
Signature · 1 line
1.7.12.1
#4 lore raw

PATCH 2/4 gstreamer: port to gstreamer-1.0

Dear Bogdan Radulescu,

Quoted 5 lines · Bogdan Radulescu

From: Bogdan Radulescu <[email protected]>

Initial commit of updated gstreamer + plugins which compile

Signed-off-by Bogdan Radulescu <[email protected]>

Some environments are not yet gst-1.0-ready, especially for network streaming. Wouldn't it be useful, at least for some time, to have the choice between 0.10, 1.0, or both (they can be installed side by side without any conflict)?

Best regards,
Beno?t

#5 lore raw

PATCH 2/4 gstreamer: port to gstreamer-1.0

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Beno?t" == Beno?t Th?baudeau <[email protected]> writes:

Beno?t> Dear Bogdan Radulescu,

Quoted 5 lines · Bogdan Radulescu
Quoted 5 lines

From: Bogdan Radulescu <[email protected]>

Initial commit of updated gstreamer + plugins which compile

Signed-off-by Bogdan Radulescu <[email protected]>

Beno?t> Some environments are not yet gst-1.0-ready, especially for Beno?t> network streaming. Wouldn't it be useful, at least for some Beno?t> time, to have the choice between 0.10, 1.0, or both (they can Beno?t> be installed side by side without any conflict)?

Indeed. Either as a version selection in gstreamer (like E.G. busybox) or as a seperate BR2_PACKAGE_GSTREAMER_10 if the differences are too big.

Signature · 1 line
Bye, Peter Korsgaard
author
#6 lore raw

PATCH 3/4 gstreamer: adjust set of plug-ins for gstreamer-1.0

In reply to bogdan at nimblex.org

From: Bogdan Radulescu <[email protected]>

Added wavpack to gst-plugins-good and opus to gst-plugins-bad Added videoconvert to gst-plugins-base and gdkpixbuf to gst-plugins-good. Deleted plugins which will not be ported to gstreamer-1.0. Added FAAD

Signed-off-by Bogdan Radulescu <[email protected]>
---
 package/multimedia/gst-plugins-bad/Config.in       | 22 +++---
 ...d-opus-jpegformat-unbreak-non-debug-build.patch | 78 ----------------------
 .../multimedia/gst-plugins-bad/gst-plugins-bad.mk  | 30 +++++----
 package/multimedia/gst-plugins-base/Config.in      | 10 +--
 .../gst-plugins-base/gst-plugins-base.mk           | 18 ++---
 package/multimedia/gst-plugins-good/Config.in      |  8 +++
 .../gst-plugins-good/gst-plugins-good.mk           | 14 ++++
 7 files changed, 59 insertions(+), 121 deletions(-)
 delete mode 100644 package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
package/multimedia/gst-plugins-bad/Config.in +12 -10
index d87aec4..ed43533 100644
@@ -33,9 +33,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER
 	bool "bayer"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN
-	bool "camerabin"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2
 	bool "camerabin2"
 

@@ -82,9 +79,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
 	bool "fieldanalysis"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
-	bool "freeze"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB
 	bool "freeverb"
 

@@ -208,12 +202,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH
 	bool "smooth"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED
-	bool "speed"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC
 	bool "subenc"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED
+	bool "speed"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO
 	bool "stereo"
 

@@ -241,7 +235,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
 	bool "y4m"
 
-comment "plugins with external dependencies (there may be more available)"
+comment "plugins with external dependencies (not all from gstreamer are here)"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
 	bool "apexsink"

@@ -267,6 +261,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD
+	bool "faad"
+	select BR2_PACKAGE_FAAD2
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV
 	bool "fbdev"
 

@@ -274,6 +272,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "libmms"
 	select BR2_PACKAGE_LIBMMS
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPG123
+	bool "mpg123"
+	select BR2_PACKAGE_MMPG123
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
 	bool "musepack"
 	select BR2_PACKAGE_MUSEPACK
package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch deleted +0 -78

78 lines not on this page · raw message

package/multimedia/gst-plugins-bad/gst-plugins-bad.mk +16 -14
index 714c987..6cfce08 100644
@@ -3,8 +3,8 @@
 # gst-plugins-bad
 #
 #############################################################
-GST_PLUGINS_BAD_VERSION = 0.10.23
-GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
+GST_PLUGINS_BAD_VERSION = 1.0.3
+GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 
 GST_PLUGINS_BAD_CONF_OPT = \

@@ -58,12 +58,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-bayer
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
 else

@@ -148,12 +142,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-freeze
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-freeze
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-freeverb
 else

@@ -508,6 +496,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-dvb
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST_PLUGINS_BAD_DEPENDENCIES += faad2
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-faad
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-fbdev
 else

@@ -521,6 +516,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-libmms
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPG123),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-mpg123
+GST_PLUGINS_BAD_DEPENDENCIES += mpg123
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-mpg123
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-musepack
 GST_PLUGINS_BAD_DEPENDENCIES += musepack
package/multimedia/gst-plugins-base/Config.in +3 -7
index 5d82533..4abfec6 100644
@@ -36,13 +36,6 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING
 	bool "encoding"
 
-config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE
-	bool "ffmpegcolorspace (mandatory for video playback)"
-	default y
-
-config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP
-	bool "gdp"
-
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK
 	bool "playback (mandatory)"
 	default y

@@ -57,6 +50,9 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND
 	bool "typefind (mandatory)"
 	default y
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
+	bool "videoconvert"
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC
 	bool "videotestsrc"
package/multimedia/gst-plugins-base/gst-plugins-base.mk +6 -12
index f4aab00..0203c5f 100644
@@ -89,18 +89,6 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-encoding
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ffmpegcolorspace
-else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ffmpegcolorspace
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-gdp
-else
-GST_PLUGINS_BASE_CONF_OPT += --disable-gdp
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-playback
 else

@@ -125,6 +113,12 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-typefind
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-videoconvert
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-videoconvert
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc
 else
package/multimedia/gst-plugins-good/Config.in +8 -0
index 33ecb5c..92a56c8 100644
@@ -79,6 +79,10 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX
 	bool "flx"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
+       bool "gdkpixbuf"
+       select BR2_PACKAGE_GDK_PIXBUF
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM
 	bool "goom"
 

@@ -204,4 +208,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
 	bool "speex"
 	select BR2_PACKAGE_SPEEX
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK
+	bool "wavpack (*.wv audio)"
+	select BR2_PACKAGE_WAVPACK
+
 endif
package/multimedia/gst-plugins-good/gst-plugins-good.mk +14 -0
index 1eefd45..a184055 100644
@@ -147,6 +147,13 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-flx
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-goom
 else

@@ -303,6 +310,13 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST_PLUGINS_GOOD_DEPENDENCIES += wavpack
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
 else
Signature · 1 line
1.7.12.1
author
#7 lore raw

PATCH 4/4 gstreamer: replace gst-ffmpeg with gst-libav

In reply to bogdan at nimblex.org

From: Bogdan Radulescu <[email protected]>

Replaced gst-ffmepg with gst-libav plug-in.
Didn't use external libav since the gstreamer guys use a snapshot instead of a release of libav. Removed gst-dsp and gst-omapfb as they are not available for gstreamer-1.0

Signed-off-by Bogdan Radulescu <[email protected]>
---
 package/multimedia/Config.in                |  4 +---
 package/multimedia/gst-dsp/Config.in        |  8 -------
 package/multimedia/gst-dsp/gst-dsp.mk       | 18 ---------------
 package/multimedia/gst-ffmpeg/Config.in     | 17 ---------------
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 18 ---------------
 package/multimedia/gst-libav/Config.in      | 16 ++++++++++++++
 package/multimedia/gst-libav/gst-libav.mk   | 34 +++++++++++++++++++++++++++++
 package/multimedia/gst-omapfb/Config.in     |  7 ------
 package/multimedia/gst-omapfb/gst-omapfb.mk | 19 ----------------
 9 files changed, 51 insertions(+), 90 deletions(-)
 delete mode 100644 package/multimedia/gst-dsp/Config.in
 delete mode 100644 package/multimedia/gst-dsp/gst-dsp.mk
 delete mode 100644 package/multimedia/gst-ffmpeg/Config.in
 delete mode 100644 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
 create mode 100644 package/multimedia/gst-libav/Config.in
 create mode 100644 package/multimedia/gst-libav/gst-libav.mk
 delete mode 100644 package/multimedia/gst-omapfb/Config.in
 delete mode 100644 package/multimedia/gst-omapfb/gst-omapfb.mk
package/multimedia/Config.in +1 -3
index 273d9bc..5ff7b4a 100644
@@ -6,9 +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/gst-ffmpeg/Config.in"
-source "package/multimedia/gst-dsp/Config.in"
-source "package/multimedia/gst-omapfb/Config.in"
+source "package/multimedia/gst-libav/Config.in"
 source "package/multimedia/gst-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
package/multimedia/gst-dsp/Config.in deleted +0 -8
deleted file mode 100644
index 590931a..0000000
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_GST_DSP
-	bool "gst-dsp"
-	depends on BR2_PACKAGE_GSTREAMER && BR2_cortex_a8
-	select BR2_PACKAGE_TIDSP_BINARIES
-	help
-	  GStreamer plug-in to access TI OMAP3 DSP algorithms.
-
-	  http://code.google.com/p/gst-dsp/
package/multimedia/gst-dsp/gst-dsp.mk deleted +0 -18
deleted file mode 100644
index 74b4c98..0000000
@@ -1,18 +0,0 @@
-GST_DSP_VERSION = 0.10.2
-GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
-
-define GST_DSP_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e
-endef
-
-define GST_DSP_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install
-endef
-
-define GST_DSP_UNINSTALL_TARGET_CMDS
-	$(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstdsp.so
-endef
-
-GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkgconf
-
-$(eval $(generic-package))
package/multimedia/gst-ffmpeg/Config.in deleted +0 -17
deleted file mode 100644
index 537101e..0000000
@@ -1,17 +0,0 @@
-config BR2_PACKAGE_GST_FFMPEG
-	bool "gst-ffmpeg"
-	depends on BR2_PACKAGE_GSTREAMER
-	select BR2_PACKAGE_GST_PLUGINS_BASE
-	select BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_FFMPEG_GPL
-	select BR2_PACKAGE_FFMPEG_POSTPROC
-	select BR2_PACKAGE_FFMPEG_SWSCALE
-	depends on BR2_LARGEFILE
-	depends on BR2_INET_IPV6
-	help
-	  GStreamer plugin using FFmpeg.
-
-	  http://gstreamer.freedesktop.org/
-
-comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
-	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk deleted +0 -18
deleted file mode 100644
index 2570cea..0000000
@@ -1,18 +0,0 @@
-#############################################################
-#
-# gst-ffmpeg
-#
-#############################################################
-
-GST_FFMPEG_VERSION = 0.11.2
-GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
-GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
-GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base ffmpeg
-GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
-
-ifeq ($(BR2_PACKAGE_BZIP2),y)
-GST_FFMPEG_DEPENDENCIES += bzip2
-endif
-
-$(eval $(autotools-package))
package/multimedia/gst-libav/Config.in new file +16 -0
new file mode 100644
index 0000000..1365256
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_GST_LIBAV
+	bool "gst-libav"
+	depends on BR2_PACKAGE_GSTREAMER
+	select BR2_PACKAGE_GST_PLUGINS_BASE
+	depends on BR2_LARGEFILE
+	help
+	  GStreamer plugin (formerly gst-ffmpeg).
+
+	  This package is an implementation of the former
+	  gst-ffmpeg plugin but there is a lot missing from it.
+	  So far it only support decoding WMA and AAC.
+	  
+	  http://gstreamer.freedesktop.org/
+
+comment "gst-libav requires a toolchain with LARGEFILE support"
+	depends on !(BR2_LARGEFILE)
package/multimedia/gst-libav/gst-libav.mk new file +34 -0
new file mode 100644
index 0000000..cff69b2
@@ -0,0 +1,34 @@
+
+#############################################################
+#
+# gst-libav
+#
+#############################################################
+
+GST_LIBAV_VERSION = 1.0.3
+GST_LIBAV_SOURCE = gst-libav-$(GST_LIBAV_VERSION).tar.xz
+GST_LIBAV_SITE = http://gstreamer.freedesktop.org/src/gst-libav
+GST_LIBAV_INSTALL_STAGING = YES
+
+GST_LIBAV_DEPENDENCIES = host-pkgconf gstreamer
+
+GST_LIBAV_CONF_OPT = \
+	--with-libav-extra-configure="--target-os=linux \
+	                               --disable-debug \
+                                       --enable-pthreads \
+                                       --enable-zlib \
+                                       --prefix=$(STAGING_DIR)/usr \
+                                       --sysroot=$(STAGING_DIR) \
+                                       --host-cc=$(TARGET_CC) \
+                                       --cc=$(TARGET_CC) \
+                                       --arch=$(BR2_ARCH) \
+                                       --enable-cross-compile \
+                                       --cross-prefix=$(TARGET_CROSS) \
+                                       --disable-shared \
+                                       --enable-static"
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+GST_LIBAV_DEPENDENCIES += bzip2
+endif
+
+$(eval $(autotools-package))
package/multimedia/gst-omapfb/Config.in deleted +0 -7
deleted file mode 100644
index e603cb1..0000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_GST_OMAPFB
-	bool "gst-omapfb"
-	depends on BR2_PACKAGE_GSTREAMER && BR2_cortex_a8
-	help
-	  GStreamer plug-in to use OMAP framebuffer.
-
-	  http://github.com/felipec/gst-omapfb
package/multimedia/gst-omapfb/gst-omapfb.mk deleted +0 -19
deleted file mode 100644
index f23bc86..0000000
@@ -1,19 +0,0 @@
-GST_OMAPFB_VERSION=1.0
-GST_OMAPFB_SOURCE=gst-omapfb-$(GST_OMAPFB_VERSION).tar.gz
-GST_OMAPFB_SITE=http://gst-dsp.googlecode.com/files/
-
-define GST_OMAPFB_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e
-endef
-
-define GST_OMAPFB_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install
-endef
-
-define GST_OMAPFB_UNINSTALL_TARGET_CMDS
-	$(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstomapfb.so
-endef
-
-GST_OMAPFB_DEPENDENCIES = gstreamer
-
-$(eval $(generic-package))
Signature · 1 line
1.7.12.1
#8 lore raw

PATCH 1/4 libglib2: bumped version to 2.32.4

In reply to bogdan at nimblex.org

Dear bogdan at nimblex.org,

Quoted 4 lines · bogdan at nimblex.org

From: Sven Neumann <[email protected]>

Bump libglib2 to a newer stable version.

Quoted 8 lines

There are a few changes to the configure options necessary in order to make it compile cleanly and work correctly. The patch has been tested on ARM and i486. Some things might have to be adjusted for other platforms.

Signed-off-by Sven Neumann <[email protected]>
---
 ...b2-make-codegen-python2-python3-compliant.patch | 192 ---------------------

Could you justify why this patch is no longer needed?

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#9 lore raw

PATCH 1/4 libglib2: bumped version to 2.32.4

Quoted 12 lines · Thomas Petazzoni

Dear bogdan at nimblex.org,

Quoted 9 lines · bogdan at nimblex.org

From: Sven Neumann<[email protected]>

Bump libglib2 to a newer stable version.

There are a few changes to the configure options necessary in order to make it compile cleanly and work correctly. The patch has been tested on ARM and i486. Some things might have to be adjusted for other platforms.

Quoted 5 lines
Quoted 3 lines
Signed-off-by Sven Neumann<[email protected]>
---
  ...b2-make-codegen-python2-python3-compliant.patch | 192 ---------------------

Could you justify why this patch is no longer needed?

Are you serious? The second line of the patch says:
"This patch is already included upstream, from the glib-2.32.4 release."

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
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
#10 lore raw

PATCH 1/4 libglib2: bumped version to 2.32.4

Dear Arnout Vandecappelle,

Quoted 4 lines · Arnout Vandecappelle
Quoted 1 line

Could you justify why this patch is no longer needed?

Are you serious? The second line of the patch says:
"This patch is already included upstream, from the glib-2.32.4 release."

Missed it, sorry. Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com