updated chromium-vl.spec, v8-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2277 ec354946-7b23-47d6-9f5a-488ba84defc7

c/chromium/chromium-vl.spec

@@ -8,15 +8,15 @@
 %define with_system_icu 1
 %endif
 
-%define svn_rev 62756
-%define v8_ver 2.4.9
+%define svn_rev 67715
+%define v8_ver 2.5.9
 
 Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        8.0.556.0
-Release:        2%{?_dist_release}
+Version:        9.0.598.0
+Release:        1%{?_dist_release}
 License:        BSD
 Group:          Applications/Internet
 Source0:        %{name}.%{version}.svn%{svn_rev}.tar.lzma
@@ -27,11 +27,14 @@ Source1:        http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
 Source2:        repack_chromium_archive.sh
 # Script used to create the tar.lzma archive from a checked out source
 Source3:        pack_chromium_source.sh
+# Official ffmpeg headers
+Source8:        ffmpeg-0.6-headers.tar.bz2
 #Source10:       chromium.desktop
 #Source10:       chromium-vine.desktop
 # Patch template which adds vendor to user agent
 ##!!Source20:       chromium-vendor.patch.in
 Source20:       chromium-vendor-vine.patch.in
+# Set default prefs
 ##!!Source30:       master_preferences
 Source30:       master_preferences.vine
 #Source31:       default_bookmarks.html
@@ -55,7 +58,7 @@ Provides:       chromium-browser = %{version}
 ##Obsoletes:      chromium-browser < %{version}
 
 ## Start Patches
-# Many changes to the gyp system so we can use system libraries
+# Many changes to the gyp systems so we can use system libraries
 # My first ever patch set.  I hope I did well.
 Patch3:         chromium-gyp-system-icu.patch
 Patch4:         chromium-no-sqlite-debug.patch
@@ -64,17 +67,25 @@ Patch7:         chromium-codechanges-nss-nspr.patch
 Patch8:         chromium-codechanges-zlib.patch
 Patch12:        chromium-no-test-sources.patch
 Patch13:        chromium-no-courgette.patch
-Patch14:	chromium-master-prefs-path.patch
+Patch14:        chromium-master-prefs-path.patch
 Patch17:        chromium-system-glew.patch
 Patch18:        chromium-system-expat.patch
 Patch19:        chromium-system-zlib.patch
-Patch20:        chromium-noffmpeg.patch
-Patch21:        chromium-system-old-ffmpeg-way.patch
+Patch20:        chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
+Patch21:        chromium-7.0.542.0-media-probe.patch
 Patch23:        chromium-disable-mmx.patch
 Patch25:        tcmalloc-factory.patch
 Patch26:        chromium-remoting-build-fix.diff
+#Patch27:        chromium-7.0.542.0-system-libjingle.patch
+Patch28:        chromium-7.0.500.0-system-speex.patch
+Patch29:        chromium-7.0.510.0-system-ffmpeg.patch
+Patch30:        chromium-7.0.510.0-fstat.patch
+#Patch31:        chromium-7.0.542.0-system-srtp.patch
+Patch32:        chromium-7.0.542.0-system-libvpx.patch
+#Patch33:        chromium-20090807-gyp-system-minizip.patch
+Patch34:        chromium-7.0.542.0-codechanges-system-minizip-v8.patch
 # Shared Library patches
-Patch60:	chromium-sharedlibfixes.patch
+Patch60:        chromium-sharedlibfixes.patch
 Patch61:        chromium-shared-chromiumthreading.patch
 Patch62:        chromium-norpath.patch
 Patch63:        chromium-6.0.406.0-system-gyp-v8.patch
@@ -145,10 +156,14 @@ BuildRequires:  mesa-libGLU-devel
 
 %{?with_system_icu:BuildRequires:  libicu-devel >= 4.0}
 BuildRequires:  libevent-devel
+#BuildRequires:  libjingle-devel >= 0.4.0-7
+#BuildRequires:  srtp-devel
+BuildRequires:  speex-devel
 
 ##Vine Linux
 Requires:       v8 = %{v8_ver}
 BuildRequires:  libXScrnSaver-devel
+BuildRequires:  libXtst-devel
 #BuildRequires:  gle-devel
 #BuildRequires:  webkit-gtk-devel
 #BuildRequires:  scons
@@ -158,13 +173,11 @@ Requires:  nspluginwrapper
 
 ##!!Requires:       alsa
 Requires:       alsa-lib
+Requires:       xdg-utils
 # shouldn't be required to name all dependencies
 # Requires:       mozilla-nss mozilla-nspr gtk2 glib2 cairo >= 1.6 freetype2 dbus-1 alsa v8 >= 1.3.15
