From 3b6c6a052a32b163f3f6986dd03606759d8294ae Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 17:32:45 +0100 Subject: [PATCH 1/6] flac: add (R)DEPENDS (and _${PN}) to pass packageqa --- recipes/flac/flac.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index f5a82b4..618fafa 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -10,14 +10,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz" CONFIGURE_USE_FLAGS += "use=ogg:depend=libogg" -DEPENDS = "libm libgcc \ - libstdc++" +DEPENDS = "libm libc" AUTO_PACKAGE_LIBS = "FLAC FLAC++" AUTO_PACKAGE_LIBS_RDEPENDS:USE_ogg = " libogg" AUTO_PACKAGE_LIBS_DEV_DEPENDS:USE_ogg = " libogg" -RDEPENDS_${PN}-libflac = "libm libgcc" +DEPENDS_${PN}-libflac = "libc libm" +RDEPENDS_${PN}-libflac = "libc libm" +DEPENDS_${PN}-libflac++ = "libc libflac libm libstdc++" RDEPENDS_${PN}-libflac++ = "libflac libstdc++" FILES_${PN}-libflac-dev += "${includedir}/FLAC \ ${libdir}/pkgconfig/flac.pc \ @@ -30,7 +31,8 @@ FILES_${PN}-dev = "" PROVIDES_${PN} = "metaflac" FILES_${PN} = "${bindir}/*" -RDEPENDS_${PN} = "${PN}-libflaclibm" +DEPENDS_${PN} = "libc libm libflac" +RDEPENDS_${PN} = "${PN}-libflac libm libc" RDEPENDS_${PN}:>USE_ogg = " libogg" DEPENDS_${PN}:>USE_ogg = " libogg" From e19bc5f04a1c02aa19a16ddca8b4aeecd5276f02 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 17:06:38 +0100 Subject: [PATCH 2/6] flac: update homepage link and SRC_URI --- recipes/flac/flac.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index 618fafa..72f8396 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -1,12 +1,9 @@ DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless." -HOMEPAGE = "http://flac.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=13478&atid=113478" +HOMEPAGE = "https://xiph.org/flac" LICENSE = "GFDL-1.2 & GPLv2.0+ & LGPLv2.1+ & BSD" - inherit auto-package-libs configure-use c++ -require conf/fetch/sourceforge.conf -SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz" +SRC_URI = "http://downloads.xiph.org/releases/flac/flac-${PV}.tar.xz" CONFIGURE_USE_FLAGS += "use=ogg:depend=libogg" From f1c7d7a06f783043b888708f3d93a66e3e463fcf Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 17:09:59 +0100 Subject: [PATCH 3/6] flac: update license to GFDL-1.2, GPL-2.0, LGPL-2.1 and BSD-3-Clause This is according to SPDX License List. --- recipes/flac/flac.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index 72f8396..d8c9da2 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -1,6 +1,6 @@ DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless." HOMEPAGE = "https://xiph.org/flac" -LICENSE = "GFDL-1.2 & GPLv2.0+ & LGPLv2.1+ & BSD" +LICENSE = "GFDL-1.2 GPL-2.0 LGPL-2.1 BSD-3-Clause" inherit auto-package-libs configure-use c++ SRC_URI = "http://downloads.xiph.org/releases/flac/flac-${PV}.tar.xz" From cc93cc3239ab45d83a725279503ead338f5fc64a Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Fri, 27 Jan 2017 17:06:11 +0100 Subject: [PATCH 4/6] flac: add version 1.3.2 Leaving in flac version 1.2.1 as im not sure about the patches applied to this version. Currently version 1.3.2 has only be proven to build not really tested runtime. --- recipes/flac/flac_1.3.2.oe | 1 + recipes/flac/flac_1.3.2.oe.sig | 1 + 2 files changed, 2 insertions(+) create mode 100644 recipes/flac/flac_1.3.2.oe create mode 100644 recipes/flac/flac_1.3.2.oe.sig diff --git a/recipes/flac/flac_1.3.2.oe b/recipes/flac/flac_1.3.2.oe new file mode 100644 index 0000000..bd54419 --- /dev/null +++ b/recipes/flac/flac_1.3.2.oe @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/recipes/flac/flac_1.3.2.oe.sig b/recipes/flac/flac_1.3.2.oe.sig new file mode 100644 index 0000000..d6bef1d --- /dev/null +++ b/recipes/flac/flac_1.3.2.oe.sig @@ -0,0 +1 @@ +2bdbb56b128a780a5d998e230f2f4f6eb98f33ee flac-1.3.2.tar.xz From ac37f2ace7748ff4714e49b6002f88d1be08d6c1 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Mon, 30 Jan 2017 09:24:56 +0100 Subject: [PATCH 5/6] flac-1.2.1: reset SRC_URI from inc to fetch source from proper uri --- recipes/flac/flac_1.2.1.oe | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/flac/flac_1.2.1.oe b/recipes/flac/flac_1.2.1.oe index e121283..f470220 100644 --- a/recipes/flac/flac_1.2.1.oe +++ b/recipes/flac/flac_1.2.1.oe @@ -1,5 +1,6 @@ require ${PN}.inc +SRC_URI = "http://downloads.xiph.org/releases/flac/flac-${PV}.tar.gz" SRC_URI += "file://disable-xmms-plugin.patch" SRC_URI += "file://flac-gcc43-fixes.patch" SRC_URI += "file://14_metadata_iterators_memleak.patch" From a18c510f8634b97f2bd7479c9859efa6c1e7a3f5 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Tue, 31 Jan 2017 16:38:55 +0100 Subject: [PATCH 6/6] flac: add allow-missing-provides to pass qa test --- recipes/flac/flac.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index d8c9da2..9454744 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -7,6 +7,9 @@ SRC_URI = "http://downloads.xiph.org/releases/flac/flac-${PV}.tar.xz" CONFIGURE_USE_FLAGS += "use=ogg:depend=libogg" +PROVIDES_${PN}-libflac++[qa] += "allow-missing-provides" +PROVIDES_${PN}-libflac[qa] += "allow-missing-provides" + DEPENDS = "libm libc" AUTO_PACKAGE_LIBS = "FLAC FLAC++"