Author: glen Date: Thu Dec 2 08:09:49 2010 GMT Module: packages Tag: HEAD ---- Log message: - add system vpx patch from gentoo (chromium-system-vpx-r1.patch) - up to 9.0.600.0 (r67949)
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.88 -> 1.89) , chromium-system-vpx.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.88 packages/chromium-browser/chromium-browser.spec:1.89 --- packages/chromium-browser/chromium-browser.spec:1.88 Thu Nov 18 12:30:21 2010 +++ packages/chromium-browser/chromium-browser.spec Thu Dec 2 09:09:44 2010 @@ -22,18 +22,18 @@ # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites # - to look for new tarball, use update-source.sh script -%define svndate 20101118 -%define svnver 66583 +%define svndate 20101202 +%define svnver 67949 %define rel 1 Summary: A WebKit powered web browser Name: chromium-browser -Version: 9.0.589.0 +Version: 9.0.600.0 Release: %{svnver}.%{rel} License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz -# Source0-md5: 79d79b56c6ae014477ef803c9e5c7a4e +# Source0-md5: 44c92370a2e47f76ca56eaf94f4ef573 Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh @@ -46,6 +46,7 @@ Patch4: search-workaround.patch Patch5: options-support.patch Patch6: gcc45.patch +Patch7: chromium-system-vpx.patch URL: http://code.google.com/chromium/ BuildRequires: GConf2-devel BuildRequires: OpenGL-GLU-devel @@ -167,6 +168,9 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +cd src +%patch7 -p0 +cd .. # drop bundled libs, from gentoo remove_bundled_lib() { @@ -314,6 +318,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.89 2010/12/02 08:09:44 glen +- add system vpx patch from gentoo (chromium-system-vpx-r1.patch) +- up to 9.0.600.0 (r67949) + Revision 1.88 2010/11/18 11:30:21 glen - depend on xdg-utils chromium expects @@ -388,7 +396,8 @@ - BR: libgnome-keyring-devel Revision 1.65 2010/06/13 07:47:01 arekm -- up to 6.0.434.0~svn20100613r49638; remove bundled libraries (we use system one) in case when some haders are used from bundled libs +- up to 6.0.434.0~svn20100613r49638; remove bundled libraries (we use system + one) in case when some headers are used from bundled libs Revision 1.64 2010/06/10 19:42:38 arekm - up to 6.0.431.0-49356 ================================================================ Index: packages/chromium-browser/chromium-system-vpx.patch diff -u /dev/null packages/chromium-browser/chromium-system-vpx.patch:1.1 --- /dev/null Thu Dec 2 09:09:49 2010 +++ packages/chromium-browser/chromium-system-vpx.patch Thu Dec 2 09:09:44 2010 @@ -0,0 +1,64 @@ +--- remoting/base/encoder_vp8.cc.orig 2010-11-10 09:52:56.000000000 +0100 ++++ remoting/base/encoder_vp8.cc 2010-11-10 09:53:32.000000000 +0100 +@@ -11,9 +11,9 @@ + + extern "C" { + #define VPX_CODEC_DISABLE_COMPAT 1 +-#include "third_party/libvpx/include/vpx/vpx_codec.h" +-#include "third_party/libvpx/include/vpx/vpx_encoder.h" +-#include "third_party/libvpx/include/vpx/vp8cx.h" ++#include "vpx/vpx_codec.h" ++#include "vpx/vpx_encoder.h" ++#include "vpx/vp8cx.h" + } + + namespace remoting { +--- remoting/base/decoder_vp8.cc.orig 2010-11-10 09:54:14.000000000 +0100 ++++ remoting/base/decoder_vp8.cc 2010-11-10 09:54:37.000000000 +0100 +@@ -10,9 +10,9 @@ + + extern "C" { + #define VPX_CODEC_DISABLE_COMPAT 1 +-#include "third_party/libvpx/include/vpx/vpx_codec.h" +-#include "third_party/libvpx/include/vpx/vpx_decoder.h" +-#include "third_party/libvpx/include/vpx/vp8dx.h" ++#include "vpx/vpx_codec.h" ++#include "vpx/vpx_decoder.h" ++#include "vpx/vp8dx.h" + } + + namespace remoting { +--- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig 2010-11-10 09:55:43.000000000 +0100 ++++ third_party/ffmpeg/ffmpeg_stub_headers.fragment 2010-11-10 09:56:09.000000000 +0100 +@@ -7,9 +7,9 @@ + #include <libavformat/avformat.h> + + #define VPX_CODEC_DISABLE_COMPAT 1 +-#include "third_party/libvpx/include/vpx/vpx_codec.h" +-#include "third_party/libvpx/include/vpx/vpx_encoder.h" +-#include "third_party/libvpx/include/vpx/vpx_decoder.h" ++#include "vpx/vpx_codec.h" ++#include "vpx/vpx_encoder.h" ++#include "vpx/vpx_decoder.h" + + typedef int (*AVLockMgrOperation)(void**, enum AVLockOp); + +--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-11-19 10:32:50.000000000 +0000 ++++ third_party/ffmpeg/ffmpeg.gyp 2010-11-19 10:36:33.000000000 +0000 +@@ -898,6 +898,16 @@ + }, + }], + ++ ['use_system_vpx!=0', { ++ 'direct_dependent_settings': { ++ 'link_settings': { ++ 'libraries': [ ++ '-lvpx', ++ ], ++ }, ++ }, ++ }], ++ + # Add pkg-config result to include path when use_system_ffmpeg!=0 + ['use_system_ffmpeg!=0', { + 'cflags': [ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.88&r2=1.89&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
