| Message ID | 20240206000254.2916314-1-rs@ti.com |
|---|---|
| State | Rejected |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master] cairo: remove cairo append and include | expand |
NAK On Mon, Feb 05, 2024 at 06:02:54PM -0600, Randolph Sapp via lists.yoctoproject.org wrote: > From: Randolph Sapp <rs@ti.com> > > Cairo versions >= 1.17.8 dropped all GL render backends entirely, > invalidating both the opengl and glesv2 PACKAGECONFIGS. As such this > override is no longer necessary. > > Signed-off-by: Randolph Sapp <rs@ti.com> > --- > meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend | 1 - > meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc | 5 ----- > 2 files changed, 6 deletions(-) > delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend > delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc > > diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend > deleted file mode 100644 > index 459d8d09..00000000 > --- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend > +++ /dev/null > @@ -1 +0,0 @@ > -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} > diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc > deleted file mode 100644 > index b41f1a01..00000000 > --- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc > +++ /dev/null > @@ -1,5 +0,0 @@ > -# This is required since cairo expects the opengl distro feature to refer to > -# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. > - > -PACKAGECONFIG:remove = "opengl" > -PACKAGECONFIG:append = " glesv2" > -- > 2.43.0
On 2/5/24 18:27, Denys Dmytriyenko wrote: > NAK > > On Mon, Feb 05, 2024 at 06:02:54PM -0600, Randolph Sapp via lists.yoctoproject.org wrote: >> From: Randolph Sapp <rs@ti.com> >> >> Cairo versions >= 1.17.8 dropped all GL render backends entirely, >> invalidating both the opengl and glesv2 PACKAGECONFIGS. As such this >> override is no longer necessary. >> >> Signed-off-by: Randolph Sapp <rs@ti.com> >> --- >> meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend | 1 - >> meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc | 5 ----- >> 2 files changed, 6 deletions(-) >> delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend >> delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc >> >> diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend >> deleted file mode 100644 >> index 459d8d09..00000000 >> --- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend >> +++ /dev/null >> @@ -1 +0,0 @@ >> -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} >> diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc >> deleted file mode 100644 >> index b41f1a01..00000000 >> --- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc >> +++ /dev/null >> @@ -1,5 +0,0 @@ >> -# This is required since cairo expects the opengl distro feature to refer to >> -# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. >> - >> -PACKAGECONFIG:remove = "opengl" >> -PACKAGECONFIG:append = " glesv2" >> -- >> 2.43.0 Alright, what's wrong with it? Oe-core is currently using cairo 1.18, this append currently just introduces a warning. Are you already carrying this in a private branch?
On Tue, Feb 06, 2024 at 12:18:04AM -0600, Res Sapp wrote: > On 2/5/24 18:27, Denys Dmytriyenko wrote: > >NAK > > > >On Mon, Feb 05, 2024 at 06:02:54PM -0600, Randolph Sapp via lists.yoctoproject.org wrote: > >>From: Randolph Sapp <rs@ti.com> > >> > >>Cairo versions >= 1.17.8 dropped all GL render backends entirely, > >>invalidating both the opengl and glesv2 PACKAGECONFIGS. As such this > >>override is no longer necessary. > >> > >>Signed-off-by: Randolph Sapp <rs@ti.com> > >>--- > >> meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend | 1 - > >> meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc | 5 ----- > >> 2 files changed, 6 deletions(-) > >> delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend > >> delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc > >> > >>diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend > >>deleted file mode 100644 > >>index 459d8d09..00000000 > >>--- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend > >>+++ /dev/null > >>@@ -1 +0,0 @@ > >>-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} > >>diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc > >>deleted file mode 100644 > >>index b41f1a01..00000000 > >>--- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc > >>+++ /dev/null > >>@@ -1,5 +0,0 @@ > >>-# This is required since cairo expects the opengl distro feature to refer to > >>-# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. > >>- > >>-PACKAGECONFIG:remove = "opengl" > >>-PACKAGECONFIG:append = " glesv2" > >>-- > >>2.43.0 > > Alright, what's wrong with it? Oe-core is currently using cairo > 1.18, this append currently just introduces a warning. Are you > already carrying this in a private branch? https://patchwork.yoctoproject.org/project/ti/patch/20240201173635.2591975-1-denis@denix.org/ Seems there's a bit of a backlog for master...
On 2/6/2024 2:23 AM, Denys Dmytriyenko wrote: > On Tue, Feb 06, 2024 at 12:18:04AM -0600, Res Sapp wrote: >> On 2/5/24 18:27, Denys Dmytriyenko wrote: >>> NAK >>> >>> On Mon, Feb 05, 2024 at 06:02:54PM -0600, Randolph Sapp via lists.yoctoproject.org wrote: >>>> From: Randolph Sapp <rs@ti.com> >>>> >>>> Cairo versions >= 1.17.8 dropped all GL render backends entirely, >>>> invalidating both the opengl and glesv2 PACKAGECONFIGS. As such this >>>> override is no longer necessary. >>>> >>>> Signed-off-by: Randolph Sapp <rs@ti.com> >>>> --- >>>> meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend | 1 - >>>> meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc | 5 ----- >>>> 2 files changed, 6 deletions(-) >>>> delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend >>>> delete mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc >>>> >>>> diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend >>>> deleted file mode 100644 >>>> index 459d8d09..00000000 >>>> --- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend >>>> +++ /dev/null >>>> @@ -1 +0,0 @@ >>>> -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} >>>> diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc >>>> deleted file mode 100644 >>>> index b41f1a01..00000000 >>>> --- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc >>>> +++ /dev/null >>>> @@ -1,5 +0,0 @@ >>>> -# This is required since cairo expects the opengl distro feature to refer to >>>> -# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. >>>> - >>>> -PACKAGECONFIG:remove = "opengl" >>>> -PACKAGECONFIG:append = " glesv2" >>>> -- >>>> 2.43.0 >> >> Alright, what's wrong with it? Oe-core is currently using cairo >> 1.18, this append currently just introduces a warning. Are you >> already carrying this in a private branch? > > https://patchwork.yoctoproject.org/project/ti/patch/20240201173635.2591975-1-denis@denix.org/ > > Seems there's a bit of a backlog for master... Yes. The churn in oe-core and other repos lately is causing our master builds to take forever... It's hard to find quiet time to test all of the patches.
diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend deleted file mode 100644 index 459d8d09..00000000 --- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc deleted file mode 100644 index b41f1a01..00000000 --- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This is required since cairo expects the opengl distro feature to refer to -# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. - -PACKAGECONFIG:remove = "opengl" -PACKAGECONFIG:append = " glesv2"