Removals after addition of libav to OE-Core

This is now in OE-Core.

Signed-off-by Paul Eggleton <[email protected]>

---
  .../0001-configure-enable-pic-for-AArch64.patch    |  27 -----
  meta-oe/recipes-multimedia/libav/libav.inc         | 127 ---------------------
  meta-oe/recipes-multimedia/libav/libav_0.8.4.bb    |  28 -----
  meta-oe/recipes-multimedia/libav/libav_git.bb      |  23 ----
  4 files changed, 205 deletions(-)

delete mode 100644 meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch delete mode 100644 meta-oe/recipes-multimedia/libav/libav.inc
delete mode 100644 meta-oe/recipes-multimedia/libav/libav_0.8.4.bb
delete mode 100644 meta-oe/recipes-multimedia/libav/libav_git.bb

meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch deleted +0 -27

deleted file mode 100644
index 5f2df43..0000000
@@ -1,27 +0,0 @@
-From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <[email protected]>
-Date: Thu, 10 Jan 2013 12:42:19 +0100
-Subject: [PATCH] configure: enable pic for AArch64
-
-Signed-off-by: Marcin Juszkiewicz <[email protected]>
-
-Upstream-Status: Backport
----
- configure |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- git.orig/configure
-+++ git/configure
-@@ -2390,11 +2390,11 @@ EOF
-
- check_host_cflags -std=c99
- check_host_cflags -Wall
-
- case "$arch" in
--    alpha|ia64|mips|parisc|sparc)
-+    alpha|ia64|mips|parisc|sparc|aarch64)
-         spic=$shared
-     ;;
-     x86)
-         subarch="x86_32"
-         check_cc <<EOF && subarch="x86_64"

meta-oe/recipes-multimedia/libav/libav.inc deleted +0 -127

deleted file mode 100644
index 0155b4b..0000000
@@ -1,127 +0,0 @@
-DESCRIPTION = "Libav is a complete, cross-platform solution to record, convert and stream audio and video."
-HOMEPAGE = "http://libav.org/"
-SECTION = "libs"
-LICENSE = "GPLv2+"
-
-# Provides ffmpeg compat, see http://libav.org/about.html
-PROVIDES = "ffmpeg"
-
-ARM_INSTRUCTION_SET = "arm"
-
-# faac faad2 lame schroedinger libgsm
-DEPENDS = "x264 virtual/libsdl zlib libogg libvorbis libvpx libtheora"
-
-INC_PR = "r8"
-
-inherit autotools pkgconfig
-
-#    --enable-libgsm
-#    --enable-libmp3lame
-#    --enable-libschroedinger
-#    --enable-libvpx
-
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
-BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
-
-EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
-EXTRA_FFCONF ?= ""
-
-PACKAGECONFIG ??= "bzip2"
-PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
-PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
-
-EXTRA_OECONF = " \
-    --enable-shared \
-    --enable-pthreads \
-    --enable-gpl \
-    --enable-avfilter \
-    \
-    --cross-prefix=${TARGET_PREFIX} \
-    --prefix=${prefix} \
-    \
-    --enable-avserver \
-    --enable-avplay \
-    --enable-x11grab \
-    --enable-libtheora  \
-    --enable-libvorbis \
-    --enable-libx264 \
-    --arch=${TARGET_ARCH} \
-    --target-os="linux" \
-    --enable-cross-compile \
-    --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-    --extra-ldflags="${TARGET_LDFLAGS}" \
-    --sysroot="${STAGING_DIR_TARGET}" \
-    --enable-hardcoded-tables \
-    ${EXTRA_FFCONF} \
-"
-
-#| yasm not found, use --disable-yasm for a crippled build
-EXTRA_OECONF_append_x86-64 = " --disable-yasm"
-EXTRA_OECONF_append_x86 = " --disable-yasm"
-
-do_configure() {
-    # We don't have TARGET_PREFIX-pkgconfig
-    sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure
-    mkdir -p ${B}
-    cd ${B}
-    ${S}/configure ${EXTRA_OECONF}
-    sed -i -e s:Os:O4:g ${B}/config.h
-}
-
-do_install_append() {
-    install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
-}
-
-FFMPEG_LIBS = "libavcodec libavdevice libavformat \
-               libavutil libpostproc libswscale libavfilter"
-
-PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
-
-RSUGGESTS_${PN} = "mplayer"
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}/${PN}"
-
-FILES_${PN}-vhook = "${libdir}/vhook"
-FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
-
-FILES_ffmpeg-x264-presets = "${datadir}/*.avpreset"
-
-LEAD_SONAME = "libavcodec.so"
-
-FILES_${PN}-dev = "${includedir}"
-
-python populate_packages_prepend() {
-    av_libdir = d.expand('${libdir}')
-    av_pkgconfig = d.expand('${libdir}/pkgconfig')
-
-    # Runtime package
-    do_split_packages(d, av_libdir, '^lib(.*)\.so\..*',
-                      output_pattern='lib%s',
-                      description='libav %s library',
-                      extra_depends='',
-                      prepend=True,
-                      allow_links=True)
-
-    # Development packages (-dev, -staticdev)
-    do_split_packages(d, av_libdir, '^lib(.*)\.so$',
-                      output_pattern='lib%s-dev',
-                      description='libav %s development package',
-                      extra_depends='${PN}-dev',
-                      prepend=True,
-                      allow_links=True)
-    do_split_packages(d, av_pkgconfig, '^lib(.*)\.pc$',
-                      output_pattern='lib%s-dev',
-                      description='libav %s development package',
-                      extra_depends='${PN}-dev',
-                      prepend=True)
-    do_split_packages(d, av_libdir, '^lib(.*)\.a$',
-                      output_pattern='lib%s-staticdev',
-                      description='libav %s development package - static library',
-                      extra_depends='${PN}-dev',
-                      prepend=True,
-                      allow_links=True)
-}
-
-PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc).*"

