diff options
Diffstat (limited to 'yocto-poky/meta/recipes-multimedia/gstreamer')
10 files changed, 89 insertions, 24 deletions
diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player_git.bb index 54cfbbc92..985024256 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player_git.bb +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player_git.bb @@ -16,7 +16,9 @@ SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645" S = "${WORKDIR}/git" -inherit autotools gtk-doc lib_package pkgconfig +inherit autotools gtk-doc lib_package pkgconfig distro_features_check + +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" do_configure_prepend() { touch ${S}/ChangeLog diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb index 97fc7ec3f..5d74a2e57 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb @@ -25,3 +25,6 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ S = "${WORKDIR}/gst-libav-${PV}" +# http://errors.yoctoproject.org/Errors/Details/20493/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc index d69890434..26c13361f 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc @@ -20,11 +20,10 @@ EXTRA_OECONF += "--disable-valgrind --with-omx-target=${GSTREAMER_1_0_OMX_TARGET python __anonymous () { omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True) if omx_target in ['generic', 'bellagio']: - srcdir = d.getVar("S", True) # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this - d.appendVar("CFLAGS", " -I%s/omx/openmax" % srcdir) + d.appendVar("CFLAGS", " -I${S}/omx/openmax") elif omx_target == "rpi": # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True)) diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index cdedb60b2..b4f01afe5 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc @@ -20,7 +20,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - orc curl uvch264 neon sndfile \ + orc curl neon sndfile \ hls sbc dash bz2 smoothstreaming \ " @@ -38,7 +38,7 @@ PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland virtual/egl" -PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev" +PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" @@ -55,6 +55,9 @@ PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1 PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" +PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" +PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" +PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdnav libdvdread" # these plugins have not been ported to 1.0 (yet): # directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv @@ -66,8 +69,8 @@ PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" # these plugins have no corresponding library in OE-core or meta-openembedded: # openni2 winks direct3d directdraw directsound winscreencap osx_video # apple_media android_media avc chromaprint daala dts gme gsm kate ladspa mimic -# mpeg2enc mplex ofa openjpeg opensles pvr resindvd rtmp soundtouch spandsp spc -# srtp vdpau voaacenc voamrwbenc wasapi zbar +# mpeg2enc mplex ofa openjpeg opensles pvr rtmp soundtouch spandsp spc +# srtp vdpau wasapi zbar EXTRA_OECONF += " \ --enable-dvb \ @@ -106,7 +109,6 @@ EXTRA_OECONF += " \ --disable-osx_video \ --disable-pvr \ --disable-quicktime \ - --disable-resindvd \ --disable-sdl \ --disable-sdltest \ --disable-sndio \ @@ -118,8 +120,6 @@ EXTRA_OECONF += " \ --disable-timidity \ --disable-vcd \ --disable-vdpau \ - --disable-voaacenc \ - --disable-voamrwbenc \ --disable-wasapi \ --disable-wildmidi \ --disable-wininet \ @@ -133,3 +133,4 @@ ARM_INSTRUCTION_SET = "arm" FILES_gstreamer1.0-plugins-bad-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" +FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch new file mode 100644 index 000000000..f677603eb --- /dev/null +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch @@ -0,0 +1,32 @@ +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 24 Sep 2015 19:47:32 +0300 +Subject: [PATCH] glimagesink: Downrank to marginal + +On desktop, where there is good OpenGL, xvimagesink will come up first, +on other platforms, OpenGL can't be trusted because it's either software (like +in a VM) or broken (like on embedded)., so let ximagesink come above. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ext/gl/gstopengl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c +index a4b2540..0ccaacd 100644 +--- a/ext/gl/gstopengl.c ++++ b/ext/gl/gstopengl.c +@@ -101,7 +101,7 @@ plugin_init (GstPlugin * plugin) + #endif + + if (!gst_element_register (plugin, "glimagesink", +- GST_RANK_SECONDARY, GST_TYPE_GLIMAGE_SINK)) { ++ GST_RANK_MARGINAL, GST_TYPE_GLIMAGE_SINK)) { + return FALSE; + } + +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb index 59065de81..687366924 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" -SRC_URI += "file://0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch" +SRC_URI += "file://0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch \ + file://0001-glimagesink-Downrank-to-marginal.patch \ + " SRC_URI[md5sum] = "e0bb39412cf4a48fe0397bcf3a7cd451" SRC_URI[sha256sum] = "152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c" diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc index 47f3f4011..4909b10d5 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc @@ -25,13 +25,12 @@ PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +# libvisual do not seem to exist anywhere in OE +PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" +PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" - -# cdparanoia and libvisual do not seem to exist anywhere in OE EXTRA_OECONF += " \ --disable-freetypetest \ - --disable-cdparanoia \ - --disable-libvisual \ " FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 6e316de9f..edaafe842 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -11,7 +11,7 @@ inherit gettext PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - orc cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib \ + orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib v4l2\ " X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" @@ -22,7 +22,8 @@ PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" -PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" +PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" +PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" @@ -31,15 +32,11 @@ PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" - -# the 1394 plugins require both libraw1394 and libiec61883 -# the former is included in meta-oe, the latter isn't -# -> disabled +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libiec61883 libavc1394" +PACKAGECONFIG[v4l2] = "--enable-gst_v4l2,--disable-gst_v4l2" EXTRA_OECONF += " \ --enable-oss \ - --enable-gst_v4l2 \ - --without-libv4l2 \ --disable-directsound \ --disable-waveform \ --disable-oss4 \ @@ -51,7 +48,6 @@ EXTRA_OECONF += " \ --disable-libdv \ --disable-shout2 \ --disable-examples \ - --disable-dv1394 \ " FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch new file mode 100755 index 000000000..d682ee60c --- /dev/null +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch @@ -0,0 +1,30 @@ +From 73df2b5c0aea58015788f5a94a3ec65296a688d3 Mon Sep 17 00:00:00 2001 +From: Song Bing <b06498@freescale.com> +Date: Thu, 2 Jul 2015 14:32:21 +0800 +Subject: [PATCH] basesink: Shouldn't drop buffer when sync=false + +Shouldn't drop buffer when sync=false + +Upstream-Status: Accepted + +https://bugzilla.gnome.org/show_bug.cgi?id=751819 +--- + libs/gst/base/gstbasesink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c +index d44e8fc..cd759ac 100644 +--- a/libs/gst/base/gstbasesink.c ++++ b/libs/gst/base/gstbasesink.c +@@ -3423,7 +3423,7 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad, + if (G_UNLIKELY (stepped)) + goto dropped; + +- if (syncable && do_sync) { ++ if (syncable && do_sync && gst_base_sink_get_sync (basesink)) { + GstClock *clock; + + GST_OBJECT_LOCK (basesink); +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb index db58754a6..73a4a9927 100644 --- a/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb +++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb @@ -9,6 +9,7 @@ SRC_URI = " \ file://0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch \ file://inputselector-sticky-events-haven-t-send-out-when-ac-1-4-1.patch \ file://0002-basesink-Fix-QoS-lateness-checking-if-subclass-imple.patch \ + file://0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch \ " SRC_URI[md5sum] = "88a9289c64a4950ebb4f544980234289" SRC_URI[sha256sum] = "40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae" |
