summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-13 22:30:03 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-08-16 12:58:30 +0200
commit30ba23377ec568a58c43e466582506980b67baad (patch)
tree2882970b1a57c9867fe752dcae417a030caef956 /meta-oe/recipes-multimedia
parent5f78d37f9d28d2b6aff6993f3b3d050a0f5cfb90 (diff)
downloadmeta-openembedded-30ba23377ec568a58c43e466582506980b67baad.tar.gz
libav: remove
This is now in OE-Core. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch27
-rw-r--r--meta-oe/recipes-multimedia/libav/libav.inc127
-rw-r--r--meta-oe/recipes-multimedia/libav/libav_0.8.4.bb28
-rw-r--r--meta-oe/recipes-multimedia/libav/libav_git.bb23
4 files changed, 0 insertions, 205 deletions
diff --git a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch b/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch
deleted file mode 100644
index 5f2df4334..000000000
--- a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001
2From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
3Date: Thu, 10 Jan 2013 12:42:19 +0100
4Subject: [PATCH] configure: enable pic for AArch64
5
6Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
7
8Upstream-Status: Backport
9---
10 configure | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13--- git.orig/configure
14+++ git/configure
15@@ -2390,11 +2390,11 @@ EOF
16
17 check_host_cflags -std=c99
18 check_host_cflags -Wall
19
20 case "$arch" in
21- alpha|ia64|mips|parisc|sparc)
22+ alpha|ia64|mips|parisc|sparc|aarch64)
23 spic=$shared
24 ;;
25 x86)
26 subarch="x86_32"
27 check_cc <<EOF && subarch="x86_64"
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc
deleted file mode 100644
index 0155b4b0f..000000000
--- a/meta-oe/recipes-multimedia/libav/libav.inc
+++ /dev/null
@@ -1,127 +0,0 @@
1DESCRIPTION = "Libav is a complete, cross-platform solution to record, convert and stream audio and video."
2HOMEPAGE = "http://libav.org/"
3SECTION = "libs"
4LICENSE = "GPLv2+"
5
6# Provides ffmpeg compat, see http://libav.org/about.html
7PROVIDES = "ffmpeg"
8
9ARM_INSTRUCTION_SET = "arm"
10
11# faac faad2 lame schroedinger libgsm
12DEPENDS = "x264 virtual/libsdl zlib libogg libvorbis libvpx libtheora"
13
14INC_PR = "r8"
15
16inherit autotools pkgconfig
17
18# --enable-libgsm
19# --enable-libmp3lame
20# --enable-libschroedinger
21# --enable-libvpx
22
23B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
24
25FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
26BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
27
28EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
29EXTRA_FFCONF ?= ""
30
31PACKAGECONFIG ??= "bzip2"
32PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
33PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
34
35EXTRA_OECONF = " \
36 --enable-shared \
37 --enable-pthreads \
38 --enable-gpl \
39 --enable-avfilter \
40 \
41 --cross-prefix=${TARGET_PREFIX} \
42 --prefix=${prefix} \
43 \
44 --enable-avserver \
45 --enable-avplay \
46 --enable-x11grab \
47 --enable-libtheora \
48 --enable-libvorbis \
49 --enable-libx264 \
50 --arch=${TARGET_ARCH} \
51 --target-os="linux" \
52 --enable-cross-compile \
53 --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
54 --extra-ldflags="${TARGET_LDFLAGS}" \
55 --sysroot="${STAGING_DIR_TARGET}" \
56 --enable-hardcoded-tables \
57 ${EXTRA_FFCONF} \
58"
59
60#| yasm not found, use --disable-yasm for a crippled build
61EXTRA_OECONF_append_x86-64 = " --disable-yasm"
62EXTRA_OECONF_append_x86 = " --disable-yasm"
63
64do_configure() {
65 # We don't have TARGET_PREFIX-pkgconfig
66 sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure
67 mkdir -p ${B}
68 cd ${B}
69 ${S}/configure ${EXTRA_OECONF}
70 sed -i -e s:Os:O4:g ${B}/config.h
71}
72
73do_install_append() {
74 install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
75}
76
77FFMPEG_LIBS = "libavcodec libavdevice libavformat \
78 libavutil libpostproc libswscale libavfilter"
79
80PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
81
82RSUGGESTS_${PN} = "mplayer"
83FILES_${PN} = "${bindir}"
84FILES_${PN}-dev = "${includedir}/${PN}"
85
86FILES_${PN}-vhook = "${libdir}/vhook"
87FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
88
89FILES_ffmpeg-x264-presets = "${datadir}/*.avpreset"
90
91LEAD_SONAME = "libavcodec.so"
92
93FILES_${PN}-dev = "${includedir}"
94
95python populate_packages_prepend() {
96 av_libdir = d.expand('${libdir}')
97 av_pkgconfig = d.expand('${libdir}/pkgconfig')
98
99 # Runtime package
100 do_split_packages(d, av_libdir, '^lib(.*)\.so\..*',
101 output_pattern='lib%s',
102 description='libav %s library',
103 extra_depends='',
104 prepend=True,
105 allow_links=True)
106
107 # Development packages (-dev, -staticdev)
108 do_split_packages(d, av_libdir, '^lib(.*)\.so$',
109 output_pattern='lib%s-dev',
110 description='libav %s development package',
111 extra_depends='${PN}-dev',
112 prepend=True,
113 allow_links=True)
114 do_split_packages(d, av_pkgconfig, '^lib(.*)\.pc$',
115 output_pattern='lib%s-dev',
116 description='libav %s development package',
117 extra_depends='${PN}-dev',
118 prepend=True)
119 do_split_packages(d, av_libdir, '^lib(.*)\.a$',
120 output_pattern='lib%s-staticdev',
121 description='libav %s development package - static library',
122 extra_depends='${PN}-dev',
123 prepend=True,
124 allow_links=True)
125}
126
127PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc).*"
diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb
deleted file mode 100644
index b48ae96ad..000000000
--- a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1require libav.inc
2
3EXTRA_OECONF += " \
4 --enable-postproc \
5"
6
7FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:"
8
9SRC_URI_append = " \
10 file://0001-configure-enable-pic-for-AArch64.patch \
11"
12LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
14 file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
15 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
16
17PV = "0.8.4+git${SRCPV}"
18PR = "${INC_PR}.0"
19
20# When bumping SRCREV make sure you bump PR here and in dependant
21# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
22# changes
23SRCREV = "2c8ce46250ff78191fe6565876ddc4bc03fdf519"
24SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
25
26S = "${WORKDIR}/git"
27
28
diff --git a/meta-oe/recipes-multimedia/libav/libav_git.bb b/meta-oe/recipes-multimedia/libav/libav_git.bb
deleted file mode 100644
index d12bd9d21..000000000
--- a/meta-oe/recipes-multimedia/libav/libav_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require libav.inc
2
3LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
5 file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
6 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
7
8DEPENDS += "libpostproc"
9PV = "0.8.99+git${SRCPV}"
10PR = "${INC_PR}.0"
11
12DEFAULT_PREFERENCE = "-1"
13
14# When bumping SRCREV make sure you bump PR here and in dependant
15# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
16# changes
17SRCREV = "4673a5a761f329af0aa56fc84f34ed898188bfa2"
18SRC_URI = "git://git.libav.org/libav.git;protocol=git"
19
20S = "${WORKDIR}/git"
21
22# postproc has been split
23EXTRA_OECONF := "${@oe_filter_out('--enable-postproc', '${EXTRA_OECONF}', d)}"