meta-oe/recipes-multimedia/libav/libav_0.8.4.bb deleted +0 -28

deleted file mode 100644
index b48ae96..0000000
@@ -1,28 +0,0 @@
-require libav.inc
-
-EXTRA_OECONF += " \
-    --enable-postproc \
-"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:"
-
-SRC_URI_append = " \
-    file://0001-configure-enable-pic-for-AArch64.patch \
-"
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
-                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-PV = "0.8.4+git${SRCPV}"
-PR = "${INC_PR}.0"
-
-# When bumping SRCREV make sure you bump PR here and in dependant
-# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
-# changes
-SRCREV = "2c8ce46250ff78191fe6565876ddc4bc03fdf519"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
-
-S = "${WORKDIR}/git"
-
-

meta-oe/recipes-multimedia/libav/libav_git.bb deleted +0 -23

deleted file mode 100644
index d12bd9d..0000000
@@ -1,23 +0,0 @@
-require libav.inc
-
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
-                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-DEPENDS += "libpostproc"
-PV = "0.8.99+git${SRCPV}"
-PR = "${INC_PR}.0"
-
-DEFAULT_PREFERENCE = "-1"
-
-# When bumping SRCREV make sure you bump PR here and in dependant
-# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
-# changes
-SRCREV = "4673a5a761f329af0aa56fc84f34ed898188bfa2"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-# postproc has been split
-EXTRA_OECONF := "${@oe_filter_out('--enable-postproc', '${EXTRA_OECONF}', d)}"

Quoted 1 line · Paul Eggleton

This is now in OE-Core.

As of what commit? I don't see it in Poky/Yocto as of this morning:

   commit 0c0ac7dd3af04610ca740817224d8c57ccd2fba5
   Author: Scott Rifenbark <[email protected]>
   Date:   Tue Aug 13 15:15:55 2013 +0300

Quoted 244 lines

Signed-off-by Paul Eggleton <[email protected]>

---
  .../0001-configure-enable-pic-for-AArch64.patch    |  27 -----
  meta-oe/recipes-multimedia/libav/libav.inc         | 127 ---------------------
  meta-oe/recipes-multimedia/libav/libav_0.8.4.bb    |  28 -----
  meta-oe/recipes-multimedia/libav/libav_git.bb      |  23 ----
  4 files changed, 205 deletions(-)

delete mode 100644 meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch delete mode 100644 meta-oe/recipes-multimedia/libav/libav.inc
delete mode 100644 meta-oe/recipes-multimedia/libav/libav_0.8.4.bb
delete mode 100644 meta-oe/recipes-multimedia/libav/libav_git.bb

meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch deleted +0 -27

deleted file mode 100644
index 5f2df43..0000000
@@ -1,27 +0,0 @@
-From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <[email protected]>
-Date: Thu, 10 Jan 2013 12:42:19 +0100
-Subject: [PATCH] configure: enable pic for AArch64
-
-Signed-off-by: Marcin Juszkiewicz <[email protected]>
-
-Upstream-Status: Backport
----
- configure |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- git.orig/configure
-+++ git/configure
-@@ -2390,11 +2390,11 @@ EOF
-
- check_host_cflags -std=c99
- check_host_cflags -Wall
-
- case "$arch" in
--    alpha|ia64|mips|parisc|sparc)
-+    alpha|ia64|mips|parisc|sparc|aarch64)
-         spic=$shared
-     ;;
-     x86)
-         subarch="x86_32"
-         check_cc <<EOF && subarch="x86_64"

meta-oe/recipes-multimedia/libav/libav.inc deleted +0 -127

