From 26b814e959d2f2e515ee9a9910108f1d266ab042 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 19 Aug 2009 17:05:03 +0100 Subject: gstreamer, gst-plugins-base: Upgrade to 0.10.22 Signed-off-by: Richard Purdie --- .../packages/gstreamer/gst-plugins-base_0.10.20.bb | 12 --------- .../packages/gstreamer/gst-plugins-base_0.10.22.bb | 12 +++++++++ .../gst-inspect-check-error.patch | 11 -------- .../gst-inspect-check-error.patch | 11 ++++++++ meta/packages/gstreamer/gstreamer/check_fix.patch | 23 ++++++++-------- meta/packages/gstreamer/gstreamer_0.10.20.bb | 31 ---------------------- meta/packages/gstreamer/gstreamer_0.10.22.bb | 30 +++++++++++++++++++++ 7 files changed, 64 insertions(+), 66 deletions(-) delete mode 100644 meta/packages/gstreamer/gst-plugins-base_0.10.20.bb create mode 100644 meta/packages/gstreamer/gst-plugins-base_0.10.22.bb delete mode 100644 meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch create mode 100644 meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch delete mode 100644 meta/packages/gstreamer/gstreamer_0.10.20.bb create mode 100644 meta/packages/gstreamer/gstreamer_0.10.22.bb (limited to 'meta/packages/gstreamer') diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.20.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.20.bb deleted file mode 100644 index 2cb7d68f1..000000000 --- a/meta/packages/gstreamer/gst-plugins-base_0.10.20.bb +++ /dev/null @@ -1,12 +0,0 @@ -require gst-plugins.inc -DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv" -RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ - gnome-vfs-plugin-sftp" -PROVIDES_${PN} += "gst-plugins" - -EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora" - -do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm -f ${S}/m4/lib-link.m4 -} diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.22.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.22.bb new file mode 100644 index 000000000..2cb7d68f1 --- /dev/null +++ b/meta/packages/gstreamer/gst-plugins-base_0.10.22.bb @@ -0,0 +1,12 @@ +require gst-plugins.inc +DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv" +RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ + gnome-vfs-plugin-sftp" +PROVIDES_${PN} += "gst-plugins" + +EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora" + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm -f ${S}/m4/lib-link.m4 +} diff --git a/meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch b/meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch deleted file mode 100644 index 5da6cdd9c..000000000 --- a/meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100 -+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100 -@@ -1123,7 +1123,7 @@ - g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); - g_option_context_add_group (ctx, gst_init_get_option_group ()); - if (!g_option_context_parse (ctx, &argc, &argv, &err)) { -- g_print ("Error initializing: %s\n", err->message); -+ g_print ("Error initializing: %s\n", err ? err->message : "(null)"); - exit (1); - } - g_option_context_free (ctx); diff --git a/meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch b/meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch new file mode 100644 index 000000000..5da6cdd9c --- /dev/null +++ b/meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch @@ -0,0 +1,11 @@ +--- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100 ++++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100 +@@ -1123,7 +1123,7 @@ + g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); + g_option_context_add_group (ctx, gst_init_get_option_group ()); + if (!g_option_context_parse (ctx, &argc, &argv, &err)) { +- g_print ("Error initializing: %s\n", err->message); ++ g_print ("Error initializing: %s\n", err ? err->message : "(null)"); + exit (1); + } + g_option_context_free (ctx); diff --git a/meta/packages/gstreamer/gstreamer/check_fix.patch b/meta/packages/gstreamer/gstreamer/check_fix.patch index 5cdf6a04e..b7ffdd967 100644 --- a/meta/packages/gstreamer/gstreamer/check_fix.patch +++ b/meta/packages/gstreamer/gstreamer/check_fix.patch @@ -1,19 +1,18 @@ -Index: gstreamer-0.10.20/configure.ac +Index: gstreamer-0.10.22/configure.ac =================================================================== ---- gstreamer-0.10.20.orig/configure.ac 2008-11-10 13:20:41.000000000 +0000 -+++ gstreamer-0.10.20/configure.ac 2008-11-10 13:21:01.000000000 +0000 -@@ -501,13 +501,7 @@ +--- gstreamer-0.10.22.orig/configure.ac 2009-01-19 20:35:32.000000000 +0000 ++++ gstreamer-0.10.22/configure.ac 2009-08-19 16:11:05.000000000 +0100 +@@ -498,13 +498,7 @@ AC_SUBST(GST_DISABLE_XML_DEFINE) dnl check for "check", unit testing library/header --AM_PATH_CHECK(0.9.2, -- [ -- HAVE_CHECK=yes -- AC_MSG_NOTICE(CHECK_CFLAGS: $CHECK_CFLAGS) -- AC_MSG_NOTICE(CHECK_LIBS: $CHECK_LIBS) -- ], -- HAVE_CHECK=no) -+HAVE_CHECK=no +-if test "$cross_compiling" != yes; then +- AM_PATH_CHECK(0.9.2, +- HAVE_CHECK=yes, +- HAVE_CHECK=no) +-else + HAVE_CHECK=no +-fi AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") dnl pkg-config check that for libcheck that works for cross-compiling diff --git a/meta/packages/gstreamer/gstreamer_0.10.20.bb b/meta/packages/gstreamer/gstreamer_0.10.20.bb deleted file mode 100644 index 512df0b4b..000000000 --- a/meta/packages/gstreamer/gstreamer_0.10.20.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native" -PR = "r1" - -inherit autotools_stage pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://gst-inspect-check-error.patch;patch=1 \ - file://check_fix.patch;patch=1 \ - file://po-makefile-fix.patch;patch=1" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" - -do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm -f ${S}/common/m4/lib-link.m4 || true -} - -#do_compile_prepend () { -# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ -#} - -PARALLEL_MAKE = "" - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" -FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/" diff --git a/meta/packages/gstreamer/gstreamer_0.10.22.bb b/meta/packages/gstreamer/gstreamer_0.10.22.bb new file mode 100644 index 000000000..a96e9759f --- /dev/null +++ b/meta/packages/gstreamer/gstreamer_0.10.22.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +SECTION = "multimedia" +PRIORITY = "optional" +LICENSE = "LGPL" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native" +PR = "r1" + +inherit autotools_stage pkgconfig + +SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ + file://check_fix.patch;patch=1 \ + file://gst-inspect-check-error.patch;patch=1" +EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm -f ${S}/common/m4/lib-link.m4 || true +} + +#do_compile_prepend () { +# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ +#} + +PARALLEL_MAKE = "" + +FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/" -- cgit v1.2.3