diff options
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r-- | meta-oe/recipes-multimedia/libav/libav.inc | 4 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/webm/libvpx.inc | 15 |
3 files changed, 6 insertions, 17 deletions
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 89b14ca6c..2e3d1c9d2 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc | |||
@@ -11,7 +11,7 @@ ARM_INSTRUCTION_SET = "arm" | |||
11 | # faac faad2 lame schroedinger libgsm | 11 | # faac faad2 lame schroedinger libgsm |
12 | DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" | 12 | DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" |
13 | 13 | ||
14 | INC_PR = "r2" | 14 | INC_PR = "r3" |
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||
@@ -22,7 +22,7 @@ inherit autotools pkgconfig | |||
22 | 22 | ||
23 | B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" | 23 | B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" |
24 | 24 | ||
25 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fno-tree-vectorize -fomit-frame-pointer -O4 -ffast-math" | 25 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" |
26 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | 26 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" |
27 | 27 | ||
28 | EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" | 28 | EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" |
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 2a2d8af7b..7ed905563 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | |||
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac" | |||
21 | ARM_INSTRUCTION_SET = "ARM" | 21 | ARM_INSTRUCTION_SET = "ARM" |
22 | 22 | ||
23 | PV = "2.0+gitr${SRCPV}" | 23 | PV = "2.0+gitr${SRCPV}" |
24 | PR = "r5" | 24 | PR = "r6" |
25 | 25 | ||
26 | PARALLEL_MAKE = "" | 26 | PARALLEL_MAKE = "" |
27 | 27 | ||
@@ -130,7 +130,7 @@ EXTRA_OECONF = " \ | |||
130 | EXTRA_OECONF_append_armv6 = " --enable-armv6" | 130 | EXTRA_OECONF_append_armv6 = " --enable-armv6" |
131 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" | 131 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" |
132 | 132 | ||
133 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math -fno-tree-vectorize" | 133 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" |
134 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | 134 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" |
135 | 135 | ||
136 | CFLAGS_append = " -I${S}/libdvdread4 " | 136 | CFLAGS_append = " -I${S}/libdvdread4 " |
diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc index 8434f3841..31dafb8c8 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx.inc +++ b/meta-oe/recipes-multimedia/webm/libvpx.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "vpx Multi-Format Codec SDK" | 1 | DESCRIPTION = "vpx Multi-Format Codec SDK" |
2 | LICENSE = "BSD" | 2 | LICENSE = "BSD" |
3 | 3 | ||
4 | INC_PR = "r2" | 4 | INC_PR = "r3" |
5 | 5 | ||
6 | SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2" | 6 | SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2" |
7 | S = "${WORKDIR}/libvpx-v${PV}" | 7 | S = "${WORKDIR}/libvpx-v${PV}" |
@@ -10,18 +10,7 @@ S = "${WORKDIR}/libvpx-v${PV}" | |||
10 | # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' | 10 | # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' |
11 | ARM_INSTRUCTION_SET = "arm" | 11 | ARM_INSTRUCTION_SET = "arm" |
12 | 12 | ||
13 | #-ftree-vectorize was causing ICE with gcc-4.6 from meta-oe, see | 13 | CFLAGS += "-fPIC" |
14 | # http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html | ||
15 | #| [CC] vpx_scale/generic/gen_scalers.c.o | ||
16 | #| vpx_scale/generic/gen_scalers.c: In function 'vp8cx_vertical_band_3_4_scale_c': | ||
17 | #| vpx_scale/generic/gen_scalers.c:537:6: internal compiler error: in vect_get_vec_def_for_stmt_copy, at tree-vect-stmts.c:1390 | ||
18 | #| Please submit a full bug report, | ||
19 | #| with preprocessed source if appropriate. | ||
20 | #| See <http://gcc.gnu.org/bugs.html> for instructions. | ||
21 | #| make[1]: *** [vpx_scale/generic/gen_scalers.c.o] Error 1 | ||
22 | #| make: *** [.DEFAULT] Error 2 | ||
23 | |||
24 | CFLAGS += "-fPIC -fno-tree-vectorize" | ||
25 | 14 | ||
26 | export CC | 15 | export CC |
27 | export LD = "${CC}" | 16 | export LD = "${CC}" |