| 1 |
ssuominen 14/03/25 13:57:46 |
| 2 |
|
| 3 |
Modified: x265-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Pass -DLIB_INSTALL_DIR and drop now unrequired libdir patches wrt #505584 by "jospezial" |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-libs/x265/x265-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/x265-9999.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: x265-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- x265-9999.ebuild 12 Mar 2014 20:45:18 -0000 1.1 |
| 23 |
+++ x265-9999.ebuild 25 Mar 2014 13:57:46 -0000 1.2 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.1 2014/03/12 20:45:18 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.2 2014/03/25 13:57:46 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
-inherit cmake-multilib |
| 33 |
+inherit cmake-multilib multilib |
| 34 |
|
| 35 |
if [[ ${PV} = 9999* ]]; then |
| 36 |
inherit mercurial |
| 37 |
@@ -28,11 +28,6 @@ |
| 38 |
abi_x86_32? ( ${ASM_DEPEND} ) |
| 39 |
abi_x86_64? ( ${ASM_DEPEND} )" |
| 40 |
|
| 41 |
-PATCHES=( |
| 42 |
- "${FILESDIR}/${PN}-libdir.patch" |
| 43 |
- "${FILESDIR}/${PN}-libdir_pkgconfig.patch" |
| 44 |
-) |
| 45 |
- |
| 46 |
src_unpack() { |
| 47 |
if [[ ${PV} = 9999* ]]; then |
| 48 |
mercurial_src_unpack |
| 49 |
@@ -49,6 +44,7 @@ |
| 50 |
$(cmake-utils_use_enable test TESTS) |
| 51 |
$(multilib_build_binaries || echo "-DENABLE_CLI=OFF") |
| 52 |
-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF") |
| 53 |
+ -DLIB_INSTALL_DIR="$(get_libdir)" |
| 54 |
) |
| 55 |
cmake-utils_src_configure |
| 56 |
} |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.2 media-libs/x265/ChangeLog |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?rev=1.2&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?rev=1.2&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/ChangeLog?r1=1.1&r2=1.2 |
| 65 |
|
| 66 |
Index: ChangeLog |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v |
| 69 |
retrieving revision 1.1 |
| 70 |
retrieving revision 1.2 |
| 71 |
diff -u -r1.1 -r1.2 |
| 72 |
--- ChangeLog 12 Mar 2014 20:45:18 -0000 1.1 |
| 73 |
+++ ChangeLog 25 Mar 2014 13:57:46 -0000 1.2 |
| 74 |
@@ -1,6 +1,10 @@ |
| 75 |
# ChangeLog for media-libs/x265 |
| 76 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.1 2014/03/12 20:45:18 aballier Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.2 2014/03/25 13:57:46 ssuominen Exp $ |
| 79 |
+ |
| 80 |
+ 25 Mar 2014; Samuli Suominen <ssuominen@g.o> x265-9999.ebuild: |
| 81 |
+ Pass -DLIB_INSTALL_DIR and drop now unrequired libdir patches wrt #505584 by |
| 82 |
+ "jospezial" |
| 83 |
|
| 84 |
*x265-9999 (12 Mar 2014) |
| 85 |
*x265-0.8 (12 Mar 2014) |
| 86 |
@@ -9,4 +13,3 @@ |
| 87 |
+x265-9999.ebuild, +files/x265-libdir.patch, |
| 88 |
+files/x265-libdir_pkgconfig.patch, +metadata.xml: |
| 89 |
Initial import, bug #485352. Ebuild by Samuli Suominen, Yixun Lan and myself. |
| 90 |
- |
Archives