From 8fd24ea9d9bad6f897018e97df9446a2e3f660b5 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Mon, 9 Nov 2009 15:31:21 -0300 Subject: [PATCH 042/118] flac: inherit pkgconfig and start using INC_PR Signed-off-by: Ricardo Salveti de Araujo --- recipes/flac/flac.inc | 3 ++- recipes/flac/flac_1.1.0.bb | 2 +- recipes/flac/flac_1.1.2.bb | 2 +- recipes/flac/flac_1.2.1.bb | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index b90abd3..b7ad68c 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -3,11 +3,12 @@ HOMEPAGE = "http://flac.sourceforge.net" LICENSE = "BSD GPL" SECTION = "libs" DEPENDS = "libogg" +INC_PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ file://xmms.m4" -inherit autotools +inherit autotools pkgconfig EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ --with-ogg-libraries=${STAGING_LIBDIR} \ diff --git a/recipes/flac/flac_1.1.0.bb b/recipes/flac/flac_1.1.0.bb index 5bb0d6c..d0751d9 100644 --- a/recipes/flac/flac_1.1.0.bb +++ b/recipes/flac/flac_1.1.0.bb @@ -1,5 +1,5 @@ require flac.inc -PR = "r7" +PR = "${INC_PR}.0" SRC_URI += "file://disable-xmms-plugin.patch;patch=1" diff --git a/recipes/flac/flac_1.1.2.bb b/recipes/flac/flac_1.1.2.bb index eb328b9..4871604 100644 --- a/recipes/flac/flac_1.1.2.bb +++ b/recipes/flac/flac_1.1.2.bb @@ -1,6 +1,6 @@ require flac.inc -PR = "r7" +PR = "${INC_PR}.0" SRC_URI += "file://disable-xmms-plugin.patch;patch=1" diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb index eea1cbb..766f6c7 100644 --- a/recipes/flac/flac_1.2.1.bb +++ b/recipes/flac/flac_1.2.1.bb @@ -1,6 +1,6 @@ require flac.inc -PR = "r1" +PR = "${INC_PR}.0" # fixes from openSUSE: SRC_URI += "file://flac-gcc43-fixes.diff;patch=1;pnum=0 \ -- 1.6.3.3