diff options
| -rw-r--r-- | classes/insane.bbclass | 4 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.5.bb | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index ed6d4d0642..a3ca21d1dc 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -317,8 +317,8 @@ def package_qa_check_staged(path,d): sane = True elif file[-2:] == "pc": file_content = open(path).read() - if "/usr/include" in file_content or workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to /usr/include or workdir)" % file ) + if workdir in file_content: + bb.error("QA issue: %s failed sanity test (reference to workdir)" % file ) if package_qa_make_fatal_error( 6, "staging", path, d): sane = False diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 1d53446749..ab9a28d628 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -386,7 +386,7 @@ SLOT = "0" # Other -export PKG_CONFIG_PATH = "${STAGING_DATADIR}/pkgconfig" +export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb index 9fdd3aa235..3e18374afa 100644 --- a/packages/pulseaudio/pulseaudio_0.9.5.bb +++ b/packages/pulseaudio/pulseaudio_0.9.5.bb @@ -10,7 +10,7 @@ DEPENDS += "alsa-lib" RPROVIDES = "esound esd" -PR = "r4" +PR = "r5" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" @@ -30,10 +30,15 @@ EXTRA_OECONF = "\ PARALLEL_MAKE = "" +export TARGET_FPU="${TARGET_FPU}" do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse + + if [ "x${TARGET_FPU}" == "xsoft" ] ; then + sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf + fi } |