* [meta-oe][PATCH 0/3] Removals after addition of libav to OE-Core
@ 2013-08-13 22:30 Paul Eggleton
2013-08-13 22:30 ` [meta-oe][PATCH 1/3] libav: remove Paul Eggleton
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-08-13 22:30 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit fa914e4c80bcb29d2526bda3d0d916f71f8f6df4:
gst-ffmpeg: drop .bbappend, moved to oe-core (2013-08-14 00:20:24 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib paule/libav-core
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/libav-core
Paul Eggleton (3):
libav: remove
x264: remove
yasm: remove
.../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 ----
.../don-t-default-to-cortex-a9-with-neon.patch | 20 ----
meta-oe/recipes-multimedia/x264/x264_git.bb | 47 --------
meta-oe/recipes-support/yasm/yasm_1.2.0.bb | 15 ---
7 files changed, 287 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
delete mode 100644 meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
delete mode 100644 meta-oe/recipes-multimedia/x264/x264_git.bb
delete mode 100644 meta-oe/recipes-support/yasm/yasm_1.2.0.bb
--
1.8.1.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [meta-oe][PATCH 1/3] libav: remove 2013-08-13 22:30 [meta-oe][PATCH 0/3] Removals after addition of libav to OE-Core Paul Eggleton @ 2013-08-13 22:30 ` Paul Eggleton 2013-08-13 23:17 ` Gary Thomas 2013-08-13 22:30 ` [meta-oe][PATCH 2/3] x264: remove Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 3/3] yasm: remove Paul Eggleton 2 siblings, 1 reply; 6+ messages in thread From: Paul Eggleton @ 2013-08-13 22:30 UTC (permalink / raw) To: openembedded-devel This is now in OE-Core. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../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 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 5f2df43..0000000 --- a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> -Date: Thu, 10 Jan 2013 12:42:19 +0100 -Subject: [PATCH] configure: enable pic for AArch64 - -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -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" diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc deleted file mode 100644 index 0155b4b..0000000 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ /dev/null @@ -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).*" 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 b48ae96..0000000 --- a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb +++ /dev/null @@ -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" - - 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 d12bd9d..0000000 --- a/meta-oe/recipes-multimedia/libav/libav_git.bb +++ /dev/null @@ -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)}" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 1/3] libav: remove 2013-08-13 22:30 ` [meta-oe][PATCH 1/3] libav: remove Paul Eggleton @ 2013-08-13 23:17 ` Gary Thomas 2013-08-14 6:27 ` Martin Jansa 0 siblings, 1 reply; 6+ messages in thread From: Gary Thomas @ 2013-08-13 23:17 UTC (permalink / raw) To: openembedded-devel On 2013-08-13 16:30, Paul Eggleton wrote: > 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 <scott.m.rifenbark@intel.com> Date: Tue Aug 13 15:15:55 2013 +0300 > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > --- > .../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 > > 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 5f2df43..0000000 > --- a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 > -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > -Date: Thu, 10 Jan 2013 12:42:19 +0100 > -Subject: [PATCH] configure: enable pic for AArch64 > - > -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > - > -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" > diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc > deleted file mode 100644 > index 0155b4b..0000000 > --- a/meta-oe/recipes-multimedia/libav/libav.inc > +++ /dev/null > @@ -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).*" > 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 b48ae96..0000000 > --- a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb > +++ /dev/null > @@ -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" > - > - > 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 d12bd9d..0000000 > --- a/meta-oe/recipes-multimedia/libav/libav_git.bb > +++ /dev/null > @@ -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)}" > -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 1/3] libav: remove 2013-08-13 23:17 ` Gary Thomas @ 2013-08-14 6:27 ` Martin Jansa 0 siblings, 0 replies; 6+ messages in thread From: Martin Jansa @ 2013-08-14 6:27 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 10518 bytes --] On Tue, Aug 13, 2013 at 05:17:42PM -0600, Gary Thomas wrote: > On 2013-08-13 16:30, Paul Eggleton wrote: > > 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 <scott.m.rifenbark@intel.com> > Date: Tue Aug 13 15:15:55 2013 +0300 http://git.openembedded.org/openembedded-core/commit/?id=9a670f780b1f1204d426017ff9a95842ad85800e > > > > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > --- > > .../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 > > > > 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 5f2df43..0000000 > > --- a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 > > -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > > -Date: Thu, 10 Jan 2013 12:42:19 +0100 > > -Subject: [PATCH] configure: enable pic for AArch64 > > - > > -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > > - > > -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" > > diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc > > deleted file mode 100644 > > index 0155b4b..0000000 > > --- a/meta-oe/recipes-multimedia/libav/libav.inc > > +++ /dev/null > > @@ -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).*" > > 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 b48ae96..0000000 > > --- a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb > > +++ /dev/null > > @@ -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" > > - > > - > > 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 d12bd9d..0000000 > > --- a/meta-oe/recipes-multimedia/libav/libav_git.bb > > +++ /dev/null > > @@ -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)}" > > > > -- > ------------------------------------------------------------ > Gary Thomas | Consulting for the > MLB Associates | Embedded world > ------------------------------------------------------------ > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 2/3] x264: remove 2013-08-13 22:30 [meta-oe][PATCH 0/3] Removals after addition of libav to OE-Core Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 1/3] libav: remove Paul Eggleton @ 2013-08-13 22:30 ` Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 3/3] yasm: remove Paul Eggleton 2 siblings, 0 replies; 6+ messages in thread From: Paul Eggleton @ 2013-08-13 22:30 UTC (permalink / raw) To: openembedded-devel This is now in OE-Core. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../don-t-default-to-cortex-a9-with-neon.patch | 20 --------- meta-oe/recipes-multimedia/x264/x264_git.bb | 47 ---------------------- 2 files changed, 67 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch delete mode 100644 meta-oe/recipes-multimedia/x264/x264_git.bb diff --git a/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch deleted file mode 100644 index b844d88..0000000 --- a/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch +++ /dev/null @@ -1,20 +0,0 @@ --march flag is not in CFLAGS so this will always default to -mcpu=cortex-a8 --mfpu=neon. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: git/configure -=================================================================== ---- git.orig/configure 2013-02-10 16:26:40.666343682 +0200 -+++ git/configure 2013-02-10 16:27:49.198341677 +0200 -@@ -703,9 +703,6 @@ - fi - - if [ $asm = auto -a $ARCH = ARM ] ; then -- # set flags so neon is built by default -- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" -- - if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 - cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 - cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-oe/recipes-multimedia/x264/x264_git.bb deleted file mode 100644 index c767ffd..0000000 --- a/meta-oe/recipes-multimedia/x264/x264_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC format" -HOMEPAGE = "http://www.videolan.org/developers/x264.html" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -PR = "r1" - -DEPENDS = "yasm-native" - -SRC_URI = "git://git.videolan.org/x264.git \ - file://don-t-default-to-cortex-a9-with-neon.patch \ -" -SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7" - -PV = "r2230+git" - -S = "${WORKDIR}/git" - -inherit lib_package pkgconfig - -X264_DISABLE_ASM = "" -X264_DISABLE_ASM_armv4 = "--disable-asm" -X264_DISABLE_ASM_armv5 = "--disable-asm" - -EXTRA_OECONF = '--prefix=${prefix} \ - --host=${HOST_SYS} \ - --cross-prefix=${TARGET_PREFIX} \ - --sysroot=${STAGING_DIR_TARGET} \ - --enable-shared \ - --enable-static \ - --disable-lavf \ - --disable-swscale \ - ${X264_DISABLE_ASM} \ - ' - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -# Get rid of -e -EXTRA_OEMAKE = "" -AS = "${TARGET_PREFIX}gcc" - -do_install() { - oe_runmake install DESTDIR=${D} -} -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 3/3] yasm: remove 2013-08-13 22:30 [meta-oe][PATCH 0/3] Removals after addition of libav to OE-Core Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 1/3] libav: remove Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 2/3] x264: remove Paul Eggleton @ 2013-08-13 22:30 ` Paul Eggleton 2 siblings, 0 replies; 6+ messages in thread From: Paul Eggleton @ 2013-08-13 22:30 UTC (permalink / raw) To: openembedded-devel This is now in OE-Core. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-support/yasm/yasm_1.2.0.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 meta-oe/recipes-support/yasm/yasm_1.2.0.bb diff --git a/meta-oe/recipes-support/yasm/yasm_1.2.0.bb b/meta-oe/recipes-support/yasm/yasm_1.2.0.bb deleted file mode 100644 index 466f6e6..0000000 --- a/meta-oe/recipes-support/yasm/yasm_1.2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "x86 (SSE) assembler supporting NASM and GAS-syntaxes" -LICENSE = "BSD" -HOMEPAGE = "http://www.tortall.net/projects/yasm/" - -LIC_FILES_CHKSUM = "file://COPYING;md5=26c9f3d11f88911950f9ff62189d3d4f" - -SRC_URI = "http://www.tortall.net/projects/yasm/releases/yasm-${PV}.tar.gz" -SRC_URI[md5sum] = "4cfc0686cf5350dd1305c4d905eb55a6" -SRC_URI[sha256sum] = "768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31" - -S = "${WORKDIR}/yasm-${PV}" - -inherit autotools gettext - -BBCLASSEXTEND = "native" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-14 6:26 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-08-13 22:30 [meta-oe][PATCH 0/3] Removals after addition of libav to OE-Core Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 1/3] libav: remove Paul Eggleton 2013-08-13 23:17 ` Gary Thomas 2013-08-14 6:27 ` Martin Jansa 2013-08-13 22:30 ` [meta-oe][PATCH 2/3] x264: remove Paul Eggleton 2013-08-13 22:30 ` [meta-oe][PATCH 3/3] yasm: remove Paul Eggleton
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.