|
|
@@ -4,33 +4,47 @@
|
|
|
|
|
|
%define pkgname chromium
|
|
|
|
|
|
+#% define with_system_jpeg 1
|
|
|
+
|
|
|
#% define with_system_icu 1
|
|
|
#% define with_system_v8 1
|
|
|
+%define with_system_vpx 1
|
|
|
|
|
|
#NOTE: src/third_party/ffmpeg/ffmpeg.gyp:
|
|
|
-# libvpx doesn't currently supply a pkg-config file, so we assume that
|
|
|
-# -lvpx is sufficient.
|
|
|
-%define with_system_vpx 1
|
|
|
+# There's a couple key GYP variables that control how FFmpeg is built:
|
|
|
+# ffmpeg_branding
|
|
|
+# Controls whether we build the Chromium or Google Chrome version of
|
|
|
+# FFmpeg. The Google Chrome version contains additional codecs.
|
|
|
+# Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
|
|
|
+# use_system_ffmpeg
|
|
|
+# When set to non-zero will build Chromium against the system FFmpeg
|
|
|
+# headers via pkg-config. When Chromium is launched it will assume that
|
|
|
+# FFmpeg is present in the system library path. Default value is 0.
|
|
|
+# build_ffmpegsumo
|
|
|
+# When set to zero will build Chromium against the patched ffmpegsumo
|
|
|
+# headers, but not build ffmpegsumo itself. Users are expected to build
|
|
|
+# and provide their own version of ffmpegsumo. Default value is 1.
|
|
|
+%define with_system_ffmpeg 1
|
|
|
|
|
|
%global chrome_sandbox %{_prefix}/lib/chrome_sandbox
|
|
|
|
|
|
-#Name: chromium16
|
|
|
+#Name: chromium17
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 16.0.912.75
|
|
|
+Version: 17.0.963.54
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
Source0: %{pkgname}-%{version}.tar.xz
|
|
|
# Script used to create the %{pkgname}-%{version}.tar.xz archive from
|
|
|
# a official tarball:
|
|
|
-# http://gsdview.appspot.com/chromium-browser-official/chromium-16.0.910.XXX.tar.bz2
|
|
|
-Source3: pack_chromium16_source-vine.sh
|
|
|
+# http://gsdview.appspot.com/chromium-browser-official/chromium-17.0.963.XXX.tar.bz2
|
|
|
+Source3: pack_chromium17_source-vine.sh
|
|
|
# Official ffmpeg headers
|
|
|
-#Source8: ffmpeg-0.6-headers.tar.xz
|
|
|
-Source8: ffmpeg-0.9-headers.tar.xz
|
|
|
+Source8: ffmpeg-0.6-headers.tar.xz
|
|
|
+#Source8: ffmpeg-0.9-headers.tar.xz
|
|
|
# Patch template which adds vendor to user agent
|
|
|
##!!Source20: chromium-vendor.patch.in
|
|
|
Source20: chromium-vendor-vine.patch.in
|
|
|
@@ -62,24 +76,18 @@ Conflicts: chromium-unstable
|
|
|
Patch1: chromium-gcc46.patch
|
|
|
Patch4: chromium-no-sqlite-debug.patch
|
|
|
Patch8: chromium-codechanges-zlib.patch
|
|
|
-#Patch12: chromium-no-test-sources.patch
|
|
|
Patch13: chromium-no-courgette.patch
|
|
|
Patch14: chromium-master-prefs-path.patch
|
|
|
Patch17: chromium-system-glew.patch
|
|
|
Patch18: chromium-system-expat.patch
|
|
|
-#Patch19: chromium-system-zlib.patch
|
|
|
-#Patch20: chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
|
|
|
-#Patch20: chromium-16.0.912.63-ffmpeg-no-pkgconfig.patch
|
|
|
-Patch20: chromium-16.0.912.63-ffmpeg-0.9-no-pkgconfig.patch
|
|
|
-Patch21: chromium-7.0.542.0-media-probe.patch
|
|
|
+Patch20: chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
|
|
|
Patch25: tcmalloc-factory.patch
|
|
|
Patch26: chromium-remoting-build-fix.diff
|
|
|
Patch28: chromium-7.0.500.0-system-speex.patch
|
|
|
-#Patch29: chromium-7.0.510.0-system-ffmpeg.patch
|
|
|
Patch32: chromium-7.0.542.0-system-libvpx.patch
|
|
|
-#Patch34: chromium-7.0.542.0-codechanges-system-minizip-v8.patch
|
|
|
Patch62: chromium-norpath.patch
|
|
|
Patch63: chromium-6.0.406.0-system-gyp-v8.patch
|
|
|
+Patch64: chromium-more-codec-aliases.patch
|
|
|
|
|
|
# Vine
|
|
|
#Patch100: chromium-15.0.874.116-no-tests.patch
|
|
|
@@ -106,7 +114,7 @@ BuildRequires: libevent
|
|
|
BuildRequires: expat-devel
|
|
|
##!!BuildRequires: libgnutls-devel
|
|
|
BuildRequires: gnutls-devel
|
|
|
-BuildRequires: libjpeg-devel
|
|
|
+%{?with_system_jpeg:BuildRequires: libjpeg-devel}
|
|
|
BuildRequires: libpng-devel
|
|
|
BuildRequires: libstdc++-devel >= 4.4
|
|
|
%{?with_system_vpx:BuildRequires: libvpx-devel >= 0.9.5}
|
|
|
@@ -195,30 +203,26 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
|
|
|
%endif
|
|
|
%patch62 -p1
|
|
|
%{?with_system_v8:%patch63 -p1}
|
|
|
+%patch64
|
|
|
#%patch100 -p1 -b .vine
|
|
|
%patch8 -p1
|
|
|
-#%patch12 -p1
|
|
|
%patch13 -p1
|
|
|
%patch14 -p1
|
|
|
%patch17 -p1
|
|
|
%patch18 -p1
|
|
|
-#%patch19 -p1
|
|
|
%patch20 -p1
|
|
|
-%patch21 -p1
|
|
|
-%patch25 -p1
|
|
|
+#%patch25 -p1
|
|
|
%patch26 -p1
|
|
|
%patch28 -p1
|
|
|
-#%patch29 -p1
|
|
|
%{?with_system_vpx:%patch32 -p1}
|
|
|
-%{?with_system_v8:%patch34 -p1}
|
|
|
%patch4 -p1
|
|
|
|
|
|
|
|
|
pushd src/third_party/ffmpeg/
|
|
|
%__tar xf %{SOURCE8} || exit 1
|
|
|
## built header file: avconfig.h
|
|
|
-[ -f ffmpeg-0.9-headers/libavutil/avconfig.h ] && exit 1
|
|
|
-cat > ffmpeg-0.9-headers/libavutil/avconfig.h <<EOF
|
|
|
+[ -f ffmpeg-0.6-headers/libavutil/avconfig.h ] && exit 1
|
|
|
+cat > ffmpeg-0.6-headers/libavutil/avconfig.h <<EOF
|
|
|
/* Generated by ffconf */
|
|
|
#ifndef AVUTIL_AVCONFIG_H
|
|
|
#define AVUTIL_AVCONFIG_H
|
|
|
@@ -228,10 +232,6 @@ cat > ffmpeg-0.9-headers/libavutil/avconfig.h <<EOF
|
|
|
EOF
|
|
|
popd
|
|
|
|
|
|
-#%__rm -rf src/third_party/libvpx/
|
|
|
-%__rm -rf src/third_party/speex/
|
|
|
-%__rm -rf src/third_party/nss src/third_party/nspr
|
|
|
-
|
|
|
# apply vendor patch after substitution
|
|
|
%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
|
|
|
|
|
|
@@ -245,7 +245,9 @@ popd
|
|
|
PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-ipa-cp -fno-strict-aliasing \' | %__sed "s/ /',/g" | %__sed "s/',/', '/g"`
|
|
|
for i in src/build/common.gypi; do
|
|
|
%__sed -i "s|'-march=pentium4',||g" $i
|
|
|
+%ifnarch x86_64
|
|
|
%__sed -i "s|'-mfpmath=sse',||g" $i
|
|
|
+%endif
|
|
|
%__sed -i "s|'-O<(debug_optimize)',||g" $i
|
|
|
%__sed -i "s|'-m32',||g" $i
|
|
|
%__sed -i "s|'-fno-exceptions',|$PARSED_OPT_FLAGS|g" $i
|
|
|
@@ -259,12 +261,15 @@ pushd src
|
|
|
-Dlinux_sandbox_path=%{chrome_sandbox} \
|
|
|
-Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium \
|
|
|
-Duse_openssl=0 \
|
|
|
- -Duse_system_ffmpeg=1 \
|
|
|
+ %{?with_system_ffmpeg:-Duse_system_ffmpeg=1} \
|
|
|
+ %{!?with_system_ffmpeg:-Duse_system_ffmpeg=0} \
|
|
|
+ -Dbuild_ffmpegsumo=0 \
|
|
|
-Duse_system_zlib=1 \
|
|
|
-Duse_system_libpng=1 \
|
|
|
-Duse_system_bzip2=1 \
|
|
|
-Duse_system_libbz2=1 \
|
|
|
- -Duse_system_libjpeg=1 \
|
|
|
+ %{?with_system_jpeg:-Duse_system_libjpeg=1} \
|
|
|
+ %{!?with_system_jpeg:-Duse_system_libjpeg=0} \
|
|
|
-Duse_system_libxml=1 \
|
|
|
-Duse_system_libxslt=1 \
|
|
|
-Duse_system_libevent=1 \
|
|
|
@@ -280,11 +285,11 @@ pushd src
|
|
|
-Ddisable_nacl=1 \
|
|
|
-Djavascript_engine=v8 \
|
|
|
-Dlinux_fpic=1 \
|
|
|
- -Ddisable_sse2=1 \
|
|
|
%ifarch %{ix86}
|
|
|
-Dtarget_arch=ia32 \
|
|
|
%endif
|
|
|
%ifarch x86_64
|
|
|
+ -Ddisable_sse2=1 \
|
|
|
-Dtarget_arch=x64 \
|
|
|
%endif
|
|
|
-Dno_strict_aliasing=1 \
|
|
|
@@ -349,14 +354,6 @@ pushd %{buildroot}%{_libdir}/%{pkgname}
|
|
|
%else
|
|
|
%{__ln_s} %{_libdir}/mozilla/plugins plugins
|
|
|
%endif
|
|
|
-
|
|
|
-## support ffmpeg libs
|
|
|
-touch %{buildroot}%{_libdir}/libavcodec.so.52
|
|
|
-%{__ln_s} %{_libdir}/libavcodec.so.52 libavcodec.so.52
|
|
|
-touch %{buildroot}%{_libdir}/libavformat.so.52
|
|
|
-%{__ln_s} %{_libdir}/libavformat.so.52 libavformat.so.52
|
|
|
-touch %{buildroot}%{_libdir}/libavutil.so.50
|
|
|
-%{__ln_s} %{_libdir}/libavutil.so.50 libavutil.so.50
|
|
|
popd
|
|
|
|
|
|
# Install the master_preferences file
|
|
|
@@ -405,15 +402,18 @@ fi || :
|
|
|
%{_libdir}/chromium/resources.pak
|
|
|
%{_libdir}/chromium/locales/
|
|
|
%{?_with_shared_library:%{_libdir}/chromium/lib*.so}
|
|
|
-%{_libdir}/chromium/libavcodec.so.52
|
|
|
-%{_libdir}/chromium/libavutil.so.50
|
|
|
-%{_libdir}/chromium/libavformat.so.52
|
|
|
-%exclude %{_libdir}/libavcodec.so.52
|
|
|
-%exclude %{_libdir}/libavutil.so.50
|
|
|
-%exclude %{_libdir}/libavformat.so.52
|
|
|
%attr(4755,root,root) %{chrome_sandbox}
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Feb 12 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.54-1
|
|
|
+- updated to 17.0.963.54
|
|
|
+
|
|
|
+* Sat Feb 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.52-1
|
|
|
+- updated to 17.0.963.52
|
|
|
+
|
|
|
+* Sat Feb 4 2012 Munehiro Yamamoto <munepi@vinelinux.org> 16.0.912.77-1
|
|
|
+- updated to 16.0.912.77
|
|
|
+
|
|
|
* Sun Jan 8 2012 Munehiro Yamamoto <munepi@vinelinux.org> 16.0.912.75-1
|
|
|
- updated to 16.0.912.75
|
|
|
|
munepi