* [PATCH 1/2] xf86-video-intel: Fix build with -fno-common
@ 2020-08-05 19:08 Khem Raj
2020-08-05 19:08 ` [PATCH 2/2] libacpi: " Khem Raj
2020-08-06 1:38 ` [OE-core] [PATCH 1/2] xf86-video-intel: " Anuj Mittal
0 siblings, 2 replies; 4+ messages in thread
From: Khem Raj @ 2020-08-05 19:08 UTC (permalink / raw
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...0001-i810-Make-I810PatternROP-extern.patch | 29 +++++++++++++++++++
.../xorg-driver/xf86-video-intel_git.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
new file mode 100644
index 0000000000..610efd65d9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
@@ -0,0 +1,29 @@
+From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 5 Aug 2020 11:51:54 -0700
+Subject: [PATCH] i810: Make I810PatternROP extern
+
+Its also defined in i810_accel.c
+Fixes build with -fno-common
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/legacy/i810/i810.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
+index 347188c9..19be049c 100644
+--- a/src/legacy/i810/i810.h
++++ b/src/legacy/i810/i810.h
+@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
+ extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
+
+ extern const int I810CopyROP[16];
+-const int I810PatternROP[16];
++extern const int I810PatternROP[16];
+
+ #endif /* _I810_H_ */
+--
+2.28.0
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 7ab2236237..3c97b8c4f4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
+ file://0001-i810-Make-I810PatternROP-extern.patch \
"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] libacpi: Fix build with -fno-common
2020-08-05 19:08 [PATCH 1/2] xf86-video-intel: Fix build with -fno-common Khem Raj
@ 2020-08-05 19:08 ` Khem Raj
2020-08-06 1:38 ` [OE-core] [PATCH 1/2] xf86-video-intel: " Anuj Mittal
1 sibling, 0 replies; 4+ messages in thread
From: Khem Raj @ 2020-08-05 19:08 UTC (permalink / raw
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...1-libacpi-Fix-build-witth-fno-commom.patch | 68 +++++++++++++++++++
meta/recipes-bsp/libacpi/libacpi_0.2.bb | 4 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch
diff --git a/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch b/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch
new file mode 100644
index 0000000000..32808fb92a
--- /dev/null
+++ b/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch
@@ -0,0 +1,68 @@
+From 9839c169f513e65fc711646257b3e8588cce623c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 5 Aug 2020 12:06:01 -0700
+Subject: [PATCH] libacpi: Fix build witth -fno-commom
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libacpi.c | 16 ++++++++++++++++
+ libacpi.h | 6 +++---
+ 2 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/libacpi.c b/libacpi.c
+index 4e34725..9344ea4 100644
+--- a/libacpi.c
++++ b/libacpi.c
+@@ -14,6 +14,22 @@
+ #include "libacpi.h"
+ #include "list.h"
+
++/**
++ * Array for existing batteries, loop until
++ * globals->battery_count
++ */
++battery_t batteries[MAX_ITEMS];
++/**
++ * Array for existing thermal zones, loop until
++ * globals->thermal_count
++ */
++thermal_t thermals[MAX_ITEMS];
++/**
++ * Array for existing fans, loop until
++ * globals->fan_count
++ */
++fan_t fans[MAX_ITEMS];
++
+ static int read_acpi_battinfo(const int num);
+ static int read_acpi_battalarm(const int num);
+ static int read_acpi_battstate(const int num);
+diff --git a/libacpi.h b/libacpi.h
+index 9334b79..5242d3d 100644
+--- a/libacpi.h
++++ b/libacpi.h
+@@ -183,17 +183,17 @@ typedef struct {
+ * Array for existing batteries, loop until
+ * globals->battery_count
+ */
+-battery_t batteries[MAX_ITEMS];
++extern battery_t batteries[MAX_ITEMS];
+ /**
+ * Array for existing thermal zones, loop until
+ * globals->thermal_count
+ */
+-thermal_t thermals[MAX_ITEMS];
++extern thermal_t thermals[MAX_ITEMS];
+ /**
+ * Array for existing fans, loop until
+ * globals->fan_count
+ */
+-fan_t fans[MAX_ITEMS];
++extern fan_t fans[MAX_ITEMS];
+ /**
+ * Finds existing batteries and fills the
+ * corresponding batteries structures with the paths
+--
+2.28.0
+
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index 5e7f7fa8e0..fa9e3d4894 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -11,7 +11,9 @@ SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
file://makefile-fix.patch \
file://libacpi_fix_for_x32.patch \
file://use_correct_strip_in_cross_environment.patch \
- file://ldflags.patch "
+ file://ldflags.patch \
+ file://0001-libacpi-Fix-build-witth-fno-commom.patch \
+ "
SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH 1/2] xf86-video-intel: Fix build with -fno-common
2020-08-05 19:08 [PATCH 1/2] xf86-video-intel: Fix build with -fno-common Khem Raj
2020-08-05 19:08 ` [PATCH 2/2] libacpi: " Khem Raj
@ 2020-08-06 1:38 ` Anuj Mittal
2020-08-06 4:32 ` Khem Raj
1 sibling, 1 reply; 4+ messages in thread
From: Anuj Mittal @ 2020-08-06 1:38 UTC (permalink / raw
To: openembedded-core@lists.openembedded.org, raj.khem@gmail.com
On Wed, 2020-08-05 at 12:08 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> ...0001-i810-Make-I810PatternROP-extern.patch | 29
> +++++++++++++++++++
> .../xorg-driver/xf86-video-intel_git.bb | 1 +
> 2 files changed, 30 insertions(+)
> create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-
> intel/0001-i810-Make-I810PatternROP-extern.patch
>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-
> i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-
> driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
> new file mode 100644
> index 0000000000..610efd65d9
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-
> Make-I810PatternROP-extern.patch
> @@ -0,0 +1,29 @@
> +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00
> 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 5 Aug 2020 11:51:54 -0700
> +Subject: [PATCH] i810: Make I810PatternROP extern
> +
> +Its also defined in i810_accel.c
> +Fixes build with -fno-common
> +
> +Upstream-Status: Pending
Should we take this exact same change so we can mark this as a
backport?
https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3
Thanks,
Anuj
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + src/legacy/i810/i810.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
> +index 347188c9..19be049c 100644
> +--- a/src/legacy/i810/i810.h
> ++++ b/src/legacy/i810/i810.h
> +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
> + extern const OptionInfoRec *I810AvailableOptions(int chipid, int
> busid);
> +
> + extern const int I810CopyROP[16];
> +-const int I810PatternROP[16];
> ++extern const int I810PatternROP[16];
> +
> + #endif /* _I810_H_ */
> +--
> +2.28.0
> +
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-
> intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-
> intel_git.bb
> index 7ab2236237..3c97b8c4f4 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> @@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
>
> SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-
> intel \
> file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
> + file://0001-i810-Make-I810PatternROP-extern.patch \
> "
>
> UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH 1/2] xf86-video-intel: Fix build with -fno-common
2020-08-06 1:38 ` [OE-core] [PATCH 1/2] xf86-video-intel: " Anuj Mittal
@ 2020-08-06 4:32 ` Khem Raj
0 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2020-08-06 4:32 UTC (permalink / raw
To: Mittal, Anuj; +Cc: openembedded-core@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 3056 bytes --]
On Wed, Aug 5, 2020 at 6:38 PM Mittal, Anuj <anuj.mittal@intel.com> wrote:
> On Wed, 2020-08-05 at 12:08 -0700, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > ...0001-i810-Make-I810PatternROP-extern.patch | 29
> > +++++++++++++++++++
> > .../xorg-driver/xf86-video-intel_git.bb | 1 +
> > 2 files changed, 30 insertions(+)
> > create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-
> > intel/0001-i810-Make-I810PatternROP-extern.patch
> >
> > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-
> > i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-
> > driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
> > new file mode 100644
> > index 0000000000..610efd65d9
> > --- /dev/null
> > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-
> > Make-I810PatternROP-extern.patch
> > @@ -0,0 +1,29 @@
> > +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00
> > 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Wed, 5 Aug 2020 11:51:54 -0700
> > +Subject: [PATCH] i810: Make I810PatternROP extern
> > +
> > +Its also defined in i810_accel.c
> > +Fixes build with -fno-common
> > +
> > +Upstream-Status: Pending
>
> Should we take this exact same change so we can mark this as a
> backport?
>
>
> https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3
I think that’s better will just add the backport bits and send v2
<https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3>
>
> Thanks,
>
> Anuj
>
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + src/legacy/i810/i810.h | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
> > +index 347188c9..19be049c 100644
> > +--- a/src/legacy/i810/i810.h
> > ++++ b/src/legacy/i810/i810.h
> > +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
> > + extern const OptionInfoRec *I810AvailableOptions(int chipid, int
> > busid);
> > +
> > + extern const int I810CopyROP[16];
> > +-const int I810PatternROP[16];
> > ++extern const int I810PatternROP[16];
> > +
> > + #endif /* _I810_H_ */
> > +--
> > +2.28.0
> > +
> > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-
> > intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-
> > intel_git.bb
> > index 7ab2236237..3c97b8c4f4 100644
> > --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> > @@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
> >
> > SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-
> > intel \
> > file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
> > + file://0001-i810-Make-I810PatternROP-extern.patch \
> > "
> >
> > UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
> >
>
[-- Attachment #2: Type: text/html, Size: 4902 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-06 4:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-05 19:08 [PATCH 1/2] xf86-video-intel: Fix build with -fno-common Khem Raj
2020-08-05 19:08 ` [PATCH 2/2] libacpi: " Khem Raj
2020-08-06 1:38 ` [OE-core] [PATCH 1/2] xf86-video-intel: " Anuj Mittal
2020-08-06 4:32 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.