Apply patch 3. Many of the fixes in patch 3 are obseleted by updates made to the FCL. So the FCL head is taken in preference. This leaves only the hack in the display channel implementation to do not do a screen rotation on syborg. That solution is a bit hacky, but actually revised in a later patch.
--- a/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfnativestreamstub.cpp Thu May 06 14:32:51 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfnativestreamstub.cpp Thu May 06 15:31:43 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -303,6 +303,7 @@
aFormat.rowPadding = 1;
aFormat.pixelFormat = OWF_IMAGE_UYVY;
break;
+
default:
aFormat.linear = OWF_FALSE;
aFormat.premultiplied = OWF_FALSE;
--- a/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp Thu May 06 14:32:51 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp Thu May 06 15:31:43 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -112,10 +112,19 @@
iDispChan.Close();
}
+/*
+ * Temporary hack; whats the best config strategy for Syborg?
+ */
+#define __SYBORG__
+
void COWFScreenDisplayInfo::ConstructL()
{
User::LeaveIfError(iDispChan.Open(iScreenNumber));
+#if defined (__WINS__) || defined (__SYBORG__)
iDefaultRotation = RDisplayChannel::ERotationNormal;
+#else
+ iDefaultRotation = RDisplayChannel::ERotation270CW;
+#endif
switch (iDispChan.CurrentRotation())
{
--- a/graphicscomposition/openwfcompositionengine/common/include/owfimage.h Thu May 06 14:32:51 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/common/include/owfimage.h Thu May 06 15:31:43 2010 +0100
@@ -1,4 +1,5 @@
/* Copyright (c) 2009 The Khronos Group Inc.
+ * Portions Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the
@@ -306,7 +307,6 @@
OWF_API_CALL void
OWF_Image_SetPixelBuffer(OWF_IMAGE* image, void* buffer);
-
/*!---------------------------------------------------------------------------
* \brief Blit (1:1 copy) pixels from image to another w/ clipping.
*
--- a/graphicscomposition/openwfcompositionengine/common/include/owftypes.h Thu May 06 14:32:51 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/common/include/owftypes.h Thu May 06 15:31:43 2010 +0100
@@ -1,4 +1,5 @@
/* Copyright (c) 2009 The Khronos Group Inc.
+ * Portions Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the
--- a/graphicscomposition/openwfcompositionengine/group/openwfc.mmp Thu May 06 14:32:51 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc.mmp Thu May 06 15:31:43 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"