[WinCairo] Crash when rendering (in pixman dll)

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index e803df3c1dbcf71cf49fbc79c5c0969fd265d5f6..0a944e504d587e34eb40cbe70ae6d3dc8694fa56 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -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.

diff --git a/WebKitLibraries/win/tools/vsprops/GStreamer32.props b/WebKitLibraries/win/tools/vsprops/GStreamer32.props
index b862e964de907a776cb091e6428653ba3729b421..5c1bc8263ad162dd6ca08ff701cf5e861c67674e 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/GStreamer32.props
+++ b/WebKitLibraries/win/tools/vsprops/GStreamer32.props
@@ -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

diff --git a/WebKitLibraries/win/tools/vsprops/GStreamer64.props b/WebKitLibraries/win/tools/vsprops/GStreamer64.props
index 1eb483ad771fe54bf4286876073ebe6e09c3f2d8..22ce6045021c430d03f57c05f61ada19fdf2da07 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/GStreamer64.props
+++ b/WebKitLibraries/win/tools/vsprops/GStreamer64.props
@@ -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