diff options
author | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-04-09 17:29:05 +0000 |
---|---|---|
committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-04-09 17:29:05 +0000 |
commit | 506ade84c38a6df58cbeebe80cc9e26bc032823f (patch) | |
tree | aa95f4e6accbd8e079e43e0f3a80a751317638eb /www-client | |
parent | Version bump and remove old. (diff) | |
download | gentoo-2-506ade84c38a6df58cbeebe80cc9e26bc032823f.tar.gz gentoo-2-506ade84c38a6df58cbeebe80cc9e26bc032823f.tar.bz2 gentoo-2-506ade84c38a6df58cbeebe80cc9e26bc032823f.zip |
Make ffmpeg support required, starting with the most recent versions.
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
-rw-r--r-- | www-client/chromium/chromium-5.0.371.0.ebuild | 24 | ||||
-rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 24 |
3 files changed, 23 insertions, 31 deletions
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 <phajdan.jr@gentoo.org> + 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/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 |