[meego-commits] 23765: Changes to MeeGo:1.2.0:oss:Update:Testing/chromium
jieyang
no_reply at build.meego.com
Fri Sep 2 01:54:35 UTC 2011
Hi,
I have made the following changes to chromium in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.
Thank You,
jieyang
[This message was auto-generated]
---
Request #23765:
submit: home:jieyang:branches:MeeGo:1.2.0:oss:Update:Testing/chromium(r10)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/chromium
Message:
Upgrade chromium to 15.0.854.0 to fix BMC#22785
State: new 2011-09-01T18:42:15 jieyang
Comment: None
changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Wed Sep 1 2011 Yang Jie <yang.jie at intel.com> - 15.0.854.0
+- Upgrade chromium to 15.0.854.0 to fix BMC#22785
+
old:
----
chromium-13.0.752.0.tar.bz2
ffmpeg-20101210svn25926-headers.tar.bz2
new:
----
chromium-15.0.854.0.tar.bz2
ffmpeg-0.6-headers.tar.bz2
spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -25,7 +25,7 @@
# see src/chrome/VERSION
# Google's versioning is interesting. They never reset "BUILD", which is how we jumped
# from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch
-Version: 13.0.752.0
+Version: 15.0.854.0
Release: 4%{?svncheckout:.%{svncheckout}}%{?dist}
Summary: A WebKit powered web browser
# Licensing Overview
@@ -67,7 +67,8 @@
Source3: chromium-browser.desktop
Source4: chromium-browser.xml
# Official ffmpeg headers (from SVN)
-Source5: ffmpeg-20101210svn25926-headers.tar.bz2
+#Source5: ffmpeg-20101210svn25926-headers.tar.bz2
+Source5: ffmpeg-0.6-headers.tar.bz2
# Set default prefs
Source6: master_preferences
# We don't actually use this in the build, but it is included so you can make the tarball.
@@ -158,17 +159,17 @@
%patch0 -p1 -b .chromium-ffmpeg-no-pkgconfig
%patch1 -p1 -b .armbuild
-%patch2 -p1 -b .close-download-icon-after-installed
+#%patch2 -p1 -b .close-download-icon-after-installed
%patch3 -p1 -b .libvpx
%patch5 -p1 -b .chromium-system-ffmpeg
%patch6 -p1 -b .chromium-20100319-default-browser-setting
%patch7 -p1 -b .ffmpeg_glue
%patch8 -p1 -b .build_database_error
-%patch9 -p1 -b .disable_Xinerama
-%patch10 -p1 -b .ntlmsso
-%patch11 -p1 -b .nssdb
-%patch12 -p1 -b .fixsslproceedbutton
-%patch13 -p1 -b .fullscreenbubble
+#%patch9 -p1 -b .disable_Xinerama
+#%patch10 -p1 -b .ntlmsso
+#%patch11 -p1 -b .nssdb
+#%patch12 -p1 -b .fixsslproceedbutton
+#%patch13 -p1 -b .fullscreenbubble
pushd third_party/ffmpeg/
tar xf %{SOURCE5}
other changes:
--------------
++++++ chromium-13.0.752.0.tar.bz2 -> chromium-15.0.854.0.tar.bz2
6184534 lines of diff (skipped)
++++++ chromium-ffmpeg-no-pkgconfig.patch
--- chromium-ffmpeg-no-pkgconfig.patch
+++ chromium-ffmpeg-no-pkgconfig.patch
@@ -11,14 +11,14 @@
- ],
+ 'include_dirs': [
+ 'config',
-+ 'ffmpeg-20101210svn25926-headers',
++ 'ffmpeg-0.6-headers',
+ ],
'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+ 'include_dirs': [
+ 'config',
-+ 'ffmpeg-20101210svn25926-headers',
++ 'ffmpeg-0.6-headers',
],
},
}, { # else use_system_ffmpeg==0, add local copy to include path
++++++ ffmpeg-0.6-headers.tar.bz2 (new)
++++++ ffmpeg_glue.patch
--- ffmpeg_glue.patch
+++ ffmpeg_glue.patch
@@ -1,8 +1,6 @@
-diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
-index 625aaf5..f011187 100644
---- a/media/filters/ffmpeg_glue.cc
-+++ b/media/filters/ffmpeg_glue.cc
-@@ -10,81 +10,7 @@
+--- chromium-15.0.848.0/media/filters/ffmpeg_glue.cc 2011-08-11 17:51:05.000000000 +0800
++++ chromium-15.0.848.0/media/filters/ffmpeg_glue.cc.new 2011-08-17 14:23:20.749766005 +0800
+@@ -11,82 +11,6 @@
namespace media {
@@ -15,19 +13,19 @@
- FFmpegURLProtocol* protocol;
- FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
- if (!protocol)
-- return AVERROR_IO;
+- return AVERROR(EIO);
-
- h->priv_data = protocol;
- h->flags = URL_RDONLY;
- h->is_streamed = protocol->IsStreaming();
- return 0;
-}
-
+-
-static int ReadContext(URLContext* h, unsigned char* buf, int size) {
- FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
- int result = protocol->Read(size, buf);
- if (result < 0)
-- result = AVERROR_IO;
+- result = AVERROR(EIO);
- return result;
-}
-
@@ -37,12 +35,12 @@
-static int WriteContext(URLContext* h, unsigned char* buf, int size) {
-#endif
- // We don't support writing.
-- return AVERROR_IO;
+- return AVERROR(EIO);
-}
-
-static int64 SeekContext(URLContext* h, int64 offset, int whence) {
- FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
-- int64 new_offset = AVERROR_IO;
+- int64 new_offset = AVERROR(EIO);
- switch (whence) {
- case SEEK_SET:
- if (protocol->SetPosition(offset))
@@ -73,7 +71,7 @@
- NOTREACHED();
- }
- if (new_offset < 0)
-- new_offset = AVERROR_IO;
+- new_offset = AVERROR(EIO);
- return new_offset;
-}
-
@@ -81,6 +79,7 @@
- h->priv_data = NULL;
- return 0;
-}
-
+-
static int LockManagerOperation(void** lock, enum AVLockOp op) {
switch (op) {
+ case AV_LOCK_CREATE:
++++++ libvpx.patch
--- libvpx.patch
+++ libvpx.patch
@@ -1,12 +1,11 @@
-diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
-index f1b2ec3..ee7fd63 100644
---- a/remoting/remoting.gyp
-+++ b/remoting/remoting.gyp
-@@ -117,6 +117,7 @@
- '../media/media.gyp:media',
+--- chromium-15.0.854.0/remoting/remoting.gyp 2011-08-17 17:41:06.000000000 +0800
++++ chromium-15.0.854.0/remoting/remoting.gyp.new 2011-09-01 15:21:05.278426003 +0800
+@@ -285,6 +285,8 @@
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
- '../third_party/libvpx/libvpx.gyp:libvpx_include',
-+ '../third_party/libvpx/libvpx.gyp:libvpx_lib',
++ '../third_party/libvpx/libvpx.gyp:libvpx_include',
++ '../third_party/libvpx/libvpx.gyp:libvpx_lib',
'../third_party/zlib/zlib.gyp:zlib',
- 'chromoting_jingle_glue',
- 'proto/chromotocol.gyp:chromotocol_proto_lib',
+ '../media/media.gyp:yuv_convert',
+ 'remoting_jingle_glue',
++++++ deleted files:
--- ffmpeg-20101210svn25926-headers.tar.bz2
More information about the MeeGo-commits
mailing list