Переглянути джерело

updated chromium16-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5378 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 роки тому
батько
коміт
f530a68a81
1 змінених файлів з 24 додано та 9 видалено
  1. 24 9
      c/chromium/chromium16-vl.spec

+ 24 - 9
c/chromium/chromium16-vl.spec

@@ -14,12 +14,12 @@
 
 %global chrome_sandbox %{_prefix}/lib/chrome_sandbox
 
-#Name:           chromium15
+#Name:           chromium16
 Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        16.0.912.57
+Version:        16.0.912.75
 Release:        1%{?_dist_release}
 License:        BSD
 Group:          Applications/Internet
@@ -29,7 +29,8 @@ Source0:        %{pkgname}-%{version}.tar.xz
 # http://gsdview.appspot.com/chromium-browser-official/chromium-16.0.910.XXX.tar.bz2
 Source3:        pack_chromium16_source-vine.sh
 # Official ffmpeg headers
-Source8:        ffmpeg-0.6-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
@@ -58,7 +59,7 @@ Conflicts:      chromium-unstable
 ## Start Patches
 # OpenSuse and Fedora
 # Many changes to the gyp systems so we can use system libraries
-#Patch1:         chromium-gcc46.patch
+Patch1:         chromium-gcc46.patch
 Patch4:         chromium-no-sqlite-debug.patch
 Patch8:         chromium-codechanges-zlib.patch
 #Patch12:        chromium-no-test-sources.patch
@@ -67,7 +68,9 @@ 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-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
 Patch25:        tcmalloc-factory.patch
 Patch26:        chromium-remoting-build-fix.diff
@@ -187,7 +190,9 @@ Chromium は Google Chrome の後方にあるオープンソースプロジェ
 xz -dc %{SOURCE0} | %__tar -xf - || exit 1
 %setup -D -T -n %{pkgname}-%{version}
 
-#%patch1 -p1
+%if %{?_dist_release} == "vl7"
+%patch1 -p1
+%endif
 %patch62 -p1
 %{?with_system_v8:%patch63 -p1}
 #%patch100 -p1 -b .vine
@@ -212,12 +217,13 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
 pushd src/third_party/ffmpeg/
 %__tar xf %{SOURCE8} || exit 1
 ## built header file: avconfig.h
-[ -f ffmpeg-0.6-headers/libavutil/avconfig.h ] && exit 1
-cat > ffmpeg-0.6-headers/libavutil/avconfig.h <<EOF
+[ -f ffmpeg-0.9-headers/libavutil/avconfig.h ] && exit 1
+cat > ffmpeg-0.9-headers/libavutil/avconfig.h <<EOF
 /* Generated by ffconf */
 #ifndef AVUTIL_AVCONFIG_H
 #define AVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1
 #endif /* AVUTIL_AVCONFIG_H */
 EOF
 popd
@@ -283,7 +289,7 @@ pushd src
     %endif
     -Dno_strict_aliasing=1 \
     -Drelease_extra_cflags=-fPIC \
-    %if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
+    %if %{?_dist_release} == "vl6"
         -Dgcc_version=44 \
     %endif
     ;
@@ -408,6 +414,15 @@ fi || :
 %attr(4755,root,root) %{chrome_sandbox}
 
 %changelog
+* Sun Jan  8 2012 Munehiro Yamamoto <munepi@vinelinux.org> 16.0.912.75-1
+- updated to 16.0.912.75
+
+* Fri Dec 30 2011 Munehiro Yamamoto <munepi@vinelinux.org> 16.0.912.63-1
+- updated to 16.0.912.63
+
+* Thu Dec  1 2011 Munehiro Yamamoto <munepi@vinelinux.org> 16.0.912.57-1
+- updated to 16.0.912.57
+
 * Sat Oct 29 2011 Munehiro Yamamoto <munepi@vinelinux.org> 15.0.874.116-1
 - updated to 15.0.874.116