summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-18 17:29:17 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:23 +0000
commitc1ea98126a519e473b2452144b69c4364d0c9791 (patch)
tree53fbbfd34d22d8261adcabc1fa9710e145ad59c3 /meta
parentbeb80910e9f805e50b6446a31202343763c00467 (diff)
downloadpoky-c1ea98126a519e473b2452144b69c4364d0c9791.tar.gz
gstreamer1.0-plugins-good: minor formatting improvements
(From OE-Core rev: 91ac8a8aec76208d468586b6f42d2379675071be) 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-good.inc37
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb5
3 files changed, 21 insertions, 22 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 3d17497df8..e79da9e796 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -2,53 +2,52 @@ require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2.1+" 3LICENSE = "GPLv2+ & LGPLv2.1+"
4 4
5# libid3tag 5DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2"
6DEPENDS += "gstreamer1.0-plugins-base zlib bzip2 libcap"
7 6
8inherit gettext 7inherit gettext
9 8
10
11PACKAGECONFIG ??= " \ 9PACKAGECONFIG ??= " \
12 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 10 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
14 orc cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \ 11 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
15 " 12 cairo flac gdk-pixbuf gudev jpeg libpng orc soup speex taglib v4l2 \
13"
16 14
17X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" 15X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
18PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" 16
19PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
20PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" 17PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo"
18PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
21PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" 19PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac"
22PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" 20PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
23PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" 21PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev"
24PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2"
25PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 22PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
26PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" 23PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
27PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" 24PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng"
25PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2"
26PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
28PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4" 27PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4"
29PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" 28PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
30PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" 29PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib"
30PACKAGECONFIG[v4l2] = "--enable-gst_v4l2,--disable-gst_v4l2"
31PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" 31PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx"
32PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" 32PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
33PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394" 33PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}"
34PACKAGECONFIG[v4l2] = "--enable-gst_v4l2,--disable-gst_v4l2"
35 34
36EXTRA_OECONF += " \ 35EXTRA_OECONF += " \
36 --enable-bz2 \
37 --enable-oss \ 37 --enable-oss \
38 --enable-zlib \ 38 --enable-zlib \
39 --enable-bz2 \
40 --disable-directsound \
41 --disable-waveform \
42 --disable-oss4 \
43 --disable-sunaudio \
44 --disable-osx_audio \
45 --disable-osx_video \
46 --disable-aalib \ 39 --disable-aalib \
47 --disable-aalibtest \ 40 --disable-aalibtest \
41 --disable-directsound \
42 --disable-examples \
48 --disable-libcaca \ 43 --disable-libcaca \
49 --disable-libdv \ 44 --disable-libdv \
45 --disable-oss4 \
46 --disable-osx_audio \
47 --disable-osx_video \
50 --disable-shout2 \ 48 --disable-shout2 \
51 --disable-examples \ 49 --disable-sunaudio \
50 --disable-waveform \
52" 51"
53 52
54FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" 53FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb
index 92ebe1da42..022cfd2790 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
5 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" 5 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
6 6
7SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch" 7SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch"
8
8SRC_URI[md5sum] = "ef4f5bc4f31f706832a234b0f603967b" 9SRC_URI[md5sum] = "ef4f5bc4f31f706832a234b0f603967b"
9SRC_URI[sha256sum] = "876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92" 10SRC_URI[sha256sum] = "876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92"
10 11
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
index 2c0e0efe68..d60eaffc2f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
@@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ 6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
7 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" 7 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
8 8
9S = "${WORKDIR}/git"
10
11SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140" 9SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140"
12 10
11S = "${WORKDIR}/git"
12
13do_configure_prepend() { 13do_configure_prepend() {
14 cd ${S} 14 cd ${S}
15 ./autogen.sh --noconfigure 15 ./autogen.sh --noconfigure
16 cd ${B} 16 cd ${B}
17} 17}
18