All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/cog: fix software rendering
@ 2022-03-29 16:40 James Hilliard
  2022-03-29 22:34 ` Adrian Perez de Castro
  0 siblings, 1 reply; 4+ messages in thread
From: James Hilliard @ 2022-03-29 16:40 UTC (permalink / raw)
  To: buildroot; +Cc: Adrian Perez de Castro, James Hilliard

We need to backport a patch to fix software rendering with cog.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch

diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
new file mode 100644
index 0000000000..fec21c225c
--- /dev/null
+++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
@@ -0,0 +1,42 @@
+From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Sat, 26 Mar 2022 13:30:47 -0600
+Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release
+ function name.
+
+(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91)
+
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+[james.hilliard1@gmail.com: backport from upstream commit
+717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc]
+---
+ platform/wayland/cog-platform-wl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
+index 0ff9e6f..46c5185 100644
+--- a/platform/wayland/cog-platform-wl.c
++++ b/platform/wayland/cog-platform-wl.c
+@@ -63,7 +63,7 @@
+ 
+ #define DEFAULT_ZOOM_STEP 0.1f
+ 
+-#if defined(WPE_WL_CHECK_VERSION)
++#if defined(WPE_FDO_CHECK_VERSION)
+ #    define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0)
+ #    define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1)
+ #else
+@@ -1705,8 +1705,8 @@ static void
+ shm_buffer_destroy(struct shm_buffer *buffer)
+ {
+     if (buffer->exported_buffer) {
+-        wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
+-                                                                                buffer->exported_buffer);
++        wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
++                                                                                 buffer->exported_buffer);
+     }
+ 
+     wl_buffer_destroy(buffer->buffer);
+-- 
+2.25.1
+
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/cog: fix software rendering
  2022-03-29 16:40 [Buildroot] [PATCH 1/1] package/cog: fix software rendering James Hilliard
@ 2022-03-29 22:34 ` Adrian Perez de Castro
  2022-03-29 23:07   ` James Hilliard
  2022-03-29 23:11   ` Adrian Perez de Castro
  0 siblings, 2 replies; 4+ messages in thread
From: Adrian Perez de Castro @ 2022-03-29 22:34 UTC (permalink / raw)
  To: James Hilliard; +Cc: James Hilliard, buildroot


