Patchwork [CONSOLIDATED,REQUEST,46/64] owl-video_git.bb: fix compilation on Fedora 13 machine

login
register
mail settings
Submitter Saul Wold
Date Aug. 14, 2012, 12:13 p.m.
Message ID <ccea2d07d0f88da1d5df027147238a97f78a4d3a.1344946189.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/34603/
State New
Headers show

Comments

Saul Wold - Aug. 14, 2012, 12:13 p.m.
From: Matthew McClintock <msm@freescale.com>

This adds libXrandr to the link step and fixes this issue:

| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputInfo'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetScreenResourcesCurrent'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeOutputInfo'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeScreenResources'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputPrimary'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeCrtcInfo'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetCrtcInfo'
| collect2: ld returned 1 exit status

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../owl-video/0001-add-dependency-for-xrandr.patch |   30 ++++++++++++++++++++
 .../recipes-sato/owl-video-widget/owl-video_git.bb |    5 ++-
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
McClintock Matthew-B29882 - Aug. 14, 2012, 2:48 p.m.
Saul,

I think we decided to wait / ignore this one.

-M

On Tue, Aug 14, 2012 at 7:13 AM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Matthew McClintock <msm@freescale.com>
>
> This adds libXrandr to the link step and fixes this issue:
>
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputInfo'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetScreenResourcesCurrent'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeOutputInfo'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeScreenResources'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputPrimary'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeCrtcInfo'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetCrtcInfo'
> | collect2: ld returned 1 exit status
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../owl-video/0001-add-dependency-for-xrandr.patch |   30 ++++++++++++++++++++
>  .../recipes-sato/owl-video-widget/owl-video_git.bb |    5 ++-
>  2 files changed, 33 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
>
> diff --git a/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
> new file mode 100644
> index 0000000..8c14578
> --- /dev/null
> +++ b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
> @@ -0,0 +1,30 @@
> +Upstream-Status: Pending
> +
> +This patch should probably go upstream
> +
> +From 18bdd57b36489439dc5c18b20abd9d59c6778662 Mon Sep 17 00:00:00 2001
> +From: Matthew McClintock <msm@freescale.com>
> +Date: Wed, 25 Jul 2012 15:05:40 -0500
> +Subject: [PATCH] add dependency for xrandr
> +
> +Signed-off-by: Matthew McClintock <msm@freescale.com>
> +---
> + src/Makefile.am |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 60e845b..00e4b11 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -12,7 +12,7 @@ video_SOURCES = video.c      \
> +       owl-overlay-bin.c       \
> +       owl-overlay-bin.h
> +
> +-video_LDADD = $(VIDEO_LIBS)
> ++video_LDADD = $(VIDEO_LIBS) -lXrandr
> +
> + dist_pkgdata_DATA = gtk-fullscreen.png
> +
> +--
> +1.7.5.4
> +
> diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
> index bc63273..321b71b 100644
> --- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
> +++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
> @@ -10,7 +10,7 @@ DEPENDS = "libowl-av"
>
>  SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
>  PV = "0.1+git${SRCPV}"
> -PR = "r1"
> +PR = "r2"
>
>  S = "${WORKDIR}/git"
>
> @@ -23,7 +23,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
>             file://stock_volume-med.png \
>             file://stock_volume-max.png \
>             file://owl-video-widget.desktop \
> -          file://make-382.patch"
> +          file://make-382.patch \
> +          file://0001-add-dependency-for-xrandr.patch"
>
>  inherit autotools pkgconfig
>
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Ross Burton - Aug. 14, 2012, 3:07 p.m.
On 14 August 2012 15:48, McClintock Matthew-B29882 <B29882@freescale.com> wrote:
> I think we decided to wait / ignore this one.

Yes, unless this crops up again this can be dropped.

Ross

Patch

diff --git a/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
new file mode 100644
index 0000000..8c14578
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
@@ -0,0 +1,30 @@ 
+Upstream-Status: Pending
+
+This patch should probably go upstream
+
+From 18bdd57b36489439dc5c18b20abd9d59c6778662 Mon Sep 17 00:00:00 2001
+From: Matthew McClintock <msm@freescale.com>
+Date: Wed, 25 Jul 2012 15:05:40 -0500
+Subject: [PATCH] add dependency for xrandr
+
+Signed-off-by: Matthew McClintock <msm@freescale.com>
+---
+ src/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 60e845b..00e4b11 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ video_SOURCES = video.c	\
+ 	owl-overlay-bin.c	\
+ 	owl-overlay-bin.h
+ 
+-video_LDADD = $(VIDEO_LIBS)
++video_LDADD = $(VIDEO_LIBS) -lXrandr
+ 
+ dist_pkgdata_DATA = gtk-fullscreen.png
+ 
+-- 
+1.7.5.4
+
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
index bc63273..321b71b 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -10,7 +10,7 @@  DEPENDS = "libowl-av"
 
 SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/git"
 
@@ -23,7 +23,8 @@  SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
            file://stock_volume-med.png \
            file://stock_volume-max.png \
            file://owl-video-widget.desktop \
-	   file://make-382.patch"
+	   file://make-382.patch \
+	   file://0001-add-dependency-for-xrandr.patch"
 
 inherit autotools pkgconfig