diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-13 22:30:03 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-08-16 12:58:30 +0200 |
| commit | 30ba23377ec568a58c43e466582506980b67baad (patch) | |
| tree | 2882970b1a57c9867fe752dcae417a030caef956 /meta-oe/recipes-multimedia/libav | |
| parent | 5f78d37f9d28d2b6aff6993f3b3d050a0f5cfb90 (diff) | |
| download | meta-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/libav')
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 5f2df4334b..0000000000 --- a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
| 3 | Date: Thu, 10 Jan 2013 12:42:19 +0100 | ||
| 4 | Subject: [PATCH] configure: enable pic for AArch64 | ||
| 5 | |||
| 6 | Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
| 7 | |||
| 8 | Upstream-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 0155b4b0fa..0000000000 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ /dev/null | |||
| @@ -1,127 +0,0 @@ | |||
| 1 | DESCRIPTION = "Libav is a complete, cross-platform solution to record, convert and stream audio and video." | ||
| 2 | HOMEPAGE = "http://libav.org/" | ||
| 3 | SECTION = "libs" | ||
| 4 | LICENSE = "GPLv2+" | ||
| 5 | |||
| 6 | # Provides ffmpeg compat, see http://libav.org/about.html | ||
| 7 | PROVIDES = "ffmpeg" | ||
| 8 | |||
| 9 | ARM_INSTRUCTION_SET = "arm" | ||
| 10 | |||
| 11 | # faac faad2 lame schroedinger libgsm | ||
| 12 | DEPENDS = "x264 virtual/libsdl zlib libogg libvorbis libvpx libtheora" | ||
| 13 | |||
| 14 | INC_PR = "r8" | ||
| 15 | |||
| 16 | inherit autotools pkgconfig | ||
| 17 | |||
| 18 | # --enable-libgsm | ||
| 19 | # --enable-libmp3lame | ||
| 20 | # --enable-libschroedinger | ||
| 21 | # --enable-libvpx | ||
| 22 | |||
| 23 | B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" | ||
| 24 | |||
| 25 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" | ||
| 26 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | ||
| 27 | |||
| 28 | EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" | ||
| 29 | EXTRA_FFCONF ?= "" | ||
| 30 | |||
| 31 | PACKAGECONFIG ??= "bzip2" | ||
| 32 | PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" | ||
| 33 | PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" | ||
| 34 | |||
| 35 | EXTRA_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 | ||
| 61 | EXTRA_OECONF_append_x86-64 = " --disable-yasm" | ||
| 62 | EXTRA_OECONF_append_x86 = " --disable-yasm" | ||
| 63 | |||
| 64 | do_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 | |||
| 73 | do_install_append() { | ||
| 74 | install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ | ||
| 75 | } | ||
| 76 | |||
| 77 | FFMPEG_LIBS = "libavcodec libavdevice libavformat \ | ||
| 78 | libavutil libpostproc libswscale libavfilter" | ||
| 79 | |||
| 80 | PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" | ||
| 81 | |||
| 82 | RSUGGESTS_${PN} = "mplayer" | ||
| 83 | FILES_${PN} = "${bindir}" | ||
| 84 | FILES_${PN}-dev = "${includedir}/${PN}" | ||
| 85 | |||
| 86 | FILES_${PN}-vhook = "${libdir}/vhook" | ||
| 87 | FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug" | ||
| 88 | |||
| 89 | FILES_ffmpeg-x264-presets = "${datadir}/*.avpreset" | ||
| 90 | |||
| 91 | LEAD_SONAME = "libavcodec.so" | ||
| 92 | |||
| 93 | FILES_${PN}-dev = "${includedir}" | ||
| 94 | |||
| 95 | python 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 | |||
| 127 | PACKAGES_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 b48ae96add..0000000000 --- a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | require libav.inc | ||
| 2 | |||
| 3 | EXTRA_OECONF += " \ | ||
| 4 | --enable-postproc \ | ||
| 5 | " | ||
| 6 | |||
| 7 | FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:" | ||
| 8 | |||
| 9 | SRC_URI_append = " \ | ||
| 10 | file://0001-configure-enable-pic-for-AArch64.patch \ | ||
| 11 | " | ||
| 12 | LIC_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 | |||
| 17 | PV = "0.8.4+git${SRCPV}" | ||
| 18 | PR = "${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 | ||
| 23 | SRCREV = "2c8ce46250ff78191fe6565876ddc4bc03fdf519" | ||
| 24 | SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" | ||
| 25 | |||
| 26 | S = "${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 d12bd9d217..0000000000 --- a/meta-oe/recipes-multimedia/libav/libav_git.bb +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | require libav.inc | ||
| 2 | |||
| 3 | LIC_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 | |||
| 8 | DEPENDS += "libpostproc" | ||
| 9 | PV = "0.8.99+git${SRCPV}" | ||
| 10 | PR = "${INC_PR}.0" | ||
| 11 | |||
| 12 | DEFAULT_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 | ||
| 17 | SRCREV = "4673a5a761f329af0aa56fc84f34ed898188bfa2" | ||
| 18 | SRC_URI = "git://git.libav.org/libav.git;protocol=git" | ||
| 19 | |||
| 20 | S = "${WORKDIR}/git" | ||
| 21 | |||
| 22 | # postproc has been split | ||
| 23 | EXTRA_OECONF := "${@oe_filter_out('--enable-postproc', '${EXTRA_OECONF}', d)}" | ||
