[OE-core] [PATCH 4/7] gstreamer1.0-plugins-bad: upgrade to version 1.6.0
Carlos Rafael Giani
dv at pseudoterminal.org
Sun Sep 27 21:48:08 UTC 2015
0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch is now
in upstream, and therefore not needed as a separate patch anymore.
Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
---
.../gstreamer/gstreamer1.0-plugins-bad.inc | 46 +++++++++++++---------
...heck-for-GL-GLU-EGL-GLES2-libs-if-disable.patch | 41 -------------------
..._1.4.5.bb => gstreamer1.0-plugins-bad_1.6.0.bb} | 6 +--
3 files changed, 30 insertions(+), 63 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.4.5.bb => gstreamer1.0-plugins-bad_1.6.0.bb} (66%)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index cdedb60..5dcfb43 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -20,10 +20,12 @@ 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 \
- hls sbc dash bz2 smoothstreaming \
+ orc curl uvch264 neon sndfile hls sbc dash bz2 smoothstreaming rsvg dtls \
"
+# gtk is not in the PACKAGECONFIG variable by default until
+# the transition to gtk+3 is finished
+#
# dash = Dynamic Adaptive Streaming over HTTP
PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
@@ -55,36 +57,38 @@ 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[dtls] = "--enable-dtls,--disable-dtls,openssl"
+PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
+PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt,qtbase qtdeclarative"
# these plugins have not been ported to 1.0 (yet):
-# directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv
-# nas timidity teletextdec sdl xvid wininet acm gsettings
-# sndio qtwrapper cdxaparse dccp faceoverlay hdvparse tta
-# mve nuvdemux osx_video patchdetect quicktime real sdi
-# videomeasure gsettings
+# apexsink dc1394 lv2 linsys musepack nas timidity teletextdec sdl xvid wininet
+# acm gsettings sndio cdxaparse dccp faceoverlay hdvparse tta mve nuvdemux
+# patchdetect real sdi videomeasure gsettings
# 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
+# openni2 winks direct3d directsound winscreencap
+# apple_media android_media avc bs2b chromaprint daala dts gme gsm kate ladspa
+# libde265 mimic mpeg2enc mplex ofa openh264 opensles pvr resindvd
+# soundtouch spandsp spc srtp vdpau voaacenc voamrwbenc wasapi x265 zbar
EXTRA_OECONF += " \
--enable-dvb \
--enable-shm \
--enable-fbdev \
--enable-decklink \
+ --enable-vcd \
--disable-acm \
--disable-android_media \
--disable-apexsink \
--disable-apple_media \
--disable-avc \
+ --disable-bs2b \
--disable-chromaprint \
--disable-cocoa \
--disable-daala \
--disable-dc1394 \
--disable-direct3d \
- --disable-directdraw \
--disable-directsound \
--disable-dts \
--disable-gme \
@@ -92,20 +96,22 @@ EXTRA_OECONF += " \
--disable-gsm \
--disable-kate \
--disable-ladspa \
+ --disable-libvisual \
+ --disable-libde265 \
--disable-linsys \
--disable-lv2 \
--disable-mimic \
--disable-mpeg2enc \
--disable-mplex \
--disable-musepack \
- --disable-mythtv \
--disable-nas \
--disable-ofa \
+ --disable-openexr \
+ --disable-openh264 \
--disable-openjpeg \
+ --disable-openni2 \
--disable-opensles \
- --disable-osx_video \
--disable-pvr \
- --disable-quicktime \
--disable-resindvd \
--disable-sdl \
--disable-sdltest \
@@ -116,20 +122,24 @@ EXTRA_OECONF += " \
--disable-srtp \
--disable-teletextdec \
--disable-timidity \
- --disable-vcd \
--disable-vdpau \
--disable-voaacenc \
--disable-voamrwbenc \
--disable-wasapi \
--disable-wildmidi \
--disable-wininet \
+ --disable-winks \
--disable-winscreencap \
+ --disable-x265 \
--disable-xvid \
--disable-zbar \
${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \
"
-ARM_INSTRUCTION_SET = "arm"
+OPENCV_PREFIX="${STAGING_DIR_TARGET}${prefix}"
+export OPENCV_PREFIX
-FILES_gstreamer1.0-plugins-bad-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
+ARM_INSTRUCTION_SET = "arm"
+FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
+FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
deleted file mode 100644
index 042a32c..0000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From deba0da45ec821209a7ed148a4521d562e6512cd Mon Sep 17 00:00:00 2001
-From: Carlos Rafael Giani <dv at pseudoterminal.org>
-Date: Wed, 27 Aug 2014 14:47:25 +0200
-Subject: [PATCH] gl: do not check for GL/GLU/EGL/GLES2 libs if disabled in
- configuration
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=735522]
-
-Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
----
- configure.ac | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1a46afb..e85d4ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -661,10 +661,16 @@ case $host in
- fi
- ;;
- *)
-- AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h)
-- AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h)
-- AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h)
-- AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h)
-+ if test "x$NEED_GL" != "xno"; then
-+ AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h)
-+ AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h)
-+ fi
-+ if test "x$NEED_GLES2" != "xno"; then
-+ AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h)
-+ fi
-+ if test "x$NEED_EGL" != "xno"; then
-+ AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h)
-+ fi
-
- old_LIBS=$LIBS
- old_CFLAGS=$CFLAGS
---
-1.8.3.2
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.0.bb
similarity index 66%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.0.bb
index 59065de..d523977 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.0.bb
@@ -5,10 +5,8 @@ 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[md5sum] = "e0bb39412cf4a48fe0397bcf3a7cd451"
-SRC_URI[sha256sum] = "152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c"
+SRC_URI[md5sum] = "111632f8d1d1ba39bbf3665aaafcb28c"
+SRC_URI[sha256sum] = "d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49"
S = "${WORKDIR}/gst-plugins-bad-${PV}"
--
1.9.1
More information about the Openembedded-core
mailing list