summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-18 17:29:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:23 +0000
commitc45ce26ee1deb87fcc528db2ee2e03fa505e2ade (patch)
tree1b8bbc86b98f10b126c07f3f234db342e0032dc9 /meta
parentc1ea98126a519e473b2452144b69c4364d0c9791 (diff)
downloadpoky-c45ce26ee1deb87fcc528db2ee2e03fa505e2ade.tar.gz
gstreamer1.0-plugins-bad: minor formatting improvements
(From OE-Core rev: c18761a08605e42a5b9900c9de0c5ff0df24a9ce) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc74
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb5
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb11
3 files changed, 42 insertions, 48 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 9bdf9dacd4..4aa2f564cd 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -1,13 +1,12 @@
1require gstreamer1.0-plugins.inc 1require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " 3LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
4 4
5DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" 5DEPENDS += "gstreamer1.0-plugins-base libpng jpeg"
6 6
7S = "${WORKDIR}/gst-plugins-bad-${PV}" 7SRC_URI += "file://configure-allow-to-disable-libssh2.patch"
8 8
9SRC_URI += "file://configure-allow-to-disable-libssh2.patch \ 9S = "${WORKDIR}/gst-plugins-bad-${PV}"
10 "
11 10
12inherit gettext bluetooth 11inherit gettext bluetooth
13 12
@@ -15,54 +14,52 @@ inherit gettext bluetooth
15# and BSP layers to pick either (desktop) opengl, gles2, or no GL 14# and BSP layers to pick either (desktop) opengl, gles2, or no GL
16PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" 15PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
17 16
17# gtk is not in the PACKAGECONFIG variable by default until
18# the transition to gtk+3 is finished
18PACKAGECONFIG ??= " \ 19PACKAGECONFIG ??= " \
19 ${PACKAGECONFIG_GL} \ 20 ${PACKAGECONFIG_GL} \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
23 orc curl uvch264 neon sndfile hls sbc dash bz2 smoothstreaming rsvg dtls \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
24 " 24 bz2 curl dash dtls hls neon orc rsvg sbc smoothstreaming sndfile uvch264 \
25"
25 26
26# gtk is not in the PACKAGECONFIG variable by default until
27# the transition to gtk+3 is finished
28#
29# dash = Dynamic Adaptive Streaming over HTTP
30PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" 27PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
28PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}"
29PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
31PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 30PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
32PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" 31PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2"
33PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" 32PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
33PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl"
34PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" 34PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
35PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" 35PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
36PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
37PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
38PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
39PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
40PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
36PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" 41PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
42PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
37PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" 43PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
38PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" 44PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
39PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
40PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
41PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
42PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland virtual/egl"
43PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev"
44PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
45PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" 45PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
46PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" 46PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
47PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" 47PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
48PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
49PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
50PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav"
51PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
52PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
48PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" 53PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
49PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2"
50PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
51PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
52PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" 54PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger"
53PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" 55PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
54PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}"
55PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
56PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" 56PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
57PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
58PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
59PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
60PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl"
61PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
62PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp" 57PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp"
58PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev"
63PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" 59PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
64PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" 60PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
65PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav" 61PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland virtual/egl"
62PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
66 63
67# these plugins have not been ported to 1.0 (yet): 64# these plugins have not been ported to 1.0 (yet):
68# apexsink dc1394 lv2 linsys musepack nas timidity teletextdec sdl xvid wininet 65# apexsink dc1394 lv2 linsys musepack nas timidity teletextdec sdl xvid wininet
@@ -81,10 +78,10 @@ PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdrea
81# in a gstreamer1.0-plugins-bad bbappend). 78# in a gstreamer1.0-plugins-bad bbappend).
82 79
83EXTRA_OECONF += " \ 80EXTRA_OECONF += " \
81 --enable-decklink \
84 --enable-dvb \ 82 --enable-dvb \
85 --enable-shm \
86 --enable-fbdev \ 83 --enable-fbdev \
87 --enable-decklink \ 84 --enable-shm \
88 --enable-vcd \ 85 --enable-vcd \
89 --disable-acm \ 86 --disable-acm \
90 --disable-android_media \ 87 --disable-android_media \
@@ -104,8 +101,8 @@ EXTRA_OECONF += " \
104 --disable-gsm \ 101 --disable-gsm \
105 --disable-kate \ 102 --disable-kate \
106 --disable-ladspa \ 103 --disable-ladspa \
107 --disable-libvisual \
108 --disable-libde265 \ 104 --disable-libde265 \
105 --disable-libvisual \
109 --disable-linsys \ 106 --disable-linsys \
110 --disable-lv2 \ 107 --disable-lv2 \
111 --disable-mimic \ 108 --disable-mimic \
@@ -139,14 +136,13 @@ EXTRA_OECONF += " \
139 --disable-xvid \ 136 --disable-xvid \
140 --disable-zbar \ 137 --disable-zbar \
141 ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \ 138 ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \
142 " 139"
143 140
144OPENCV_PREFIX="${STAGING_DIR_TARGET}${prefix}" 141export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
145export OPENCV_PREFIX
146 142
147ARM_INSTRUCTION_SET = "arm" 143ARM_INSTRUCTION_SET = "arm"
148 144
149FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*" 145FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
150FILES_${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs" 146FILES_${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs"
147FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*"
151FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" 148FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs"
152FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
index 284e1f26e2..c1c322b136 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
@@ -1,9 +1,9 @@
1include gstreamer1.0-plugins-bad.inc 1include gstreamer1.0-plugins-bad.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
4 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a \
5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ 4 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \
6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" 5 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \
6 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a"
7 7
8SRC_URI += "file://0001-glimagesink-Downrank-to-marginal.patch" 8SRC_URI += "file://0001-glimagesink-Downrank-to-marginal.patch"
9 9
@@ -11,4 +11,3 @@ SRC_URI[md5sum] = "7c73bec1d389f0e184ebbbbb9e9f883d"
11SRC_URI[sha256sum] = "650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe" 11SRC_URI[sha256sum] = "650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe"
12 12
13S = "${WORKDIR}/gst-plugins-bad-${PV}" 13S = "${WORKDIR}/gst-plugins-bad-${PV}"
14
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 309505f7db..79c17774e3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -3,24 +3,23 @@ DEFAULT_PREFERENCE = "-1"
3include gstreamer1.0-plugins-bad.inc 3include gstreamer1.0-plugins-bad.inc
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
6 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a \
7 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ 6 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \
8 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" 7 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \
9 8 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a"
10S = "${WORKDIR}/git"
11 9
12SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce" 10SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce"
13 11
12S = "${WORKDIR}/git"
13
14PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" 14PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
15PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" 15PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
16 16
17EXTRA_OECONF += " \ 17EXTRA_OECONF += " \
18 -disable-openjpeg \ 18 -disable-openjpeg \
19 " 19"
20 20
21do_configure_prepend() { 21do_configure_prepend() {
22 cd ${S} 22 cd ${S}
23 ./autogen.sh --noconfigure 23 ./autogen.sh --noconfigure
24 cd ${B} 24 cd ${B}
25} 25}
26