summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2013-11-16 21:23:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:32 +0000
commitc2cbe0f60e6d19ab9a8321be74d636d2c36671a8 (patch)
tree2bdb40fa526b09e9a9aa7e08f11afb5fd09d82c7 /meta/recipes-multimedia
parent7865ce6d805ba19ea32d2658cae65c9585c84539 (diff)
downloadpoky-c2cbe0f60e6d19ab9a8321be74d636d2c36671a8.tar.gz
gstreamer1.0: upgrade to 1.2.0
starting with this version, the recipes enable Orc acceleration by default (From OE-Core rev: 686ee2f13673d48d8c7666d4fa1806e98b037561) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/libav_e500mc.patch21
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.0.9.bb)13
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc110
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.0.9.bb)8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb10
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.0.bb10
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc13
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.0.9.bb)6
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.9.bb)4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.2.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.0.9.bb)8
14 files changed, 141 insertions, 103 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
index 3d996bcaa4..ec5956a735 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
@@ -13,7 +13,7 @@ PR = "r1"
13# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, 13# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
14# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the 14# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
15# libav copy included in the gst-libav package. 15# libav copy included in the gst-libav package.
16PACKAGECONFIG ??= " " 16PACKAGECONFIG ??= " orc "
17PACKAGECONFIG[libav] = "--with-system-libav,,libav" 17PACKAGECONFIG[libav] = "--with-system-libav,,libav"
18PACKAGECONFIG[lgpl] = "--enable-lgpl,," 18PACKAGECONFIG[lgpl] = "--enable-lgpl,,"
19PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" 19PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/libav_e500mc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/libav_e500mc.patch
deleted file mode 100644
index eba4988031..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/libav_e500mc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1diff --git a/gst-libs/ext/libav/configure b/gst-libs/ext/libav/configure
2index 8473069..4f74952 100755
3--- a/gst-libs/ext/libav/configure
4+++ b/gst-libs/ext/libav/configure
5Fix gst-ffmpeg build issues for libav on e500mc (fsl-p4080)
6
7Upstream-Status: Backport
8
9Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
10
11@@ -2210,6 +2210,10 @@ elif enabled ppc; then
12 cpuflags="-mcpu=cell"
13 enable ldbrx
14 ;;
15+ e500mc)
16+ cpuflags="-mcpu=e500mc"
17+ disable altivec
18+ ;;
19 e500v2)
20 cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double"
21 disable altivec
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.0.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.0.bb
index 0b6bd50c25..66fe83bdb7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.0.9.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.0.bb
@@ -1,21 +1,20 @@
1include gstreamer1.0-libav.inc 1include gstreamer1.0-libav.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ 4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
5 file://ext/libav/gstav.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9 \ 5 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
6 file://gst-libs/ext/libav/LICENSE;md5=abc3b8cb02856aa7823bbbd162d16232 \ 6 file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
7 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ 8 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ 9 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
10 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 10 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
11 11
12SRC_URI = " \ 12SRC_URI = " \
13 http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ 13 http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
14 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ 14 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
15 file://libav_e500mc.patch \
16 " 15 "
17SRC_URI[md5sum] = "8414f8d4c4a239a74a3d5eadf3d14875" 16SRC_URI[md5sum] = "382bc5a99d22a4fbf8e971c42bb72c01"
18SRC_URI[sha256sum] = "759641c0597c24191322f40945b363b75df299a539ff4086650be6193028189a" 17SRC_URI[sha256sum] = "48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099"
19 18
20LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ 19LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
21 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ 20 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index a36335aeff..c3827588b0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -4,96 +4,114 @@ LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
4 4
5DEPENDS += "gstreamer1.0-plugins-base bzip2" 5DEPENDS += "gstreamer1.0-plugins-base bzip2"
6 6
7SRC_URI[md5sum] = "d1493d1219b836a8cbf54f4fba962420"
8SRC_URI[sha256sum] = "5f49e6353fdc855834b5beb054b3a47ef5fa558006c7eda6d2ec07b36315c2ab"
9
10S = "${WORKDIR}/gst-plugins-bad-${PV}" 7S = "${WORKDIR}/gst-plugins-bad-${PV}"
11 8
12inherit gettext 9inherit gettext
13 10
14 11
15PACKAGECONFIG ??= " \ 12PACKAGECONFIG ??= " \
16 curl eglgles wayland \ 13 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \
15 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
16 orc curl uvch264 directfb neon \
17 hls sbc dash bz2 smoothstreaming \
17 " 18 "
18 19# rsvg plugin requires librsvg >= 2.36
19PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" 20# dash = Dynamic Adaptive Streaming over HTTP
20PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 21PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
21PACKAGECONFIG[eglgles] = "--enable-eglgles,--disable-eglgles,virtual/egl virtual/libgles2" 22PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
22PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" 23PACKAGECONFIG[eglgles] = "--enable-eglgles,--disable-eglgles,virtual/egl virtual/libgles2"
23PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" 24PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
24PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" 25PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
25PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" 26PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
26PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" 27PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
27PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" 28PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
28PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" 29PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
29PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" 30PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
30 31PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
32PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
33PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev"
34PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
35PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
36PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
37PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
38PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
39PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2"
40PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
41PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
42PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger"
43PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
44PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4"
31 45
32 46
33# these plugins have not been ported to 1.0 (yet): 47# these plugins have not been ported to 1.0 (yet):
34# directdraw vcd uvch264 apexsink cdaudio cog dc1394 directfb dirac fbdev jasper 48# directdraw vcd apexsink cdaudio dc1394 lv2 linsys musepack mythtv
35# kate ladspa lv2 linsys musepack musicbrainz mythtv nas neon ofa openal rsvg 49# nas timidity teletextdec sdl sndfile xvid wininet acm gsettings
36# timidity teletextdec wildmidi sdl sndfile xvid wininet acm gsettings sndio 50# sndio cdxaparse dccp faceoverlay hdvparse ivfparse jp2kdecimator
37#mfc hls openjpeg sbc 51# linsys mve nuvdemux osx_video patchdetect quicktime real sdi stereo
52# tta videomeasure videosignal vmnc
53
38EXTRA_OECONF += " \ 54EXTRA_OECONF += " \
39 --enable-dvb \ 55 --enable-dvb \
40 --enable-shm \ 56 --enable-shm \
41 --disable-uvch264 \ 57 --enable-mfc \
42 --disable-vcd \ 58 --enable-fbdev \
43 --disable-fbdev \ 59 --enable-decklink \
44 --disable-examples \
45 --disable-experimental \
46 --disable-celt \
47 --disable-chromaprint \
48 --disable-decklink \
49 --disable-dts \
50 --disable-faac \
51 --disable-gme \
52 --disable-gsm \
53 --disable-mpeg2enc \
54 --disable-mplex \
55 --disable-resindvd \
56 --disable-rtmp \
57 --disable-schro \
58 --disable-soundtouch \
59 --disable-spandsp \
60 --disable-vdpau \
61 --disable-acm \ 60 --disable-acm \
62 --disable-android_media \ 61 --disable-android_media \
63 --disable-apexsink \ 62 --disable-apexsink \
64 --disable-apple_media \ 63 --disable-apple_media \
65 --disable-avc \ 64 --disable-avc \
66 --disable-cdaudio \ 65 --disable-cdaudio \
67 --disable-cog \ 66 --disable-chromaprint \
67 --disable-daala \
68 --disable-dc1394 \ 68 --disable-dc1394 \
69 --disable-dirac \
70 --disable-direct3d \ 69 --disable-direct3d \
71 --disable-direct3d9 \
72 --disable-directdraw \ 70 --disable-directdraw \
73 --disable-directsound \
74 --disable-directshow \ 71 --disable-directshow \
72 --disable-directsound \
73 --disable-dts \
74 --disable-gme \
75 --disable-gsettings \ 75 --disable-gsettings \
76 --disable-gsm \
76 --disable-kate \ 77 --disable-kate \
77 --disable-ladspa \ 78 --disable-ladspa \
78 --disable-linsys \ 79 --disable-linsys \
79 --disable-lv2 \ 80 --disable-lv2 \
80 --disable-mimic \ 81 --disable-mimic \
82 --disable-mpeg2enc \
83 --disable-mplex \
81 --disable-musepack \ 84 --disable-musepack \
82 --disable-mythtv \ 85 --disable-mythtv \
83 --disable-nas \ 86 --disable-nas \
84 --disable-ofa \ 87 --disable-ofa \
88 --disable-openjpeg \
89 --disable-opensles \
85 --disable-osx_video \ 90 --disable-osx_video \
86 --disable-pvr \ 91 --disable-pvr \
87 --disable-quicktime \ 92 --disable-quicktime \
93 --disable-resindvd \
94 --disable-rsvg \
95 --disable-rtmp \
96 --disable-sdl \
97 --disable-sdltest \
98 --disable-sndfile \
88 --disable-sndio \ 99 --disable-sndio \
100 --disable-soundtouch \
101 --disable-spandsp \
89 --disable-spc \ 102 --disable-spc \
90 --disable-swfdec \ 103 --disable-srtp \
91 --disable-teletextdec \ 104 --disable-teletextdec \
92 --disable-timidity \ 105 --disable-timidity \
106 --disable-vcd \
107 --disable-vdpau \
93 --disable-voaacenc \ 108 --disable-voaacenc \
94 --disable-voamrwbenc \ 109 --disable-voamrwbenc \
110 --disable-wasapi \
111 --disable-webp \
95 --disable-wildmidi \ 112 --disable-wildmidi \
96 --disable-wininet \ 113 --disable-wininet \
114 --disable-winscreencap \
97 --disable-xvid \ 115 --disable-xvid \
98 --disable-zbar \ 116 --disable-zbar \
99 ${GSTREAMER_1_0_ORC} \ 117 ${GSTREAMER_1_0_ORC} \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch
new file mode 100644
index 0000000000..6299a475ab
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch
@@ -0,0 +1,35 @@
1commit 1ab90f259fee4fa9a7c10dac0a1e85799a15881b
2Author: Sebastian Dröge <slomo@circular-chaos.org>
3Date: Wed Sep 25 20:25:03 2013 +0200
4
5 bluez: Fix compilation on big endian systems
6
7Upstream-Status: Backport
8
9diff --git a/sys/bluez/gstavdtputil.c b/sys/bluez/gstavdtputil.c
10index dea803a..ed5c276 100644
11--- a/sys/bluez/gstavdtputil.c
12+++ b/sys/bluez/gstavdtputil.c
13@@ -611,11 +611,11 @@ gst_avdtp_util_parse_aac_raw (void *config)
14 GValue value = G_VALUE_INIT;
15 GValue value_str = G_VALUE_INIT;
16 GValue list = G_VALUE_INIT;
17+ a2dp_aac_t aac_local = { 0 };
18+ a2dp_aac_t *aac = &aac_local;
19
20 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
21 uint8_t *raw = (uint8_t *) config;
22- a2dp_aac_t aac_local = { 0 };
23- a2dp_aac_t *aac = &aac_local;
24 aac->object_type = raw[0];
25 aac->frequency = (raw[1] << 4) | ((raw[2] & 0xFF) >> 4);
26 aac->channels = (raw[2] >> 2) & 0x3;
27@@ -624,7 +624,7 @@ gst_avdtp_util_parse_aac_raw (void *config)
28 aac->bitrate = (raw[4] << 16) | (raw[3] << 8) | raw[4];
29 aac->bitrate &= ~0x800000;
30 #elif G_BYTE_ORDER == G_BIG_ENDIAN
31- *aac = (a2dp_aac_t *) config;
32+ *aac = *((a2dp_aac_t *) config);
33 #else
34 #error "Unknown byte order"
35 #endif
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.0.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.0.bb
index 9ce7991028..d9e3b487df 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.0.9.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.0.bb
@@ -3,10 +3,12 @@ include gstreamer1.0-plugins-bad.inc
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 \ 4 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a \
5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ 5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \
6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c" 6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50"
7 7
8SRC_URI[md5sum] = "569e5122fd7bfd7bd861a537f0a28c60" 8SRC_URI[md5sum] = "4fd078e1b9d903d22b67872b616f1715"
9SRC_URI[sha256sum] = "69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75" 9SRC_URI[sha256sum] = "a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa"
10
11SRC_URI += "file://bluez-fix-compilation-on-big-endian-systems.patch"
10 12
11S = "${WORKDIR}/gst-plugins-bad-${PV}" 13S = "${WORKDIR}/gst-plugins-bad-${PV}"
12 14
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 5002399396..ebfa7cd4e5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -11,7 +11,7 @@ inherit gettext
11PACKAGECONFIG ??= " \ 11PACKAGECONFIG ??= " \
12 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 12 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
13 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 13 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
14 ivorbis ogg theora vorbis \ 14 orc ivorbis ogg theora vorbis \
15 " 15 "
16 16
17X11DEPENDS = "virtual/libx11 libsm libxrender" 17X11DEPENDS = "virtual/libx11 libsm libxrender"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb
deleted file mode 100644
index 7b1e9908d7..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1include gstreamer1.0-plugins-base.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
5 file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
6 "
7SRC_URI[md5sum] = "24af1986581d9c2cd3dc834ab64d133d"
8SRC_URI[sha256sum] = "963e3b83d651661f495ca2e44ccd2d5c61e986e9d7706246e568276689a372ea"
9
10S = "${WORKDIR}/gst-plugins-base-${PV}"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.0.bb
new file mode 100644
index 0000000000..cc4d11bff2
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.0.bb
@@ -0,0 +1,10 @@
1include gstreamer1.0-plugins-base.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
5 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
6 "
7SRC_URI[md5sum] = "d0f7bb7f6c781be127902bff89b87c5c"
8SRC_URI[sha256sum] = "8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d"
9
10S = "${WORKDIR}/gst-plugins-base-${PV}"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 19b16cafa4..b6949884e3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -11,7 +11,7 @@ inherit gettext gconf
11PACKAGECONFIG ??= " \ 11PACKAGECONFIG ??= " \
12 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 12 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
13 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 13 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
14 cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ 14 orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \
15 " 15 "
16 16
17X11DEPENDS = "virtual/libx11 libsm libxrender" 17X11DEPENDS = "virtual/libx11 libsm libxrender"
@@ -30,12 +30,17 @@ PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
30PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" 30PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib"
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[v4l] = "--with-libv4l2,--without-libv4l2,libv4l" 33
34# the 1394 plugins require both libraw1394 and libiec61883
35# the former is included in meta-oe, the latter isn't
36# -> disabled
34 37
35EXTRA_OECONF += " \ 38EXTRA_OECONF += " \
39 --enable-oss \
40 --enable-gst_v4l2 \
41 --without-libv4l2 \
36 --disable-directsound \ 42 --disable-directsound \
37 --disable-waveform \ 43 --disable-waveform \
38 --disable-oss \
39 --disable-oss4 \ 44 --disable-oss4 \
40 --disable-sunaudio \ 45 --disable-sunaudio \
41 --disable-osx_audio \ 46 --disable-osx_audio \
@@ -43,9 +48,9 @@ EXTRA_OECONF += " \
43 --disable-aalib \ 48 --disable-aalib \
44 --disable-libcaca \ 49 --disable-libcaca \
45 --disable-libdv \ 50 --disable-libdv \
46 --disable-dv1394 \
47 --disable-shout2 \ 51 --disable-shout2 \
48 --disable-examples \ 52 --disable-examples \
53 --disable-dv1394 \
49 ${GSTREAMER_1_0_ORC} \ 54 ${GSTREAMER_1_0_ORC} \
50" 55"
51 56
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.0.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.0.bb
index 1b65b7da64..5d54f27713 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.0.9.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.0.bb
@@ -1,11 +1,11 @@
1include gstreamer1.0-plugins-good.inc 1include gstreamer1.0-plugins-good.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ 4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
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[md5sum] = "20bb77f201b044f4ba61de167c4466d7" 7SRC_URI[md5sum] = "df96825d4154940fd934aa0a95b40836"
8SRC_URI[sha256sum] = "cfa2e617a76f93e9ddd4ae1109297e93fb4a06b152042b996231234a72c5a5ff" 8SRC_URI[sha256sum] = "2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa"
9 9
10S = "${WORKDIR}/gst-plugins-good-${PV}" 10S = "${WORKDIR}/gst-plugins-good-${PV}"
11 11
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
index 3f47949018..0dd011bf33 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
@@ -9,7 +9,7 @@ inherit gettext
9 9
10 10
11PACKAGECONFIG ??= " \ 11PACKAGECONFIG ??= " \
12 a52dec lame mad mpeg2dec \ 12 orc a52dec lame mad mpeg2dec \
13 " 13 "
14 14
15PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" 15PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.0.bb
index 30fa3a361d..a772877437 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.9.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.0.bb
@@ -3,8 +3,8 @@ include gstreamer1.0-plugins-ugly.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
4 file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " 4 file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 "
5 5
6SRC_URI[md5sum] = "ea8b4e05ed5beb982762b45aba266720" 6SRC_URI[md5sum] = "81c97981ed373bd77bb10f2ae555c166"
7SRC_URI[sha256sum] = "11250fe9e44b0169c3a289e981b31874b483643ed78f619682ae1644d7088379" 7SRC_URI[sha256sum] = "e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de"
8 8
9S = "${WORKDIR}/gst-plugins-ugly-${PV}" 9S = "${WORKDIR}/gst-plugins-ugly-${PV}"
10 10
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.0.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.2.0.bb
index e4b2f1e759..98d5412f2c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.0.9.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.2.0.bb
@@ -1,13 +1,13 @@
1include gstreamer1.0.inc 1include gstreamer1.0.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
4 file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" 4 file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ 7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
8 file://0001-Fix-crash-with-gst-inspect.patch \ 8 file://0001-Fix-crash-with-gst-inspect.patch \
9 " 9 "
10SRC_URI[md5sum] = "cbbad73d703b811bc8bd18e47b36e534" 10SRC_URI[md5sum] = "250b4bec48b0986103f5aab75e43cef9"
11SRC_URI[sha256sum] = "17a2c60a82baa461ef685ad3de187edb9c03a2c7e07513daba58a5a32efacaa3" 11SRC_URI[sha256sum] = "94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463"
12S = "${WORKDIR}/gstreamer-${PV}" 12S = "${WORKDIR}/gstreamer-${PV}"
13 13