deleted file mode 100644
index 0155b4b..0000000
@@ -1,127 +0,0 @@
-DESCRIPTION = "Libav is a complete, cross-platform solution to record, convert and stream audio and video."
-HOMEPAGE = "http://libav.org/"
-SECTION = "libs"
-LICENSE = "GPLv2+"
-
-# Provides ffmpeg compat, see http://libav.org/about.html
-PROVIDES = "ffmpeg"
-
-ARM_INSTRUCTION_SET = "arm"
-
-# faac faad2 lame schroedinger libgsm
-DEPENDS = "x264 virtual/libsdl zlib libogg libvorbis libvpx libtheora"
-
-INC_PR = "r8"
-
-inherit autotools pkgconfig
-
-#    --enable-libgsm
-#    --enable-libmp3lame
-#    --enable-libschroedinger
-#    --enable-libvpx
-
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
-BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
-
-EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
-EXTRA_FFCONF ?= ""
-
-PACKAGECONFIG ??= "bzip2"
-PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
-PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
-
-EXTRA_OECONF = " \
-    --enable-shared \
-    --enable-pthreads \
-    --enable-gpl \
-    --enable-avfilter \
-    \
-    --cross-prefix=${TARGET_PREFIX} \
-    --prefix=${prefix} \
-    \
-    --enable-avserver \
-    --enable-avplay \
-    --enable-x11grab \
-    --enable-libtheora  \
-    --enable-libvorbis \
-    --enable-libx264 \
-    --arch=${TARGET_ARCH} \
-    --target-os="linux" \
-    --enable-cross-compile \
-    --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-    --extra-ldflags="${TARGET_LDFLAGS}" \
-    --sysroot="${STAGING_DIR_TARGET}" \
-    --enable-hardcoded-tables \
-    ${EXTRA_FFCONF} \
-"
-
-#| yasm not found, use --disable-yasm for a crippled build
-EXTRA_OECONF_append_x86-64 = " --disable-yasm"
-EXTRA_OECONF_append_x86 = " --disable-yasm"
-
-do_configure() {
-    # We don't have TARGET_PREFIX-pkgconfig
-    sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure
-    mkdir -p ${B}
-    cd ${B}
-    ${S}/configure ${EXTRA_OECONF}
-    sed -i -e s:Os:O4:g ${B}/config.h
-}
-
-do_install_append() {
-    install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
-}
-
-FFMPEG_LIBS = "libavcodec libavdevice libavformat \
-               libavutil libpostproc libswscale libavfilter"
-
-PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
-
-RSUGGESTS_${PN} = "mplayer"
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}/${PN}"
-
-FILES_${PN}-vhook = "${libdir}/vhook"
-FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
-
-FILES_ffmpeg-x264-presets = "${datadir}/*.avpreset"
-
-LEAD_SONAME = "libavcodec.so"
-
-FILES_${PN}-dev = "${includedir}"
-
-python populate_packages_prepend() {
-    av_libdir = d.expand('${libdir}')
-    av_pkgconfig = d.expand('${libdir}/pkgconfig')
-
-    # Runtime package
-    do_split_packages(d, av_libdir, '^lib(.*)\.so\..*',
-                      output_pattern='lib%s',
-                      description='libav %s library',
-                      extra_depends='',
-                      prepend=True,
-                      allow_links=True)
-
-    # Development packages (-dev, -staticdev)
-    do_split_packages(d, av_libdir, '^lib(.*)\.so$',
-                      output_pattern='lib%s-dev',
-                      description='libav %s development package',
-                      extra_depends='${PN}-dev',
-                      prepend=True,
-                      allow_links=True)
-    do_split_packages(d, av_pkgconfig, '^lib(.*)\.pc$',
-                      output_pattern='lib%s-dev',
-                      description='libav %s development package',
-                      extra_depends='${PN}-dev',
-                      prepend=True)
-    do_split_packages(d, av_libdir, '^lib(.*)\.a$',
-                      output_pattern='lib%s-staticdev',
-                      description='libav %s development package - static library',
-                      extra_depends='${PN}-dev',
-                      prepend=True,
-                      allow_links=True)
-}
-
-PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc).*"

meta-oe/recipes-multimedia/libav/libav_0.8.4.bb deleted +0 -28

deleted file mode 100644
index b48ae96..0000000
@@ -1,28 +0,0 @@
-require libav.inc
-
-EXTRA_OECONF += " \
-    --enable-postproc \
-"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:"
-
-SRC_URI_append = " \
-    file://0001-configure-enable-pic-for-AArch64.patch \
-"
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
-                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-PV = "0.8.4+git${SRCPV}"
-PR = "${INC_PR}.0"
-
-# When bumping SRCREV make sure you bump PR here and in dependant
-# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
-# changes
-SRCREV = "2c8ce46250ff78191fe6565876ddc4bc03fdf519"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
-
-S = "${WORKDIR}/git"
-
-

meta-oe/recipes-multimedia/libav/libav_git.bb deleted +0 -23

deleted file mode 100644
index d12bd9d..0000000
@@ -1,23 +0,0 @@
-require libav.inc
-
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
-                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-DEPENDS += "libpostproc"
-PV = "0.8.99+git${SRCPV}"
-PR = "${INC_PR}.0"
-
-DEFAULT_PREFERENCE = "-1"
-
-# When bumping SRCREV make sure you bump PR here and in dependant
-# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
-# changes
-SRCREV = "4673a5a761f329af0aa56fc84f34ed898188bfa2"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-# postproc has been split
-EXTRA_OECONF := "${@oe_filter_out('--enable-postproc', '${EXTRA_OECONF}', d)}"

Signature · 8 lines

------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel