diff options
35 files changed, 0 insertions, 1962 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb deleted file mode 100644 index 1e2cd2a4ab..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | require gst-fluendo.inc | ||
| 2 | |||
| 3 | SUMMARY = "Fluendo closed-format mp3 GStreamer plug-in" | ||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=259a43dd1c9854b71fc396f74699f4d2" | ||
| 6 | LICENSE_FLAGS = "commercial" | ||
| 7 | |||
| 8 | GSTREAMER_DEBUG ?= "--disable-debug" | ||
| 9 | EXTRA_OECONF += "${GSTREAMER_DEBUG} --with-gstreamer-api=0.10" | ||
| 10 | |||
| 11 | acpaths = "-I ${S}/common/m4 -I ${S}/m4" | ||
| 12 | |||
| 13 | SRC_URI[md5sum] = "adf0390f3416bb72f91c358528be0c38" | ||
| 14 | SRC_URI[sha256sum] = "dae0d0559a4e159c0dd92b7e18de059a5783f8d038904c7de4ca6393f7d55c7d" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb deleted file mode 100644 index 7bba41a341..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | require gst-fluendo.inc | ||
| 2 | |||
| 3 | SUMMARY = "Fluendo MPEG Transport Stream and Program Stream demuxer for GStreamer" | ||
| 4 | LICENSE = "MPLv1.1" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=be282f1c3cc9a98cc0dc5c2b25dfc510 \ | ||
| 6 | file://src/gstmpegdemux.h;beginline=1;endline=19;md5=a9e90033f59897b91664d9f2a2ff01dd" | ||
| 7 | LICENSE_FLAGS = "commercial" | ||
| 8 | |||
| 9 | acpaths = "-I ${S}/common/m4 -I ${S}/m4" | ||
| 10 | |||
| 11 | SRC_URI[md5sum] = "7c4fb993f80b9ae631b11897733f0970" | ||
| 12 | SRC_URI[sha256sum] = "df04c91cc8e5d9a892c2492ed989974b4547beaa2a3647649e85113317897424" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc deleted file mode 100644 index 7a77d624f2..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | SUMMARY = "Fluendo closed-format GStreamer plug-in" | ||
| 2 | SECTION = "multimedia" | ||
| 3 | HOMEPAGE = "https://core.fluendo.com/gstreamer/trac/wiki" | ||
| 4 | DEPENDS = "gstreamer gst-plugins-base zlib" | ||
| 5 | |||
| 6 | inherit autotools pkgconfig | ||
| 7 | |||
| 8 | SRC_URI = "http://core.fluendo.com/gstreamer/src/${BPN}/${BPN}-${PV}.tar.bz2" | ||
| 9 | |||
| 10 | FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" | ||
| 11 | FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" | ||
| 12 | FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" | ||
| 13 | |||
| 14 | EXTRA_OECONF = "--disable-valgrind" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb deleted file mode 100644 index 88f1abf68a..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb +++ /dev/null | |||
| @@ -1,73 +0,0 @@ | |||
| 1 | SUMMARY = "GStreamer package groups" | ||
| 2 | LICENSE = "MIT" | ||
| 3 | |||
| 4 | COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}" | ||
| 5 | DEPENDS_UGLY="${@'gst-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}" | ||
| 6 | DEPENDS_BAD="${@'gst-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}" | ||
| 7 | DEPENDS = "gstreamer gst-plugins-base gst-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}" | ||
| 8 | |||
| 9 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ | ||
| 10 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
| 11 | |||
| 12 | |||
| 13 | PR = "r13" | ||
| 14 | |||
| 15 | PACKAGES = "\ | ||
| 16 | gst-meta-base \ | ||
| 17 | gst-meta-x11-base \ | ||
| 18 | gst-meta-audio \ | ||
| 19 | gst-meta-debug \ | ||
| 20 | gst-meta-video" | ||
| 21 | |||
| 22 | ALLOW_EMPTY_gst-meta-base = "1" | ||
| 23 | ALLOW_EMPTY_gst-meta-x11-base = "1" | ||
| 24 | ALLOW_EMPTY_gst-meta-audio = "1" | ||
| 25 | ALLOW_EMPTY_gst-meta-debug = "1" | ||
| 26 | ALLOW_EMPTY_gst-meta-video = "1" | ||
| 27 | |||
| 28 | RDEPENDS_gst-meta-base = "\ | ||
| 29 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \ | ||
| 30 | gstreamer \ | ||
| 31 | gst-plugins-base-playbin \ | ||
| 32 | gst-plugins-base-decodebin \ | ||
| 33 | gst-plugins-base-decodebin2 \ | ||
| 34 | gst-plugins-base-gio \ | ||
| 35 | gst-plugins-base-alsa \ | ||
| 36 | gst-plugins-base-volume \ | ||
| 37 | gst-plugins-base-audioconvert \ | ||
| 38 | gst-plugins-base-audioresample \ | ||
| 39 | gst-plugins-base-typefindfunctions \ | ||
| 40 | gst-plugins-base-videoscale \ | ||
| 41 | gst-plugins-base-ffmpegcolorspace \ | ||
| 42 | gst-plugins-good-autodetect \ | ||
| 43 | gst-plugins-good-souphttpsrc" | ||
| 44 | |||
| 45 | RRECOMMENDS_gst-meta-x11-base = "\ | ||
| 46 | gst-plugins-base-ximagesink \ | ||
| 47 | gst-plugins-base-xvimagesink" | ||
| 48 | |||
| 49 | RDEPENDS_gst-meta-audio = "\ | ||
| 50 | gst-meta-base \ | ||
| 51 | gst-plugins-base-vorbis \ | ||
| 52 | gst-plugins-base-ogg \ | ||
| 53 | gst-plugins-good-wavparse \ | ||
| 54 | gst-plugins-good-flac \ | ||
| 55 | ${COMMERCIAL_AUDIO_PLUGINS}" | ||
| 56 | |||
| 57 | |||
| 58 | RDEPENDS_gst-meta-debug = "\ | ||
| 59 | gst-meta-base \ | ||
| 60 | gst-plugins-good-debug \ | ||
| 61 | gst-plugins-base-audiotestsrc \ | ||
| 62 | gst-plugins-base-videotestsrc" | ||
| 63 | |||
| 64 | |||
| 65 | RDEPENDS_gst-meta-video = "\ | ||
| 66 | gst-meta-base \ | ||
| 67 | gst-plugins-good-avi \ | ||
| 68 | gst-plugins-good-matroska \ | ||
| 69 | gst-plugins-base-theora \ | ||
| 70 | ${COMMERCIAL_VIDEO_PLUGINS}" | ||
| 71 | |||
| 72 | RRECOMMENDS_gst-meta-video = "\ | ||
| 73 | gst-meta-audio" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch deleted file mode 100644 index 57a63b5a0f..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 4 | |||
| 5 | Index: gst-openmax-0.10.1/omx/gstomx.c | ||
| 6 | =================================================================== | ||
| 7 | --- gst-openmax-0.10.1.orig/omx/gstomx.c 2010-09-30 18:00:24.000000000 -0700 | ||
| 8 | +++ gst-openmax-0.10.1/omx/gstomx.c 2011-05-17 23:08:08.794535872 -0700 | ||
| 9 | @@ -238,7 +238,8 @@ | ||
| 10 | const gchar *element_name = gst_structure_nth_field_name (element_table, i); | ||
| 11 | GstStructure *element = get_element_entry (element_name); | ||
| 12 | const gchar *type_name, *parent_type_name; | ||
| 13 | - const gchar *component_name, *component_role, *library_name; | ||
| 14 | + const gchar *component_name, *library_name; | ||
| 15 | + const gchar __attribute__((__unused__)) *component_role; | ||
| 16 | GType type; | ||
| 17 | gint rank; | ||
| 18 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch deleted file mode 100644 index 5965bbafbb..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | Rename static functions that use GLib naming conventions as one of them | ||
| 2 | (g_ptr_array_insert) has now been added to GLib. | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 6 | |||
| 7 | diff --git a/omx/gstomx_util.c b/omx/gstomx_util.c | ||
| 8 | index 423e441..579dbf5 100644 | ||
| 9 | --- a/omx/gstomx_util.c | ||
| 10 | +++ b/omx/gstomx_util.c | ||
| 11 | @@ -85,7 +85,7 @@ static gboolean initialized; | ||
| 12 | */ | ||
| 13 | |||
| 14 | static void | ||
| 15 | -g_ptr_array_clear (GPtrArray * array) | ||
| 16 | +omx_g_ptr_array_clear (GPtrArray * array) | ||
| 17 | { | ||
| 18 | guint index; | ||
| 19 | for (index = 0; index < array->len; index++) | ||
| 20 | @@ -93,7 +93,7 @@ g_ptr_array_clear (GPtrArray * array) | ||
| 21 | } | ||
| 22 | |||
| 23 | static void | ||
| 24 | -g_ptr_array_insert (GPtrArray * array, guint index, gpointer data) | ||
| 25 | +omx_g_ptr_array_insert (GPtrArray * array, guint index, gpointer data) | ||
| 26 | { | ||
| 27 | if (index + 1 > array->len) { | ||
| 28 | g_ptr_array_set_size (array, index + 1); | ||
| 29 | @@ -394,7 +394,7 @@ g_omx_core_unload (GOmxCore * core) | ||
| 30 | } | ||
| 31 | |||
| 32 | core_for_each_port (core, g_omx_port_free); | ||
| 33 | - g_ptr_array_clear (core->ports); | ||
| 34 | + omx_g_ptr_array_clear (core->ports); | ||
| 35 | } | ||
| 36 | |||
| 37 | static inline GOmxPort * | ||
| 38 | @@ -418,7 +418,7 @@ g_omx_core_new_port (GOmxCore * core, guint index) | ||
| 39 | } | ||
| 40 | |||
| 41 | port = g_omx_port_new (core, index); | ||
| 42 | - g_ptr_array_insert (core->ports, index, port); | ||
| 43 | + omx_g_ptr_array_insert (core->ports, index, port); | ||
| 44 | |||
| 45 | return port; | ||
| 46 | } | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb deleted file mode 100644 index 2e01579569..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | SUMMARY = "GStreamer plug-in for communication with OpenMAX IL components" | ||
| 2 | DESCRIPTION = "GstOpenMAX is a GStreamer plug-in that allows \ | ||
| 3 | communication with OpenMAX Integration Layer (IL) components. OpenMAX \ | ||
| 4 | IL is an industry standard that provides an abstraction layer for \ | ||
| 5 | computer graphics, video, and sound routines." | ||
| 6 | HOMEPAGE = "http://freedesktop.org/wiki/GstOpenMAX" | ||
| 7 | DEPENDS = "gstreamer" | ||
| 8 | RDEPENDS_${PN} = "libomxil" | ||
| 9 | LICENSE = "LGPLv2.1" | ||
| 10 | LICENSE_FLAGS = "commercial" | ||
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ | ||
| 12 | file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc" | ||
| 13 | |||
| 14 | SRC_URI = "http://gstreamer.freedesktop.org/src/gst-openmax/gst-openmax-${PV}.tar.bz2 \ | ||
| 15 | file://gcc_4.6.patch \ | ||
| 16 | file://ptr-array.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | inherit autotools pkgconfig | ||
| 20 | |||
| 21 | # Tell configure that this isn't a development snapshot so we don't want | ||
| 22 | # -Werror (hopefully fixed in 0.10.2) | ||
| 23 | export GST_CVS="no" | ||
| 24 | |||
| 25 | EXTRA_OECONF += "--disable-valgrind" | ||
| 26 | |||
| 27 | PR = "r4" | ||
| 28 | |||
| 29 | FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so" | ||
| 30 | FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.la" | ||
| 31 | FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/libgstomx.a" | ||
| 32 | FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/" | ||
| 33 | |||
| 34 | SRC_URI[md5sum] = "4d0370bfe99dea20918c84347abadb4e" | ||
| 35 | SRC_URI[sha256sum] = "9074d5a0591995133d19cfb15144f19664f902c1623f996595695cf2c2070e1f" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch deleted file mode 100644 index 235acda8bf..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | Description: Fix buffer overflow in mp4 parsing | ||
| 2 | Author: Ralph Giles <giles@mozilla.com> | ||
| 3 | --- | ||
| 4 | Backport patch from debian to fix CVE-2015-0797. | ||
| 5 | https://sources.debian.net/data/main/g/gst-plugins-bad0.10/0.10.23-7.1+deb7u2/debian/patches/buffer-overflow-mp4.patch | ||
| 6 | |||
| 7 | Upstream-Status: Backport | ||
| 8 | |||
| 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 10 | --- | ||
| 11 | --- gst-plugins-bad0.10-0.10.23.orig/gst/videoparsers/gsth264parse.c | ||
| 12 | +++ gst-plugins-bad0.10-0.10.23/gst/videoparsers/gsth264parse.c | ||
| 13 | @@ -384,6 +384,11 @@ gst_h264_parse_wrap_nal (GstH264Parse * | ||
| 14 | |||
| 15 | GST_DEBUG_OBJECT (h264parse, "nal length %d", size); | ||
| 16 | |||
| 17 | + if (size > G_MAXUINT32 - nl) { | ||
| 18 | + GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL), | ||
| 19 | + ("overflow in nal size")); | ||
| 20 | + return NULL; | ||
| 21 | + } | ||
| 22 | buf = gst_buffer_new_and_alloc (size + nl + 4); | ||
| 23 | if (format == GST_H264_PARSE_FORMAT_AVC) { | ||
| 24 | GST_WRITE_UINT32_BE (GST_BUFFER_DATA (buf), size << (32 - 8 * nl)); | ||
| 25 | @@ -452,6 +457,11 @@ gst_h264_parse_process_nal (GstH264Parse | ||
| 26 | GST_DEBUG_OBJECT (h264parse, "not processing nal size %u", nalu->size); | ||
| 27 | return; | ||
| 28 | } | ||
| 29 | + if (G_UNLIKELY (nalu->size > 20 * 1024 * 1024)) { | ||
| 30 | + GST_DEBUG_OBJECT (h264parse, "not processing nal size %u (too big)", | ||
| 31 | + nalu->size); | ||
| 32 | + return; | ||
| 33 | + } | ||
| 34 | |||
| 35 | /* we have a peek as well */ | ||
| 36 | nal_type = nalu->type; | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb deleted file mode 100644 index 38fccc8d01..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | require gst-plugins.inc | ||
| 2 | |||
| 3 | LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | ||
| 5 | file://gst/tta/filters.h;beginline=12;endline=29;md5=629b0c7a665d155a6677778f4460ec06 \ | ||
| 6 | file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ | ||
| 7 | file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c" | ||
| 8 | |||
| 9 | DEPENDS += "gst-plugins-base" | ||
| 10 | |||
| 11 | PR = "r4" | ||
| 12 | |||
| 13 | SRC_URI += "file://buffer-overflow-mp4.patch" | ||
| 14 | |||
| 15 | inherit gettext gsettings | ||
| 16 | |||
| 17 | EXTRA_OECONF += "--disable-experimental \ | ||
| 18 | --disable-sdl --disable-cdaudio --disable-directfb \ | ||
| 19 | --disable-vdpau --disable-apexsink" | ||
| 20 | |||
| 21 | PACKAGECONFIG ??= "bzip curl \ | ||
| 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}" | ||
| 23 | |||
| 24 | PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2" | ||
| 25 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" | ||
| 26 | PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg," | ||
| 27 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | ||
| 28 | PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" | ||
| 29 | PACKAGECONFIG[mms] = "--enable-libmms,--disable-libmms,libmms" | ||
| 30 | PACKAGECONFIG[cog] = "--enable-cog,--disable-cog,libpng" | ||
| 31 | PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" | ||
| 32 | PACKAGECONFIG[jp2k] = "--enable-jp2k,--disable-jp2k,jasper" | ||
| 33 | PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" | ||
| 34 | PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" | ||
| 35 | PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" | ||
| 36 | PACKAGECONFIG[vp8] = "--enable-vp8,--disable-vp8,libvpx" | ||
| 37 | PACKAGECONFIG[ass] = "--enable-assrender,--disable-assrender,libass" | ||
| 38 | PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" | ||
| 39 | PACKAGECONFIG[schro] = "--enable-schro,--disable-schro,schroedinger" | ||
| 40 | PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" | ||
| 41 | PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" | ||
| 42 | PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" | ||
| 43 | PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" | ||
| 44 | PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" | ||
| 45 | PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdnav libdvdread" | ||
| 46 | PACKAGECONFIG[zbar] = "--enable-zbar,--disable-zbar,zbar jpeg" | ||
| 47 | |||
| 48 | ARM_INSTRUCTION_SET = "arm" | ||
| 49 | |||
| 50 | PACKAGES =+ "${PN}-resindvd" | ||
| 51 | FILES_${PN}-resindvd = "${libdir}/gstreamer-${LIBV}/libresindvd.so" | ||
| 52 | FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/libresindvd.la" | ||
| 53 | FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" | ||
| 54 | |||
| 55 | do_configure_prepend() { | ||
| 56 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 | ||
| 57 | rm ${S}/m4/lib-link.m4 || true | ||
| 58 | } | ||
| 59 | |||
| 60 | SRC_URI[md5sum] = "fcb09798114461955260e4d940db5987" | ||
| 61 | SRC_URI[sha256sum] = "0eae7d1a1357ae8377fded6a1b42e663887beabe0e6cc336e2ef9ada42e11491" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch deleted file mode 100644 index 29fbec5f80..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 5478eafecf618cd8e742cc1b96d688a2c7ce5a79 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Sun, 2 Oct 2016 21:49:33 +0200 | ||
| 4 | Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | we are definitely not one of those poor souls mentioned | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 14 | --- | ||
| 15 | common/m4/gst-glib2.m4 | 1 - | ||
| 16 | 1 file changed, 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4 | ||
| 19 | index b01f02f..4569ae5 100644 | ||
| 20 | --- a/common/m4/gst-glib2.m4 | ||
| 21 | +++ b/common/m4/gst-glib2.m4 | ||
| 22 | @@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK], | ||
| 23 | fi | ||
| 24 | |||
| 25 | dnl for the poor souls who for example have glib in /usr/local | ||
| 26 | - AS_SCRUB_INCLUDE(GLIB_CFLAGS) | ||
| 27 | |||
| 28 | AC_SUBST(GLIB_EXTRA_CFLAGS) | ||
| 29 | ]) | ||
| 30 | -- | ||
| 31 | 2.5.5 | ||
| 32 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch deleted file mode 100644 index 52142562ab..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | audioresample: Fix build on x86 if emmintrin.h is available but can't be used | ||
| 2 | |||
| 3 | On x86, EMMINTRIN is defined but not usable without SSE so check for | ||
| 4 | __SSE__ and __SSE2__ as well. | ||
| 5 | |||
| 6 | https://bugzilla.gnome.org/show_bug.cgi?id=670690 | ||
| 7 | |||
| 8 | Upstream-Status: Backport | ||
| 9 | |||
| 10 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 11 | --- | ||
| 12 | gst/audioresample/resample.c | 4 ++-- | ||
| 13 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c | ||
| 16 | index 98d006c..481fa01 100644 | ||
| 17 | --- a/gst/audioresample/resample.c | ||
| 18 | +++ b/gst/audioresample/resample.c | ||
| 19 | @@ -77,13 +77,13 @@ | ||
| 20 | #define EXPORT G_GNUC_INTERNAL | ||
| 21 | |||
| 22 | #ifdef _USE_SSE | ||
| 23 | -#ifndef HAVE_XMMINTRIN_H | ||
| 24 | +#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) | ||
| 25 | #undef _USE_SSE | ||
| 26 | #endif | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #ifdef _USE_SSE2 | ||
| 30 | -#ifndef HAVE_EMMINTRIN_H | ||
| 31 | +#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) | ||
| 32 | #undef _USE_SSE2 | ||
| 33 | #endif | ||
| 34 | #endif | ||
| 35 | -- | ||
| 36 | 1.7.1 | ||
| 37 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch deleted file mode 100644 index b8602c80d7..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [similar patch by other author, bugzilla] | ||
| 2 | Bugtracker-URL: https://bugzilla.gnome.org/show_bug.cgi?id=663600 | ||
| 3 | |||
| 4 | Prepend PKG_CONFIG_SYSROOT to includedir, so configure doesn't | ||
| 5 | search for gstconfig.h in /usr/include. | ||
| 6 | |||
| 7 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
| 8 | --- | ||
| 9 | configure.ac | 2 +- | ||
| 10 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/configure.ac b/configure.ac | ||
| 13 | index 1901bcf..460fb0a 100644 | ||
| 14 | --- a/configure.ac | ||
| 15 | +++ b/configure.ac | ||
| 16 | @@ -435,7 +435,7 @@ AG_GST_CHECK_PLUGIN(volume) | ||
| 17 | dnl check for gstreamer core features (subsystems) | ||
| 18 | dnl FIXME: this assumes srcdir == builddir for uninstalled setups | ||
| 19 | GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h" | ||
| 20 | -AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH) | ||
| 21 | +AG_GST_PARSE_SUBSYSTEM_DISABLES($PKG_CONFIG_SYSROOT_DIR$GST_CONFIGPATH) | ||
| 22 | AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1") | ||
| 23 | |||
| 24 | dnl disable plug-ins that require libxml2's HTML support if it is not available | ||
| 25 | -- | ||
| 26 | 1.7.5.4 | ||
| 27 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch deleted file mode 100644 index 99dbc9d52e..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | Remove -DTREMOR option since Tremor has dropped its internal | ||
| 2 | libogg2, and gst-plugins-base has dependency on that. | ||
| 3 | |||
| 4 | Upstream-Status: Inappropriate [configuration] | ||
| 5 | |||
| 6 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 7 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
| 8 | |||
| 9 | diff -r 70065fb4e085 ext/vorbis/Makefile.am | ||
| 10 | --- a/ext/vorbis/Makefile.am Tue Mar 13 16:36:56 2012 +0800 | ||
| 11 | +++ b/ext/vorbis/Makefile.am Tue Mar 13 16:38:53 2012 +0800 | ||
| 12 | @@ -30,7 +30,7 @@ | ||
| 13 | gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c | ||
| 14 | libgstivorbisdec_la_CFLAGS = \ | ||
| 15 | $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ | ||
| 16 | - -DTREMOR $(IVORBIS_CFLAGS) | ||
| 17 | + $(IVORBIS_CFLAGS) | ||
| 18 | libgstivorbisdec_la_LIBADD = \ | ||
| 19 | $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ | ||
| 20 | $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb deleted file mode 100644 index f2354648df..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | require gst-plugins.inc | ||
| 2 | |||
| 3 | LICENSE = "GPLv2+ & LGPLv2+" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | ||
| 5 | file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ | ||
| 6 | file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ | ||
| 7 | file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" | ||
| 8 | |||
| 9 | DEPENDS += "alsa-lib libogg libvorbis libtheora util-linux tremor glib-2.0-native" | ||
| 10 | |||
| 11 | SRC_URI += "file://gst-plugins-base-tremor.patch \ | ||
| 12 | file://configure.ac-fix-subparse-plugin.patch \ | ||
| 13 | file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \ | ||
| 14 | file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \ | ||
| 15 | " | ||
| 16 | |||
| 17 | SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" | ||
| 18 | SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" | ||
| 19 | |||
| 20 | PR = "r8" | ||
| 21 | |||
| 22 | inherit gettext | ||
| 23 | |||
| 24 | EXTRA_OECONF += "--disable-freetypetest" | ||
| 25 | |||
| 26 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
| 27 | |||
| 28 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | ||
| 29 | PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" | ||
| 30 | PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice" | ||
| 31 | PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" | ||
| 32 | |||
| 33 | do_configure_prepend() { | ||
| 34 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 | ||
| 35 | rm -f ${S}/m4/lib-link.m4 | ||
| 36 | } | ||
| 37 | |||
| 38 | FILES_${PN} += "${datadir}/${BPN}" | ||
| 39 | |||
| 40 | CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" | ||
| 41 | |||
| 42 | # /usr/bin/gst-visualise-0.10 is a perl script. | ||
| 43 | RDEPENDS_${PN}-apps += "perl" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch deleted file mode 100644 index bc2f88b241..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 14d51cbefef19737e7ab2b6818ee1d3bdb248d12 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jeremy Stashluk <jstashluk@dekaresearch.com> | ||
| 3 | Date: Wed, 6 Feb 2013 09:59:48 -0500 | ||
| 4 | Subject: [PATCH] conditional gl framebuffer undefined use | ||
| 5 | |||
| 6 | The OpenGL extension GL_ARB_framebuffer_object defines the macro | ||
| 7 | GL_FRAMEBUFFER_UNDEFINED. The macro will only need to map to an error | ||
| 8 | string if the extension provides functions that might return the macro. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com> | ||
| 13 | --- | ||
| 14 | gst-libs/gst/gl/gstgldisplay.c | 2 ++ | ||
| 15 | 1 file changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c | ||
| 18 | index 3ed0b71..64c6c2c 100644 | ||
| 19 | --- a/gst-libs/gst/gl/gstgldisplay.c | ||
| 20 | +++ b/gst-libs/gst/gl/gstgldisplay.c | ||
| 21 | @@ -2177,9 +2177,11 @@ gst_gl_display_check_framebuffer_status (void) | ||
| 22 | GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"); | ||
| 23 | break; | ||
| 24 | |||
| 25 | +#if defined(GL_ARB_framebuffer_object) | ||
| 26 | case GL_FRAMEBUFFER_UNDEFINED: | ||
| 27 | GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED"); | ||
| 28 | break; | ||
| 29 | +#endif | ||
| 30 | |||
| 31 | default: | ||
| 32 | GST_ERROR ("General FBO error"); | ||
| 33 | -- | ||
| 34 | 1.7.9.5 | ||
| 35 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch deleted file mode 100644 index 7db1c5afcc..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | Check for header and library separately and check for GLESv2 before egl | ||
| 2 | this is to overcome an annoying issue with rpi/userland where egl depends | ||
| 3 | on sysmbols from libGLESv2 | ||
| 4 | |||
| 5 | -Khem | ||
| 6 | Index: gst-plugins-gl-0.10.3/configure.ac | ||
| 7 | =================================================================== | ||
| 8 | --- gst-plugins-gl-0.10.3.orig/configure.ac | ||
| 9 | +++ gst-plugins-gl-0.10.3/configure.ac | ||
| 10 | @@ -183,8 +183,10 @@ case $host in | ||
| 11 | else | ||
| 12 | AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no]) | ||
| 13 | if test "x$HAVE_EGL" = "xyes"; then | ||
| 14 | - AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required])) | ||
| 15 | - AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required])) | ||
| 16 | + AC_CHECK_HEADERS([GLES2/gl2.h],, AC_MSG_ERROR([OpenGLES2 is required])) | ||
| 17 | + AC_CHECK_LIB(GLESv2,[glTexImage2D],, AC_MSG_ERROR([OpenGLES2 is required])) | ||
| 18 | + AC_CHECK_HEADERS([EGL/egl.h],, AC_MSG_ERROR([EGL is required])) | ||
| 19 | + AC_CHECK_LIB(EGL,[eglGetError],, AC_MSG_ERROR([EGL is required])) | ||
| 20 | GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" | ||
| 21 | GL_BACKEND=x11ES2 | ||
| 22 | GL_TYPE=gles | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb deleted file mode 100644 index f3eaf30940..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | require gst-plugins.inc | ||
| 2 | |||
| 3 | LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | ||
| 5 | |||
| 6 | SRC_URI[md5sum] = "ac70ede13f79978d56eaed8abaa3c938" | ||
| 7 | SRC_URI[sha256sum] = "48340b6a4b8abce16344a7bc33e74a94fdcce4f57ef6342cdf2f941c429bf210" | ||
| 8 | |||
| 9 | SRC_URI += " file://0001-conditional-gl-framebuffer-undefined-use.patch \ | ||
| 10 | file://rpi-egl-gles2-dep.patch \ | ||
| 11 | " | ||
| 12 | |||
| 13 | DEPENDS += "gst-plugins-base virtual/libgles2 virtual/egl jpeg libpng glew" | ||
| 14 | |||
| 15 | PR = "r4" | ||
| 16 | |||
| 17 | inherit gettext distro_features_check | ||
| 18 | |||
| 19 | REQUIRED_DISTRO_FEATURES = "opengl" | ||
| 20 | |||
| 21 | # This package doesn't have a configure switch for EGL or GL, so forcibly tell | ||
| 22 | # configure that it can't find gl.h so it always uses EGL. If/when we have some | ||
| 23 | # way for machines to specify their preferred GL flavour this can be | ||
| 24 | # automatically adapted. | ||
| 25 | EXTRA_OECONF += "ac_cv_header_GL_gl_h=no" | ||
| 26 | |||
| 27 | ALLOW_EMPTY_${PN} = "1" | ||
| 28 | ALLOW_EMPTY_${PN}-apps = "1" | ||
| 29 | ALLOW_EMPTY_${PN}-glib = "1" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch deleted file mode 100644 index 6456d3c6c2..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Wed, 5 Sep 2012 18:54:42 +0200 | ||
| 4 | Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input | ||
| 5 | field was removed | ||
| 6 | MIME-Version: 1.0 | ||
| 7 | Content-Type: text/plain; charset=UTF-8 | ||
| 8 | Content-Transfer-Encoding: 8bit | ||
| 9 | |||
| 10 | Upstream-Status: Backport | ||
| 11 | |||
| 12 | [1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012 | ||
| 13 | |||
| 14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 15 | --- | ||
| 16 | sys/v4l2/gstv4l2bufferpool.c | 1 - | ||
| 17 | 1 files changed, 0 insertions(+), 1 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c | ||
| 20 | index b81c6a4..51cc0ce 100644 | ||
| 21 | --- a/sys/v4l2/gstv4l2bufferpool.c | ||
| 22 | +++ b/sys/v4l2/gstv4l2bufferpool.c | ||
| 23 | @@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) | ||
| 24 | GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", | ||
| 25 | ret->vbuffer.m.offset); | ||
| 26 | GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); | ||
| 27 | - GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); | ||
| 28 | |||
| 29 | data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, | ||
| 30 | PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, | ||
| 31 | -- | ||
| 32 | 1.7.6.5 | ||
| 33 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch deleted file mode 100644 index bd0de583a5..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Thu, 22 Aug 2013 12:15:54 -0400 | ||
| 4 | Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER | ||
| 5 | |||
| 6 | kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls] | ||
| 7 | removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three | ||
| 8 | years of depreciation. | ||
| 9 | |||
| 10 | The ioctl values are still free, and the case statement which processess them | ||
| 11 | in v4l2 userspace falls through to the proper replacement. So in the short | ||
| 12 | term, we can explicitly define them using the old absolute values, and everything | ||
| 13 | will work. | ||
| 14 | |||
| 15 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 16 | --- | ||
| 17 | sys/v4l2/v4l2_calls.c | 9 +++++++-- | ||
| 18 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c | ||
| 21 | index 309bfb6..3c64544 100644 | ||
| 22 | --- a/sys/v4l2/v4l2_calls.c | ||
| 23 | +++ b/sys/v4l2/v4l2_calls.c | ||
| 24 | @@ -54,11 +54,16 @@ | ||
| 25 | #include "gst/gst-i18n-plugin.h" | ||
| 26 | |||
| 27 | /* Those are ioctl calls */ | ||
| 28 | + | ||
| 29 | +/* V4L2_CID_HCENTER has been removed from the mainline kernel, but | ||
| 30 | + the ioctl space is still present. Since these values fall through | ||
| 31 | + to their replacement, it is safe (in the short term) to re-use the | ||
| 32 | + old values explictily */ | ||
| 33 | #ifndef V4L2_CID_HCENTER | ||
| 34 | -#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED | ||
| 35 | +#define V4L2_CID_HCENTER V4L2_CID_BASE+22 | ||
| 36 | #endif | ||
| 37 | #ifndef V4L2_CID_VCENTER | ||
| 38 | -#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED | ||
| 39 | +#define V4L2_CID_VCENTER V4L2_CID_BASE+23 | ||
| 40 | #endif | ||
| 41 | |||
| 42 | GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); | ||
| 43 | -- | ||
| 44 | 1.7.10.4 | ||
| 45 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch deleted file mode 100644 index 48b8e98b81..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | From ce94b2c2b91b6db190c121860e12a6afafce7ae1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Roland Krikava <rkrikava@gmail.com> | ||
| 3 | Date: Fri, 2 Nov 2012 12:38:44 -0400 | ||
| 4 | Subject: [PATCH 407/440] mulawdec: fix integer overrun | ||
| 5 | |||
| 6 | There might be more than 65535 samples in a chunk of data. | ||
| 7 | |||
| 8 | https://bugzilla.gnome.org/show_bug.cgi?id=687469 | ||
| 9 | |||
| 10 | Commit - 3be45f70220310ec1c60d819f90b5f2ae03b5d83 in 0.10 branch | ||
| 11 | |||
| 12 | Upstream Status: Backported | ||
| 13 | |||
| 14 | Signed-off-by: Roland Krikava <rkrikava@gmail.com> | ||
| 15 | --- | ||
| 16 | gst/law/mulaw-conversion.c | 6 ++++-- | ||
| 17 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c | ||
| 20 | index 8afae80..190a9f5 100644 | ||
| 21 | --- a/gst/law/mulaw-conversion.c | ||
| 22 | +++ b/gst/law/mulaw-conversion.c | ||
| 23 | @@ -51,9 +51,10 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples) | ||
| 24 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 25 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 | ||
| 26 | }; | ||
| 27 | - gint16 sign, exponent, mantissa, i; | ||
| 28 | + gint16 sign, exponent, mantissa; | ||
| 29 | gint16 sample; | ||
| 30 | guint8 ulawbyte; | ||
| 31 | + gint i; | ||
| 32 | |||
| 33 | for (i = 0; i < numsamples; i++) { | ||
| 34 | sample = in[i]; | ||
| 35 | @@ -102,7 +103,8 @@ mulaw_decode (guint8 * in, gint16 * out, gint numsamples) | ||
| 36 | static gint16 exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 }; | ||
| 37 | gint16 sign, exponent, mantissa; | ||
| 38 | guint8 ulawbyte; | ||
| 39 | - gint16 linear, i; | ||
| 40 | + gint16 linear; | ||
| 41 | + gint i; | ||
| 42 | |||
| 43 | for (i = 0; i < numsamples; i++) { | ||
| 44 | ulawbyte = in[i]; | ||
| 45 | -- | ||
| 46 | 1.7.9.5 | ||
| 47 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb deleted file mode 100644 index f993cfc111..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | require gst-plugins.inc | ||
| 2 | |||
| 3 | LICENSE = "GPLv2+ & LGPLv2.1+" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
| 5 | file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ | ||
| 6 | file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" | ||
| 7 | |||
| 8 | PR = "r8" | ||
| 9 | |||
| 10 | PACKAGECONFIG ?= "jpeg v4l \ | ||
| 11 | ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ | ||
| 12 | " | ||
| 13 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" | ||
| 14 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | ||
| 15 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | ||
| 16 | PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" | ||
| 17 | PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" | ||
| 18 | PACKAGECONFIG[v4l] = "--enable-gst_v4l2 --with-gudev,--disable-gst_v4l2 --without-gudev,libgudev" | ||
| 19 | # sub-feature of v4l, but control separately since libv4l is not part of oe-core | ||
| 20 | PACKAGECONFIG[libv4l] = "--with-libv4l2,--without-libv4l2,libv4l" | ||
| 21 | PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2" | ||
| 22 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | ||
| 23 | PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage" | ||
| 24 | PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libiec61883 libavc1394" | ||
| 25 | |||
| 26 | DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \ | ||
| 27 | speex libsoup-2.4 libcap" | ||
| 28 | |||
| 29 | inherit gettext gconf | ||
| 30 | |||
| 31 | SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \ | ||
| 32 | file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch \ | ||
| 33 | file://0407-mulawdec-fix-integer-overrun.patch \ | ||
| 34 | " | ||
| 35 | EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal \ | ||
| 36 | --disable-examples --disable-taglib" | ||
| 37 | |||
| 38 | do_configure_prepend() { | ||
| 39 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 | ||
| 40 | rm ${S}/m4/lib-link.m4 || true | ||
| 41 | } | ||
| 42 | |||
| 43 | SRC_URI[md5sum] = "24f98a294a2b521e1b29412bdadae2e6" | ||
| 44 | SRC_URI[sha256sum] = "7e27840e40a7932ef2dc032d7201f9f41afcaf0b437daf5d1d44dc96d9e35ac6" | ||
| 45 | |||
| 46 | FILES_${PN}-gconfelements += "${sysconfdir}/gconf/schemas/gstreamer-0.10.schemas" | ||
| 47 | FILES_${PN}-equalizer += "${datadir}/gstreamer-0.10/presets/*.prs" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch deleted file mode 100644 index 1f72fc036c..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch +++ /dev/null | |||
| @@ -1,193 +0,0 @@ | |||
| 1 | From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leon Merten Lohse <leon@green-side.de> | ||
| 3 | Date: Thu, 3 May 2012 23:50:30 +0100 | ||
| 4 | Subject: [PATCH] cdio: compensate for libcdio's recent cd-text api changes | ||
| 5 | |||
| 6 | https://bugzilla.gnome.org/show_bug.cgi?id=675112 | ||
| 7 | |||
| 8 | Conflicts: | ||
| 9 | |||
| 10 | ext/cdio/gstcdiocddasrc.c | ||
| 11 | |||
| 12 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 13 | |||
| 14 | Upstream-Status: Backport | ||
| 15 | --- | ||
| 16 | ext/cdio/gstcdio.c | 35 ++++++++++++++++++++++++++++------- | ||
| 17 | ext/cdio/gstcdio.h | 16 ++++++++++++++++ | ||
| 18 | ext/cdio/gstcdiocddasrc.c | 19 +++++++++++++++++++ | ||
| 19 | 3 files changed, 63 insertions(+), 7 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c | ||
| 22 | index 2f58d18..483ebf5 100644 | ||
| 23 | --- a/ext/cdio/gstcdio.c | ||
| 24 | +++ b/ext/cdio/gstcdio.c | ||
| 25 | @@ -30,12 +30,16 @@ | ||
| 26 | GST_DEBUG_CATEGORY (gst_cdio_debug); | ||
| 27 | |||
| 28 | void | ||
| 29 | -gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, | ||
| 30 | +gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, | ||
| 31 | cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) | ||
| 32 | { | ||
| 33 | const gchar *txt; | ||
| 34 | |||
| 35 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 36 | + txt = cdtext_get_const (cdtext, field, track); | ||
| 37 | +#else | ||
| 38 | txt = cdtext_get_const (field, cdtext); | ||
| 39 | +#endif | ||
| 40 | if (txt == NULL || *txt == '\0') { | ||
| 41 | GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); | ||
| 42 | return; | ||
| 43 | @@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, | ||
| 44 | } | ||
| 45 | |||
| 46 | GstTagList * | ||
| 47 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 48 | +gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) | ||
| 49 | +{ | ||
| 50 | + GstTagList *tags = NULL; | ||
| 51 | + | ||
| 52 | +#else | ||
| 53 | gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) | ||
| 54 | { | ||
| 55 | GstTagList *tags = NULL; | ||
| 56 | @@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) | ||
| 57 | GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); | ||
| 58 | return NULL; | ||
| 59 | } | ||
| 60 | +#endif | ||
| 61 | |||
| 62 | - gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); | ||
| 63 | - gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); | ||
| 64 | + gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, | ||
| 65 | + GST_TAG_ARTIST, &tags); | ||
| 66 | + gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, | ||
| 67 | + &tags); | ||
| 68 | |||
| 69 | return tags; | ||
| 70 | } | ||
| 71 | |||
| 72 | void | ||
| 73 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 74 | +gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, | ||
| 75 | + GstTagList * tags) | ||
| 76 | +{ | ||
| 77 | +#else | ||
| 78 | gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) | ||
| 79 | { | ||
| 80 | cdtext_t *t; | ||
| 81 | @@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) | ||
| 82 | GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); | ||
| 83 | return; | ||
| 84 | } | ||
| 85 | +#endif | ||
| 86 | |||
| 87 | - /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ | ||
| 88 | - gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); | ||
| 89 | - gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); | ||
| 90 | - | ||
| 91 | + gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, | ||
| 92 | + GST_TAG_ALBUM_ARTIST, &tags); | ||
| 93 | + gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, | ||
| 94 | + &tags); | ||
| 95 | + gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, | ||
| 96 | + &tags); | ||
| 97 | GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); | ||
| 98 | } | ||
| 99 | |||
| 100 | diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h | ||
| 101 | index ef31ed0..c6da580 100644 | ||
| 102 | --- a/ext/cdio/gstcdio.h | ||
| 103 | +++ b/ext/cdio/gstcdio.h | ||
| 104 | @@ -24,22 +24,38 @@ | ||
| 105 | #include <gst/gst.h> | ||
| 106 | #include <cdio/cdio.h> | ||
| 107 | #include <cdio/cdtext.h> | ||
| 108 | +#include <cdio/version.h> | ||
| 109 | + | ||
| 110 | +#if LIBCDIO_VERSION_NUM <= 83 | ||
| 111 | + #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER | ||
| 112 | + #define CDTEXT_FIELD_GENRE CDTEXT_GENRE | ||
| 113 | + #define CDTEXT_FIELD_TITLE CDTEXT_TITLE | ||
| 114 | +#endif | ||
| 115 | |||
| 116 | GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); | ||
| 117 | #define GST_CAT_DEFAULT gst_cdio_debug | ||
| 118 | |||
| 119 | void gst_cdio_add_cdtext_field (GstObject * src, | ||
| 120 | cdtext_t * cdtext, | ||
| 121 | + track_t track, | ||
| 122 | cdtext_field_t field, | ||
| 123 | const gchar * gst_tag, | ||
| 124 | GstTagList ** p_tags); | ||
| 125 | |||
| 126 | GstTagList * gst_cdio_get_cdtext (GstObject * src, | ||
| 127 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 128 | + cdtext_t * t, | ||
| 129 | +#else | ||
| 130 | CdIo * cdio, | ||
| 131 | +#endif | ||
| 132 | track_t track); | ||
| 133 | |||
| 134 | void gst_cdio_add_cdtext_album_tags (GstObject * src, | ||
| 135 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 136 | + cdtext_t * t, | ||
| 137 | +#else | ||
| 138 | CdIo * cdio, | ||
| 139 | +#endif | ||
| 140 | GstTagList * tags); | ||
| 141 | |||
| 142 | #endif /* __GST_CDIO_H__ */ | ||
| 143 | diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c | ||
| 144 | index 615a0c8..830839e 100644 | ||
| 145 | --- a/ext/cdio/gstcdiocddasrc.c | ||
| 146 | +++ b/ext/cdio/gstcdiocddasrc.c | ||
| 147 | @@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) | ||
| 148 | GstCdioCddaSrc *src; | ||
| 149 | discmode_t discmode; | ||
| 150 | gint first_track, num_tracks, i; | ||
| 151 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 152 | + cdtext_t *cdtext; | ||
| 153 | +#endif | ||
| 154 | |||
| 155 | src = GST_CDIO_CDDA_SRC (audiocdsrc); | ||
| 156 | |||
| 157 | @@ -244,8 +244,18 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device) | ||
| 158 | if (src->read_speed != -1) | ||
| 159 | cdio_set_speed (src->cdio, src->read_speed); | ||
| 160 | |||
| 161 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 162 | + cdtext = cdio_get_cdtext (src->cdio); | ||
| 163 | + | ||
| 164 | + if (NULL == cdtext) | ||
| 165 | + GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); | ||
| 166 | + else | ||
| 167 | + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, | ||
| 168 | + cddabasesrc->tags); | ||
| 169 | +#else | ||
| 170 | gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, | ||
| 171 | cddabasesrc->tags); | ||
| 172 | +#endif | ||
| 173 | |||
| 174 | GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); | ||
| 175 | |||
| 176 | @@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) | ||
| 177 | * the right thing here (for cddb id calculations etc. as well) */ | ||
| 178 | track.start = cdio_get_track_lsn (src->cdio, i + first_track); | ||
| 179 | track.end = track.start + len_sectors - 1; /* -1? */ | ||
| 180 | +#if LIBCDIO_VERSION_NUM > 83 | ||
| 181 | + if (NULL != cdtext) | ||
| 182 | + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, | ||
| 183 | + i + first_track); | ||
| 184 | +#else | ||
| 185 | track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, | ||
| 186 | i + first_track); | ||
| 187 | +#endif | ||
| 188 | |||
| 189 | gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); | ||
| 190 | } | ||
| 191 | -- | ||
| 192 | 2.1.0 | ||
| 193 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch deleted file mode 100644 index 3fd6a26974..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | From e634bc6420826f760f6519a9f134c6a4d3412ef8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
| 3 | Date: Mon, 19 Oct 2015 15:26:24 +0200 | ||
| 4 | Subject: [PATCH] Fix opencore include paths | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [no upstream - GStreamer 0.10 is no longer being maintained] | ||
| 7 | |||
| 8 | Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
| 9 | --- | ||
| 10 | ext/amrnb/amrnbdec.h | 2 +- | ||
| 11 | ext/amrnb/amrnbenc.h | 2 +- | ||
| 12 | ext/amrwbdec/amrwbdec.h | 4 ++-- | ||
| 13 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h | ||
| 16 | index 1e81839..01b7154 100644 | ||
| 17 | --- a/ext/amrnb/amrnbdec.h | ||
| 18 | +++ b/ext/amrnb/amrnbdec.h | ||
| 19 | @@ -22,7 +22,7 @@ | ||
| 20 | |||
| 21 | #include <gst/gst.h> | ||
| 22 | #include <gst/audio/gstaudiodecoder.h> | ||
| 23 | -#include <interf_dec.h> | ||
| 24 | +#include <opencore-amrnb/interf_dec.h> | ||
| 25 | |||
| 26 | G_BEGIN_DECLS | ||
| 27 | |||
| 28 | diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h | ||
| 29 | index 7f673ac..5be39b5 100644 | ||
| 30 | --- a/ext/amrnb/amrnbenc.h | ||
| 31 | +++ b/ext/amrnb/amrnbenc.h | ||
| 32 | @@ -21,7 +21,7 @@ | ||
| 33 | #define __GST_AMRNBENC_H__ | ||
| 34 | |||
| 35 | #include <gst/gst.h> | ||
| 36 | -#include <interf_enc.h> | ||
| 37 | +#include <opencore-amrnb/interf_enc.h> | ||
| 38 | #include <gst/audio/gstaudioencoder.h> | ||
| 39 | |||
| 40 | G_BEGIN_DECLS | ||
| 41 | diff --git a/ext/amrwbdec/amrwbdec.h b/ext/amrwbdec/amrwbdec.h | ||
| 42 | index c3528fc..f27c6d2 100644 | ||
| 43 | --- a/ext/amrwbdec/amrwbdec.h | ||
| 44 | +++ b/ext/amrwbdec/amrwbdec.h | ||
| 45 | @@ -22,8 +22,8 @@ | ||
| 46 | |||
| 47 | #include <gst/gst.h> | ||
| 48 | #include <gst/audio/gstaudiodecoder.h> | ||
| 49 | -#include <dec_if.h> | ||
| 50 | -#include <if_rom.h> | ||
| 51 | +#include <opencore-amrwb/dec_if.h> | ||
| 52 | +#include <opencore-amrwb/if_rom.h> | ||
| 53 | |||
| 54 | G_BEGIN_DECLS | ||
| 55 | |||
| 56 | -- | ||
| 57 | 1.9.1 | ||
| 58 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb deleted file mode 100644 index 199b47d762..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | require gst-plugins.inc | ||
| 2 | |||
| 3 | LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" | ||
| 4 | LICENSE_FLAGS = "commercial" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
| 6 | file://gst/synaesthesia/synaescope.h;beginline=1;endline=20;md5=99f301df7b80490c6ff8305fcc712838 \ | ||
| 7 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 \ | ||
| 8 | file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" | ||
| 9 | |||
| 10 | DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" | ||
| 11 | PR = "r3" | ||
| 12 | |||
| 13 | inherit gettext | ||
| 14 | |||
| 15 | EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia \ | ||
| 16 | --disable-orc" | ||
| 17 | |||
| 18 | PACKAGECONFIG ??= "" | ||
| 19 | PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" | ||
| 20 | PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" | ||
| 21 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" | ||
| 22 | PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" | ||
| 23 | PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" | ||
| 24 | |||
| 25 | do_configure_prepend() { | ||
| 26 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 | ||
| 27 | rm ${S}/m4/lib-link.m4 || true | ||
| 28 | } | ||
| 29 | |||
| 30 | SRC_URI[md5sum] = "1d81c593e22a6cdf0f2b4f57eae93df2" | ||
| 31 | SRC_URI[sha256sum] = "1ca90059275c0f5dca71d4d1601a8f429b7852baed0723e820703b977e2c8df0" | ||
| 32 | SRC_URI += "file://0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch \ | ||
| 33 | file://0002-Fix-opencore-include-paths.patch" | ||
| 34 | |||
| 35 | FILES_${PN}-amrnb += "${datadir}/gstreamer-0.10/presets/GstAmrnbEnc.prs" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc deleted file mode 100644 index 6e163a8c49..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | SUMMARY = "Plugins for the GStreamer multimedia framework" | ||
| 2 | HOMEPAGE = "http://gstreamer.freedesktop.org/" | ||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" | ||
| 4 | SECTION = "multimedia" | ||
| 5 | DEPENDS = "gstreamer" | ||
| 6 | |||
| 7 | # gobject-introspection to get --disable-introspection into UNKNOWN_CONFIGURE_WHITELIST | ||
| 8 | inherit autotools pkgconfig gobject-introspection | ||
| 9 | |||
| 10 | SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2" | ||
| 11 | |||
| 12 | GSTREAMER_DEBUG ?= "--disable-debug" | ||
| 13 | EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples --disable-introspection" | ||
| 14 | |||
| 15 | acpaths = "-I ${S}/common/m4 -I ${S}/m4" | ||
| 16 | |||
| 17 | LIBV = "0.10" | ||
| 18 | require recipes-multimedia/gstreamer/gst-plugins-package.inc | ||
| 19 | |||
| 20 | PACKAGES_DYNAMIC += "^${PN}-.*" | ||
| 21 | |||
| 22 | # apply gstreamer hack after Makefile.in.in in source is replaced by our version from | ||
| 23 | # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed | ||
| 24 | # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html | ||
| 25 | oe_runconf_prepend() { | ||
| 26 | if [ -e ${S}/po/Makefile.in.in ]; then | ||
| 27 | sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in | ||
| 28 | fi | ||
| 29 | } | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch deleted file mode 100644 index 69b21dd874..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | index gst-rtsp_0.10.8/bindings/python/Makefile.am | ||
| 2 | Index: gst-rtsp-0.10.8/bindings/python/Makefile.am | ||
| 3 | =================================================================== | ||
| 4 | --- gst-rtsp-0.10.8.orig/bindings/python/Makefile.am | ||
| 5 | +++ gst-rtsp-0.10.8/bindings/python/Makefile.am | ||
| 6 | @@ -14,7 +14,7 @@ defs_DATA = $(DEFS) | ||
| 7 | defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs | ||
| 8 | OVERRIDES = rtspserver.override | ||
| 9 | |||
| 10 | -INCLUDES = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) | ||
| 11 | +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) | ||
| 12 | |||
| 13 | rtspserver_la_CFLAGS = -I$(top_srcdir)/src \ | ||
| 14 | $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) | ||
| 15 | Index: gst-rtsp-0.10.8/examples/Makefile.am | ||
| 16 | =================================================================== | ||
| 17 | --- gst-rtsp-0.10.8.orig/examples/Makefile.am | ||
| 18 | +++ gst-rtsp-0.10.8/examples/Makefile.am | ||
| 19 | @@ -1,6 +1,6 @@ | ||
| 20 | noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth | ||
| 21 | |||
| 22 | -INCLUDES = -I$(top_srcdir) -I$(srcdir) | ||
| 23 | +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) | ||
| 24 | |||
| 25 | AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) | ||
| 26 | AM_LDFLAGS = \ | ||
| 27 | Index: gst-rtsp-0.10.8/tests/Makefile.am | ||
| 28 | =================================================================== | ||
| 29 | --- gst-rtsp-0.10.8.orig/tests/Makefile.am | ||
| 30 | +++ gst-rtsp-0.10.8/tests/Makefile.am | ||
| 31 | @@ -1,6 +1,6 @@ | ||
| 32 | noinst_PROGRAMS = test-cleanup | ||
| 33 | |||
| 34 | -INCLUDES = -I$(top_srcdir) -I$(srcdir) | ||
| 35 | +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) | ||
| 36 | |||
| 37 | AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) | ||
| 38 | AM_LDFLAGS = \ | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb deleted file mode 100644 index b78bcaf5ac..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | SUMMARY = "GStreamer RTSP server" | ||
| 2 | LICENSE = "LGPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | ||
| 4 | |||
| 5 | SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ | ||
| 6 | file://0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch" | ||
| 7 | SRC_URI[md5sum] = "b511af07000595f63c3a705946221643" | ||
| 8 | SRC_URI[sha256sum] = "9915887cf8515bda87462c69738646afb715b597613edc7340477ccab63a6617" | ||
| 9 | |||
| 10 | DEPENDS = "gst-plugins-base gstreamer" | ||
| 11 | |||
| 12 | EXTRA_OECONF = "--disable-introspection" | ||
| 13 | |||
| 14 | # Configure always checks for Python so inherit pythonnative. Better solution | ||
| 15 | # would be to disable the checks entirely. | ||
| 16 | inherit autotools pythonnative gettext | ||
| 17 | |||
| 18 | FILES_${PN}-dev += "${datadir}/vala/vapi/" | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch deleted file mode 100644 index d07749682b..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From ed7f4802222234eef192aa3f74bc92268f338f97 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sebastian Droege <sebastian.droege@collabora.co.uk> | ||
| 3 | Date: Tue, 6 Mar 2012 12:28:02 +0100 | ||
| 4 | Subject: [PATCH] baseparse: Fix 'self-comparison always evaluates to true' | ||
| 5 | |||
| 6 | This was really a bug. | ||
| 7 | |||
| 8 | Commit is ed7f4802222234eef192aa3f74bc92268f338f97 in 0.10 branch | ||
| 9 | |||
| 10 | Upstream Status: Backported | ||
| 11 | |||
| 12 | Signed-off-by: Sebastian Droege <sebastian.droege@collabora.co.uk> | ||
| 13 | --- | ||
| 14 | libs/gst/base/gstbaseparse.c | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c | ||
| 18 | index 851ec1d..108ee89 100644 | ||
| 19 | --- a/libs/gst/base/gstbaseparse.c | ||
| 20 | +++ b/libs/gst/base/gstbaseparse.c | ||
| 21 | @@ -3899,7 +3899,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) | ||
| 22 | seek event (in bytes) to upstream. Segment / flush handling happens | ||
| 23 | in corresponding src event handlers */ | ||
| 24 | GST_DEBUG_OBJECT (parse, "seek in PUSH mode"); | ||
| 25 | - if (seekstop >= 0 && seekpos <= seekpos) | ||
| 26 | + if (seekstop >= 0 && seekstop <= seekpos) | ||
| 27 | seekstop = seekpos; | ||
| 28 | new_event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, | ||
| 29 | GST_SEEK_TYPE_SET, seekpos, stop_type, seekstop); | ||
| 30 | -- | ||
| 31 | 1.7.9.5 | ||
| 32 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch deleted file mode 100644 index dc2d606122..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 60516f4798894f958fc53b470e1283318d0f8706 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kerrick Staley <kerrick@kerrickstaley.com> | ||
| 3 | Date: Tue, 20 Aug 2013 23:59:29 -0700 | ||
| 4 | Subject: [PATCH 1/2] parse: make grammar.y work with Bison 3 | ||
| 5 | |||
| 6 | YYLEX_PARAM is no longer supported in Bison 3. | ||
| 7 | |||
| 8 | https://bugzilla.gnome.org/show_bug.cgi?id=706462 | ||
| 9 | --- | ||
| 10 | gst/parse/grammar.y | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y | ||
| 14 | index 24fc87b..7f9dd16 100644 | ||
| 15 | --- a/gst/parse/grammar.y | ||
| 16 | +++ b/gst/parse/grammar.y | ||
| 17 | @@ -26,7 +26,6 @@ | ||
| 18 | */ | ||
| 19 | |||
| 20 | #define YYERROR_VERBOSE 1 | ||
| 21 | -#define YYLEX_PARAM scanner | ||
| 22 | |||
| 23 | #define YYENABLE_NLS 0 | ||
| 24 | |||
| 25 | @@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); | ||
| 26 | %right '.' | ||
| 27 | %left '!' '=' | ||
| 28 | |||
| 29 | +%lex-param { void *scanner } | ||
| 30 | %parse-param { void *scanner } | ||
| 31 | %parse-param { graph_t *graph } | ||
| 32 | %pure-parser | ||
| 33 | -- | ||
| 34 | 2.7.2 | ||
| 35 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch deleted file mode 100644 index 8db3966313..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 4b145ceb22bbce7ba6e209c6ab61f2d5867e69f9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Tue, 1 Nov 2016 19:02:30 +0100 | ||
| 4 | Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | we are definitely not one of those poor souls mentioned | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 14 | --- | ||
| 15 | common/m4/gst-glib2.m4 | 1 - | ||
| 16 | 1 file changed, 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4 | ||
| 19 | index b01f02f..4569ae5 100644 | ||
| 20 | --- a/common/m4/gst-glib2.m4 | ||
| 21 | +++ b/common/m4/gst-glib2.m4 | ||
| 22 | @@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK], | ||
| 23 | fi | ||
| 24 | |||
| 25 | dnl for the poor souls who for example have glib in /usr/local | ||
| 26 | - AS_SCRUB_INCLUDE(GLIB_CFLAGS) | ||
| 27 | |||
| 28 | AC_SUBST(GLIB_EXTRA_CFLAGS) | ||
| 29 | ]) | ||
| 30 | -- | ||
| 31 | 2.5.5 | ||
| 32 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch deleted file mode 100644 index 5d8bb13403..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | # gstreamer: Fix a problem with configure if check has already been built | ||
| 2 | # Richard Purdie <rpurdie@linux.intel.com> | ||
| 3 | |||
| 4 | Upstream-Status: Inappropriate [configuration] | ||
| 5 | |||
| 6 | diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac | ||
| 7 | --- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800 | ||
| 8 | +++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800 | ||
| 9 | @@ -543,8 +543,10 @@ | ||
| 10 | *) BUILD_CHECK=yes ;; | ||
| 11 | esac | ||
| 12 | ]) | ||
| 13 | + | ||
| 14 | dnl bit of a misnomer, but keep the conditional named like this so we don't | ||
| 15 | dnl have to change too much elsewhere | ||
| 16 | +HAVE_CHECK=no | ||
| 17 | AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes") | ||
| 18 | |||
| 19 | dnl configure the desired buffer alignment | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch deleted file mode 100644 index 30be85f59d..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | # Fix crash with gst-inspect | ||
| 2 | # Chris Lord <chris@openedhand.com> | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | |||
| 6 | --- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100 | ||
| 7 | +++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100 | ||
| 8 | @@ -1123,7 +1123,7 @@ | ||
| 9 | g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); | ||
| 10 | g_option_context_add_group (ctx, gst_init_get_option_group ()); | ||
| 11 | if (!g_option_context_parse (ctx, &argc, &argv, &err)) { | ||
| 12 | - g_print ("Error initializing: %s\n", err->message); | ||
| 13 | + g_print ("Error initializing: %s\n", err ? err->message : "(null)"); | ||
| 14 | exit (1); | ||
| 15 | } | ||
| 16 | g_option_context_free (ctx); | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c deleted file mode 100644 index c1f3e71af6..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c +++ /dev/null | |||
| @@ -1,487 +0,0 @@ | |||
| 1 | /* GStreamer | ||
| 2 | * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> | ||
| 3 | * 2000 Wim Taymans <wtay@chello.be> | ||
| 4 | * 2005 David A. Schleef <ds@schleef.org> | ||
| 5 | * | ||
| 6 | * gstregistryxml.c: GstRegistry object, support routines | ||
| 7 | * | ||
| 8 | * This library is free software; you can redistribute it and/or | ||
| 9 | * modify it ulnder the terms of the GNU Library General Public | ||
| 10 | * License as published by the Free Software Foundation; either | ||
| 11 | * version 2 of the License, or (at your option) any later version. | ||
| 12 | * | ||
| 13 | * This library is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 16 | * Library General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU Library General Public | ||
| 19 | * License along with this library; if not, write to the | ||
| 20 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
| 21 | * Boston, MA 02111-1307, USA. | ||
| 22 | */ | ||
| 23 | |||
| 24 | |||
| 25 | #include <gst/gstregistrybinary.h> | ||
| 26 | |||
| 27 | /* | ||
| 28 | ** Simple handy function to write a memory location to the registry cache file | ||
| 29 | */ | ||
| 30 | inline static gboolean | ||
| 31 | gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size) | ||
| 32 | { | ||
| 33 | if (write(registry->cache_file, mem, size) != size) | ||
| 34 | { | ||
| 35 | GST_ERROR("Failed to write binary registry element: ptr=%p size=%u error=%s\n", | ||
| 36 | mem, size, strerror(errno)); | ||
| 37 | return FALSE; | ||
| 38 | } | ||
| 39 | return TRUE; | ||
| 40 | } | ||
| 41 | |||
| 42 | /* | ||
| 43 | ** Save features GstBinary style | ||
| 44 | */ | ||
| 45 | static gboolean | ||
| 46 | gst_registry_binary_fill_feature(GList **list, GstPluginFeature *orig, GstBinaryPluginFeature *dest, const char *name) | ||
| 47 | { | ||
| 48 | GstBinaryChunck *chk; | ||
| 49 | |||
| 50 | if ((chk = calloc(1, sizeof (GstBinaryChunck))) == NULL) | ||
| 51 | return FALSE; | ||
| 52 | |||
| 53 | chk->data = dest; | ||
| 54 | chk->size = sizeof (GstBinaryPluginFeature); | ||
| 55 | |||
| 56 | *list = g_list_append(*list, chk); | ||
| 57 | |||
| 58 | dest->rank = orig->rank; | ||
| 59 | if (!strncpy(dest->typename, name, GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN) || | ||
| 60 | !strncpy(dest->name, orig->name, GST_BINARY_REGISTRY_TYPENAME_NAME_LEN)) | ||
| 61 | { | ||
| 62 | GST_ERROR("Failed to write binary registry feature"); | ||
| 63 | goto fail; | ||
| 64 | } | ||
| 65 | |||
| 66 | if (GST_IS_ELEMENT_FACTORY(orig)) | ||
| 67 | { | ||
| 68 | GstElementFactory *factory = GST_ELEMENT_FACTORY(orig); | ||
| 69 | |||
| 70 | if (!strncpy(dest->longname, factory->details.longname, GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN) || | ||
| 71 | !strncpy(dest->class, factory->details.klass, GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN) || | ||
| 72 | !strncpy(dest->description, factory->details.description, GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN) || | ||
| 73 | !strncpy(dest->author, factory->details.author, GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN)) | ||
| 74 | { | ||
| 75 | GST_ERROR("Failed to write binary registry feature"); | ||
| 76 | goto fail; | ||
| 77 | } | ||
| 78 | } | ||
| 79 | |||
| 80 | dest->npadtemplates = dest->ninterfaces = dest->nuritypes = 0; | ||
| 81 | return TRUE; | ||
| 82 | |||
| 83 | fail: | ||
| 84 | free(chk); | ||
| 85 | return FALSE; | ||
| 86 | } | ||
| 87 | |||
| 88 | |||
| 89 | /* | ||
| 90 | ** Initialize the GstBinaryRegistryMagic, setting both our magic number and gstreamer major/minor version | ||
| 91 | */ | ||
| 92 | inline static gboolean | ||
| 93 | gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m) | ||
| 94 | { | ||
| 95 | if (!strncpy(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) || | ||
| 96 | !strncpy(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN)) | ||
| 97 | { | ||
| 98 | GST_ERROR("Failed to write magic to the registry magic structure"); | ||
| 99 | return FALSE; | ||
| 100 | } | ||
| 101 | return TRUE; | ||
| 102 | } | ||
| 103 | |||
| 104 | /* | ||
| 105 | ** Check GstBinaryRegistryMagic validity. | ||
| 106 | ** Return a pointer pointing right after the magic structure | ||
| 107 | */ | ||
| 108 | static gchar * | ||
| 109 | gst_registry_binary_check_magic(gchar *in) | ||
| 110 | { | ||
| 111 | GstBinaryRegistryMagic *m = (GstBinaryRegistryMagic *) in; | ||
| 112 | |||
| 113 | if (m == NULL || m->magic == NULL || m->version == NULL) | ||
| 114 | { | ||
| 115 | GST_ERROR("Binary registry magic structure is broken"); | ||
| 116 | return NULL; | ||
| 117 | } | ||
| 118 | if (strncmp(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) != 0) | ||
| 119 | { | ||
| 120 | GST_ERROR("Binary registry magic is different : %02x%02x%02x%02x != %02x%02x%02x%02x", | ||
| 121 | GST_MAGIC_BINARY_REGISTRY_STR[0] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[1] & 0xff, | ||
| 122 | GST_MAGIC_BINARY_REGISTRY_STR[2] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[3] & 0xff, | ||
| 123 | m->magic[0] & 0xff, m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff); | ||
| 124 | return NULL; | ||
| 125 | } | ||
| 126 | if (strncmp(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN)) | ||
| 127 | { | ||
| 128 | GST_ERROR("Binary registry magic version is different : %s != %s", | ||
| 129 | GST_MAJORMINOR, m->version); | ||
| 130 | return NULL; | ||
| 131 | } | ||
| 132 | return (in + sizeof (GstBinaryRegistryMagic)); | ||
| 133 | } | ||
| 134 | |||
| 135 | /* | ||
| 136 | ** Adapt a GstPlugin to our GstBinaryPluginElement structure, and write it to the | ||
| 137 | ** registry file. | ||
| 138 | */ | ||
| 139 | static gboolean | ||
| 140 | gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin) | ||
| 141 | { | ||
| 142 | GstBinaryPluginElement *e; | ||
| 143 | GstBinaryChunck *chk; | ||
| 144 | GList *walk; | ||
| 145 | |||
| 146 | if ((e = calloc(1, sizeof (GstBinaryPluginElement))) == NULL || | ||
| 147 | (chk = calloc(1, sizeof (GstBinaryChunck))) == NULL) | ||
| 148 | return FALSE; | ||
| 149 | |||
| 150 | chk->data = e; | ||
| 151 | chk->size = sizeof (GstBinaryPluginElement); | ||
| 152 | *list = g_list_append(*list, chk); | ||
| 153 | |||
| 154 | if (!strncpy(e->name, plugin->desc.name, GST_BINARY_REGISTRY_NAME_LEN) || | ||
| 155 | !strncpy(e->description, plugin->desc.description, GST_BINARY_REGISTRY_DESCRIPTION_LEN) || | ||
| 156 | !strncpy(e->filename, plugin->filename, _POSIX_PATH_MAX) || | ||
| 157 | !strncpy(e->version, plugin->desc.version, GST_BINARY_REGISTRY_VERSION_LEN) || | ||
| 158 | !strncpy(e->license, plugin->desc.license, GST_BINARY_REGISTRY_LICENSE_LEN) || | ||
| 159 | !strncpy(e->source, plugin->desc.source, GST_BINARY_REGISTRY_SOURCE_LEN) || | ||
| 160 | !strncpy(e->package, plugin->desc.package, GST_BINARY_REGISTRY_PACKAGE_LEN) || | ||
| 161 | !strncpy(e->origin, plugin->desc.origin, GST_BINARY_REGISTRY_ORIGIN_LEN)) | ||
| 162 | { | ||
| 163 | GST_DEBUG("Can't adapt GstPlugin to GstBinaryPluginElement"); | ||
| 164 | goto fail; | ||
| 165 | } | ||
| 166 | |||
| 167 | e->size = plugin->file_size; | ||
| 168 | e->m32p = plugin->file_mtime; | ||
| 169 | |||
| 170 | GList *ft_list = gst_registry_get_feature_list_by_plugin(registry, plugin->desc.name); | ||
| 171 | |||
| 172 | for (walk = ft_list; walk; walk = g_list_next(walk), e->nfeatures++) | ||
| 173 | { | ||
| 174 | GstPluginFeature *curfeat = GST_PLUGIN_FEATURE (walk->data); | ||
| 175 | GstBinaryPluginFeature *newfeat; | ||
| 176 | const char *feat_name = g_type_name(G_OBJECT_TYPE(curfeat)); | ||
| 177 | |||
| 178 | if ((newfeat = calloc(1, sizeof (GstBinaryPluginFeature))) == NULL) | ||
| 179 | goto fail; | ||
| 180 | |||
| 181 | if (!feat_name || !gst_registry_binary_fill_feature(list, curfeat, newfeat, feat_name)) | ||
| 182 | { | ||
| 183 | GST_ERROR("Can't fill plugin feature, aborting."); | ||
| 184 | goto fail; | ||
| 185 | } | ||
| 186 | } | ||
| 187 | |||
| 188 | GST_DEBUG("Found %d features in plugin \"%s\"\n", e->nfeatures, e->name); | ||
| 189 | return TRUE; | ||
| 190 | |||
| 191 | fail: | ||
| 192 | free(chk); | ||
| 193 | free(e); | ||
| 194 | return FALSE; | ||
| 195 | } | ||
| 196 | |||
| 197 | /* | ||
| 198 | ** Write the cache to file. Part of the code was taken from gstregistryxml.c | ||
| 199 | */ | ||
| 200 | gboolean | ||
| 201 | gst_registry_binary_write_cache(GstRegistry *registry, const char *location) | ||
| 202 | { | ||
| 203 | GList *walk; | ||
| 204 | char *tmp_location; | ||
| 205 | GstBinaryRegistryMagic *magic; | ||
| 206 | GstBinaryChunck *magic_chunck; | ||
| 207 | GList *to_write = NULL; | ||
| 208 | |||
| 209 | GST_INFO("Writing binary registry cache"); | ||
| 210 | |||
| 211 | g_return_val_if_fail (GST_IS_REGISTRY (registry), FALSE); | ||
| 212 | tmp_location = g_strconcat (location, ".tmpXXXXXX", NULL); | ||
| 213 | registry->cache_file = g_mkstemp (tmp_location); | ||
| 214 | if (registry->cache_file == -1) | ||
| 215 | { | ||
| 216 | char *dir; | ||
| 217 | |||
| 218 | /* oops, I bet the directory doesn't exist */ | ||
| 219 | dir = g_path_get_dirname (location); | ||
| 220 | g_mkdir_with_parents (dir, 0777); | ||
| 221 | g_free (dir); | ||
| 222 | |||
| 223 | registry->cache_file = g_mkstemp (tmp_location); | ||
| 224 | } | ||
| 225 | |||
| 226 | if (registry->cache_file == -1) | ||
| 227 | goto fail; | ||
| 228 | |||
| 229 | if ((magic = calloc(1, sizeof (GstBinaryRegistryMagic))) == NULL || | ||
| 230 | !gst_registry_binary_initialize_magic(magic)) | ||
| 231 | goto fail; | ||
| 232 | |||
| 233 | if ((magic_chunck = calloc(1, sizeof (GstBinaryChunck))) == NULL) | ||
| 234 | goto fail; | ||
| 235 | |||
| 236 | magic_chunck->data = magic; | ||
| 237 | magic_chunck->size = sizeof (GstBinaryRegistryMagic); | ||
| 238 | to_write = g_list_append(to_write, magic_chunck); | ||
| 239 | |||
| 240 | /* Iterate trough the list of plugins in the GstRegistry and adapt them to our structures */ | ||
| 241 | for (walk = g_list_last(registry->plugins); walk; walk = g_list_previous(walk)) | ||
| 242 | { | ||
| 243 | GstPlugin *plugin = GST_PLUGIN(walk->data); | ||
| 244 | |||
| 245 | if (!plugin->filename) | ||
| 246 | continue; | ||
| 247 | |||
| 248 | if (plugin->flags & GST_PLUGIN_FLAG_CACHED) | ||
| 249 | { | ||
| 250 | int ret; | ||
| 251 | struct stat statbuf; | ||
| 252 | |||
| 253 | ret = g_stat (plugin->filename, &statbuf); | ||
| 254 | if ((ret = g_stat (plugin->filename, &statbuf)) < 0 || | ||
| 255 | plugin->file_mtime != statbuf.st_mtime || | ||
| 256 | plugin->file_size != statbuf.st_size) | ||
| 257 | continue; | ||
| 258 | } | ||
| 259 | |||
| 260 | if (!gst_registry_binary_save_plugin(&to_write, registry, plugin)) | ||
| 261 | { | ||
| 262 | GST_ERROR("Can't write binary plugin information for \"%s\"", plugin->filename); | ||
| 263 | continue; /* Try anyway */ | ||
| 264 | } | ||
| 265 | } | ||
| 266 | |||
| 267 | for (walk = g_list_first(to_write); walk; walk = g_list_next(walk)) | ||
| 268 | { | ||
| 269 | GstBinaryChunck *cur = walk->data; | ||
| 270 | |||
| 271 | if (!gst_registry_binary_write(registry, cur->data, cur->size)) | ||
| 272 | { | ||
| 273 | free(cur->data); | ||
| 274 | free(cur); | ||
| 275 | g_list_free(to_write); | ||
| 276 | goto fail; | ||
| 277 | } | ||
| 278 | free(cur->data); | ||
| 279 | free(cur); | ||
| 280 | } | ||
| 281 | g_list_free(to_write); | ||
| 282 | |||
| 283 | if (close(registry->cache_file) < 0) | ||
| 284 | { | ||
| 285 | GST_DEBUG("Can't close registry file : %s", strerror(errno)); | ||
| 286 | goto fail; | ||
| 287 | } | ||
| 288 | |||
| 289 | if (g_file_test (tmp_location, G_FILE_TEST_EXISTS)) { | ||
| 290 | #ifdef WIN32 | ||
| 291 | remove (location); | ||
| 292 | #endif | ||
| 293 | rename (tmp_location, location); | ||
| 294 | } | ||
| 295 | |||
| 296 | g_free (tmp_location); | ||
| 297 | return TRUE; | ||
| 298 | |||
| 299 | fail: | ||
| 300 | g_free(tmp_location); | ||
| 301 | return FALSE; | ||
| 302 | } | ||
| 303 | |||
| 304 | static GstPluginFeature* | ||
| 305 | gst_registry_binary_load_feature(GstBinaryPluginFeature *in) | ||
| 306 | { | ||
| 307 | GstPluginFeature *feature; | ||
| 308 | GType type; | ||
| 309 | |||
| 310 | if (!in->typename || !*(in->typename)) | ||
| 311 | return NULL; | ||
| 312 | |||
| 313 | /* GST_INFO("Plugin feature typename : %s", in->typename);*/ | ||
| 314 | |||
| 315 | if (!(type = g_type_from_name(in->typename))) | ||
| 316 | { | ||
| 317 | GST_ERROR("Unknown type from typename"); | ||
| 318 | return NULL; | ||
| 319 | } | ||
| 320 | feature = g_object_new (type, NULL); | ||
| 321 | |||
| 322 | if (!feature) { | ||
| 323 | GST_ERROR("Can't create feature from type"); | ||
| 324 | return NULL; | ||
| 325 | } | ||
| 326 | |||
| 327 | if (!GST_IS_PLUGIN_FEATURE (feature)) { | ||
| 328 | /* don't really know what it is */ | ||
| 329 | if (GST_IS_OBJECT (feature)) | ||
| 330 | gst_object_unref (feature); | ||
| 331 | else | ||
| 332 | g_object_unref (feature); | ||
| 333 | return NULL; | ||
| 334 | } | ||
| 335 | |||
| 336 | feature->name = g_strdup(in->name); | ||
| 337 | feature->rank = in->rank; | ||
| 338 | |||
| 339 | if (GST_IS_ELEMENT_FACTORY(feature)) | ||
| 340 | { | ||
| 341 | GstElementFactory *factory = GST_ELEMENT_FACTORY(feature); | ||
| 342 | |||
| 343 | factory->details.longname = g_strdup(in->longname); | ||
| 344 | factory->details.klass = g_strdup(in->class); | ||
| 345 | factory->details.description = g_strdup(in->description); | ||
| 346 | factory->details.author = g_strdup(in->author); | ||
| 347 | |||
| 348 | /* GST_INFO("Element factory : %s", factory->details.longname); */ | ||
| 349 | } | ||
| 350 | |||
| 351 | GST_DEBUG("Added feature %p with name %s", feature, feature->name); | ||
| 352 | return feature; | ||
| 353 | } | ||
| 354 | |||
| 355 | /* | ||
| 356 | ** Make a new plugin from current GstBinaryPluginElement structure | ||
| 357 | ** and save it to the GstRegistry. Return an offset to the next | ||
| 358 | ** GstBinaryPluginElement structure. | ||
| 359 | */ | ||
| 360 | static unsigned long | ||
| 361 | gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in) | ||
| 362 | { | ||
| 363 | GstBinaryPluginElement *p = (GstBinaryPluginElement *) in; | ||
| 364 | GstPlugin *plugin = NULL; | ||
| 365 | GList *plugin_features = NULL; | ||
| 366 | GstBinaryPluginFeature *feat; | ||
| 367 | unsigned int i; | ||
| 368 | unsigned long offset; | ||
| 369 | |||
| 370 | plugin = g_object_new (GST_TYPE_PLUGIN, NULL); | ||
| 371 | |||
| 372 | plugin->flags |= GST_PLUGIN_FLAG_CACHED; | ||
| 373 | |||
| 374 | plugin->desc.name = g_strdup(p->name); | ||
| 375 | plugin->desc.description= g_strdup(p->description); | ||
| 376 | plugin->filename = g_strdup(p->filename); | ||
| 377 | plugin->desc.version = g_strdup(p->version); | ||
| 378 | plugin->desc.license = g_strdup(p->license); | ||
| 379 | plugin->desc.source = g_strdup(p->source); | ||
| 380 | plugin->desc.package = g_strdup(p->package); | ||
| 381 | plugin->desc.origin = g_strdup(p->origin); | ||
| 382 | plugin->file_mtime = p->m32p; | ||
| 383 | plugin->file_size = p->size; | ||
| 384 | plugin->basename = g_path_get_basename (plugin->filename); | ||
| 385 | |||
| 386 | if (plugin->file_mtime < 0 || plugin->file_size < 0) | ||
| 387 | { | ||
| 388 | GST_ERROR("Plugin time or file size is not valid !"); | ||
| 389 | g_free(plugin); | ||
| 390 | return -1; | ||
| 391 | } | ||
| 392 | |||
| 393 | if (p->nfeatures < 0) | ||
| 394 | { | ||
| 395 | GST_ERROR("The number of feature structure is not valid !"); | ||
| 396 | gst_object_unref(plugin); | ||
| 397 | return -1; | ||
| 398 | } | ||
| 399 | |||
| 400 | for (feat = (GstBinaryPluginFeature *) (in + sizeof (GstBinaryPluginElement)), i = 0; | ||
| 401 | i < p->nfeatures; i++, feat++) | ||
| 402 | { | ||
| 403 | GstPluginFeature *gstfeat; | ||
| 404 | |||
| 405 | if ((gstfeat = gst_registry_binary_load_feature(feat)) == NULL) | ||
| 406 | { | ||
| 407 | g_list_free(plugin_features); | ||
| 408 | g_free(plugin); | ||
| 409 | GST_ERROR("Error while loading binary feature"); | ||
| 410 | return -1; | ||
| 411 | } | ||
| 412 | gstfeat->plugin_name = g_strdup(plugin->desc.name); | ||
| 413 | plugin_features = g_list_prepend(plugin_features, gstfeat); | ||
| 414 | } | ||
| 415 | |||
| 416 | GST_DEBUG("Added plugin \"%s\" to global registry from binary registry", plugin->desc.name); | ||
| 417 | GList *g; | ||
| 418 | |||
| 419 | gst_registry_add_plugin (registry, plugin); | ||
| 420 | for (g = plugin_features; g; g = g_list_next (g)) | ||
| 421 | gst_registry_add_feature (registry, GST_PLUGIN_FEATURE (g->data)); | ||
| 422 | /* g_list_free(plugin_features); */ | ||
| 423 | |||
| 424 | offset = sizeof (GstBinaryPluginElement) + p->nfeatures * sizeof (GstBinaryPluginFeature); | ||
| 425 | return offset; | ||
| 426 | } | ||
| 427 | |||
| 428 | |||
| 429 | /* | ||
| 430 | ** Read the cache and adapt it to fill GstRegistry | ||
| 431 | */ | ||
| 432 | gboolean | ||
| 433 | gst_registry_binary_read_cache(GstRegistry *registry, const char *location) | ||
| 434 | { | ||
| 435 | GMappedFile *mapped = NULL; | ||
| 436 | GTimer *timer = NULL; | ||
| 437 | gchar *contents = NULL; | ||
| 438 | gdouble seconds; | ||
| 439 | unsigned long offset, inc; | ||
| 440 | gsize size; | ||
| 441 | |||
| 442 | /* make sure these types exist */ | ||
| 443 | GST_TYPE_ELEMENT_FACTORY; | ||
| 444 | GST_TYPE_TYPE_FIND_FACTORY; | ||
| 445 | GST_TYPE_INDEX_FACTORY; | ||
| 446 | |||
| 447 | timer = g_timer_new (); | ||
| 448 | |||
| 449 | if ((mapped = g_mapped_file_new(location, FALSE, NULL)) == NULL || | ||
| 450 | (contents = g_mapped_file_get_contents(mapped)) == NULL) | ||
| 451 | { | ||
| 452 | GST_ERROR("Can't load file : %s", strerror(errno)); | ||
| 453 | return FALSE; | ||
| 454 | } | ||
| 455 | if ((contents = gst_registry_binary_check_magic(contents)) == NULL) | ||
| 456 | { | ||
| 457 | GST_ERROR("Binary registry type not recognized (invalid magic)"); | ||
| 458 | g_mapped_file_free(mapped); | ||
| 459 | return FALSE; | ||
| 460 | } | ||
| 461 | |||
| 462 | if ((size = g_mapped_file_get_length(mapped)) < sizeof (GstBinaryPluginElement)) | ||
| 463 | { | ||
| 464 | GST_INFO("No binary plugins structure to read"); | ||
| 465 | return TRUE; /* This is not really an error */ | ||
| 466 | } | ||
| 467 | |||
| 468 | for (offset = inc = 0; (offset + sizeof (GstBinaryPluginElement)) < size && | ||
| 469 | (inc = gst_registry_binary_get_binary_plugin(registry, contents + offset)) > 0; | ||
| 470 | offset += inc) | ||
| 471 | ; /* May want in the future to do something here */ | ||
| 472 | if (inc < 0) | ||
| 473 | { | ||
| 474 | GST_DEBUG("Problem while reading binary registry"); | ||
| 475 | return FALSE; | ||
| 476 | } | ||
| 477 | |||
| 478 | g_timer_stop (timer); | ||
| 479 | seconds = g_timer_elapsed (timer, NULL); | ||
| 480 | g_timer_destroy (timer); | ||
| 481 | |||
| 482 | GST_INFO ("loaded %s in %f seconds", location, seconds); | ||
| 483 | |||
| 484 | if (mapped) | ||
| 485 | g_mapped_file_free (mapped); | ||
| 486 | return TRUE; | ||
| 487 | } | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h deleted file mode 100644 index 2ef24d765d..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h +++ /dev/null | |||
| @@ -1,194 +0,0 @@ | |||
| 1 | /* GStreamer | ||
| 2 | * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> | ||
| 3 | * 2000 Wim Taymans <wim.taymans@chello.be> | ||
| 4 | * | ||
| 5 | * gstregistry.h: Header for registry handling | ||
| 6 | * | ||
| 7 | * This library is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU Library General Public | ||
| 9 | * License as published by the Free Software Foundation; either | ||
| 10 | * version 2 of the License, or (at your option) any later version. | ||
| 11 | * | ||
| 12 | * This library is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * Library General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU Library General Public | ||
| 18 | * License along with this library; if not, write to the | ||
| 19 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
| 20 | * Boston, MA 02111-1307, USA. | ||
| 21 | */ | ||
| 22 | |||
| 23 | /* SUGGESTIONS AND TODO : | ||
| 24 | ** ==================== | ||
| 25 | ** - Use a compressed registry, but would induce performance loss | ||
| 26 | ** - Encrypt the registry, for security purpose, but would also reduce performances | ||
| 27 | ** - Also have a non-mmap based cache reading (work with file descriptors) | ||
| 28 | */ | ||
| 29 | |||
| 30 | #ifndef __GST_REGISTRYBINARY_H__ | ||
| 31 | #define __GST_REGISTRYBINARY_H__ | ||
| 32 | |||
| 33 | #ifdef HAVE_CONFIG_H | ||
| 34 | # include "config.h" | ||
| 35 | #endif | ||
| 36 | |||
| 37 | #include <stdio.h> | ||
| 38 | #include <errno.h> | ||
| 39 | #include <sys/types.h> | ||
| 40 | #include <sys/stat.h> | ||
| 41 | #include <dirent.h> | ||
| 42 | #include <fcntl.h> | ||
| 43 | #include <sys/mman.h> | ||
| 44 | #ifdef HAVE_UNISTD_H | ||
| 45 | #include <unistd.h> | ||
| 46 | #endif | ||
| 47 | |||
| 48 | #include <gst/gst_private.h> | ||
| 49 | #include <gst/gstelement.h> | ||
| 50 | #include <gst/gsttypefind.h> | ||
| 51 | #include <gst/gsttypefindfactory.h> | ||
| 52 | #include <gst/gsturi.h> | ||
| 53 | #include <gst/gstinfo.h> | ||
| 54 | #include <gst/gstenumtypes.h> | ||
| 55 | #include <gst/gstregistry.h> | ||
| 56 | #include <gst/gstpadtemplate.h> | ||
| 57 | |||
| 58 | #include "glib-compat-private.h" | ||
| 59 | #include <glib/gstdio.h> | ||
| 60 | |||
| 61 | /* A magic, written at the beginning of the file */ | ||
| 62 | #define GST_MAGIC_BINARY_REGISTRY_STR "\xc0\xde\xf0\x0d" | ||
| 63 | #define GST_MAGIC_BINARY_REGISTRY_LEN (4) | ||
| 64 | #define GST_MAGIC_BINARY_VERSION_LEN (64) | ||
| 65 | |||
| 66 | typedef struct _GstBinaryRegistryMagic | ||
| 67 | { | ||
| 68 | char magic[GST_MAGIC_BINARY_REGISTRY_LEN]; | ||
| 69 | char version[GST_MAGIC_BINARY_VERSION_LEN]; | ||
| 70 | } GstBinaryRegistryMagic; | ||
| 71 | |||
| 72 | |||
| 73 | /* Used to store pointers to write */ | ||
| 74 | typedef struct _GstBinaryChunck | ||
| 75 | { | ||
| 76 | void *data; | ||
| 77 | unsigned int size; | ||
| 78 | } GstBinaryChunck; | ||
| 79 | |||
| 80 | |||
| 81 | /* A structure containing (staticely) every information needed for a plugin | ||
| 82 | ** | ||
| 83 | ** Notes : | ||
| 84 | ** "nfeatures" is used to say how many GstBinaryPluginFeature structures we will have | ||
| 85 | ** right after the structure itself. | ||
| 86 | */ | ||
| 87 | |||
| 88 | /* Various lenght defines for our GstBinaryPluginElement structure | ||
| 89 | ** Note : We could eventually use smaller size | ||
| 90 | */ | ||
| 91 | #define GST_BINARY_REGISTRY_NAME_LEN (256) | ||
| 92 | #define GST_BINARY_REGISTRY_DESCRIPTION_LEN (1024) | ||
| 93 | #define GST_BINARY_REGISTRY_VERSION_LEN (64) | ||
| 94 | #define GST_BINARY_REGISTRY_LICENSE_LEN (256) | ||
| 95 | #define GST_BINARY_REGISTRY_SOURCE_LEN (256) | ||
| 96 | #define GST_BINARY_REGISTRY_PACKAGE_LEN (1024) | ||
| 97 | #define GST_BINARY_REGISTRY_ORIGIN_LEN (1024) | ||
| 98 | |||
| 99 | typedef struct _GstBinaryPluginElement | ||
| 100 | { | ||
| 101 | char name[GST_BINARY_REGISTRY_NAME_LEN]; | ||
| 102 | char description[GST_BINARY_REGISTRY_DESCRIPTION_LEN]; | ||
| 103 | char filename[_POSIX_PATH_MAX]; | ||
| 104 | char version[GST_BINARY_REGISTRY_VERSION_LEN]; | ||
| 105 | char license[GST_BINARY_REGISTRY_LICENSE_LEN]; | ||
| 106 | char source[GST_BINARY_REGISTRY_SOURCE_LEN]; | ||
| 107 | char package[GST_BINARY_REGISTRY_PACKAGE_LEN]; | ||
| 108 | char origin[GST_BINARY_REGISTRY_ORIGIN_LEN]; | ||
| 109 | unsigned long size; | ||
| 110 | unsigned long m32p; | ||
| 111 | unsigned int nfeatures; | ||
| 112 | } GstBinaryPluginElement; | ||
| 113 | |||
| 114 | |||
| 115 | /* A structure containing the plugin features | ||
| 116 | ** | ||
| 117 | ** Note : | ||
| 118 | ** "npadtemplates" is used to store the number of GstBinaryPadTemplate structures following the structure itself. | ||
| 119 | ** "ninterfaces" is used to store the number of GstBinaryInterface structures following the structure itself. | ||
| 120 | ** "nuritypes" is used to store the number of GstBinaryUriType structures following the structure itself. | ||
| 121 | */ | ||
| 122 | #define GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN (256) | ||
| 123 | #define GST_BINARY_REGISTRY_TYPENAME_NAME_LEN (256) | ||
| 124 | #define GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN (1024) | ||
| 125 | #define GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN (512) | ||
| 126 | #define GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN (1024) | ||
| 127 | #define GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN (256) | ||
| 128 | |||
| 129 | typedef struct _GstBinaryPluginFeature | ||
| 130 | { | ||
| 131 | char typename[GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN]; | ||
| 132 | char name[GST_BINARY_REGISTRY_TYPENAME_NAME_LEN]; | ||
| 133 | unsigned long rank; | ||
| 134 | char longname[GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN]; | ||
| 135 | char class[GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN]; | ||
| 136 | char description[GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN]; | ||
| 137 | char author[GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN]; | ||
| 138 | unsigned int npadtemplates; | ||
| 139 | unsigned int ninterfaces; | ||
| 140 | unsigned int nuritypes; | ||
| 141 | } GstBinaryPluginFeature; | ||
| 142 | |||
| 143 | |||
| 144 | /* | ||
| 145 | ** A structure containing the static pad templates of a plugin feature | ||
| 146 | */ | ||
| 147 | #define GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN (256) | ||
| 148 | #define GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN (1024) | ||
| 149 | |||
| 150 | typedef struct _GstBinaryPadTemplate | ||
| 151 | { | ||
| 152 | char name[GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN]; | ||
| 153 | char cap[GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN]; | ||
| 154 | int direction; /* Either 0:"sink" or 1:"src" */ | ||
| 155 | GstPadPresence presence; | ||
| 156 | } GstBinaryPadTemplate; | ||
| 157 | |||
| 158 | /* | ||
| 159 | ** A very simple structure defining the plugin feature interface string | ||
| 160 | */ | ||
| 161 | #define GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN (512) | ||
| 162 | typedef struct _GstBinaryInterface | ||
| 163 | { | ||
| 164 | char interface[GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN]; | ||
| 165 | unsigned long size; | ||
| 166 | } GstBinaryInterface; | ||
| 167 | |||
| 168 | /* Uri Type */ | ||
| 169 | typedef struct _GstBinaryUriType | ||
| 170 | { | ||
| 171 | GstURIType type; | ||
| 172 | unsigned long nuriprotocols; | ||
| 173 | } GstBinaryUriType; | ||
| 174 | |||
| 175 | /* | ||
| 176 | ** Function prototypes | ||
| 177 | */ | ||
| 178 | |||
| 179 | /* Local prototypes */ | ||
| 180 | inline static gboolean gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size); | ||
| 181 | inline static gboolean gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m); | ||
| 182 | static gboolean gst_registry_binary_fill_feature(GList **list, GstPluginFeature *, GstBinaryPluginFeature *, const char *); | ||
| 183 | static gboolean gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin); | ||
| 184 | static gchar *gst_registry_binary_check_magic(gchar *in); | ||
| 185 | static GstPluginFeature *gst_registry_binary_load_feature(GstBinaryPluginFeature *); | ||
| 186 | static unsigned long gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in); | ||
| 187 | |||
| 188 | /* Exportable */ | ||
| 189 | gboolean gst_registry_binary_write_cache(GstRegistry *registry, const char *location); | ||
| 190 | gboolean gst_registry_binary_read_cache(GstRegistry *registry, const char *location); | ||
| 191 | |||
| 192 | #endif /* !__GST_REGISTRYBINARY_H__ */ | ||
| 193 | |||
| 194 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb deleted file mode 100644 index 56d82205ee..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | SUMMARY = "GStreamer multimedia framework" | ||
| 2 | DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ | ||
| 3 | It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." | ||
| 4 | HOMEPAGE = "http://gstreamer.freedesktop.org/" | ||
| 5 | BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" | ||
| 6 | SECTION = "multimedia" | ||
| 7 | LICENSE = "LGPLv2+" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ | ||
| 9 | file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" | ||
| 10 | DEPENDS = "glib-2.0 libxml2 bison-native flex-native glib-2.0-native" | ||
| 11 | |||
| 12 | PR = "r2" | ||
| 13 | |||
| 14 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ | ||
| 15 | file://check_fix.patch \ | ||
| 16 | file://gst-inspect-check-error.patch \ | ||
| 17 | file://0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch \ | ||
| 18 | file://0001-parse-make-grammar.y-work-with-Bison-3.patch \ | ||
| 19 | file://0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \ | ||
| 20 | " | ||
| 21 | |||
| 22 | SRC_URI[md5sum] = "a0cf7d6877f694a1a2ad2b4d1ecb890b" | ||
| 23 | SRC_URI[sha256sum] = "e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30" | ||
| 24 | |||
| 25 | inherit autotools pkgconfig gettext | ||
| 26 | |||
| 27 | GSTREAMER_DEBUG ?= "--disable-debug" | ||
| 28 | EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \ | ||
| 29 | --disable-dependency-tracking --disable-check \ | ||
| 30 | --disable-examples --disable-tests \ | ||
| 31 | --disable-valgrind ${GSTREAMER_DEBUG} \ | ||
| 32 | --disable-introspection \ | ||
| 33 | " | ||
| 34 | |||
| 35 | CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" | ||
| 36 | |||
| 37 | # apply gstreamer hack after Makefile.in.in in source is replaced by our version from | ||
| 38 | # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed | ||
| 39 | # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html | ||
| 40 | oe_runconf_prepend() { | ||
| 41 | sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in | ||
| 42 | } | ||
| 43 | |||
| 44 | #do_compile_prepend () { | ||
| 45 | # mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ | ||
| 46 | #} | ||
| 47 | |||
| 48 | FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" | ||
| 49 | FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" | ||
| 50 | FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/" | ||