-## Recommends the ffmpeg libraries (available from packman)
-#Recommends:     libavcodec52 libavformat52 libavutil50
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-ExclusiveArch:	%{ix86} x86_64
 
 %description
 Chromium is the open-source project behind Google Chrome. 
@@ -177,7 +190,7 @@ web applications.
 Chromium は Google Chrome の後方にあるオープンソースプロジェクトです。
 私たちは、ウェブを体験しているすべてのインターネットユーザに対して
 より安全で、より速くて、より安定した方法を築き上げるのを助けるために、
-ウェブアプリケーションの新しい世代を発展させるように
+そして、ウェブアプリケーションの新しい世代を発展させるように
 強力なプラットホームを作成するために、
 私たちの取り組みで私たちに加わるようにあなたを誘います。
 
@@ -234,7 +247,20 @@ cd - || exit 1
 %patch23 -p1
 %endif
 %patch26 -p1
+#%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+#%patch31 -p1
+%patch32 -p1
+#%patch33 -p1 
+%patch34 -p1
+
+pushd src/third_party/ffmpeg/
+tar xf %{SOURCE8}
+popd
 
+%__rm -rf src/third_party/libvpx/ src/third_party/speex/
 
 # apply vendor patch after substitution
 %__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
@@ -271,6 +297,7 @@ pushd src
     -Duse_system_vpx=1 \
     -Dproprietary_codecs=1 \
     -Dlibrary=shared_library \
+    -Djavascript_engine=v8 \
     -Dlinux_fpic=1 \
     %{?with_system_icu:-Duse_system_icu=1} \
     %{!?with_system_icu:-Duse_system_icu=0} \
@@ -289,7 +316,7 @@ pushd src
 
 #make -r %{?jobs:-j%jobs} chrome BUILDTYPE=Release
 #%__make -r -j5 chrome BUILDTYPE=Release
-%__make %{?_smp_mflags} chrome BUILDTYPE=Release
+%__make -r %{?_smp_mflags} chrome BUILDTYPE=Release
 
 popd
 
@@ -339,13 +366,13 @@ fdupes %{buildroot}%{_libdir}/chromium/include
 %endif
 
 %__mkdir_p %{buildroot}/%{_libdir}/pkgconfig
-cat <<! > %{buildroot}/%{_libdir}/pkgconfig/chromium-browser.pc
+cat <<EOF > %{buildroot}/%{_libdir}/pkgconfig/chromium-browser.pc
 Name: Chromium browser
 Description: Chromium browser development package
 Version: 1.0.1
-Libs: -L%{_libdir}/chromium -lapp_base -lappcache -lbase_i18n -lbase -lblob -lbrowser -lcacheinvalidation -lchrome_gpu -lchromoting_base -lchromoting_client -lchromoting_host -lchromoting_jingle_glue -lchromotocol_proto_lib -lcld -lcommon_constants -lcommon_net -lcommon -ldatabase -ldebugger -ldefault_plugin -ldynamic_annotations -lffmpeg -lfileapi -lgfx -lglue -lgoogleurl -lgtest -lharfbuzz_interface -lharfbuzz -lhttp_listen_socket -lhunspell -lil -linstaller_util -lipc -ljingle_p2p -ljingle -lmedia -lmodp_b64 -lnet_base -lnet -lnotifier -lomx_wrapper -lots -lpcre -lplugin -lprinting -lprofile_import -lprotobuf_lite -lprotobuf -lrenderer -lsandbox -lsdch -lservice -lskia_opts -lskia -lspeex -lsqlite3 -lsrtp -lssl -lsymbolize -lsyncapi -lsync_notifier -lsync -ltrace_proto_lib -lutility -lwebcore_bindings -lwebcore_platform -lwebcore_remaining -lwebcore_svg -lwebkit_user_agent -lworker -lwtf -lxdg_mime -lzlib
+Libs: -L%{_libdir}/chromium -lapp_base -lappcache -lbase_i18n -lbase -lblob -lbrowser -lcacheinvalidation -lchrome_gpu -lchromoting_base -lchromoting_client -lchromoting_host -lchromoting_jingle_glue -lchromoting_protocol -lchromotocol_proto_lib -lcld -lcommon_constants -lcommon_net -lcommon -ldatabase -ldebugger -ldefault_plugin -ldynamic_annotations -lffmpeg -lfileapi -lgfx -lglue -lgoogleurl -lgtest -lharfbuzz_interface -lharfbuzz -lhttp_listen_socket -lhunspell -liccjpeg -lil -linstaller_util -lipc -ljingle_p2p -ljingle -lmedia -lmodp_b64 -lnet_base -lnet -lnotifier -lomx_wrapper -lots -lpcre -lppapi_plugin -lplugin -lprinting -lprofile_import -lprotobuf_lite -lrenderer -lsandbox -lsdch -lservice -lskia_opts -lskia -lsqlite3 -lsrtp -lssl_host_info -lssl -lsymbolize -lsyncapi -lsync_notifier -lsync -ltrace_proto_lib -lundoview -lutility -lwebcore_bindings -lwebcore_html -lwebcore_platform -lwebcore_remaining -lwebcore_svg -lwebkit -lwebkit_user_agent -lwebp -lworker -lwtf -lxdg_mime -lzlib 
 Cflags: -I%{_libdir}/chromium/include -I%{_libdir}/chromium/include/skia/config
-!
+EOF
 
 %__mkdir_p %{buildroot}%{_datadir}/pixmaps/
 %__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
@@ -390,8 +417,8 @@ popd
 %files
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/%{name}
-%dir /usr/share/gnome-control-center
-%dir /usr/share/gnome-control-center/default-apps
+%dir %{_datadir}/gnome-control-center
+%dir %{_datadir}/gnome-control-center/default-apps
 %{_bindir}/chromium
 %{_libdir}/chromium/chromium
 # These unique permissions are intentional and necessary for the sandboxing
@@ -419,12 +446,30 @@ popd
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/chromium/include/
-%_libdir/pkgconfig/chromium-browser.pc
+%{_libdir}/pkgconfig/chromium-browser.pc
 
 %changelog
-* Sun Nov 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 8.0.556.0-2
-- rebuilt
-- added ExclusiveArch: %%{ix86} x86_64
+* Sat Dec 04 2010 Munehiro Yamamoto <munepi@vinelinux.org> 9.0.598.0-1
+- updated to 9.0.598
+
+* Fri Nov 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 9.0.593.0-1
+- updated to 9.0.593
+
+* Thu Nov 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> 9.0.582.0-1
+- updated to 9.0.582
+- added Requires: xdg-utils
+
+* Thu Nov 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> 9.0.578.0-1
+- updated to 9.0.578
+
+* Sat Oct 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 9.0.569.0-1
+- updated to 9.0.569
+
+  * Mon Oct 25 2010 tittiatcoke@gmail.com
+  - Update to 9.0.564 build
+    * Added specific patches for MeeGo.
+    * We are now using shared libraries for Chromium
+    * Spec-file cleanup (Thanks to prusnak)
 
 * Sat Oct 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 8.0.556.0-1
 - updated to snapshot 8.0.556

v/v8/v8-snapshot.sh

@@ -16,7 +16,8 @@ pwd=$(pwd)
 dirname=v8
 
 cd "$tmp"
-svn checkout http://v8.googlecode.com/svn/trunk/ $dirname
+#svn checkout http://v8.googlecode.com/svn/trunk $dirname
+svn checkout -r 5896 http://v8.googlecode.com/svn/trunk $dirname
 cd $dirname
 MAJOR_VERSION=$(grep "#define MAJOR_VERSION" src/version.cc | sed -e "s/#define MAJOR_VERSION[[:blank:]]*//" -e "s/[[:blank:]]*$//")
 MINOR_VERSION=$(grep "#define MINOR_VERSION" src/version.cc | sed -e "s/#define MINOR_VERSION[[:blank:]]*//" -e "s/[[:blank:]]*$//")

v/v8/v8-vl.spec

@@ -1,28 +1,24 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-# For the 1.2 branch, we use 0s here
-# For 1.3+, we use the three digit versions
 %global somajor 2
-%global sominor 4
+%global sominor 5
 %global sobuild 9
 %global sover %{somajor}.%{sominor}.%{sobuild}
 
-%define svnrevision 5631
+%define svnrevision 5896
 
 Name:		v8
 Version:	%{sover}
 Release:	1%{?svnrevision:.svn%svnrevision}%{?_dist_release}
+Provides:	lib%{name} = %{version}-%{release}
 Summary:	JavaScript Engine
 Summary(ja):	JavaScript エンジン
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://code.google.com/p/v8
-# U=http://v8.googlecode.com/svn/trunk/
-# R=$(svn log $U |awk '/^r[0-9]* / {r=$1} /2\.4\.8/ {print r; exit}')
-# svn export -$R $U v8-2.4.8
-# tar cjf v8-2.4.8.tar.bz2 v8-2.4.8
 Source0:	%{name}-%{version}%{?svnrevision:.svn%svnrevision}.tar.bz2
 Source10:	v8-snapshot.sh
+Patch0:         v8-2.5.9-buildfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	%{ix86} x86_64 arm
@@ -46,6 +42,7 @@ V8 は ECMA-262 第 3 版で指定されている ECMAScript を満たしてい
 Group:		Development/Libraries
 Summary:	Development headers and libraries for v8
 Requires:	%{name} = %{version}-%{release}
+Provides:	lib%{name}-devel = %{version}-%{release}
 
 %description devel
 Development headers, libraries and tools for v8.
@@ -53,10 +50,11 @@ Development headers, libraries and tools for v8.
 
 %prep
 %setup -q
+%patch0 -p0 -b .orig
 
 # -fno-strict-aliasing is needed with gcc 4.4 to get past some ugly code
-PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -Wno-unused-parameter\'| %__sed "s/ /',/g" | %__sed "s/',/', '/g"`
-%__sed -i "s|'-O3',|$PARSED_OPT_FLAGS,|g" SConstruct
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS \' | %__sed "s/ /',/g" | %__sed "s/',/', '/g"`
+%__sed -i "s|'-O3',|$PARSED_OPT_FLAGS '-fno-strict-aliasing',|g" SConstruct
 
 
 %build
@@ -65,42 +63,48 @@ export GCC_VERSION="44"
 %endif
 scons library=shared snapshots=on %{_smp_mflags} \
 %ifarch x86_64
-	arch=x64 \
+    arch=x64 \
 %endif
-	visibility=default \
-	env=CCFLAGS:"-fPIC"
+    visibility=default \
+    env=CCFLAGS:"-fPIC"
 
 # When will people learn to create versioned shared libraries by default?
 # first, lets get rid of the old .so
-%__rm -rf libv8.so
+%__rm -f libv8.so
 # Now, lets make it right.
-%ifarch arm
-g++ $RPM_OPT_FLAGS -fPIC -o libv8.so.%{sover} -shared -Wl,-soname,libv8.so.%{somajor} obj/release/*.os obj/release/arm/*.os
-%endif
-%ifarch %{ix86}
-g++ $RPM_OPT_FLAGS -fPIC -o libv8.so.%{sover} -shared -Wl,-soname,libv8.so.%{somajor} obj/release/*.os obj/release/ia32/*.os
-%endif
-%ifarch x86_64
-g++ $RPM_OPT_FLAGS -fPIC -o libv8.so.%{sover} -shared -Wl,-soname,libv8.so.%{somajor} obj/release/*.os obj/release/x64/*.os
-%endif
-
+%__cxx $RPM_OPT_FLAGS -fPIC -o libv8.so.%{sover} -shared \
+    -Wl,-soname,libv8.so.%{somajor} \
+        obj/release/*.os \
+        obj/release/extensions/*.os \
+    %ifarch arm
+        obj/release/arm/*.os \
+    %endif
+    %ifarch %{ix86}
+        obj/release/ia32/*.os \
+    %endif
+    %ifarch x86_64
+        obj/release/x64/*.os \
+    %endif
+	;
 # We need to do this so d8 can link against it.
 %__ln_s -f libv8.so.%{sover} libv8.so
 
 scons d8 %{_smp_mflags} \
 %ifarch x86_64
-	arch=x64 \
+    arch=x64 \
 %endif
-	library=shared snapshots=on console=readline visibility=default
+    library=shared snapshots=on console=readline visibility=default
 
 # Ahem
-%__rm -rf d8
+%__rm -f d8
 
-g++ $RPM_OPT_FLAGS -o d8 obj/release/d8-debug.os obj/release/d8-posix.os obj/release/d8-readline.os obj/release/d8.os obj/release/d8-js.os -lpthread -lreadline -lpthread -L. -lv8
+%__cxx $RPM_OPT_FLAGS -o d8 obj/release/d8-debug.os obj/release/d8-posix.os obj/release/d8-readline.os obj/release/d8.os obj/release/d8-js.os -lpthread -lreadline -lpthread -L. -lv8
 
 
 %install
 %__rm -rf %{buildroot}
+
+[ -f libv8.so ] && [ ! -f libv8.so.%{sover} ] && %__mv libv8.so libv8.so.%{sover}
 %__mkdir_p %{buildroot}%{_includedir}
 %__mkdir_p %{buildroot}%{_libdir}
 %__install -p include/*.h %{buildroot}%{_includedir}
@@ -120,6 +124,9 @@ cd %{buildroot}%{_libdir}
 %__chmod -x %{buildroot}%{_includedir}/v8*.h
 
 
+# %check
+# tools/test.py --no-build -p dots --shell d8
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -143,6 +150,18 @@ cd %{buildroot}%{_libdir}
 
 
 %changelog
+* Sat Dec 04 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 2.5.9-1.svn5896
+- source 2.5.9 rev.5896
+
+* Fri Nov 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 2.5.8-1.svn5891
+- source 2.5.8 rev.5891
+
+* Thu Nov 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 2.5.6-1.svn5808
+- source 2.5.6 rev.5808
+
+* Sun Oct 31 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 2.5.2-1.svn5743
+- source 2.5.2 rev.5743
+
 * Sat Oct 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 2.4.9-1.svn5631
 - source 2.4.9 rev.5631