From patchwork Thu Nov 22 06:46:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] pulseaudio: fix compilation on RHEL-5.8 64bit machine Date: Thu, 22 Nov 2012 06:46:43 -0000 From: jackie huang X-Patchwork-Id: 39451 Message-Id: <6ef7001b467caa7cebe92e399a94a9680265efb8.1353564658.git.jackie.huang@windriver.com> To: Cc: saul.wold@intel.com, Shiqun.Lin@windriver.com From: Jackie Huang This fixes the following issue when pulseaudio is built with the oe-core toolchain: ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputInfo' ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetScreenResourcesCurrent' ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRFreeOutputInfo' ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRFreeScreenResources' ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputPrimary' ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRFreeCrtcInfo' ../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetCrtcInfo' collect2: ld returned 1 exit status Signed-off-by: Aws Ismail Signed-off-by: Jackie Huang --- ...ulseaudio-fix-compilation-on-RHEL-machine.patch | 35 ++++++++++++++++++++ .../pulseaudio/pulseaudio_2.1.bb | 6 ++- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-fix-compilation-on-RHEL-machine.patch diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-fix-compilation-on-RHEL-machine.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-fix-compilation-on-RHEL-machine.patch new file mode 100644 index 0000000..4630dea --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-fix-compilation-on-RHEL-machine.patch @@ -0,0 +1,35 @@ +commit da81efa600ca7f5657ee4cb877e405fdfc6eee24 +Author: Aws Ismail +Date: Wed Aug 15 16:34:52 2012 +0800 + + Fix compilation on RHEL-5.8 64bit machine + + This fixes the following issue when pulseaudio is built + with the oe-core toolchain: + +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputInfo' +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetScreenResourcesCurrent' +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRFreeOutputInfo' +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRFreeScreenResources' +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputPrimary' +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRFreeCrtcInfo' +../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libgdk-x11-2.0.so: undefined reference to `XRRGetCrtcInfo' + collect2: ld returned 1 exit status + + Upstream-Status: Pending + + Signed-off-by: Aws Ismail + +diff --git a/src/Makefile.am b/src/Makefile.am +index e3af12f..58dad5e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -51,7 +51,7 @@ AM_CFLAGS = \ + SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO + + AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS) +-AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS) ++AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS) -lXrandr + AM_LDFLAGS = $(NODELETE_LDFLAGS) + + if STATIC_BINS diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb index 811dc0f..35137a8 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,13 +1,15 @@ require pulseaudio.inc -PR = "r14" +PR = "r15" -DEPENDS += "libjson gdbm speex libxml-parser-perl-native" +DEPENDS += "libjson gdbm speex libxml-parser-perl-native \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'libxrandr', '', d)}" inherit gettext perlnative SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ file://volatiles.04_pulse \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'file://pulseaudio-fix-compilation-on-RHEL-machine.patch', '', d)} \ " SRC_URI[md5sum] = "33e85023259d530f0a763d5204e8bad9"