CVS commit: pkgsrc/www/firefox52

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Sep 13 10:03:47 UTC 2017

Modified Files:
        pkgsrc/www/firefox52: distinfo
Added Files:
        pkgsrc/www/firefox52/patches: patch-gfx_2d_DataSurfaceHelpers.cpp
            patch-gfx_2d_HelpersCairo.h

Log Message:
firefox52: hacks for sparc64/big endian platforms

While graphics support for big endian platforms ist still not quite
right, we prefer slightly garbled display (or missing items) over
browser crashes.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox52/patches/patch-gfx_2d_DataSurfaceHelpers.cpp \
    pkgsrc/www/firefox52/patches/patch-gfx_2d_HelpersCairo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.5 pkgsrc/www/firefox52/distinfo:1.6
--- pkgsrc/www/firefox52/distinfo:1.5   Sat Aug 19 04:13:51 2017
+++ pkgsrc/www/firefox52/distinfo       Wed Sep 13 10:03:47 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2017/08/19 04:13:51 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2017/09/13 10:03:47 martin Exp $
 
 SHA1 (firefox-52.3.0esr.source.tar.xz) = 10c9b836167b3d1dc500decd6e324adfebd6f854
 RMD160 (firefox-52.3.0esr.source.tar.xz) = 9f43af8abbd449ea3921583d1b47de40b2b302a7
@@ -29,6 +29,8 @@ SHA1 (patch-dom_plugins_ipc_PluginModule
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 15c01df2fa7f989b533ef769ce77438b5e9bfdb9
 SHA1 (patch-dom_system_OSFileConstants.cpp) = e932ca46cbc78eb8486b9ff704434a962645c6b2
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 2aaf5f82a57dbb375558442718c239e2e7da1406
+SHA1 (patch-gfx_2d_DataSurfaceHelpers.cpp) = e18b002f51fc0a191d579fa49025aac2c5000d81
+SHA1 (patch-gfx_2d_HelpersCairo.h) = f910d634624fdf288a042c2a0c636598103ef289
 SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
 SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = 09eb2fa66109d38a3aedc940fcaaee5f91e216ae

Added files:

Index: pkgsrc/www/firefox52/patches/patch-gfx_2d_DataSurfaceHelpers.cpp
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-gfx_2d_DataSurfaceHelpers.cpp:1.1
--- /dev/null   Wed Sep 13 10:03:47 2017
+++ pkgsrc/www/firefox52/patches/patch-gfx_2d_DataSurfaceHelpers.cpp    Wed Sep 13 10:03:47 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-gfx_2d_DataSurfaceHelpers.cpp,v 1.1 2017/09/13 10:03:47 martin Exp $
+
+On big endian platforms this happens a lot - swap an application crash
+for slightly broken display while we are still hunting the real bug.
+
+--- gfx/2d/DataSurfaceHelpers.cpp.orig 2017-04-11 04:13:04.000000000 +0200
++++ gfx/2d/DataSurfaceHelpers.cpp      2017-09-13 11:29:20.039199172 +0200
+@@ -320,6 +320,12 @@ CopyRect(DataSourceSurface* aSrc, DataSo
+     MOZ_CRASH("GFX: we should never be getting invalid rects at this point");
+   }
+ 
++#if MOZ_BIG_ENDIAN
++  // hack: avoid a crash, we cope with the bogus display result for now
++  if (aSrc->GetFormat() != aDest->GetFormat())
++    return false;
++#endif
++
+   MOZ_RELEASE_ASSERT(aSrc->GetFormat() == aDest->GetFormat(),
+                      "GFX: different surface formats");
+   MOZ_RELEASE_ASSERT(IntRect(IntPoint(), aSrc->GetSize()).Contains(aSrcRect),
Index: pkgsrc/www/firefox52/patches/patch-gfx_2d_HelpersCairo.h
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-gfx_2d_HelpersCairo.h:1.1
--- /dev/null   Wed Sep 13 10:03:47 2017
+++ pkgsrc/www/firefox52/patches/patch-gfx_2d_HelpersCairo.h    Wed Sep 13 10:03:47 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-gfx_2d_HelpersCairo.h,v 1.1 2017/09/13 10:03:47 martin Exp $
+
+Total hack: avoid lots of debug spew on big endian platforms
+(there is a real bug involved here, but this does not help
+debugging)
+
+--- gfx/2d/HelpersCairo.h.orig 2017-04-11 04:13:04.000000000 +0200
++++ gfx/2d/HelpersCairo.h      2017-09-13 11:19:21.840242779 +0200
+@@ -160,7 +160,9 @@ GfxFormatToCairoFormat(SurfaceFormat for
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
++#if MOZ_LITTLE_ENDIAN
+       gfxCriticalError() << "Unknown image format " << (int)format;
++#endif
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }