Title: [161640] trunk/WebKitLibraries
Revision
161640
Author
commit-qu...@webkit.org
Date
2014-01-10 09:17:23 -0800 (Fri, 10 Jan 2014)

Log Message

[WinCairo] Crash when rendering (in pixman dll)
https://bugs.webkit.org/show_bug.cgi?id=126750

Patch by pe...@outlook.com <pe...@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.

Modified Paths

Diff

Modified: trunk/WebKitLibraries/ChangeLog (161639 => 161640)


--- trunk/WebKitLibraries/ChangeLog	2014-01-10 17:07:56 UTC (rev 161639)
+++ trunk/WebKitLibraries/ChangeLog	2014-01-10 17:17:23 UTC (rev 161640)
@@ -1,3 +1,17 @@
+2014-01-10  pe...@outlook.com  <pe...@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  <achristen...@webkit.org>
 
         [WinCairo] Enable video using GStreamer.

Modified: trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props (161639 => 161640)


--- trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props	2014-01-10 17:07:56 UTC (rev 161639)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props	2014-01-10 17:17:23 UTC (rev 161640)
@@ -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>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(GSTREAMER_1_0_ROOT_X86)lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file

Modified: trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props (161639 => 161640)


--- trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props	2014-01-10 17:07:56 UTC (rev 161639)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props	2014-01-10 17:17:23 UTC (rev 161640)
@@ -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>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86_64)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(GSTREAMER_1_0_ROOT_X86_64)lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to