From 690c627eed5c381c13aa6e3d1c97288f47cba8b6 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 2 Oct 2010 18:52:43 +0200 Subject: [PATCH] update gst-plugins-bad to 0.10.20, gst-plugins-good to 0.10.25, gst-plugins-ugly to 0.10.16 --- conf/checksums.ini | 12 ++++++++++++ .../gstreamer/gst-plugins-bad/ac3parse-fix-rank.diff | 11 +++++++++++ .../mpegtsdemux_fix_ac3_detection.diff | 14 +++++++------- recipes/gstreamer/gst-plugins-bad_0.10.20.bb | 20 ++++++++++++++++++++ recipes/gstreamer/gst-plugins-good_0.10.25.bb | 16 ++++++++++++++++ recipes/gstreamer/gst-plugins-ugly_0.10.16.bb | 16 ++++++++++++++++ 6 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 recipes/gstreamer/gst-plugins-bad/ac3parse-fix-rank.diff create mode 100644 recipes/gstreamer/gst-plugins-bad_0.10.20.bb create mode 100644 recipes/gstreamer/gst-plugins-good_0.10.25.bb create mode 100644 recipes/gstreamer/gst-plugins-ugly_0.10.16.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index de7f2d9..603be38 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11846,6 +11846,10 @@ sha256=2f800127e00da0f157358f87b06563b3de23cbc630fbf6295b43405e52e02070 md5=368f72e2a1c7a6e8fe60394e4315259b sha256=7b6c49f22caad3b573aee481381355b38ac9f2077f291d9f33a9a808a2568888 +[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.20.tar.bz2] +md5=7c84766f6d24f41ba90c3f6141012ab8 +sha256=1031dff866df976a957f34039addbab4c0753406299a275f4cf1780e1dbe2a90 + [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2] md5=8545a02c408976c5e9f0c2cf3c6a362e sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e @@ -11966,6 +11970,10 @@ sha256=2e7771a611cedb1e8208601cb26744fbf33109598e222afee1be8811ba4babcf md5=dc0de606e3e303cf378327b72a4d281f sha256=f274aac9c5b8efc66833c33cfad353209c785ac111465b37146680ee0de2d0be +[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.25.tar.bz2] +md5=d734bc866788d1d6fc74c4ff1318926c +sha256=b5d5750c12412c47d85ba9391c842f6f02cad9511876695e48b15fb37e4699f6 + [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.4.tar.bz2] md5=e189496e7987898823d28d26b79f63dc sha256=f2b90ef5fb4b2d0b06d5fd8193a7c19b1d08d4f737abeafabf04d39673ea703b @@ -12010,6 +12018,10 @@ sha256=78dba9963e130cfd09f294b60219e6562459c5d848bc3b38a653db7f21fc850b md5=21c034a762a5da252f91640e53bfe457 sha256=ceebb7878d957a61cf437c1f93934a0371631fa50e4111ef016691d65866790c +[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.16.tar.bz2] +md5=989e1b0fab010f73f76912f70ec5f62a +sha256=d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c + [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2] md5=cf604b6acd80b57dc5173db7e93fc116 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f diff --git a/recipes/gstreamer/gst-plugins-bad/ac3parse-fix-rank.diff b/recipes/gstreamer/gst-plugins-bad/ac3parse-fix-rank.diff new file mode 100644 index 0000000..54bdc4c --- /dev/null +++ b/recipes/gstreamer/gst-plugins-bad/ac3parse-fix-rank.diff @@ -0,0 +1,11 @@ +--- gst-plugins-bad-0.10.20.org/gst/audioparsers/plugin.c 2010-02-15 13:47:47.000000000 +0100 ++++ gst-plugins-bad-0.10.20/gst/audioparsers/plugin.c 2010-09-29 16:46:06.032700502 +0200 +@@ -36,7 +36,7 @@ + ret &= gst_element_register (plugin, "amrparse", + GST_RANK_PRIMARY + 1, GST_TYPE_AMRPARSE); + ret &= gst_element_register (plugin, "ac3parse", +- GST_RANK_MARGINAL, GST_TYPE_AC3_PARSE); ++ GST_RANK_PRIMARY + 2, GST_TYPE_AC3_PARSE); + ret &= gst_element_register (plugin, "flacparse", + GST_RANK_NONE, GST_TYPE_FLAC_PARSE); + diff --git a/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff b/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff index 9483383..7945c72 100644 --- a/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff +++ b/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff @@ -1,16 +1,16 @@ ---- gst/mpegdemux/gstmpegtsdemux.c 2009-10-12 12:23:39.000000000 +0200 -+++ gst/mpegdemux/gstmpegtsdemux.c 2009-10-22 23:08:42.000000000 +0200 -@@ -738,15 +738,15 @@ +--- gst/mpegdemux/gstmpegtsdemux.c 2010-09-02 23:30:31.000000000 +0200 ++++ gst/mpegdemux/gstmpegtsdemux.c 2010-09-29 15:26:53.156823244 +0200 +@@ -737,15 +737,15 @@ if (program_info) desc = gst_mpeg_descriptor_find (program_info, DESC_REGISTRATION); - if (desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) { -+ if (gst_mpeg_descriptor_find (stream->ES_info, ++ if (stream->ES_info && gst_mpeg_descriptor_find (stream->ES_info, + DESC_DVB_ENHANCED_AC3)) { template = klass->audio_template; name = g_strdup_printf ("audio_%04x", stream->PID); caps = gst_caps_new_simple ("audio/x-eac3", NULL); -- } else if (gst_mpeg_descriptor_find (stream->ES_info, +- } else if (stream->ES_info && gst_mpeg_descriptor_find (stream->ES_info, - DESC_DVB_ENHANCED_AC3)) { + } else if (desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) { template = klass->audio_template; @@ -18,5 +18,5 @@ - caps = gst_caps_new_simple ("audio/x-eac3", NULL); + caps = gst_caps_new_simple ("audio/x-ac3", NULL); } else { - if (!gst_mpeg_descriptor_find (stream->ES_info, DESC_DVB_AC3)) { - GST_WARNING ("AC3 stream type found but no corresponding " + if (!stream->ES_info || + !gst_mpeg_descriptor_find (stream->ES_info, DESC_DVB_AC3)) { diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.20.bb b/recipes/gstreamer/gst-plugins-bad_0.10.20.bb new file mode 100644 index 0000000..48aee2b --- /dev/null +++ b/recipes/gstreamer/gst-plugins-bad_0.10.20.bb @@ -0,0 +1,20 @@ +require gst-plugins.inc + +INC_PR = "r0" +PR = "${INC_PR}.0" + +do_configure_prepend() { + sed -i -e s:docs::g Makefile.am +} + +DEPENDS += "gst-plugins-base" + +EXTRA_OECONF_opendreambox += "--disable-apexsink --disable-dvdnav --disable-cdaudio --disable-mpeg2enc --disable-mplex" + +SRC_URI_append_opendreambox += " file://mpegpsdemux_speedup.diff;patch=1;pnum=0 \ + file://mpegtsdemux_fix_ac3_detection.diff;patch=1;pnum=0 \ + file://aacparse-fix-rank.diff;patch=1;pnum=1 \ + file://ac3parse-fix-rank.diff;patch=1;pnum=1" + +RCONFLICTS_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux" +RREPLACES_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux" diff --git a/recipes/gstreamer/gst-plugins-good_0.10.25.bb b/recipes/gstreamer/gst-plugins-good_0.10.25.bb new file mode 100644 index 0000000..8c41eab --- /dev/null +++ b/recipes/gstreamer/gst-plugins-good_0.10.25.bb @@ -0,0 +1,16 @@ +require gst-plugins.inc + +SRC_URI += "file://flvdemux-ecma.diff;patch=1" +INC_PR = "r0" +PR = "${INC_PR}.0" + +DEPENDS += "gst-plugins-base" + +#inherit gconf +#DEPENDS += "hal pulseaudio speex libsoup-2.4 flac gst-plugins-base openssl popt esound" +#PACKAGES =+ "gst-plugin-gconfelements" +#FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf" + +do_configure_prepend() { + sed -i -e s:docs::g Makefile.am +} diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.16.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.16.bb new file mode 100644 index 0000000..140fd50 --- /dev/null +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.16.bb @@ -0,0 +1,16 @@ +require gst-plugins.inc + +SRC_URI_append_opendreambox = " file://dvdsubdec-addproperty-singlebuffer.patch;patch=1" + +INC_PR = "r0" +PR = "${INC_PR}.0" + +DEPENDS += "gst-plugins-base libsidplay" + +python() { + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise == "1": + raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") +} + -- 2.7.4