[embedlite] Align all the patches for esr52. Fixes JB#49559

sailfishos · May 6, 2020 · fbd98dc · fbd98dc
1 parent 4bb2f3a
commit fbd98dc
Show file tree

Hide file tree

Showing 28 changed files with 158 additions and 923 deletions.
diff --git a/rpm/0001-Supply-source-uri-to-gstreamer-pipeline.patch b/rpm/0001-Supply-source-uri-to-gstreamer-pipeline.patch
diff --git a/...around-for-late-access-message-loop.patch → ...around-for-late-access-message-loop.patch b/...around-for-late-access-message-loop.patch → ...around-for-late-access-message-loop.patch
@@ -1,7 +1,7 @@
-From 742457bea87cd7ed6d88c7bcf4817afff7ce5acd Mon Sep 17 00:00:00 2001
+From 4eebc26c55145395f8b1e0d785109472b1b8b077 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:12:04 +0300
-Subject: [PATCH 02/17] Workaround for late access message loop.
+Subject: [PATCH] Workaround for late access message loop.
 
 See bug JB10381
 
@@ -11,10 +11,10 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp
-index 30791953fb32..1f0b70a27430 100644
+index d03c7935e87f..6d117afdb36e 100644
 --- a/ipc/glue/MessagePump.cpp
 +++ b/ipc/glue/MessagePump.cpp
-@@ -213,6 +213,9 @@ DoWorkRunnable::Run()
+@@ -216,6 +216,9 @@ DoWorkRunnable::Run()
  {
    MessageLoop* loop = MessageLoop::current();
    MOZ_ASSERT(loop);
@@ -25,5 +25,5 @@ index 30791953fb32..1f0b70a27430 100644
    bool nestableTasksAllowed = loop->NestableTasksAllowed();
 
 -- 
-2.24.1
+2.17.1
 
diff --git a/...e-area-rather-than-width-and-height.patch → ...e-area-rather-than-width-and-height.patch b/...e-area-rather-than-width-and-height.patch → ...e-area-rather-than-width-and-height.patch
@@ -1,7 +1,7 @@
-From c282851b1cc387f79f6a67a33be450e668260f73 Mon Sep 17 00:00:00 2001
+From 72932beedf7c5419eaa7e6e9b9613a18fe69b0f6 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:17:36 +0300
-Subject: [PATCH 05/17] Limit surface area rather than width and height
+Subject: [PATCH] Limit surface area rather than width and height
 
 See bug JB26935
 
@@ -11,7 +11,7 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/gfx/cairo/cairo/src/cairo-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c
-index 91043722c4c6..ba1d4688c14d 100644
+index 4aaf1c159203..2abfd30af2c3 100644
 --- a/gfx/cairo/cairo/src/cairo-image-surface.c
 +++ b/gfx/cairo/cairo/src/cairo-image-surface.c
 @@ -91,8 +91,9 @@ _pixman_image_for_solid (const cairo_solid_pattern_t *pattern);
@@ -27,5 +27,5 @@ index 91043722c4c6..ba1d4688c14d 100644
 
  cairo_format_t
 -- 
-2.24.1
+2.17.1
 
diff --git a/...EGL-hold-a-reference-to-GLContext.-.patch → ...EGL-hold-a-reference-to-GLContext.-.patch b/...EGL-hold-a-reference-to-GLContext.-.patch → ...EGL-hold-a-reference-to-GLContext.-.patch
@@ -1,8 +1,8 @@
-From ef04eb022fcfcd473f58a3fda98e28d68dcd5348 Mon Sep 17 00:00:00 2001
+From 31a4e217286fb1267cf6cedc04ae7d8bb658fa24 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <piotr.tworek@jollamobile.com>
 Date: Wed, 8 Jul 2015 16:13:11 +0200
-Subject: [PATCH 06/17] Make TextureImageEGL hold a reference to GLContext.
- Fixes JB#30109.
+Subject: [PATCH] Make TextureImageEGL hold a reference to GLContext. Fixes
+ JB#30109.
 
 Due to rather non standard view shutdown procedure of EmbedLite port
 objets like TextureImageEGL often end up being destroyed after the
@@ -25,18 +25,18 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gfx/gl/TextureImageEGL.h b/gfx/gl/TextureImageEGL.h
-index 472718e2efd2..61d873a79a90 100644
+index fa7075064ac9..54b78206ca98 100644
 --- a/gfx/gl/TextureImageEGL.h
 +++ b/gfx/gl/TextureImageEGL.h
-@@ -63,7 +63,7 @@ public:
+@@ -55,7 +55,7 @@ public:
  protected:
      typedef gfxImageFormat ImageFormat;
 
 -    GLContext* mGLContext;
 +    RefPtr<GLContext> mGLContext;
 
-     gfx::IntRect mUpdateRect;
      gfx::SurfaceFormat mUpdateFormat;
+     EGLImage mEGLImage;
 -- 
-2.24.1
+2.17.1