From: Paweł Hajdan Date: Fri, 9 Apr 2010 17:29:05 +0000 (+0000) Subject: Make ffmpeg support required, starting with the most recent versions. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9136030abd94ea87bbea4b7ad23dbc0f33eab6f;p=gentoo.git Make ffmpeg support required, starting with the most recent versions. Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index e57f6c8666b2..2efa7b48c91d 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.79 2010/04/09 13:32:54 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.80 2010/04/09 17:29:05 phajdan.jr Exp $ + + 09 Apr 2010; Pawel Hajdan jr + chromium-5.0.371.0.ebuild, chromium-9999.ebuild: + Make ffmpeg support required, starting with the most recent versions. *chromium-5.0.371.0 (09 Apr 2010) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d1aeba2d7d05..1f8f630e1fe1 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -14,8 +14,8 @@ EBUILD chromium-5.0.342.7.ebuild 6565 RMD160 c36ab88fb6211e01358dbda562d54350be8 EBUILD chromium-5.0.342.9.ebuild 6565 RMD160 7e4d556a9820abcdd46e0240d9116836b321bdcb SHA1 5e56e82d276b58298e76e015974aa2f888698c52 SHA256 7faab279b35573483cafc4ada425535f3f1552f53d3db20f306b9179e2a02b2e EBUILD chromium-5.0.360.5.ebuild 6565 RMD160 8bf565d0bacae19cd0e6ea407c81a888bc6f9aa5 SHA1 44484d9d2aba8f51a63a2f824b79fb2b9b83047f SHA256 646737d054efb4bf8793341c562afbf2181fc9a03d4d8ce34b2a3f65ddbb9e77 EBUILD chromium-5.0.366.2.ebuild 6534 RMD160 8bc649c153aeed1df97e6a814e336e97654d837f SHA1 11b9f35fc7f7dedbbb9673ed9717d1954dcb6397 SHA256 ecabef1f0c9c8cad45349caa9734b7b0fa96285c177c3f19772a63be9ddbebaf -EBUILD chromium-5.0.371.0.ebuild 6427 RMD160 56fbf6de35574709a8609ee10d611b41d3f8e54e SHA1 7ca6ea4bbf07bd8d847f3c9b90995279031ea777 SHA256 57f14e7140f47a35ff899dab5c9e282a583bc356478951b39679ba7135fc966a -EBUILD chromium-9999.ebuild 8180 RMD160 074ce38823cce3858bb4f3ed9edbcb618bfd1f02 SHA1 a03436417309d479574fbab8d4728e777a0f75c2 SHA256 7ddbdaa29a82e2e8660e19c3e63b128ac4396d7ebd33c4bdffffca930f915a34 -MISC ChangeLog 18218 RMD160 c527a39531e91e13cb1315883410e51436810de3 SHA1 dc09cb9c6cc40e11aab0cd1366f659bb7bec3fa6 SHA256 db545b3bc322fa6d3126b1932a4e00586275cdb2e13e68b0f01b37aff10c2969 +EBUILD chromium-5.0.371.0.ebuild 6330 RMD160 b82dd319c37e1a3a96edf413b608c43cd34c4410 SHA1 84ade81b43dafe34933a0c15abf6aff838ccb9a7 SHA256 f10fa43f6829f52bf8284572fe1e22a4482f67177dbaf614e7c5d7d4ef34e27d +EBUILD chromium-9999.ebuild 8083 RMD160 893a2ed1b45b0e9d43adbb2440d2a85bd6914525 SHA1 4bf0ad46e5ead90c6eaa97c56c421690f9047a60 SHA256 11b4f6cf83c3784ad6ab3bd71f675fe816c8959f923b2c7d069b27a8cab5fea3 +MISC ChangeLog 18397 RMD160 e282ddb460d593860059113f7f92fc7a6e768383 SHA1 6b2c3549a39b432916175f9d084440a89adb1cc2 SHA256 54e15a14e2dea549123201db21ad2f2cd6faf5d51cbe6b546d32e1b45357e8ac MISC chromium-9999.ebuild.orig 8287 RMD160 d1d186c7a1207a35665ffc6317e0990c75b75831 SHA1 cd8097e1c9a6b8f9b7928149a9c2b26b98187cb7 SHA256 8a70d5ebe1d3dd864ad7963e5c27f1a8242e3231a11887e99ee3e02d69837596 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c diff --git a/www-client/chromium/chromium-5.0.371.0.ebuild b/www-client/chromium/chromium-5.0.371.0.ebuild index 7925e0305ee1..85bd541d800e 100644 --- a/www-client/chromium/chromium-5.0.371.0.ebuild +++ b/www-client/chromium/chromium-5.0.371.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.1 2010/04/09 13:32:54 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.2 2010/04/09 17:29:05 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability toolchain-funcs @@ -12,7 +12,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist +ffmpeg +plugins-symlink" +IUSE="bindist +plugins-symlink" RDEPEND="app-arch/bzip2 >=dev-libs/libevent-1.4.13 @@ -23,7 +23,7 @@ RDEPEND="app-arch/bzip2 >=media-libs/alsa-lib-1.0.19 media-libs/jpeg:0 media-libs/libpng - ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 ) + >=media-video/ffmpeg-0.5_p21602 sys-libs/zlib >=x11-libs/gtk+-2.14.7 x11-libs/libXScrnSaver" @@ -120,7 +120,7 @@ EOF export HOME="${S}" # Configuration options (system libraries) - local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" + local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" # -Duse_system_sqlite=1 : http://crbug.com/22208 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) @@ -143,10 +143,6 @@ EOF myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" fi - if use ffmpeg; then - myconf="${myconf} -Duse_system_ffmpeg=1" - fi - build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" } @@ -183,13 +179,11 @@ src_install() { newman out/Release/chrome.1 chrome.1 newman out/Release/chrome.1 chromium.1 - if use ffmpeg; then - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} - fi + # Chromium looks for these in its folder + # See media_posix.cc and base_paths_linux.cc + dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} + dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} + dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} # Plugins symlink, optional wrt bug #301911 if use plugins-symlink; then diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index e36fea50575c..e50bf27054d4 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.38 2010/04/09 13:32:54 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.39 2010/04/09 17:29:05 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability subversion toolchain-funcs @@ -14,7 +14,7 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="bindist +ffmpeg +plugins-symlink" +IUSE="bindist +plugins-symlink" RDEPEND="app-arch/bzip2 >=dev-libs/libevent-1.4.13 @@ -25,7 +25,7 @@ RDEPEND="app-arch/bzip2 >=media-libs/alsa-lib-1.0.19 media-libs/jpeg:0 media-libs/libpng - ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 ) + >=media-video/ffmpeg-0.5_p21602 sys-libs/zlib >=x11-libs/gtk+-2.14.7 x11-libs/libXScrnSaver" @@ -164,7 +164,7 @@ EOF export HOME="${S}" # Configuration options (system libraries) - local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" + local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" # -Duse_system_sqlite=1 : http://crbug.com/22208 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) @@ -187,10 +187,6 @@ EOF myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" fi - if use ffmpeg; then - myconf="${myconf} -Duse_system_ffmpeg=1" - fi - build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" } @@ -227,13 +223,11 @@ src_install() { newman out/Release/chrome.1 chrome.1 newman out/Release/chrome.1 chromium.1 - if use ffmpeg; then - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} - fi + # Chromium looks for these in its folder + # See media_posix.cc and base_paths_linux.cc + dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} + dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} + dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} # Plugins symlink, optional wrt bug #301911 if use plugins-symlink; then