summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-22 18:20:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:13:09 (GMT)
commit8350c03eeca3f5d70984797ef784f29c71cbbb3b (patch)
treee8ca7a059cdd9dee15c463e4ea4a698f00c6daf0 /meta/recipes-multimedia/gstreamer
parentab69a16b21d0ce81458f6d3e6821e1800ee19a7c (diff)
downloadpoky-8350c03eeca3f5d70984797ef784f29c71cbbb3b.tar.gz
gst-plugins: remove obsolete orcc hack
* The sed script replacing ${bindir}/orcc with ${STAGING_BINDIR_NATIVE}/orcc causes orcc to not be found. It may have been a workaround for older versions of pkg-config or older gst-plugins. Removing it makes gst-plugins use orcc from 'orc-native' successfully, if available. (From OE-Core rev: a5e2277c53a8345a096eee8ccd9622838574a240) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb5
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb5
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb5
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins.inc10
5 files changed, 11 insertions, 18 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
index fac5fe3..656b61e 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
@@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
8 8
9DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg" 9DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
10 10
11PR = "r0" 11PR = "r1"
12 12
13inherit gettext 13inherit gettext
14 14
15EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \ 15EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \
16 --with-plugins=musicbrainz,wavpack,ivorbis,mpegvideoparse --disable-vdpau --disable-apexsink" 16 --with-plugins=musicbrainz,wavpack,ivorbis,mpegvideoparse --disable-vdpau --disable-apexsink \
17 --disable-orc"
17 18
18ARM_INSTRUCTION_SET = "arm" 19ARM_INSTRUCTION_SET = "arm"
19 20
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 9b169ec..5499829 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -14,11 +14,11 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
14SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" 14SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"
15SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" 15SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976"
16 16
17PR = "r1" 17PR = "r2"
18 18
19inherit gettext 19inherit gettext
20 20
21EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs" 21EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs --disable-orc"
22 22
23do_configure_prepend() { 23do_configure_prepend() {
24 # This m4 file contains nastiness which conflicts with libtool 2.2.2 24 # This m4 file contains nastiness which conflicts with libtool 2.2.2
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index 4fdd272..e0eaf7b 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 7
8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ 8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
9 speex libsoup-2.4 pulseaudio" 9 speex libsoup-2.4 pulseaudio"
10PR = "r0" 10PR = "r1"
11 11
12inherit gettext gconf 12inherit gettext gconf
13 13
14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check" 14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \
15 --disable-orc"
15 16
16do_configure_prepend() { 17do_configure_prepend() {
17 # This m4 file contains nastiness which conflicts with libtool 2.2.2 18 # This m4 file contains nastiness which conflicts with libtool 2.2.2
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb
index 233778d..125d09c 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb
@@ -8,11 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
8 file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" 8 file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
9 9
10DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" 10DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
11PR = "r0" 11PR = "r1"
12 12
13inherit gettext 13inherit gettext
14 14
15EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia" 15EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia \
16 --disable-orc"
16 17
17do_configure_prepend() { 18do_configure_prepend() {
18 # This m4 file contains nastiness which conflicts with libtool 2.2.2 19 # This m4 file contains nastiness which conflicts with libtool 2.2.2
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index a71a868..f11a4af 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = "gstreamer"
6 6
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8 8
9PR = "r1"
10
11FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" 9FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
12 10
13SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2" 11SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
@@ -16,14 +14,6 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
16 14
17acpaths = "-I ${S}/common/m4 -I ${S}/m4" 15acpaths = "-I ${S}/common/m4 -I ${S}/m4"
18 16
19# orc.m4 calls pkg-config ----variable=orcc orc-0.4 to get the path to orcc,
20# resulting in /usr/bin/orcc. Force it to use the staged orcc.
21do_configure_append() {
22 for i in $(find ${S} -name "Makefile") ; do
23 sed -i -e s:${bindir}/orcc:${STAGING_BINDIR_NATIVE}/orcc:g $i
24 done
25}
26
27require gst-plugins-package.inc 17require gst-plugins-package.inc
28 18
29PACKAGES_DYNAMIC = "${PN}-*" 19PACKAGES_DYNAMIC = "${PN}-*"