From 9dd3b2d57440101c2103e1a6e1fd3b0125afada1 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 15:46:23 +0100 Subject: [PATCH 1/4] libmad: incify recipe --- recipes/libmad/libmad.inc | 31 +++++++++++++++++++++++++++++++ recipes/libmad/libmad_0.15.1b.oe | 32 +------------------------------- 2 files changed, 32 insertions(+), 31 deletions(-) create mode 100644 recipes/libmad/libmad.inc diff --git a/recipes/libmad/libmad.inc b/recipes/libmad/libmad.inc new file mode 100644 index 0000000..0d634be --- /dev/null +++ b/recipes/libmad/libmad.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "MPEG Audio Decoder Library" +HOMEPAGE = "http://sourceforge.net/projects/mad/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" +LICENSE = "GPLv2+" +DEPENDS = "libid3tag" +DEPENDS_${PN} = "libid3tag" +RDEPENDS_${PN} = "libid3tag" +DEPENDS_${PN}-dev = "libid3tag-dev" +RRDEPENDS_${PN}-dev = "libid3tag-dev" + +require conf/fetch/sourceforge.conf +SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \ + file://no-force-mem.patch \ + file://add-pkgconfig.patch \ + file://fix_for_mips_with_gcc-4.5.0.patch" + +S = "${SRCDIR}/libmad-${PV}" + +inherit autotools pkgconfig library + +EXTRA_OECONF = "-enable-speed --enable-shared" +# The ASO's don't take any account of thumb... +EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default" +EXTRA_OECONF_append_arm = " --enable-fpm=arm" + +#do_configure_prepend () { +## damn picky automake... +# touch NEWS AUTHORS ChangeLog +#} + +ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/libmad/libmad_0.15.1b.oe b/recipes/libmad/libmad_0.15.1b.oe index 0d634be..0029fef 100644 --- a/recipes/libmad/libmad_0.15.1b.oe +++ b/recipes/libmad/libmad_0.15.1b.oe @@ -1,31 +1 @@ -DESCRIPTION = "MPEG Audio Decoder Library" -HOMEPAGE = "http://sourceforge.net/projects/mad/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" -LICENSE = "GPLv2+" -DEPENDS = "libid3tag" -DEPENDS_${PN} = "libid3tag" -RDEPENDS_${PN} = "libid3tag" -DEPENDS_${PN}-dev = "libid3tag-dev" -RRDEPENDS_${PN}-dev = "libid3tag-dev" - -require conf/fetch/sourceforge.conf -SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \ - file://no-force-mem.patch \ - file://add-pkgconfig.patch \ - file://fix_for_mips_with_gcc-4.5.0.patch" - -S = "${SRCDIR}/libmad-${PV}" - -inherit autotools pkgconfig library - -EXTRA_OECONF = "-enable-speed --enable-shared" -# The ASO's don't take any account of thumb... -EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default" -EXTRA_OECONF_append_arm = " --enable-fpm=arm" - -#do_configure_prepend () { -## damn picky automake... -# touch NEWS AUTHORS ChangeLog -#} - -ARM_INSTRUCTION_SET = "arm" +require libmad.inc From d2c928353b725ff0c0702316259a162f9f21b619 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 15:47:24 +0100 Subject: [PATCH 2/4] libmad: update license and clean up recipe --- recipes/libmad/libmad.inc | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/recipes/libmad/libmad.inc b/recipes/libmad/libmad.inc index 0d634be..6203fda 100644 --- a/recipes/libmad/libmad.inc +++ b/recipes/libmad/libmad.inc @@ -1,31 +1,27 @@ DESCRIPTION = "MPEG Audio Decoder Library" HOMEPAGE = "http://sourceforge.net/projects/mad/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" -LICENSE = "GPLv2+" -DEPENDS = "libid3tag" -DEPENDS_${PN} = "libid3tag" -RDEPENDS_${PN} = "libid3tag" -DEPENDS_${PN}-dev = "libid3tag-dev" -RRDEPENDS_${PN}-dev = "libid3tag-dev" +LICENSE = "GPL-2.0" -require conf/fetch/sourceforge.conf SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \ file://no-force-mem.patch \ file://add-pkgconfig.patch \ file://fix_for_mips_with_gcc-4.5.0.patch" -S = "${SRCDIR}/libmad-${PV}" - +require conf/fetch/sourceforge.conf inherit autotools pkgconfig library +S = "${SRCDIR}/libmad-${PV}" + EXTRA_OECONF = "-enable-speed --enable-shared" # The ASO's don't take any account of thumb... EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default" EXTRA_OECONF_append_arm = " --enable-fpm=arm" -#do_configure_prepend () { -## damn picky automake... -# touch NEWS AUTHORS ChangeLog -#} - ARM_INSTRUCTION_SET = "arm" + +DEPENDS = "libid3tag" +DEPENDS_${PN} = "libid3tag" +RDEPENDS_${PN} = "libid3tag" +DEPENDS_${PN}-dev = "libid3tag-dev" +RRDEPENDS_${PN}-dev = "libid3tag-dev" From b297fc8bda57cc8be5b149bf8608afa981b03411 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 16:06:26 +0100 Subject: [PATCH 3/4] libmad: add libc to (R)DEPENDS_${PN} --- recipes/libmad/libmad.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libmad/libmad.inc b/recipes/libmad/libmad.inc index 6203fda..fea29a7 100644 --- a/recipes/libmad/libmad.inc +++ b/recipes/libmad/libmad.inc @@ -21,7 +21,7 @@ EXTRA_OECONF_append_arm = " --enable-fpm=arm" ARM_INSTRUCTION_SET = "arm" DEPENDS = "libid3tag" -DEPENDS_${PN} = "libid3tag" -RDEPENDS_${PN} = "libid3tag" +DEPENDS_${PN} = "libid3tag libc" +RDEPENDS_${PN} = "libid3tag libc" DEPENDS_${PN}-dev = "libid3tag-dev" RRDEPENDS_${PN}-dev = "libid3tag-dev" From bf2c4ad6ad56b4db279bf161bee48f8d3ed4e4c3 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Tue, 31 Jan 2017 16:59:03 +0100 Subject: [PATCH 4/4] libmad: add allow-missing-provides to pass packageqa --- recipes/libmad/libmad.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libmad/libmad.inc b/recipes/libmad/libmad.inc index fea29a7..aa145a1 100644 --- a/recipes/libmad/libmad.inc +++ b/recipes/libmad/libmad.inc @@ -13,6 +13,8 @@ inherit autotools pkgconfig library S = "${SRCDIR}/libmad-${PV}" +PROVIDES_${PN}[qa] += "allow-missing-provides" + EXTRA_OECONF = "-enable-speed --enable-shared" # The ASO's don't take any account of thumb... EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"