[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fbb324b3eba771fabf9c1e5fd702874efcf0bc3a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 17:16:53 2010 +0000

    2010-12-10  Hironori Bono  <hbono at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            [Chromium] Use libjpeg-turbo instead of libjpeg
            https://bugs.webkit.org/show_bug.cgi?id=50054
    
            This change replaces the hard-coded path to the GYP files of the JPEG
            library with a 'libjpeg_gyp_path' variable, which is added by Chromium
            r68453. (When building WebKit Chromium, this change sets its value to
            '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp' to avoid changing
            the current behavior.)
    
            No new tests since this does not change the code at all.
    
            * WebCore.gyp/WebCore.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4e0fbcd..9d01cbe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-10  Hironori Bono  <hbono at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [Chromium] Use libjpeg-turbo instead of libjpeg
+        https://bugs.webkit.org/show_bug.cgi?id=50054
+
+        This change replaces the hard-coded path to the GYP files of the JPEG
+        library with a 'libjpeg_gyp_path' variable, which is added by Chromium
+        r68453. (When building WebKit Chromium, this change sets its value to
+        '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp' to avoid changing
+        the current behavior.)
+
+        No new tests since this does not change the code at all.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-12-10  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 92dd99d..5150f24 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -39,7 +39,10 @@
   'conditions': [
     ['inside_chromium_build==0', {
       # Webkit is being built outside of the full chromium project.
-      'variables': {'chromium_src_dir': '../../WebKit/chromium'},
+      'variables': {
+        'chromium_src_dir': '../../WebKit/chromium',
+        'libjpeg_gyp_path': '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp',
+      },
     },{
       # WebKit is checked out in src/chromium/third_party/WebKit
       'variables': {'chromium_src_dir': '../../../..'},
@@ -724,13 +727,13 @@
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
-        '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
         '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
         '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
         '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(libjpeg_gyp_path):libjpeg',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
@@ -836,7 +839,6 @@
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
-        '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
         '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
@@ -845,6 +847,7 @@
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+        '<(libjpeg_gyp_path):libjpeg',
       ],
       'export_dependent_settings': [
         'webcore_bindings',
@@ -853,7 +856,6 @@
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
-        '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
         '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
@@ -862,6 +864,7 @@
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+        '<(libjpeg_gyp_path):libjpeg',
       ],
       # This is needed for mac because of webkit_system_interface. It'd be nice
       # if this hard dependency could be split off the rest.

-- 
WebKit Debian packaging