From 9f0b3251bfab84369b2d4568816254bd968afca0 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Thu, 5 Nov 2015 09:32:08 +0100 Subject: gstreamer1.0-plugins-good: upgrade to version 1.6.1 decrease_asteriskh263_rank.patch no longer applies, and is obsolete, since the asteriskh263 rank has been set to NONE in upstream. Also, --enable-xshm is no longer part of the configure options. Signed-off-by: Carlos Rafael Giani Signed-off-by: Ross Burton --- .../gstreamer/gstreamer1.0-plugins-good.inc | 13 +++++------ .../decrease_asteriskh263_rank.patch | 25 ---------------------- .../gstreamer/gstreamer1.0-plugins-good_1.4.5.bb | 13 ----------- .../gstreamer/gstreamer1.0-plugins-good_1.6.1.bb | 11 ++++++++++ 4 files changed, 16 insertions(+), 46 deletions(-) delete mode 100755 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 6e316de9f2..1119e10846 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -15,9 +15,7 @@ PACKAGECONFIG ??= " \ " X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" -X11ENABLEOPTS = "--enable-x --enable-xshm" -X11DISABLEOPTS = "--disable-x --disable-xshm" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" @@ -31,14 +29,13 @@ PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" - -# the 1394 plugins require both libraw1394 and libiec61883 -# the former is included in meta-oe, the latter isn't -# -> disabled +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394" EXTRA_OECONF += " \ --enable-oss \ --enable-gst_v4l2 \ + --enable-zlib \ + --enable-bz2 \ --without-libv4l2 \ --disable-directsound \ --disable-waveform \ @@ -47,11 +44,11 @@ EXTRA_OECONF += " \ --disable-osx_audio \ --disable-osx_video \ --disable-aalib \ + --disable-aalibtest \ --disable-libcaca \ --disable-libdv \ --disable-shout2 \ --disable-examples \ - --disable-dv1394 \ " FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch deleted file mode 100755 index 288631bf76..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit d71d74daac8ed54156ed103958ab455c63c72b0e -Author: Song Bing -Date: Mon Nov 10 11:25:47 2014 +0800 - -[asteriskh263] decrease the rank as we havn't this kind of decoder. - -Decrease the rank as we havn't this kind of decoder. - -https://bugzilla.gnome.org/show_bug.cgi?id=739935 - -Upstream-Status: Pending - -Signed-off-by: Song Bing - -diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c -index a01fbc8..8fa3194 100644 ---- a/gst/rtp/gstasteriskh263.c -+++ b/gst/rtp/gstasteriskh263.c -@@ -226,5 +226,5 @@ gboolean - gst_asteriskh263_plugin_init (GstPlugin * plugin) - { - return gst_element_register (plugin, "asteriskh263", -- GST_RANK_SECONDARY, GST_TYPE_ASTERISK_H263); -+ GST_RANK_SECONDARY - 1, GST_TYPE_ASTERISK_H263); - } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb deleted file mode 100644 index 943ab60397..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -include gstreamer1.0-plugins-good.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ - file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" - -SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \ - file://decrease_asteriskh263_rank.patch \ -" -SRC_URI[md5sum] = "eaf1a6daf73749bc423feac301d60038" -SRC_URI[sha256sum] = "79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641" - -S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb new file mode 100644 index 0000000000..2b7ec7a093 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb @@ -0,0 +1,11 @@ +include gstreamer1.0-plugins-good.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ + file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" + +SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch" +SRC_URI[md5sum] = "a930f5ff133f17baf39d2876628b7890" +SRC_URI[sha256sum] = "86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935" + +S = "${WORKDIR}/gst-plugins-good-${PV}" -- cgit 1.2.3-korg