diff options
| -rw-r--r-- | media-video/x264-encoder/Manifest | 1 | ||||
| -rw-r--r-- | media-video/x264-encoder/files/ffmpeg29.patch | 13 | ||||
| -rw-r--r-- | media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild | 75 | ||||
| -rw-r--r-- | media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild | 71 |
4 files changed, 0 insertions, 160 deletions
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index c8c49eb3688f..91c698a64ab8 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/Manifest @@ -1,3 +1,2 @@ DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c -DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024 DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3 diff --git a/media-video/x264-encoder/files/ffmpeg29.patch b/media-video/x264-encoder/files/ffmpeg29.patch deleted file mode 100644 index d840c87d9623..000000000000 --- a/media-video/x264-encoder/files/ffmpeg29.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: x264-snapshot-20150820-2245/x264.c -=================================================================== ---- x264-snapshot-20150820-2245.orig/x264.c -+++ x264-snapshot-20150820-2245/x264.c -@@ -442,7 +442,7 @@ static void print_csp_names( int longhel - printf( " - valid csps for `lavf' demuxer:\n" ); - printf( INDENT ); - size_t line_len = strlen( INDENT ); -- for( enum PixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ ) -+ for( enum AVPixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ ) - { - const char *pfname = av_get_pix_fmt_name( i ); - if( pfname ) diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild deleted file mode 100644 index a837041813e2..000000000000 --- a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit flag-o-matic multilib toolchain-funcs eutils - -DESCRIPTION="A free commandline encoder for X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [[ ${PV} == 9999 ]]; then - inherit git-2 - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SRC_URI="" -else - inherit versionator - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" - -REQUIRED_USE="ffmpegsource? ( ffmpeg )" - -RDEPEND="ffmpeg? ( virtual/ffmpeg ) - ~media-libs/x264-${PV}[10bit=,interlaced=,threads=] - ffmpegsource? ( media-libs/ffmpegsource ) - mp4? ( >=media-video/gpac-0.5.2 )" - -ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="${RDEPEND} - amd64? ( ${ASM_DEP} ) - x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} ) - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/gpac.patch" "${FILESDIR}/ffmpeg29.patch" -} - -src_configure() { - tc-export CC - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --system-libx264 \ - --host="${CHOST}" \ - --disable-lsmash \ - $(usex 10bit "--bit-depth=10" "") \ - $(usex avs "" "--disable-avs") \ - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ - $(usex ffmpegsource "" "--disable-ffms") \ - $(usex interlaced "" "--disable-interlaced") \ - $(usex mp4 "" "--disable-gpac") \ - $(usex threads "" "--disable-thread") || die - - # this is a nasty workaround for bug #376925 for x264 that also applies - # here, needed because as upstream doesn't like us fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild deleted file mode 100644 index 64e7ddc531fc..000000000000 --- a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A free commandline encoder for X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [[ ${PV} == 9999 ]]; then - inherit git-2 - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SRC_URI="" -else - inherit versionator - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" - -REQUIRED_USE="ffmpegsource? ( ffmpeg )" - -RDEPEND="ffmpeg? ( virtual/ffmpeg ) - ~media-libs/x264-${PV}[10bit=,interlaced=,threads=] - ffmpegsource? ( media-libs/ffmpegsource ) - mp4? ( >=media-video/gpac-0.4.1_pre20060122 )" - -ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="${RDEPEND} - amd64? ( ${ASM_DEP} ) - x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} ) - virtual/pkgconfig" - -src_configure() { - tc-export CC - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --system-libx264 \ - --host="${CHOST}" \ - --disable-lsmash \ - $(usex 10bit "--bit-depth=10" "") \ - $(usex avs "" "--disable-avs") \ - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ - $(usex ffmpegsource "" "--disable-ffms") \ - $(usex interlaced "" "--disable-interlaced") \ - $(usex mp4 "" "--disable-gpac") \ - $(usex threads "" "--disable-thread") || die - - # this is a nasty workaround for bug #376925 for x264 that also applies - # here, needed because as upstream doesn't like us fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} |