head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.05.30.10.22.05;	author pho;	state dead;
branches;
next	1.1;
commitid	pujOAy5YvcBW3yCx;

1.1
date	2014.05.28.15.11.29;	author pho;	state Exp;
branches;
next	;
commitid	TaefekdY7BfKJjCx;


desc
@@


1.2
log
@PR pkg/48840: Remove most patches that I have recently added

The preprocessor macro XP_MACOSX is misused everywhere. They tend to
say "#if defined(XP_MACOSX)" to actually mean
"#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
result, cairo-gtk2 build on Darwin is completely broken and needs
heavy patching. Ideally they should be fixed individually but that
will be an extremely hard work, so don't define XP_MACOSX for now.
@
text
@$NetBSD: patch-gfx_layers_opengl_TextureHostOGL.cpp,v 1.1 2014/05/28 15:11:29 pho Exp $

Don't assume cocoa toolkit just because OS_ARCH is Darwin.

--- gfx/layers/opengl/TextureHostOGL.cpp.orig	2014-05-06 22:55:34.000000000 +0000
+++ gfx/layers/opengl/TextureHostOGL.cpp
@@@@ -32,7 +32,7 @@@@
 #include "nsRegion.h"                   // for nsIntRegion
 #include "GfxTexturesReporter.h"        // for GfxTexturesReporter
 #include "GLBlitTextureImageHelper.h"
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
 #include "SharedSurfaceIO.h"
 #include "mozilla/layers/MacIOSurfaceTextureHostOGL.h"
 #endif
@@@@ -113,7 +113,7 @@@@ CreateTextureHostOGL(const SurfaceDescri
       result = new StreamTextureHostOGL(aFlags, desc);
       break;
     }
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
     case SurfaceDescriptor::TSurfaceDescriptorMacIOSurface: {
       const SurfaceDescriptorMacIOSurface& desc =
         aDesc.get_SurfaceDescriptorMacIOSurface();
@@@@ -519,7 +519,7 @@@@ StreamTextureSourceOGL::RetrieveTextureF
       }
       break;
     }
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
     case SharedSurfaceType::IOSurface: {
       SharedSurface_IOSurface* glTexSurf = SharedSurface_IOSurface::Cast(sharedSurf);
       mTextureHandle = glTexSurf->Texture();
@@@@ -991,7 +991,7 @@@@ SurfaceStreamHostOGL::Lock()
       }
       break;
     }
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
     case SharedSurfaceType::IOSurface: {
       SharedSurface_IOSurface* glTexSurf = SharedSurface_IOSurface::Cast(sharedSurf);
       mTextureHandle = glTexSurf->Texture();
@


1.1
log
@PR pkg/48840: Don't assume cocoa toolkit just because OS_ARCH is Darwin
@
text
@d1 1
a1 1
$NetBSD$
@