[-- Attachment #1.1: Type: text/plain, Size: 2862 bytes --]

Hi James,

On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard <james.hilliard1@gmail.com> wrote:
> We need to backport a patch to fix software rendering with cog.

I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am
planning to release version 0.12.4 in the next hours. WDYT about waiting
until we have that and skip ahead to .4 -- that way it will not be needed to
import this patch in Buildroot.

Cheers,
-Adrian
 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++
>  1 file changed, 42 insertions(+)
>  create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
> 
> diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
> new file mode 100644
> index 0000000000..fec21c225c
> --- /dev/null
> +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
> @@ -0,0 +1,42 @@
> +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001
> +From: James Hilliard <james.hilliard1@gmail.com>
> +Date: Sat, 26 Mar 2022 13:30:47 -0600
> +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release
> + function name.
> +
> +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91)
> +
> +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> +[james.hilliard1@gmail.com: backport from upstream commit
> +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc]
> +---
> + platform/wayland/cog-platform-wl.c | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
> +index 0ff9e6f..46c5185 100644
> +--- a/platform/wayland/cog-platform-wl.c
> ++++ b/platform/wayland/cog-platform-wl.c
> +@@ -63,7 +63,7 @@
> + 
> + #define DEFAULT_ZOOM_STEP 0.1f
> + 
> +-#if defined(WPE_WL_CHECK_VERSION)
> ++#if defined(WPE_FDO_CHECK_VERSION)
> + #    define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0)
> + #    define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1)
> + #else
> +@@ -1705,8 +1705,8 @@ static void
> + shm_buffer_destroy(struct shm_buffer *buffer)
> + {
> +     if (buffer->exported_buffer) {
> +-        wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
> +-                                                                                buffer->exported_buffer);
> ++        wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
> ++                                                                                 buffer->exported_buffer);
> +     }
> + 
> +     wl_buffer_destroy(buffer->buffer);
> +-- 
> +2.25.1
> +
> -- 
> 2.25.1

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/cog: fix software rendering
  2022-03-29 22:34 ` Adrian Perez de Castro
@ 2022-03-29 23:07   ` James Hilliard
  2022-03-29 23:11   ` Adrian Perez de Castro
  1 sibling, 0 replies; 4+ messages in thread
From: James Hilliard @ 2022-03-29 23:07 UTC (permalink / raw)
  To: Adrian Perez de Castro; +Cc: buildroot

On Tue, Mar 29, 2022 at 4:34 PM Adrian Perez de Castro
<aperez@igalia.com> wrote:
>
> Hi James,
>
> On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard <james.hilliard1@gmail.com> wrote:
> > We need to backport a patch to fix software rendering with cog.
>
> I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am
> planning to release version 0.12.4 in the next hours. WDYT about waiting
> until we have that and skip ahead to .4 -- that way it will not be needed to
> import this patch in Buildroot.

Yeah, that's probably better.

>
> Cheers,
> -Adrian
>
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> >  ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++
> >  1 file changed, 42 insertions(+)
> >  create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
> >
> > diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
> > new file mode 100644
> > index 0000000000..fec21c225c
> > --- /dev/null
> > +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch
> > @@ -0,0 +1,42 @@
> > +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001
> > +From: James Hilliard <james.hilliard1@gmail.com>
> > +Date: Sat, 26 Mar 2022 13:30:47 -0600
> > +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release
> > + function name.
> > +
> > +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91)
> > +
> > +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > +[james.hilliard1@gmail.com: backport from upstream commit
> > +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc]
> > +---
> > + platform/wayland/cog-platform-wl.c | 6 +++---
> > + 1 file changed, 3 insertions(+), 3 deletions(-)
> > +
> > +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
> > +index 0ff9e6f..46c5185 100644
> > +--- a/platform/wayland/cog-platform-wl.c
> > ++++ b/platform/wayland/cog-platform-wl.c
> > +@@ -63,7 +63,7 @@
> > +
> > + #define DEFAULT_ZOOM_STEP 0.1f
> > +
> > +-#if defined(WPE_WL_CHECK_VERSION)
> > ++#if defined(WPE_FDO_CHECK_VERSION)
> > + #    define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0)
> > + #    define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1)
> > + #else
> > +@@ -1705,8 +1705,8 @@ static void
> > + shm_buffer_destroy(struct shm_buffer *buffer)
> > + {
> > +     if (buffer->exported_buffer) {
> > +-        wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
> > +-                                                                                buffer->exported_buffer);
> > ++        wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
> > ++                                                                                 buffer->exported_buffer);
> > +     }
> > +
> > +     wl_buffer_destroy(buffer->buffer);
> > +--
> > +2.25.1
> > +
> > --
> > 2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/cog: fix software rendering
  2022-03-29 22:34 ` Adrian Perez de Castro
  2022-03-29 23:07   ` James Hilliard
@ 2022-03-29 23:11   ` Adrian Perez de Castro
  1 sibling, 0 replies; 4+ messages in thread
From: Adrian Perez de Castro @ 2022-03-29 23:11 UTC (permalink / raw)
  To: James Hilliard; +Cc: James Hilliard, buildroot


[-- Attachment #1.1: Type: text/plain, Size: 591 bytes --]

On Wed, 30 Mar 2022 01:34:03 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
 
> On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard <james.hilliard1@gmail.com> wrote:
> > We need to backport a patch to fix software rendering with cog.
> 
> I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am
> planning to release version 0.12.4 in the next hours. WDYT about waiting
> until we have that and skip ahead to .4 -- that way it will not be needed to
> import this patch in Buildroot.

Here it goes: https://wpewebkit.org/release/cog-0.12.4.html

Cheers,
-Adrian

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-03-29 23:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 16:40 [Buildroot] [PATCH 1/1] package/cog: fix software rendering James Hilliard
2022-03-29 22:34 ` Adrian Perez de Castro
2022-03-29 23:07   ` James Hilliard
2022-03-29 23:11   ` Adrian Perez de Castro

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.