ssuominen 14/03/25 13:57:46 Modified: x265-9999.ebuild ChangeLog Log: Pass -DLIB_INSTALL_DIR and drop now unrequired libdir patches wrt #505584 by "jospezial" (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.2 media-libs/x265/x265-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?r1=1.1&r2=1.2 Index: x265-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- x265-9999.ebuild 12 Mar 2014 20:45:18 -0000 1.1 +++ x265-9999.ebuild 25 Mar 2014 13:57:46 -0000 1.2 @@ -1,10 +1,10 @@ # Copyright 1999-2014 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.1 2014/03/12 20:45:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.2 2014/03/25 13:57:46 ssuominen Exp $ EAPI=5 -inherit cmake-multilib +inherit cmake-multilib multilib if [[ ${PV} = 9999* ]]; then inherit mercurial @@ -28,11 +28,6 @@ abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} )" -PATCHES=( - "${FILESDIR}/${PN}-libdir.patch" - "${FILESDIR}/${PN}-libdir_pkgconfig.patch" -) - src_unpack() { if [[ ${PV} = 9999* ]]; then mercurial_src_unpack @@ -49,6 +44,7 @@ $(cmake-utils_use_enable test TESTS) $(multilib_build_binaries || echo "-DENABLE_CLI=OFF") -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF") + -DLIB_INSTALL_DIR="$(get_libdir)" ) cmake-utils_src_configure } 1.2 media-libs/x265/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?r1=1.1&r2=1.2 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 12 Mar 2014 20:45:18 -0000 1.1 +++ ChangeLog 25 Mar 2014 13:57:46 -0000 1.2 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/x265 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.1 2014/03/12 20:45:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.2 2014/03/25 13:57:46 ssuominen Exp $ + + 25 Mar 2014; Samuli Suominen <[email protected]> x265-9999.ebuild: + Pass -DLIB_INSTALL_DIR and drop now unrequired libdir patches wrt #505584 by + "jospezial" *x265-9999 (12 Mar 2014) *x265-0.8 (12 Mar 2014) @@ -9,4 +13,3 @@ +x265-9999.ebuild, +files/x265-libdir.patch, +files/x265-libdir_pkgconfig.patch, +metadata.xml: Initial import, bug #485352. Ebuild by Samuli Suominen, Yixun Lan and myself. -
