From: chang Date: Tue, 15 Jan 2013 08:15:36 +0000 (+0900) Subject: updated gstreamer to current 0.10 git version X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=commitdiff_plain;h=b22bd4db77a3c0668932b90ee10609a9b4ed4997 updated gstreamer to current 0.10 git version --- diff --git a/meta-openvuplus/classes/git-project.bbclass b/meta-openvuplus/classes/git-project.bbclass index 57c1331..dec7eee 100644 --- a/meta-openvuplus/classes/git-project.bbclass +++ b/meta-openvuplus/classes/git-project.bbclass @@ -2,6 +2,7 @@ S = "${WORKDIR}/git" inherit gitpkgv +GIT_PV ?= "${SRCPV}" RECIPE_PV := "${PV}" -PV = "${RECIPE_PV}+git${SRCPV}" +PV = "${RECIPE_PV}+git${GIT_PV}" PKGV = "${RECIPE_PV}+git${GITPKGV}" diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad-0.10.23.1+git b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad-0.10.23.1+git new file mode 120000 index 0000000..55a821e --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad-0.10.23.1+git @@ -0,0 +1 @@ +gst-plugins-bad-0.10.23 \ No newline at end of file diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad-0.10.23/0004-mpegdemux-compile-fixes.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad-0.10.23/0004-mpegdemux-compile-fixes.patch new file mode 100644 index 0000000..999c4cb --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad-0.10.23/0004-mpegdemux-compile-fixes.patch @@ -0,0 +1,30 @@ +diff -Naur git.org/gst/mpegdemux/gstmpegdemux.c git/gst/mpegdemux/gstmpegdemux.c +--- git.org/gst/mpegdemux/gstmpegdemux.c 2012-08-01 19:21:08.662409533 +0200 ++++ git/gst/mpegdemux/gstmpegdemux.c 2012-08-01 19:18:15.294405055 +0200 +@@ -292,7 +292,7 @@ + if (stream->pad) + gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad); + if (stream->buf) +- free(stream->buf); ++ g_free(stream->buf); + if (stream->meta_buf) + gst_buffer_unref(stream->meta_buf); + g_free (stream); +@@ -426,7 +426,7 @@ + stream->segment_thresh = threshold; + + if (threshold == VIDEO_SEGMENT_THRESHOLD) { +- stream->buf = malloc(64*1024); ++ stream->buf = g_malloc(64*1024); + stream->buf_pos = 0; + stream->meta_buf = gst_buffer_new(); + } +@@ -481,7 +481,7 @@ + gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream, + GstBuffer * buf) + { +- GstFlowReturn result; ++ GstFlowReturn result = GST_FLOW_OK; + guint64 timestamp; + guint size; + gboolean sent = FALSE; diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb new file mode 100644 index 0000000..5c61468 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb @@ -0,0 +1,70 @@ +require recipes-multimedia/gstreamer/gst-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://gst/tta/filters.h;beginline=12;endline=29;md5=629b0c7a665d155a6677778f4460ec06 \ + file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c" + +DEPENDS += "libmusicbrainz tremor curl libmms" +DEPENDS += "gst-plugins-base" +CONFLICTS = "librsvg" + +PR = "r0" +GIT_PV = "" + +SRCREV = "852d247947a21d472d7766f51148b5ea7b12ef12" + +EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \ + --disable-vdpau --disable-apexsink --enable-orc --disable-mpeg2enc --disable-mplex --disable-rsvg --disable-uvch264" + +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN}" + +SRC_URI += " \ + file://0003-mpegpsdemux_speedup.diff.patch \ + file://0004-mpegdemux-compile-fixes.patch \ + file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ +" + +inherit autotools pkgconfig gettext git-project + +do_common_update() { + cd ${S} + # Make sure we have common + if test ! -f common/gst-autogen.sh; + then + echo "+ Setting up common submodule" + git submodule init + fi + git submodule update + + # source helper functions + if test ! -f common/gst-autogen.sh; + then + echo There is something wrong with your source tree. + echo You are missing common/gst-autogen.sh + exit 1 + fi + . common/gst-autogen.sh + # install pre-commit hook for doing clean commits + if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \); + then + rm -f .git/hooks/pre-commit + ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit + fi + + # GNU gettext automake support doesn't get along with git. + # https://bugzilla.gnome.org/show_bug.cgi?id=661128 + autopoint || touch config.rpath + touch -t 200001010000 po/gst-plugins-base-0.10.pot +} +addtask common_update after do_unpack before do_patch + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true +} + +require mips-only.inc diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/configure.ac-fix-subparse-plugin.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/configure.ac-fix-subparse-plugin.patch new file mode 100644 index 0000000..b8602c8 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/configure.ac-fix-subparse-plugin.patch @@ -0,0 +1,27 @@ +Upstream-Status: Submitted [similar patch by other author, bugzilla] +Bugtracker-URL: https://bugzilla.gnome.org/show_bug.cgi?id=663600 + +Prepend PKG_CONFIG_SYSROOT to includedir, so configure doesn't +search for gstconfig.h in /usr/include. + +Signed-off-by: Andreas Oberritter +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1901bcf..460fb0a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -435,7 +435,7 @@ AG_GST_CHECK_PLUGIN(volume) + dnl check for gstreamer core features (subsystems) + dnl FIXME: this assumes srcdir == builddir for uninstalled setups + GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h" +-AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH) ++AG_GST_PARSE_SUBSYSTEM_DISABLES($PKG_CONFIG_SYSROOT_DIR$GST_CONFIGPATH) + AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1") + + dnl disable plug-ins that require libxml2's HTML support if it is not available +-- +1.7.5.4 + diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/disable-vorbis-encoder.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/disable-vorbis-encoder.patch new file mode 120000 index 0000000..8a22776 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/disable-vorbis-encoder.patch @@ -0,0 +1 @@ +../gst-plugins-base-0.10.36/disable-vorbis-encoder.patch \ No newline at end of file diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/gst-plugins-base-tremor.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/gst-plugins-base-tremor.patch new file mode 100644 index 0000000..99dbc9d --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/gst-plugins-base-tremor.patch @@ -0,0 +1,20 @@ +Remove -DTREMOR option since Tremor has dropped its internal +libogg2, and gst-plugins-base has dependency on that. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Dongxiao Xu +Signed-off-by: Shane Wang + +diff -r 70065fb4e085 ext/vorbis/Makefile.am +--- a/ext/vorbis/Makefile.am Tue Mar 13 16:36:56 2012 +0800 ++++ b/ext/vorbis/Makefile.am Tue Mar 13 16:38:53 2012 +0800 +@@ -30,7 +30,7 @@ + gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c + libgstivorbisdec_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +- -DTREMOR $(IVORBIS_CFLAGS) ++ $(IVORBIS_CFLAGS) + libgstivorbisdec_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/orc.m4-fix-location-of-orcc-when-cross-compiling.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/orc.m4-fix-location-of-orcc-when-cross-compiling.patch new file mode 120000 index 0000000..ea31003 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36.1+git/orc.m4-fix-location-of-orcc-when-cross-compiling.patch @@ -0,0 +1 @@ +../gst-plugins-base-0.10.36/orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ No newline at end of file diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.1.bb new file mode 100644 index 0000000..c4c11eb --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.1.bb @@ -0,0 +1,66 @@ +require recipes-multimedia/gstreamer/gst-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ + file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" +DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor orc orc-native" +DEPENDS += "gstreamer" + +SRCREV = "95c384136a1dfc22ad656c13b547c4077566d80b" + +PR = "r1" +GIT_PV = "" + +inherit autotools pkgconfig gettext git-project + +SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN}" + +SRC_URI += " \ + file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ + file://disable-vorbis-encoder.patch \ + file://gst-plugins-base-tremor.patch \ + file://configure.ac-fix-subparse-plugin.patch \ +" + +do_common_update() { + cd ${S} + # Make sure we have common + if test ! -f common/gst-autogen.sh; + then + echo "+ Setting up common submodule" + git submodule init + fi + git submodule update + + # source helper functions + if test ! -f common/gst-autogen.sh; + then + echo There is something wrong with your source tree. + echo You are missing common/gst-autogen.sh + exit 1 + fi + . common/gst-autogen.sh + # install pre-commit hook for doing clean commits + if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \); + then + rm -f .git/hooks/pre-commit + ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit + fi + + # GNU gettext automake support doesn't get along with git. + # https://bugzilla.gnome.org/show_bug.cgi?id=661128 + autopoint || touch config.rpath + touch -t 200001010000 po/gst-plugins-base-0.10.pot +} +addtask common_update after do_unpack before do_patch + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true +} + +require mips-only.inc diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31.1+git b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31.1+git new file mode 120000 index 0000000..c0d6406 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31.1+git @@ -0,0 +1 @@ +gst-plugins-good-0.10.31 \ No newline at end of file diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-accept-substream-syncwords-DTS-HD.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-accept-substream-syncwords-DTS-HD.patch new file mode 100644 index 0000000..0a2342b --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-accept-substream-syncwords-DTS-HD.patch @@ -0,0 +1,28 @@ +From f80b60feb376b3ea0947631b8fd260fd690e4012 Mon Sep 17 00:00:00 2001 +From: Andreas Monzner +Date: Thu, 27 Dec 2012 12:05:27 +0100 +Subject: [PATCH] accept substream syncwords (DTS-HD) + +--- + gst/audioparsers/gstdcaparse.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gst/audioparsers/gstdcaparse.c b/gst/audioparsers/gstdcaparse.c +index 2bf0e38..3a87efb 100644 +--- a/gst/audioparsers/gstdcaparse.c ++++ b/gst/audioparsers/gstdcaparse.c +@@ -377,6 +377,11 @@ gst_dca_parse_check_valid_frame (GstBaseParse * parse, + + if (!gst_dca_parse_parse_header (dcaparse, &r, &s2, &r2, &c2, NULL, NULL, + &n2, &s3, &t)) { ++ guint32 marker = gst_byte_reader_peek_uint32_be_unchecked (&r); ++ if (marker == 0x64582025 || marker == 0x58642520) { ++ GST_DEBUG_OBJECT (dcaparse, "found substream syncword... accept it.."); ++ return TRUE; ++ } + GST_DEBUG_OBJECT (dcaparse, "didn't find second syncword"); + *skipsize = 4; + return FALSE; +-- +1.7.10.4 + diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/v4l-compile-fix-old-kernel.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/v4l-compile-fix-old-kernel.patch new file mode 100644 index 0000000..e68b5d6 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/v4l-compile-fix-old-kernel.patch @@ -0,0 +1,14 @@ +diff -Naur git.org/sys/v4l2/gstv4l2object.c git/sys/v4l2/gstv4l2object.c +--- git.org/sys/v4l2/gstv4l2object.c 2012-12-27 21:32:12.000000000 +0000 ++++ git/sys/v4l2/gstv4l2object.c 2012-12-27 21:41:58.989064164 +0000 +@@ -2108,8 +2108,8 @@ + *interlaced = FALSE; + break; + case V4L2_FIELD_INTERLACED: +- case V4L2_FIELD_INTERLACED_TB: +- case V4L2_FIELD_INTERLACED_BT: ++// case V4L2_FIELD_INTERLACED_TB: ++// case V4L2_FIELD_INTERLACED_BT: + *interlaced = TRUE; + break; + default: diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb new file mode 100644 index 0000000..796e5ab --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb @@ -0,0 +1,64 @@ +require recipes-multimedia/gstreamer/gst-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ + file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" + +DEPENDS += "cdparanoia cairo jpeg libpng gtk+ zlib libid3tag flac speex libsoup-2.4" +DEPENDS += "gst-plugins-base" + +PR = "r0" +GIT_PV = "" + +SRCREV = "967fc61715fa854dacaa200069437fe57d4d8390" + +EXTRA_OECONF = "--enable-orc --disable-esd --disable-aalib --disable-shout2 --disable-libcaca --disable-hal" + +inherit autotools pkgconfig gettext git-project + +SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN}" + +SRC_URI += " \ + file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ + file://0001-accept-substream-syncwords-DTS-HD.patch \ +" + +do_common_update() { + cd ${S} + # Make sure we have common + if test ! -f common/gst-autogen.sh; + then + echo "+ Setting up common submodule" + git submodule init + fi + git submodule update + + # source helper functions + if test ! -f common/gst-autogen.sh; + then + echo There is something wrong with your source tree. + echo You are missing common/gst-autogen.sh + exit 1 + fi + . common/gst-autogen.sh + # install pre-commit hook for doing clean commits + if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \); + then + rm -f .git/hooks/pre-commit + ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit + fi + + # GNU gettext automake support doesn't get along with git. + # https://bugzilla.gnome.org/show_bug.cgi?id=661128 + autopoint || touch config.rpath + touch -t 200001010000 po/gst-plugins-base-0.10.pot +} +addtask common_update after do_unpack before do_patch + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true +} + +require mips-only.inc diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly-0.10.19.1+git b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly-0.10.19.1+git new file mode 120000 index 0000000..d5e2fcf --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly-0.10.19.1+git @@ -0,0 +1 @@ +gst-plugins-ugly-0.10.19 \ No newline at end of file diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.1.bb new file mode 100644 index 0000000..155b4b7 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.1.bb @@ -0,0 +1,61 @@ +require recipes-multimedia/gstreamer/gst-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f" + +DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame libcdio opencore-amr" + +EXTRA_OECONF += "--enable-orc" + +PR = "r0" +GIT_PV = "" + +SRCREV = "981912f29e54f6cacefe62ee2a24c38a227d0565" + +inherit autotools pkgconfig gettext git-project + +SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN}" + +SRC_URI += " \ + file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ +" + +do_common_update() { + cd ${S} + # Make sure we have common + if test ! -f common/gst-autogen.sh; + then + echo "+ Setting up common submodule" + git submodule init + fi + git submodule update + + # source helper functions + if test ! -f common/gst-autogen.sh; + then + echo There is something wrong with your source tree. + echo You are missing common/gst-autogen.sh + exit 1 + fi + . common/gst-autogen.sh + # install pre-commit hook for doing clean commits + if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \); + then + rm -f .git/hooks/pre-commit + ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit + fi + + # GNU gettext automake support doesn't get along with git. + # https://bugzilla.gnome.org/show_bug.cgi?id=661128 + autopoint || touch config.rpath + touch -t 200001010000 po/gst-plugins-base-0.10.pot +} +addtask common_update after do_unpack before do_patch + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true +} + +require mips-only.inc diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/check_fix.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/check_fix.patch new file mode 100644 index 0000000..5d8bb13 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/check_fix.patch @@ -0,0 +1,19 @@ +# gstreamer: Fix a problem with configure if check has already been built +# Richard Purdie + +Upstream-Status: Inappropriate [configuration] + +diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac +--- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800 ++++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800 +@@ -543,8 +543,10 @@ + *) BUILD_CHECK=yes ;; + esac + ]) ++ + dnl bit of a misnomer, but keep the conditional named like this so we don't + dnl have to change too much elsewhere ++HAVE_CHECK=no + AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes") + + dnl configure the desired buffer alignment diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/gst-inspect-check-error.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/gst-inspect-check-error.patch new file mode 100644 index 0000000..30be85f --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/gst-inspect-check-error.patch @@ -0,0 +1,16 @@ +# Fix crash with gst-inspect +# Chris Lord + +Upstream-Status: Pending + +--- 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-openvuplus/recipes-multimedia/gstreamer/gstreamer_0.10.36.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer_0.10.36.1.bb new file mode 100644 index 0000000..fd0e36c --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gstreamer_0.10.36.1.bb @@ -0,0 +1,73 @@ +SUMMARY = "GStreamer multimedia framework" +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." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" +DEPENDS = "glib-2.0 libxml2 bison-native flex-native" + +PR = "r0" +GIT_PV = "" + +SRCREV = "935db833e236959c973e6c8ef59586d30f81a26c" + +RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + +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/ ${libexecdir}/gstreamer-0.10/.debug/" + +GSTREAMER_DEBUG ?= "--disable-debug" +EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG}" + +inherit autotools pkgconfig gettext git-project + +SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN}" + +SRC_URI += " \ + file://check_fix.patch \ + file://gst-inspect-check-error.patch \ +" + +do_common_update() { + cd ${S} + # Make sure we have common + if test ! -f common/gst-autogen.sh; + then + echo "+ Setting up common submodule" + git submodule init + fi + git submodule update + + # source helper functions + if test ! -f common/gst-autogen.sh; + then + echo There is something wrong with your source tree. + echo You are missing common/gst-autogen.sh + exit 1 + fi + . common/gst-autogen.sh + # install pre-commit hook for doing clean commits + if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \); + then + rm -f .git/hooks/pre-commit + ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit + fi + + # GNU gettext automake support doesn't get along with git. + # https://bugzilla.gnome.org/show_bug.cgi?id=661128 + autopoint || touch config.rpath + touch -t 200001010000 po/gst-plugins-base-0.10.pot +} +addtask common_update after do_unpack before do_patch + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true +} + +require mips-only.inc diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/mips-only.inc b/meta-openvuplus/recipes-multimedia/gstreamer/mips-only.inc new file mode 100644 index 0000000..012b329 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/mips-only.inc @@ -0,0 +1 @@ +COMPATIBLE_HOST = '(mips.*)-(linux)'