Date: Monday, December 7, 2015 @ 01:26:06 Author: muflone Revision: 149406
upgpkg: bluegriffon 1.8-1 Deleted: bluegriffon/trunk/freetype.patch bluegriffon/trunk/freetype261.patch bluegriffon/trunk/libvpx_1.4.patch -------------------+ freetype.patch | 74 ---------------------------------------------------- freetype261.patch | 31 --------------------- libvpx_1.4.patch | 25 ----------------- 3 files changed, 130 deletions(-) Deleted: freetype.patch =================================================================== --- freetype.patch 2015-12-07 00:24:35 UTC (rev 149405) +++ freetype.patch 2015-12-07 00:26:06 UTC (rev 149406) @@ -1,74 +0,0 @@ -Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> -Date: 2013-11-29 -Initial Package Version: 25.0.1 -Upstream Status: Submitted -Origin: mozilla -URL: https://bug944454.bugzilla.mozilla.org/attachment.cgi?id=8340117 -Description: Fixes build with FreeType-2.5.1 - -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -408,16 +408,29 @@ freetype/ftoutln.h - freetype/ttnameid.h - freetype/tttables.h - freetype/t1tables.h - freetype/ftlcdfil.h - freetype/ftsizes.h - freetype/ftadvanc.h - freetype/ftbitmap.h - freetype/ftxf86.h -+freetype.h -+ftcache.h -+ftglyph.h -+ftsynth.h -+ftoutln.h -+ttnameid.h -+tttables.h -+t1tables.h -+ftlcdfil.h -+ftsizes.h -+ftadvanc.h -+ftbitmap.h -+ftxf86.h - fribidi/fribidi.h - FSp_fopen.h - fstream - fstream.h - ft2build.h - fts.h - gconf/gconf-client.h - Gdiplus.h -diff --git a/js/src/config/system-headers b/js/src/config/system-headers ---- a/js/src/config/system-headers -+++ b/js/src/config/system-headers -@@ -408,16 +408,29 @@ freetype/ftoutln.h - freetype/ttnameid.h - freetype/tttables.h - freetype/t1tables.h - freetype/ftlcdfil.h - freetype/ftsizes.h - freetype/ftadvanc.h - freetype/ftbitmap.h - freetype/ftxf86.h -+freetype.h -+ftcache.h -+ftglyph.h -+ftsynth.h -+ftoutln.h -+ttnameid.h -+tttables.h -+t1tables.h -+ftlcdfil.h -+ftsizes.h -+ftadvanc.h -+ftbitmap.h -+ftxf86.h - fribidi/fribidi.h - FSp_fopen.h - fstream - fstream.h - ft2build.h - fts.h - gconf/gconf-client.h - Gdiplus.h Deleted: freetype261.patch =================================================================== --- freetype261.patch 2015-12-07 00:24:35 UTC (rev 149405) +++ freetype261.patch 2015-12-07 00:26:06 UTC (rev 149406) @@ -1,31 +0,0 @@ - -# HG changeset patch -# User Mike Hommey <[email protected]> -# Date 1439509838 -32400 -# Node ID af40750720b59cb7af58c32f4f3325d6e03bbbc4 -# Parent e578cc44a96a2a953e75e295b0d8954f467d5cff -Bug 1194520 - Add a system header wrapper for <freetype/ftfntfmt.h>. r=mshal - - -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -450,16 +450,17 @@ foundation/base64.h - foundation/hexdump.h - #endif - fp.h - fpieee.h - frame/log.h - frame/req.h - freetype/freetype.h - freetype/ftcache.h -+freetype/ftfntfmt.h - freetype/ftglyph.h - freetype/ftsynth.h - freetype/ftoutln.h - freetype/ttnameid.h - freetype/tttables.h - freetype/t1tables.h - freetype/ftlcdfil.h - freetype/ftsizes.h - Deleted: libvpx_1.4.patch =================================================================== --- libvpx_1.4.patch 2015-12-07 00:24:35 UTC (rev 149405) +++ libvpx_1.4.patch 2015-12-07 00:26:06 UTC (rev 149406) @@ -1,25 +0,0 @@ -diff -Naur mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc ---- mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2013-04-09 21:29:13.000000000 +0200 -+++ mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-18 20:20:47.298270190 +0200 -@@ -178,7 +178,7 @@ - // Creating a wrapper to the image - setting image data to NULL. Actual - // pointer will be set in encode. Setting align to 1, as it is meaningless - // (actual memory is not allocated). -- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, -+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, - 1, NULL); - // populate encoder configuration with default values - if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { -@@ -352,9 +352,9 @@ - } - // Image in vpx_image_t format. - // Input image is const. VP8's raw image is not defined as const. -- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); -- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); -- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); -+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); -+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); -+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); - // TODO(mikhal): Stride should be set in initialization. - raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane); - raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
