aballier 15/05/19 09:22:17 Modified: ChangeLog x265-9999.ebuild Added: x265-1.7.ebuild Log: version bump, update src_uri, fix build on x86 (bug #549028) Signed-off-by: Alexis Ballier <[email protected]> (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.24 media-libs/x265/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?r1=1.23&r2=1.24 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 19 May 2015 07:56:32 -0000 1.23 +++ ChangeLog 19 May 2015 09:22:17 -0000 1.24 @@ -1,6 +1,12 @@ # ChangeLog for media-libs/x265 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.23 2015/05/19 07:56:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.24 2015/05/19 09:22:17 aballier Exp $ + +*x265-1.7 (19 May 2015) + + 19 May 2015; Alexis Ballier <[email protected]> +x265-1.7.ebuild, + x265-9999.ebuild: + version bump, update src_uri, fix build on x86 (bug #549028) 19 May 2015; Alexis Ballier <[email protected]> -x265-1.3.ebuild, -x265-1.4.ebuild: 1.14 media-libs/x265/x265-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?r1=1.13&r2=1.14 Index: x265-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- x265-9999.ebuild 17 Mar 2015 15:24:52 -0000 1.13 +++ x265-9999.ebuild 19 May 2015 09:22:17 -0000 1.14 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.13 2015/03/17 15:24:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.14 2015/05/19 09:22:17 aballier Exp $ EAPI=5 @@ -10,8 +10,10 @@ inherit mercurial EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"; else - SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI=" + https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz + http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"; + KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" @@ -35,7 +37,7 @@ export S=${WORKDIR}/${P}/source else unpack ${A} - export S=$(echo "${WORKDIR}"/*${PN}*/source) + export S="${WORKDIR}/${PN}_${PV}/source" fi } @@ -48,6 +50,12 @@ -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF") -DLIB_INSTALL_DIR="$(get_libdir)" ) + + if [ "${ABI}" = x86 ] ; then + use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)" + mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF ) + fi + cmake-utils_src_configure } 1.1 media-libs/x265/x265-1.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-1.7.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-1.7.ebuild?rev=1.1&content-type=text/plain Index: x265-1.7.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.7.ebuild,v 1.1 2015/05/19 09:22:17 aballier Exp $ EAPI=5 inherit cmake-multilib multilib flag-o-matic if [[ ${PV} = 9999* ]]; then inherit mercurial EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"; else SRC_URI=" https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"; KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" HOMEPAGE="http://x265.org/"; LICENSE="GPL-2" # subslot = libx265 soname SLOT="0/48" IUSE="+10bit test" ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="" DEPEND="${RDEPEND} abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} )" src_unpack() { if [[ ${PV} = 9999* ]]; then mercurial_src_unpack # Can't set it at global scope due to mercurial.eclass limitations... export S=${WORKDIR}/${P}/source else unpack ${A} export S="${WORKDIR}/${PN}_${PV}/source" fi } multilib_src_configure() { append-cflags -fPIC append-cxxflags -fPIC local mycmakeargs=( $(cmake-utils_use_enable test TESTS) $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF") -DLIB_INSTALL_DIR="$(get_libdir)" ) if [ "${ABI}" = x86 ] ; then use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)" mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF ) fi cmake-utils_src_configure } src_configure() { multilib_parallel_foreach_abi multilib_src_configure } multilib_src_test() { if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then cd "${BUILD_DIR}/test" || die for i in TestBench ; do ./${i} || die done fi } src_test() { multilib_foreach_abi multilib_src_test } src_install() { cmake-multilib_src_install dodoc -r "${S}/../doc/"* }
