[WinCairo] Crash when rendering (in pixman dll)
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jan 2014 17:17:23 +0000 (17:17 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jan 2014 17:17:23 +0000 (17:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=126750

Patch by peavo@outlook.com <peavo@outlook.com> on 2014-01-10
Reviewed by Brent Fulgham.

Since we link with cairo.lib, and the gstreamer installation also comes with cairo.lib,
we link with the wrong cairo.lib, and loads gstreamers cairo dll, instead of our own.
We should user our own cairo dll for rendering.

* win/tools/vsprops/GStreamer32.props: Put gstreamer lib path last, so we link with the correct cairo.lib.
* win/tools/vsprops/GStreamer64.props: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161640 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/GStreamer32.props
WebKitLibraries/win/tools/vsprops/GStreamer64.props

index e803df3..0a944e5 100644 (file)
@@ -1,3 +1,17 @@
+2014-01-10  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Crash when rendering (in pixman dll)
+        https://bugs.webkit.org/show_bug.cgi?id=126750
+
+        Reviewed by Brent Fulgham.
+
+        Since we link with cairo.lib, and the gstreamer installation also comes with cairo.lib,
+        we link with the wrong cairo.lib, and loads gstreamers cairo dll, instead of our own.
+        We should user our own cairo dll for rendering.
+
+        * win/tools/vsprops/GStreamer32.props: Put gstreamer lib path last, so we link with the correct cairo.lib.
+        * win/tools/vsprops/GStreamer64.props: Ditto.
+
 2014-01-03  Alex Christensen  <achristensen@webkit.org>
 
         [WinCairo] Enable video using GStreamer.
index b862e96..5c1bc82 100644 (file)
@@ -5,7 +5,7 @@
       <AdditionalIncludeDirectories>$(GSTREAMER_1_0_ROOT_X86)include\gstreamer-1.0;$(GSTREAMER_1_0_ROOT_X86)include\glib-2.0;$(GSTREAMER_1_0_ROOT_X86)lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(GSTREAMER_1_0_ROOT_X86)lib</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>
\ No newline at end of file
index 1eb483a..22ce604 100644 (file)
@@ -5,7 +5,7 @@
       <AdditionalIncludeDirectories>$(GSTREAMER_1_0_ROOT_X86_64)include\gstreamer-1.0;$(GSTREAMER_1_0_ROOT_X86_64)include\glib-2.0;$(GSTREAMER_1_0_ROOT_X86_64)lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86_64)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(GSTREAMER_1_0_ROOT_X86_64)lib</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>
\ No newline at end of file