* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-11 11:29 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2015-10-11 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 5e969b9adfbfcd3e9dbd0a7fa13028426e00ffc0
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 11:28:40 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 11:28:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e969b9a
media-libs/x265: Version bump to 1.8
Package-Manager: portage-2.2.23
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-1.8.ebuild} | 4 ++--
media-libs/x265/x265-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index ff45641..154e98a 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
+DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-1.8.ebuild
similarity index 96%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-1.8.ebuild
index 008e9cb..ee4a32f 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/59"
+SLOT="0/68"
IUSE="+10bit test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -37,7 +37,7 @@ src_unpack() {
export S=${WORKDIR}/${P}/source
else
unpack ${A}
- export S="${WORKDIR}/${PN}_${PV}/source"
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
fi
}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 008e9cb..ee4a32f 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/59"
+SLOT="0/68"
IUSE="+10bit test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -37,7 +37,7 @@ src_unpack() {
export S=${WORKDIR}/${P}/source
else
unpack ${A}
- export S="${WORKDIR}/${PN}_${PV}/source"
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
fi
}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-11 11:48 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2015-10-11 11:48 UTC (permalink / raw
To: gentoo-commits
commit: 57e9fac3dbb9b7a7cbc0289a34d6afd8788bb952
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 11:45:34 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 11:48:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e9fac3
media-libs/x265: Match subslot to actual soname on live ebuild.
Package-Manager: portage-2.2.23
media-libs/x265/x265-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index ee4a32f..8a3e36f 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/68"
+SLOT="0/75"
IUSE="+10bit test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-15 14:13 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2015-10-15 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 710c78a3b906aef5f9e3f8312436434c49b15c21
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:13:08 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:13:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710c78a3
media-libs/x265: Add pic useflag to disable asm on x86.
It is the best we can do unless upstream writes PIC safe x86 asm.
https://bugs.gentoo.org/show_bug.cgi?id=528202
Package-Manager: portage-2.2.23
media-libs/x265/metadata.xml | 1 +
media-libs/x265/x265-1.8.ebuild | 7 ++++++-
media-libs/x265/x265-9999.ebuild | 7 ++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index e462346..5178f6f 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<use>
<flag name="10bit">Set output bit depth to 10</flag>
+ <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
</use>
</pkgmetadata>
diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
index 8138afc..d5b67b2 100644
--- a/media-libs/x265/x265-1.8.ebuild
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/68"
-IUSE="+10bit test"
+IUSE="+10bit pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND=""
@@ -58,6 +58,11 @@ multilib_src_configure() {
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 )
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 5b0348c..1298033 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/75"
-IUSE="+10bit test"
+IUSE="+10bit pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND=""
@@ -54,6 +54,11 @@ multilib_src_configure() {
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 )
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-15 14:28 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2015-10-15 14:28 UTC (permalink / raw
To: gentoo-commits
commit: f384ec79e1ed374c864fc5d91f148c6754303ff8
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:28:18 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:28:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f384ec79
media-libs/x265: Make src_test more robust.
Build system builds "tests" only when asm optimizations are enabled, which may be disabled by other means (x32 or pic). Run tests only when it decided to build them.
Package-Manager: portage-2.2.23
media-libs/x265/x265-1.8.ebuild | 10 +++++-----
media-libs/x265/x265-9999.ebuild | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
index d5b67b2..1505f63 100644
--- a/media-libs/x265/x265-1.8.ebuild
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -76,11 +76,11 @@ 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
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly, and you do not seem to have any."
+ einfo "Skipping tests."
fi
}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 1298033..0d77b71 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -72,11 +72,11 @@ 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
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly, and you do not seem to have any."
+ einfo "Skipping tests."
fi
}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-15 14:41 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2015-10-15 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 3907b55b37a0fc3f64b75c016da488313ac4dfb7
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:40:34 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:40:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3907b55b
media-libs/x265: Fix automagic on numactl. Bug #555012.
Package-Manager: portage-2.2.23
media-libs/x265/metadata.xml | 1 +
media-libs/x265/{x265-9999.ebuild => x265-1.8-r1.ebuild} | 13 +++++++++----
media-libs/x265/x265-9999.ebuild | 5 +++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 5178f6f..bfc9f5c 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="10bit">Set output bit depth to 10</flag>
+ <flag name="numa">Build with support for NUMA nodes.</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
</use>
</pkgmetadata>
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-1.8-r1.ebuild
similarity index 86%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-1.8-r1.ebuild
index 0d77b71..00f7e5a 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-1.8-r1.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
@@ -21,11 +21,11 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/75"
-IUSE="+10bit pic test"
+SLOT="0/68"
+IUSE="+10bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
@@ -41,12 +41,17 @@ src_unpack() {
fi
}
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" # bug #510890
+}
+
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")
+ -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 0d77b71..fbb609d 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -22,10 +22,10 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/75"
-IUSE="+10bit pic test"
+IUSE="+10bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
@@ -47,6 +47,7 @@ multilib_src_configure() {
local mycmakeargs=(
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-DLIB_INSTALL_DIR="$(get_libdir)"
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-15 16:40 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2015-10-15 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 04e534d294b0e5fc030c2a5bc4a784f0d9b00e30
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 16:39:16 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 16:39:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e534d2
media-libs/x265: Add support for 8, 10 & 12bit simultaneous support.
Rework the ebuild on top of multilib-minimal, use multibuild to build the 8, 10 & 12 bit variant, and use upstream documented way to build a library capable of producing 8 (default), 10 or 12 bits HEVC files.
Package-Manager: portage-2.2.23
media-libs/x265/metadata.xml | 3 +-
media-libs/x265/x265-1.8-r1.ebuild | 95 --------------------
media-libs/x265/x265-1.8-r2.ebuild | 175 +++++++++++++++++++++++++++++++++++++
media-libs/x265/x265-9999.ebuild | 116 ++++++++++++++++++++----
4 files changed, 275 insertions(+), 114 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index bfc9f5c..86339aa 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -6,7 +6,8 @@
<email>media-video@gentoo.org</email>
</maintainer>
<use>
- <flag name="10bit">Set output bit depth to 10</flag>
+ <flag name="10bit">Add support for producing 10bits HEVC.</flag>
+ <flag name="12bit">Add support for producing 12bits HEVC.</flag>
<flag name="numa">Build with support for NUMA nodes.</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
</use>
diff --git a/media-libs/x265/x265-1.8-r1.ebuild b/media-libs/x265/x265-1.8-r1.ebuild
deleted file mode 100644
index 00f7e5a..0000000
--- a/media-libs/x265/x265-1.8-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://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 ~ppc ~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/68"
-IUSE="+10bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" # bug #510890
-}
-
-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")
- -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
- -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 )
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
-
- cmake-utils_src_configure
-}
-
-src_configure() {
- multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly, and you do not seem to have any."
- einfo "Skipping tests."
- fi
-}
-
-src_test() {
- multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
- cmake-multilib_src_install
- dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.8-r2.ebuild b/media-libs/x265/x265-1.8-r2.ebuild
new file mode 100644
index 0000000..a93ea1d
--- /dev/null
+++ b/media-libs/x265/x265-1.8-r2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://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 ~ppc ~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/68"
+IUSE="+10bit 12bit numa pic test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+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="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" # bug #510890
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local myabicmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [[ ${ABI} = x86 ]] ; then
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ elif [[ ${ABI} = x32 ]] ; then
+ # bug #510890
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+ einfo "Skipping tests."
+ fi
+}
+
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index fbb609d..21f4143 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-multilib multilib flag-o-matic
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
if [[ ${PV} = 9999* ]]; then
inherit mercurial
@@ -21,8 +21,8 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/75"
-IUSE="+10bit numa pic test"
+SLOT="0/68"
+IUSE="+10bit 12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -41,51 +41,131 @@ src_unpack() {
fi
}
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
multilib_src_configure() {
append-cflags -fPIC
append-cxxflags -fPIC
- local mycmakeargs=(
+ local myabicmakeargs=(
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
- -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 )
# Bug #528202
if use pic ; then
ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- cmake-utils_src_configure
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
}
-src_configure() {
- multilib_parallel_foreach_abi multilib_src_configure
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
}
-multilib_src_test() {
+x265_variant_src_test() {
if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
"${BUILD_DIR}/test/TestBench" || die
else
- einfo "Unit tests check only assembly, and you do not seem to have any."
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
einfo "Skipping tests."
fi
}
-src_test() {
- multilib_foreach_abi multilib_src_test
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
}
-src_install() {
- cmake-multilib_src_install
+multilib_src_install_all() {
dodoc -r "${S}/../doc/"*
}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-10-16 5:17 Jeroen Roovers
0 siblings, 0 replies; 117+ messages in thread
From: Jeroen Roovers @ 2015-10-16 5:17 UTC (permalink / raw
To: gentoo-commits
commit: c30b475e8af22ae692de882db8ea9d461b9cf545
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 05:16:43 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 05:17:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c30b475e
media-libs/x265: Mark ~hppa (bug #555012).
Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches
media-libs/x265/x265-1.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-1.8-r2.ebuild b/media-libs/x265/x265-1.8-r2.ebuild
index a93ea1d..18bfcc1 100644
--- a/media-libs/x265/x265-1.8-r2.ebuild
+++ b/media-libs/x265/x265-1.8-r2.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2015-11-08 7:22 Jeroen Roovers
0 siblings, 0 replies; 117+ messages in thread
From: Jeroen Roovers @ 2015-11-08 7:22 UTC (permalink / raw
To: gentoo-commits
commit: a01aec5c004783e952b9bda29d96493516212f23
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 07:11:03 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 07:22:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01aec5c
media-libs/x265: Stable for PPC64 (bug #548964).
Package-Manager: portage-2.2.24
RepoMan-Options: --ignore-arches
media-libs/x265/x265-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-1.5.ebuild b/media-libs/x265/x265-1.5.ebuild
index f185fa0..34048b7 100644
--- a/media-libs/x265/x265-1.5.ebuild
+++ b/media-libs/x265/x265-1.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
- KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-01-25 10:25 Agostino Sarubbo
0 siblings, 0 replies; 117+ messages in thread
From: Agostino Sarubbo @ 2016-01-25 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 57f65c5d77189f3f25a486945a53383606c41ac7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 10:25:03 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 10:25:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f65c5d
media-libs/x265: amd64 stable wrt bug #570878
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/x265/x265-1.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
index ae1ad80..f3d3418 100644
--- a/media-libs/x265/x265-1.8-r3.ebuild
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-01-25 10:25 Agostino Sarubbo
0 siblings, 0 replies; 117+ messages in thread
From: Agostino Sarubbo @ 2016-01-25 10:25 UTC (permalink / raw
To: gentoo-commits
commit: fb88945714a7548f02153f4aa3b44c1e2e9fbae0
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 10:25:24 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 10:25:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb889457
media-libs/x265: x86 stable wrt bug #570878
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/x265/x265-1.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
index f3d3418..8ad8715 100644
--- a/media-libs/x265/x265-1.8-r3.ebuild
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-01-27 15:06 Jeroen Roovers
0 siblings, 0 replies; 117+ messages in thread
From: Jeroen Roovers @ 2016-01-27 15:06 UTC (permalink / raw
To: gentoo-commits
commit: 4ed7991c803dd11facb6f30ef3b0988e2d744aae
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 15:04:12 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 15:06:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed7991c
media-libs/x265: Stable for HPPA PPC64 (bug #571868).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
media-libs/x265/x265-1.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
index 8ad8715..01d3a7c 100644
--- a/media-libs/x265/x265-1.8-r3.ebuild
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm hppa ~ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-01-29 19:00 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2016-01-29 19:00 UTC (permalink / raw
To: gentoo-commits
commit: c297b58ada74f04ad39d5148c9495ffaa5295225
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 18:59:45 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 18:59:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c297b58a
media-libs/x265: bump to 1.9.
Enable 12bit by default since it is no more experimental.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-1.9.ebuild} | 6 +++---
media-libs/x265/x265-9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 154e98a..977da60 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,3 +1,4 @@
DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
+DIST x265_1.9.tar.gz 956101 SHA256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 SHA512 1c399101374da58d0661786a6144dd25a2028e25bcb99b3084d8839b0bd9c20bccf5c0e4413882f16b3b1c49f96710746a16cb690f3811dffb08c3befdc8e5f1 WHIRLPOOL 508d21ad0ff7ed8eb2fe9a9a69113dc7dca07306ddace6de22b29e71dad7242fae0b6e4864a409a0279d85adbe054b4ffbc8c95fe915163b506f5bab25245f8c
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-1.9.ebuild
similarity index 97%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-1.9.ebuild
index 21f4143..9e5db6a 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-1.9.ebuild
@@ -21,8 +21,8 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/68"
-IUSE="+10bit 12bit numa pic test"
+SLOT="0/79"
+IUSE="+10bit +12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -121,7 +121,7 @@ multilib_src_configure() {
local myabicmakeargs=(
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 21f4143..9652a58 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,8 +21,8 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/68"
-IUSE="+10bit 12bit numa pic test"
+SLOT="0/80"
+IUSE="+10bit +12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -121,7 +121,7 @@ multilib_src_configure() {
local myabicmakeargs=(
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-02-03 20:40 Markus Meier
0 siblings, 0 replies; 117+ messages in thread
From: Markus Meier @ 2016-02-03 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 4d3a7481f017c590ddeb7d08d7649370c5853de7
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 20:39:58 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 20:39:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3a7481
media-libs/x265: arm stable, bug #570878
Package-Manager: portage-2.2.27
RepoMan-Options: --include-arches="arm"
media-libs/x265/x265-1.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
index 01d3a7c..63563ad 100644
--- a/media-libs/x265/x265-1.8-r3.ebuild
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ppc64 x86"
+ KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-09-27 10:25 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2016-09-27 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 8a6a10cb4312721fa47487cb41832c7396f71796
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 10:25:10 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 10:25:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6a10cb
media-libs/x265: bump to 2.1
Package-Manager: portage-2.3.1
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.1.ebuild} | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 640df12..49bb022 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -3,3 +3,4 @@ DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a
DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
DIST x265_1.9.tar.gz 956101 SHA256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 SHA512 1c399101374da58d0661786a6144dd25a2028e25bcb99b3084d8839b0bd9c20bccf5c0e4413882f16b3b1c49f96710746a16cb690f3811dffb08c3befdc8e5f1 WHIRLPOOL 508d21ad0ff7ed8eb2fe9a9a69113dc7dca07306ddace6de22b29e71dad7242fae0b6e4864a409a0279d85adbe054b4ffbc8c95fe915163b506f5bab25245f8c
DIST x265_2.0.tar.gz 1028299 SHA256 5a7f6797bee33310c690be5d9a6c63125f36663ac3478e98ac6b6142a70bce1f SHA512 4262a32cf9a34c494770c7917fbaba88e8211c332a91932f4cd096ce25394979e1d43ae641be0aa480af1d0580e842ca70f58005dd41361b78dfd25870035a1e WHIRLPOOL c85e42a3bbf3ee9d84a69615b117444088e16c45cea7362956c92dc1097babdc8cb819d101bf17a97bfb0128e93a5c85cf9c8d980dc75de9de90dcf6a3e46b09
+DIST x265_2.1.tar.gz 1037400 SHA256 b3bc83754e91ed5655c8cba5a2ed48e6b9ab39699c9ed6554c670211d5870f9c SHA512 44ad6815efb039054935f2887f0c98604898a6b5bf144f845df92038ef47ea1c21f2942501294514b05e7eaffd988e52ca777da0be97e57fdd77c89ff0fda421 WHIRLPOOL f91e7fffdccb494c32a6a4b18b72e72537c89bc0a1117e26f2030b9f3d5d11a0e642e25faa83c0b59ca117666d1d81a21823b653d3e0d138073478176908f83b
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.1.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.1.ebuild
index 97e74dd..3864484 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/87"
+SLOT="0/95"
IUSE="+10bit +12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 97e74dd..3864484 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/87"
+SLOT="0/95"
IUSE="+10bit +12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2016-12-26 16:45 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2016-12-26 16:45 UTC (permalink / raw
To: gentoo-commits
commit: ea8f708e33d62490087d32e29809354931a4b301
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 15:54:41 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 16:45:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8f708e
media-libs/x265: bump to 2.2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.2.ebuild} | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 49bb022..59c60b4 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -4,3 +4,4 @@ DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2
DIST x265_1.9.tar.gz 956101 SHA256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 SHA512 1c399101374da58d0661786a6144dd25a2028e25bcb99b3084d8839b0bd9c20bccf5c0e4413882f16b3b1c49f96710746a16cb690f3811dffb08c3befdc8e5f1 WHIRLPOOL 508d21ad0ff7ed8eb2fe9a9a69113dc7dca07306ddace6de22b29e71dad7242fae0b6e4864a409a0279d85adbe054b4ffbc8c95fe915163b506f5bab25245f8c
DIST x265_2.0.tar.gz 1028299 SHA256 5a7f6797bee33310c690be5d9a6c63125f36663ac3478e98ac6b6142a70bce1f SHA512 4262a32cf9a34c494770c7917fbaba88e8211c332a91932f4cd096ce25394979e1d43ae641be0aa480af1d0580e842ca70f58005dd41361b78dfd25870035a1e WHIRLPOOL c85e42a3bbf3ee9d84a69615b117444088e16c45cea7362956c92dc1097babdc8cb819d101bf17a97bfb0128e93a5c85cf9c8d980dc75de9de90dcf6a3e46b09
DIST x265_2.1.tar.gz 1037400 SHA256 b3bc83754e91ed5655c8cba5a2ed48e6b9ab39699c9ed6554c670211d5870f9c SHA512 44ad6815efb039054935f2887f0c98604898a6b5bf144f845df92038ef47ea1c21f2942501294514b05e7eaffd988e52ca777da0be97e57fdd77c89ff0fda421 WHIRLPOOL f91e7fffdccb494c32a6a4b18b72e72537c89bc0a1117e26f2030b9f3d5d11a0e642e25faa83c0b59ca117666d1d81a21823b653d3e0d138073478176908f83b
+DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.2.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.2.ebuild
index 3864484..32a4c1f 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/95"
+SLOT="0/102"
IUSE="+10bit +12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3864484..3ac5bf9 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/95"
+SLOT="0/104"
IUSE="+10bit +12bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-01-01 12:43 Agostino Sarubbo
0 siblings, 0 replies; 117+ messages in thread
From: Agostino Sarubbo @ 2017-01-01 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 9c082f0a682595b88ddf48dba13fb5d193bd93d0
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 1 12:43:13 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 12:43:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c082f0a
media-libs/x265: ppc stable wrt bug #570878
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/x265/x265-1.8-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
index 63563ad..f855da1 100644
--- a/media-libs/x265/x265-1.8-r3.ebuild
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ 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 ~ppc ppc64 x86"
+ KEYWORDS="amd64 arm hppa ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-01-04 12:08 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-01-04 12:08 UTC (permalink / raw
To: gentoo-commits
commit: efd2ed5c48f0e8ee2ec0ade8b42087fa211b5947
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 12:08:32 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 12:08:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd2ed5c
media-libs/x265: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/Manifest | 5 --
media-libs/x265/x265-1.5.ebuild | 74 -----------------
media-libs/x265/x265-1.7.ebuild | 82 -------------------
media-libs/x265/x265-1.8.ebuild | 94 ----------------------
media-libs/x265/x265-1.9.ebuild | 171 ----------------------------------------
media-libs/x265/x265-2.0.ebuild | 171 ----------------------------------------
media-libs/x265/x265-2.1.ebuild | 171 ----------------------------------------
7 files changed, 768 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 59c60b4..7c512b4 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,7 +1,2 @@
-DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
-DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
-DIST x265_1.9.tar.gz 956101 SHA256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 SHA512 1c399101374da58d0661786a6144dd25a2028e25bcb99b3084d8839b0bd9c20bccf5c0e4413882f16b3b1c49f96710746a16cb690f3811dffb08c3befdc8e5f1 WHIRLPOOL 508d21ad0ff7ed8eb2fe9a9a69113dc7dca07306ddace6de22b29e71dad7242fae0b6e4864a409a0279d85adbe054b4ffbc8c95fe915163b506f5bab25245f8c
-DIST x265_2.0.tar.gz 1028299 SHA256 5a7f6797bee33310c690be5d9a6c63125f36663ac3478e98ac6b6142a70bce1f SHA512 4262a32cf9a34c494770c7917fbaba88e8211c332a91932f4cd096ce25394979e1d43ae641be0aa480af1d0580e842ca70f58005dd41361b78dfd25870035a1e WHIRLPOOL c85e42a3bbf3ee9d84a69615b117444088e16c45cea7362956c92dc1097babdc8cb819d101bf17a97bfb0128e93a5c85cf9c8d980dc75de9de90dcf6a3e46b09
-DIST x265_2.1.tar.gz 1037400 SHA256 b3bc83754e91ed5655c8cba5a2ed48e6b9ab39699c9ed6554c670211d5870f9c SHA512 44ad6815efb039054935f2887f0c98604898a6b5bf144f845df92038ef47ea1c21f2942501294514b05e7eaffd988e52ca777da0be97e57fdd77c89ff0fda421 WHIRLPOOL f91e7fffdccb494c32a6a4b18b72e72537c89bc0a1117e26f2030b9f3d5d11a0e642e25faa83c0b59ca117666d1d81a21823b653d3e0d138073478176908f83b
DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
diff --git a/media-libs/x265/x265-1.5.ebuild b/media-libs/x265/x265-1.5.ebuild
deleted file mode 100644
index 34048b7..00000000
--- a/media-libs/x265/x265-1.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
- SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
- KEYWORDS="amd64 arm hppa ~ppc 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/43"
-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=$(echo "${WORKDIR}"/*${PN}*/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)"
- )
- 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/"*
-}
diff --git a/media-libs/x265/x265-1.7.ebuild b/media-libs/x265/x265-1.7.ebuild
deleted file mode 100644
index 008e9cb..00000000
--- a/media-libs/x265/x265-1.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://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 ~ppc ~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/59"
-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/"*
-}
diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
deleted file mode 100644
index 1505f63..00000000
--- a/media-libs/x265/x265-1.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://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 ~ppc ~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/68"
-IUSE="+10bit pic 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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" # bug #510890
-}
-
-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 )
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
-
- cmake-utils_src_configure
-}
-
-src_configure() {
- multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly, and you do not seem to have any."
- einfo "Skipping tests."
- fi
-}
-
-src_test() {
- multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
- cmake-multilib_src_install
- dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.9.ebuild b/media-libs/x265/x265-1.9.ebuild
deleted file mode 100644
index 9e5db6a..00000000
--- a/media-libs/x265/x265-1.9.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://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 ~ppc ~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/79"
-IUSE="+10bit +12bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake-utils_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
- local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-2.0.ebuild b/media-libs/x265/x265-2.0.ebuild
deleted file mode 100644
index 97e74dd..00000000
--- a/media-libs/x265/x265-2.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://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 ~ppc ~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/87"
-IUSE="+10bit +12bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake-utils_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
- local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-2.1.ebuild b/media-libs/x265/x265-2.1.ebuild
deleted file mode 100644
index 3864484..00000000
--- a/media-libs/x265/x265-2.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://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 ~ppc ~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/95"
-IUSE="+10bit +12bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake-utils_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
- local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-04 12:12 Jeroen Roovers
0 siblings, 0 replies; 117+ messages in thread
From: Jeroen Roovers @ 2017-02-04 12:12 UTC (permalink / raw
To: gentoo-commits
commit: e80c9a1db221eb279a4c4639ab077c35364d5860
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 12:12:17 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 12:12:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80c9a1d
media-libs/x265: Stable for HPPA (bug #607802).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches
media-libs/x265/x265-2.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 32a4c1f..29e2505 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-04 15:21 Agostino Sarubbo
0 siblings, 0 replies; 117+ messages in thread
From: Agostino Sarubbo @ 2017-02-04 15:21 UTC (permalink / raw
To: gentoo-commits
commit: fc0326cb34e972ec3a3d8f85f702ecaea60b6e91
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 15:18:10 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 15:21:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0326cb
media-libs/x265: amd64 stable wrt bug #607802
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/x265/x265-2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 29e2505..0608b09 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-07 11:51 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-02-07 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 82046cbe719bed8ca113520e3d1da60f5675c7d7
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 11:42:54 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 11:42:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82046cbe
media-libs/x265: Use proper variable for en/disabling neon.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/x265-2.2.ebuild | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index ac326ae..a53a6c0 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -145,7 +145,7 @@ multilib_src_configure() {
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9edba39..3e2490c 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -145,7 +145,7 @@ multilib_src_configure() {
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-07 11:51 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-02-07 11:51 UTC (permalink / raw
To: gentoo-commits
commit: c0fa018451c60ed2c85417cc76a222d2a580f403
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 11:50:56 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 11:50:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa0184
media-libs/x265: Disable arm assembly when requesting a PIC build, it is not PIC.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/x265-2.2.ebuild | 3 ++-
media-libs/x265/x265-9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index a53a6c0..21d6b90 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -145,7 +145,8 @@ multilib_src_configure() {
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) )
+ use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3e2490c..96a0204 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -145,7 +145,8 @@ multilib_src_configure() {
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) )
+ use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-16 5:00 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-02-16 5:00 UTC (permalink / raw
To: gentoo-commits
commit: 8ede2959dad6fc5fdcae255ce019717d9a2533d4
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 04:39:05 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 04:39:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ede2959
media-libs/x265: Bump to 2.3.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.3.ebuild} | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 7c512b43fd..24b12f1ef6 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
+DIST x265_2.3.tar.gz 1215719 SHA256 47520ac3424790168ea5c2db4a3cf12ca4d55a1790720007916652f07af3e41f SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809 WHIRLPOOL c7fa65f74b342ae32ae7b89aed86e6270607ec22479c95b62bd6b3e2cb958635d459e3770fe73e7599e572b01b171d101f5fb50c161139c867bea1ddda217c10
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.3.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.3.ebuild
index 96a0204509..49b07f692b 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/108"
+SLOT="0/110"
IUSE="+10bit +12bit neon numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 96a0204509..69300360d5 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/108"
+SLOT="0/111"
IUSE="+10bit +12bit neon numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-17 11:10 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-02-17 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 3623d52b7e70159eb00852ae8f354274ad8f72a6
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 11:09:48 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 11:10:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3623d52b
media-libs/x265: Disable asm/altivec on ppc64 when doing 10 or 12bits build.
https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/x265-2.2.ebuild | 8 ++++++++
media-libs/x265/x265-2.3.ebuild | 8 ++++++++
media-libs/x265/x265-9999.ebuild | 8 ++++++++
3 files changed, 24 insertions(+)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index c6ca8a6803..56f3a30022 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -85,6 +85,10 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
;;
"main10")
mycmakeargs+=(
@@ -100,6 +104,10 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
index 76189dc858..8a1c833acf 100644
--- a/media-libs/x265/x265-2.3.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -85,6 +85,10 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
;;
"main10")
mycmakeargs+=(
@@ -100,6 +104,10 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 05efee2ad9..879d818446 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -85,6 +85,10 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
;;
"main10")
mycmakeargs+=(
@@ -100,6 +104,10 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-02-24 8:30 Michael Weber
0 siblings, 0 replies; 117+ messages in thread
From: Michael Weber @ 2017-02-24 8:30 UTC (permalink / raw
To: gentoo-commits
commit: aedb25cf3d0dd00c1b76f78a6b79e1fa242be848
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 08:13:02 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 08:30:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aedb25cf
media-libs/x265: arm ppc64 stable (bug 607802).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x265/x265-2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 56f3a30022..2a880a5c91 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -13,7 +13,7 @@ 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 ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm hppa ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-03-12 11:39 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-03-12 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 01d54dcfff9f02fc3acd31acce03d3d2011e6346
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 11:39:23 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 11:39:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d54dcf
media-libs/x265: Add power8 useflag, bug #611906
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-libs/x265/metadata.xml | 1 +
media-libs/x265/x265-2.2.ebuild | 4 +++-
media-libs/x265/x265-2.3.ebuild | 4 +++-
media-libs/x265/x265-9999.ebuild | 4 +++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index ed61a9259d5..534499f3593 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -9,6 +9,7 @@
<flag name="12bit">Add support for producing 12bits HEVC.</flag>
<flag name="numa">Build with support for NUMA nodes.</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
+ <flag name="power8">Enable support for Power 8 assembly optimizations.</flag>
</use>
<upstream>
<remote-id type="bitbucket">multicoreware/x265</remote-id>
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 31477382476..379c18e775a 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/102"
-IUSE="+10bit +12bit neon numa pic test"
+IUSE="+10bit +12bit neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -139,6 +139,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
index 6a97b960617..ed35ad6d510 100644
--- a/media-libs/x265/x265-2.3.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/110"
-IUSE="+10bit +12bit neon numa pic test"
+IUSE="+10bit +12bit neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -139,6 +139,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 5efa377f90f..65e1f961e65 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/111"
-IUSE="+10bit +12bit neon numa pic test"
+IUSE="+10bit +12bit neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -139,6 +139,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-04-23 15:12 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-04-23 15:12 UTC (permalink / raw
To: gentoo-commits
commit: 2ad0da5916fb8a6b3fec8b81ee3f4cadf11d575c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 14:54:41 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 14:54:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad0da59
media-libs/x265: Bump to 2.4
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.4.ebuild} | 8 ++++++--
media-libs/x265/x265-9999.ebuild | 8 ++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 567ea94712c..4b753c9dbe0 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
DIST x265_2.3.tar.gz 1215719 SHA256 47520ac3424790168ea5c2db4a3cf12ca4d55a1790720007916652f07af3e41f SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809 WHIRLPOOL c7fa65f74b342ae32ae7b89aed86e6270607ec22479c95b62bd6b3e2cb958635d459e3770fe73e7599e572b01b171d101f5fb50c161139c867bea1ddda217c10
+DIST x265_2.4.tar.gz 1242300 SHA256 9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729 SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe WHIRLPOOL 63ab1989856912e8922db66862901511e5f7e4f2bd429319b3f419f8267a442374e8f8626065ccf96766c3075750525755d91df6976352b7b59f229aab94ac86
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.4.ebuild
similarity index 98%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.4.ebuild
index 65e1f961e65..93bc874c3ee 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.4.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/111"
+SLOT="0/116"
IUSE="+10bit +12bit neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -29,7 +29,11 @@ DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
-PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" "${FILESDIR}/ppc64.patch" )
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+)
src_unpack() {
if [[ ${PV} = 9999* ]]; then
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 65e1f961e65..93bc874c3ee 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/111"
+SLOT="0/116"
IUSE="+10bit +12bit neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -29,7 +29,11 @@ DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
-PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" "${FILESDIR}/ppc64.patch" )
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+)
src_unpack() {
if [[ ${PV} = 9999* ]]; then
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-06-16 9:36 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-06-16 9:36 UTC (permalink / raw
To: gentoo-commits
commit: eced857ed9e46527da0466762e27e9602c312237
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 09:03:58 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 09:36:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eced857e
media-libs/x265: convert to cpu_flags_arm
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/x265/x265-2.4.ebuild | 6 +++---
media-libs/x265/x265-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-libs/x265/x265-2.4.ebuild b/media-libs/x265/x265-2.4.ebuild
index 8e49624f425..9aa6aafc30d 100644
--- a/media-libs/x265/x265-2.4.ebuild
+++ b/media-libs/x265/x265-2.4.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/116"
-IUSE="+10bit +12bit neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -158,8 +158,8 @@ multilib_src_configure() {
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) )
- use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8e49624f425..9aa6aafc30d 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/116"
-IUSE="+10bit +12bit neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -158,8 +158,8 @@ multilib_src_configure() {
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) )
- use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-06-16 9:36 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-06-16 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 612253270004b075f0471fd739f52bca28d12219
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 08:59:07 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 09:36:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61225327
media-libs/x265: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/x265/x265-2.4.ebuild | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-2.4.ebuild b/media-libs/x265/x265-2.4.ebuild
index 93bc874c3ee..8e49624f425 100644
--- a/media-libs/x265/x265-2.4.ebuild
+++ b/media-libs/x265/x265-2.4.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 93bc874c3ee..8e49624f425 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-06-17 15:08 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2017-06-17 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 6e5f82df3be977d73d324325159e2d0ff9f1a03f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 12:15:09 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 15:08:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5f82df
media-libs/x265: ~ia64 keyworded, bug #539564
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/x265/x265-2.2.ebuild | 2 +-
media-libs/x265/x265-2.3.ebuild | 2 +-
media-libs/x265/x265-2.4.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 379c18e775a..0bbf1247d2e 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -12,7 +12,7 @@ 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 ppc ppc64 x86"
+ KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
index ed35ad6d510..3c775805f14 100644
--- a/media-libs/x265/x265-2.3.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-2.4.ebuild b/media-libs/x265/x265-2.4.ebuild
index 9aa6aafc30d..ab7eef3fa30 100644
--- a/media-libs/x265/x265-2.4.ebuild
+++ b/media-libs/x265/x265-2.4.ebuild
@@ -12,7 +12,7 @@ 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-06-17 15:08 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2017-06-17 15:08 UTC (permalink / raw
To: gentoo-commits
commit: a93adb9e2f9ca1c2191df1a0b574a4d087346919
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 12:19:40 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 15:08:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a93adb9e
media-libs/x265: ia64 stable, bug #539564
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/x265/x265-2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 0bbf1247d2e..39bd8fd2b92 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -12,7 +12,7 @@ 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 ~ia64 ppc ppc64 x86"
+ KEYWORDS="amd64 arm hppa ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-07-16 12:17 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-07-16 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 94fbd1e663d2c463524b700eb372ef0a2e324438
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 12:16:53 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 12:17:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94fbd1e6
media-libs/x265: bump to 2.5
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.5.ebuild} | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 4b753c9dbe0..dd671134b8e 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,3 +1,4 @@
DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
DIST x265_2.3.tar.gz 1215719 SHA256 47520ac3424790168ea5c2db4a3cf12ca4d55a1790720007916652f07af3e41f SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809 WHIRLPOOL c7fa65f74b342ae32ae7b89aed86e6270607ec22479c95b62bd6b3e2cb958635d459e3770fe73e7599e572b01b171d101f5fb50c161139c867bea1ddda217c10
DIST x265_2.4.tar.gz 1242300 SHA256 9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729 SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe WHIRLPOOL 63ab1989856912e8922db66862901511e5f7e4f2bd429319b3f419f8267a442374e8f8626065ccf96766c3075750525755d91df6976352b7b59f229aab94ac86
+DIST x265_2.5.tar.gz 1256678 SHA256 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17 SHA512 f39b0b06a9f6ab9ab19fcdc1cba1578ace433e22dc8ec3f549ec3e5eeaaf40d17de6c7d419c12c16717ae795c45d953ef34a2fc9376d7e83eb7e9e74ab19ec93 WHIRLPOOL a5abfbbb533f22b2f243ff2053ab569d758d72b2cd0ec4ffb264688d9c4666b1354b7933d8e2a9197766cb33cda3e25c6771439ad34ad979ffbde361c2ecf0d5
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.5.ebuild
similarity index 98%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.5.ebuild
index b7e3fb2f6d9..1ef57ee3ddc 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.5.ebuild
@@ -12,7 +12,7 @@ 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index b7e3fb2f6d9..1ef57ee3ddc 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -12,7 +12,7 @@ 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-07-16 12:17 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-07-16 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 690a4bdd089e1596f2654eaf633c3d0be1af066d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 10:55:12 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 12:17:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690a4bdd
media-libs/x265: update live ebuild subslot
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/x265/x265-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9aa6aafc30d..b7e3fb2f6d9 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/116"
+SLOT="0/130"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-08-31 12:37 Tim Harder
0 siblings, 0 replies; 117+ messages in thread
From: Tim Harder @ 2017-08-31 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 001072fe4b306fc8d942e9c14b6aec30c6a407a0
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 12:36:52 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 12:36:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001072fe
media-libs/x265: use consistent indentation for metadata
media-libs/x265/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 534499f3593..22a07293b83 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -9,7 +9,7 @@
<flag name="12bit">Add support for producing 12bits HEVC.</flag>
<flag name="numa">Build with support for NUMA nodes.</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
- <flag name="power8">Enable support for Power 8 assembly optimizations.</flag>
+ <flag name="power8">Enable support for Power 8 assembly optimizations.</flag>
</use>
<upstream>
<remote-id type="bitbucket">multicoreware/x265</remote-id>
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-08-31 12:37 Tim Harder
0 siblings, 0 replies; 117+ messages in thread
From: Tim Harder @ 2017-08-31 12:37 UTC (permalink / raw
To: gentoo-commits
commit: c72f67775569ee9a9397c01f25c3528d05166a39
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 12:33:01 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 12:34:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c72f6777
media-libs/x265: use https for videolan SRC_URI
Using it for HOMEPAGE is possible as well but upstream appears to
currently use a server that severely lags on serving https so we'll hold
off.
media-libs/x265/x265-2.2.ebuild | 2 +-
media-libs/x265/x265-2.3.ebuild | 2 +-
media-libs/x265/x265-2.4.ebuild | 2 +-
media-libs/x265/x265-2.5.ebuild | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 39bd8fd2b92..8f78a69d267 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="amd64 arm hppa ia64 ppc ppc64 x86"
fi
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
index 3c775805f14..75812c4cad2 100644
--- a/media-libs/x265/x265-2.3.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
diff --git a/media-libs/x265/x265-2.4.ebuild b/media-libs/x265/x265-2.4.ebuild
index ab7eef3fa30..97a42c088bd 100644
--- a/media-libs/x265/x265-2.4.ebuild
+++ b/media-libs/x265/x265-2.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
diff --git a/media-libs/x265/x265-2.5.ebuild b/media-libs/x265/x265-2.5.ebuild
index 1ef57ee3ddc..9b814039f1c 100644
--- a/media-libs/x265/x265-2.5.ebuild
+++ b/media-libs/x265/x265-2.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 1ef57ee3ddc..9b814039f1c 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-11-30 13:57 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2017-11-30 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 84e17d10fbb46911ff3e05774855dfc57c02ddb9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 13:54:41 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 13:57:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e17d10
media-libs/x265: bump to 2.6
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-libs/x265/Manifest | 7 ++++---
media-libs/x265/{x265-9999.ebuild => x265-2.6.ebuild} | 6 ++----
media-libs/x265/x265-9999.ebuild | 6 ++----
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index dd671134b8e..bfde5591b70 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,4 +1,5 @@
DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
-DIST x265_2.3.tar.gz 1215719 SHA256 47520ac3424790168ea5c2db4a3cf12ca4d55a1790720007916652f07af3e41f SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809 WHIRLPOOL c7fa65f74b342ae32ae7b89aed86e6270607ec22479c95b62bd6b3e2cb958635d459e3770fe73e7599e572b01b171d101f5fb50c161139c867bea1ddda217c10
-DIST x265_2.4.tar.gz 1242300 SHA256 9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729 SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe WHIRLPOOL 63ab1989856912e8922db66862901511e5f7e4f2bd429319b3f419f8267a442374e8f8626065ccf96766c3075750525755d91df6976352b7b59f229aab94ac86
-DIST x265_2.5.tar.gz 1256678 SHA256 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17 SHA512 f39b0b06a9f6ab9ab19fcdc1cba1578ace433e22dc8ec3f549ec3e5eeaaf40d17de6c7d419c12c16717ae795c45d953ef34a2fc9376d7e83eb7e9e74ab19ec93 WHIRLPOOL a5abfbbb533f22b2f243ff2053ab569d758d72b2cd0ec4ffb264688d9c4666b1354b7933d8e2a9197766cb33cda3e25c6771439ad34ad979ffbde361c2ecf0d5
+DIST x265_2.3.tar.gz 1215719 BLAKE2B 8ef1fcce485dbd906ab21e344d95e2d800eaee2f492a130f23487b54fe4c168043d33bbe77ed69d6ddc9873144144db0a12119eb80165da2936a6be169ce49e5 SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809
+DIST x265_2.4.tar.gz 1242300 BLAKE2B da0dca829a20cd1f807a78152a5e2f03859c05846876a73d18ea588cf66c2c35e0d2dd4e46a96b4eda54159d998403bc3c8fd07d57b781f8325c7d4ecd15119a SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe
+DIST x265_2.5.tar.gz 1256678 BLAKE2B e949bd503f03330b4c0426dbae2cad4a1600d60d92c840d1c2b9538fb37c841cecf4a0da4ce9c80b905d56c68ea07375e240e74dee32bb862fe4a81f8a1a18c4 SHA512 f39b0b06a9f6ab9ab19fcdc1cba1578ace433e22dc8ec3f549ec3e5eeaaf40d17de6c7d419c12c16717ae795c45d953ef34a2fc9376d7e83eb7e9e74ab19ec93
+DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.6.ebuild
similarity index 97%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.6.ebuild
index 9b814039f1c..f9064b970c6 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -9,9 +9,7 @@ if [[ ${PV} = 9999* ]]; then
inherit mercurial
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
- SRC_URI="
- https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
@@ -20,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/130"
+SLOT="0/146"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9b814039f1c..f9064b970c6 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -9,9 +9,7 @@ if [[ ${PV} = 9999* ]]; then
inherit mercurial
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
- SRC_URI="
- https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
@@ -20,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/130"
+SLOT="0/146"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2017-12-09 18:41 Craig Andrews
0 siblings, 0 replies; 117+ messages in thread
From: Craig Andrews @ 2017-12-09 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 8292c7fe4fbbf5cf93098500bc151a5d00375096
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 18:21:12 2017 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 18:41:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8292c7fe
media-libs/x265: Use downloads.videolan.org
ftp.videolan.org now serves an invalid certificate
media-libs/x265/x265-2.2.ebuild | 2 +-
media-libs/x265/x265-2.3.ebuild | 2 +-
media-libs/x265/x265-2.4.ebuild | 2 +-
media-libs/x265/x265-2.5.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 8f78a69d267..9ca662332ee 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="amd64 arm hppa ia64 ppc ppc64 x86"
fi
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
index 75812c4cad2..ea1512192bb 100644
--- a/media-libs/x265/x265-2.3.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
diff --git a/media-libs/x265/x265-2.4.ebuild b/media-libs/x265/x265-2.4.ebuild
index 97a42c088bd..cdde812c233 100644
--- a/media-libs/x265/x265-2.4.ebuild
+++ b/media-libs/x265/x265-2.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
diff --git a/media-libs/x265/x265-2.5.ebuild b/media-libs/x265/x265-2.5.ebuild
index 9b814039f1c..8036e309996 100644
--- a/media-libs/x265/x265-2.5.ebuild
+++ b/media-libs/x265/x265-2.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="
https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-02-22 13:40 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2018-02-22 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 04319f013e87c09cc6bbd3aa77a0caa01f10f86a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 12:46:02 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:40:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04319f01
media-libs/x265: Remove old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/x265/Manifest | 3 -
media-libs/x265/x265-2.3.ebuild | 193 ---------------------------------------
media-libs/x265/x265-2.4.ebuild | 197 ----------------------------------------
media-libs/x265/x265-2.5.ebuild | 197 ----------------------------------------
4 files changed, 590 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index cd59f9611b8..83a2f74f4f8 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,5 +1,2 @@
DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164264ff10f3887bb244ce7e605a82c2cb0a2f2ae4f2749e009baac19407109996e599dc41bc970a610ed086 SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
-DIST x265_2.3.tar.gz 1215719 BLAKE2B 8ef1fcce485dbd906ab21e344d95e2d800eaee2f492a130f23487b54fe4c168043d33bbe77ed69d6ddc9873144144db0a12119eb80165da2936a6be169ce49e5 SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809
-DIST x265_2.4.tar.gz 1242300 BLAKE2B da0dca829a20cd1f807a78152a5e2f03859c05846876a73d18ea588cf66c2c35e0d2dd4e46a96b4eda54159d998403bc3c8fd07d57b781f8325c7d4ecd15119a SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe
-DIST x265_2.5.tar.gz 1256678 BLAKE2B e949bd503f03330b4c0426dbae2cad4a1600d60d92c840d1c2b9538fb37c841cecf4a0da4ce9c80b905d56c68ea07375e240e74dee32bb862fe4a81f8a1a18c4 SHA512 f39b0b06a9f6ab9ab19fcdc1cba1578ace433e22dc8ec3f549ec3e5eeaaf40d17de6c7d419c12c16717ae795c45d953ef34a2fc9376d7e83eb7e9e74ab19ec93
DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
deleted file mode 100644
index ea1512192bb..00000000000
--- a/media-libs/x265/x265-2.3.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
- SRC_URI="
- https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~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/110"
-IUSE="+10bit +12bit neon numa pic power8 test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" "${FILESDIR}/ppc64.patch" )
-
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake-utils_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
- local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) )
- use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-2.4.ebuild b/media-libs/x265/x265-2.4.ebuild
deleted file mode 100644
index cdde812c233..00000000000
--- a/media-libs/x265/x265-2.4.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
- SRC_URI="
- https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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/116"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}/arm.patch"
- "${FILESDIR}/neon.patch"
- "${FILESDIR}/ppc64.patch"
-)
-
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake-utils_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
- local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-2.5.ebuild b/media-libs/x265/x265-2.5.ebuild
deleted file mode 100644
index 8036e309996..00000000000
--- a/media-libs/x265/x265-2.5.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
- SRC_URI="
- https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
- https://downloads.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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/130"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}/arm.patch"
- "${FILESDIR}/neon.patch"
- "${FILESDIR}/ppc64.patch"
-)
-
-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="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake-utils_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
- local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-02-22 13:40 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2018-02-22 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 34f6dee14a6eaa6e17784a6e95784df76d79dd56
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 12:57:44 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:40:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f6dee1
media-libs/x265: bump to 2.7
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.7.ebuild} | 4 ++--
media-libs/x265/x265-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 83a2f74f4f8..c87e7efc05a 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164264ff10f3887bb244ce7e605a82c2cb0a2f2ae4f2749e009baac19407109996e599dc41bc970a610ed086 SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
+DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.7.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.7.ebuild
index f9064b970c6..8515b0a5613 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/146"
+SLOT="0/151"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index f9064b970c6..8515b0a5613 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/146"
+SLOT="0/151"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-02-23 23:17 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2018-02-23 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 0e0f13e03bf1b4322e2087e2d5e588418eb7e13c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 23:14:18 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 23:17:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0f13e0
media-libs/x265: stable 2.6 for ia64, bug #648080
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"
media-libs/x265/x265-2.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index f9064b970c6..b0777b22445 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-02-24 7:20 Jason Zaman
0 siblings, 0 replies; 117+ messages in thread
From: Jason Zaman @ 2018-02-24 7:20 UTC (permalink / raw
To: gentoo-commits
commit: d8dd0842c26c2c3b9d2ba86885ea90cbf946c4fc
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 07:12:32 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 07:20:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8dd0842
media-libs/x265: amd64 stable
Gentoo-bug: 648080
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/x265/x265-2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index b0777b22445..126face8506 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-02-24 11:06 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2018-02-24 11:06 UTC (permalink / raw
To: gentoo-commits
commit: 91019147a6314ccaf3256c5491e332b13a4fc053
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 11:06:02 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 11:06:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91019147
media-libs/x265: stable 2.6 for hppa, bug #648080
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"
media-libs/x265/x265-2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index 126face8506..05669ff9376 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-02-25 18:21 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2018-02-25 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 01bb0a96c5fd32c8054979c83434a897b8634faf
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 18:16:28 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 18:16:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bb0a96
media-libs/x265: x86 stable (bug #648080)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/x265/x265-2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index 05669ff9376..555e971aeee 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-04-03 6:26 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2018-04-03 6:26 UTC (permalink / raw
To: gentoo-commits
commit: f5eb214345e477b88e1d6583543121e8a811c1fb
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 06:25:40 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 06:25:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5eb2143
media-libs/x265: stable 2.6 for ppc64, bug #648080
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"
media-libs/x265/x265-2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index 555e971aeee..d2dc1f9cdac 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-04-12 14:43 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2018-04-12 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 52257c2f46037aa4ea285ee1cedd624fdce80e02
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 14:43:27 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 14:43:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52257c2f
media-libs/x265: stable 2.6 for ppc, bug #648080
Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"
media-libs/x265/x265-2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index d2dc1f9cdac..23eefb2d499 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-04-18 13:12 Mikle Kolyada
0 siblings, 0 replies; 117+ messages in thread
From: Mikle Kolyada @ 2018-04-18 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 3f6b5100d4f12532600f8025f808d627f0b423b5
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 13:12:14 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 13:12:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6b5100
media-libs/x265: arm stable wrt bug #648080
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/x265/x265-2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index 23eefb2d499..9c3a49a4aea 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
+ KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-06-19 13:41 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2018-06-19 13:41 UTC (permalink / raw
To: gentoo-commits
commit: d3359a2c90cace583c66b1ca85deb0b6751ba23f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 13:41:11 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 13:41:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3359a2c
media-libs/x265: bump to 2.8
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.8.ebuild} | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index c87e7efc05a..6b08aed8c9a 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,3 +1,4 @@
DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164264ff10f3887bb244ce7e605a82c2cb0a2f2ae4f2749e009baac19407109996e599dc41bc970a610ed086 SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
+DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.8.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.8.ebuild
index 8515b0a5613..b7f4c3f2050 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/151"
+SLOT="0/160"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8515b0a5613..a8bb14b86fa 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/151"
+SLOT="0/161"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-09-28 8:01 Mikle Kolyada
0 siblings, 0 replies; 117+ messages in thread
From: Mikle Kolyada @ 2018-09-28 8:01 UTC (permalink / raw
To: gentoo-commits
commit: b18d7422750ee7d0c541abd6f50ec2c54cfe3a90
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 08:01:20 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 08:01:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18d7422
media-libs/x265: amd64 stable wrt bug #666486
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/x265/x265-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 7f60a7f1134..77fe16b7dbf 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-09-30 21:38 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2018-09-30 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 9ae32e7a87624f8f001f46c956d6565afa3cc428
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 21:30:35 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 21:37:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae32e7a
media-libs/x265: stable 2.8 for ia64, bug #666486
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"
media-libs/x265/x265-2.8.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 77fe16b7dbf..4bb49087774 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-10-01 0:07 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2018-10-01 0:07 UTC (permalink / raw
To: gentoo-commits
commit: 3099d1ddc4324f4b5bca8c56adbf2fb17bd67efa
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 00:02:21 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 00:06:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3099d1dd
media-libs/x265: x86 stable (bug #666486)
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-libs/x265/x265-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 4bb49087774..58b28620539 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-10-06 22:08 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2018-10-06 22:08 UTC (permalink / raw
To: gentoo-commits
commit: bd03069029d9fe7b4833dfe704ea864b889162a2
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 6 21:15:00 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 6 22:07:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd030690
media-libs/x265: stable 2.8 for hppa, bug #666486
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
media-libs/x265/x265-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 58b28620539..5f87da893e5 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-10-07 21:27 Matt Turner
0 siblings, 0 replies; 117+ messages in thread
From: Matt Turner @ 2018-10-07 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 397286eba9f050fbff68c4466cf8108557f5a79f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 21:26:59 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 21:27:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397286eb
media-libs/x265-2.8: ppc64 stable, bug 666486
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/x265/x265-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 415f386b354..2cf0bfeaa75 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-10-07 21:27 Matt Turner
0 siblings, 0 replies; 117+ messages in thread
From: Matt Turner @ 2018-10-07 21:27 UTC (permalink / raw
To: gentoo-commits
commit: e664dd9d017a0310e080bad46f8bc97b496c1b67
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 21:26:56 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 21:27:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e664dd9d
media-libs/x265-2.8: ppc stable, bug 666486
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/x265/x265-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 5f87da893e5..415f386b354 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-10-11 16:28 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2018-10-11 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 31e2b6f15eb2ff36dc03456f6c0be0e4d259df5a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 16:16:23 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 16:28:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e2b6f1
media-libs/x265: bump to 2.9
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-2.9.ebuild} | 4 ++--
media-libs/x265/x265-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 6b08aed8c9a..7740dc8a147 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -2,3 +2,4 @@ DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164
DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
+DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-2.9.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-2.9.ebuild
index a8bb14b86fa..b62476a545d 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/161"
+SLOT="0/165"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index a8bb14b86fa..b62476a545d 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/161"
+SLOT="0/165"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-10-15 18:12 Markus Meier
0 siblings, 0 replies; 117+ messages in thread
From: Markus Meier @ 2018-10-15 18:12 UTC (permalink / raw
To: gentoo-commits
commit: b94f850b3d762de82c7068a9862ef0890f52871e
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 18:09:53 2018 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 18:09:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94f850b
media-libs/x265: arm stable, bug #666486
Signed-off-by: Markus Meier <maekke <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="arm"
media-libs/x265/x265-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 2cf0bfeaa75..c60b19162d5 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
+ KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2018-11-11 22:58 Andreas Sturmlechner
0 siblings, 0 replies; 117+ messages in thread
From: Andreas Sturmlechner @ 2018-11-11 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 762ef9d2081ac5d197f19ece0f7f4dcc102c9125
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 22:58:10 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 22:58:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762ef9d2
media-libs/x265: Restore 2.8
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/x265-2.8.ebuild | 196 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 197 insertions(+)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 922e51a3e7e..a10aac354ec 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1 +1,2 @@
+DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
new file mode 100644
index 00000000000..c60b19162d5
--- /dev/null
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc 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/160"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+ "${FILESDIR}/non_x86.patch"
+)
+
+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="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local myabicmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [[ ${ABI} = x86 ]] ; then
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ elif [[ ${ABI} = x32 ]] ; then
+ # bug #510890
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ elif [[ ${ABI} = arm ]] ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ fi
+
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+ einfo "Skipping tests."
+ fi
+}
+
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ dodoc -r "${S}/../doc/"*
+}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-02-06 13:56 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2019-02-06 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 2436a43144a0bdfaab4139b08dd45875fe7410ec
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 13:41:50 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 13:56:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2436a431
media-libs/x265: bump to 3.0
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-3.0.ebuild} | 4 ++--
media-libs/x265/x265-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index a10aac354ec..7bdfb7745e7 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
+DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.0.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.0.ebuild
index b62476a545d..8fff39d6afb 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/165"
+SLOT="0/169"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index b62476a545d..8fff39d6afb 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/165"
+SLOT="0/169"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-05-05 19:05 Mike Gilbert
0 siblings, 0 replies; 117+ messages in thread
From: Mike Gilbert @ 2019-05-05 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 1b26672c072385c1e9f622a2f8047cd603bbf1c7
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun May 5 03:19:23 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 5 19:04:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b26672c
media-libs/x265: Update subslot in live ebuild.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8fff39d6afb..32a290b75dd 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/169"
+SLOT="0/173"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-07-02 17:13 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2019-07-02 17:13 UTC (permalink / raw
To: gentoo-commits
commit: c49669e635143d33086ffb14e456f0327c174a4f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 17:12:45 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 17:13:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49669e6
media-libs/x265: bump to 3.1
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-3.1.ebuild} | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 7bdfb7745e7..2d278838d13 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,3 +1,4 @@
DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
+DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.1.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.1.ebuild
index 32a290b75dd..599c1341251 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/173"
+SLOT="0/176"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 32a290b75dd..599c1341251 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/173"
+SLOT="0/176"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-08-26 15:33 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2019-08-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: b2ec483688f1a28df945e5c220330da2f96ecc21
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 15:33:36 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 15:33:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ec4836
media-libs/x265: bump to 3.1.2
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/x265-3.1.2.ebuild | 195 ++++++++++++++++++++++++++++++++++++++
2 files changed, 196 insertions(+)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 2d278838d13..c1987c739fd 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,4 +1,5 @@
DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
+DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild
new file mode 100644
index 00000000000..599c1341251
--- /dev/null
+++ b/media-libs/x265/x265-3.1.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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/176"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+)
+
+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="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local myabicmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [[ ${ABI} = x86 ]] ; then
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ elif [[ ${ABI} = x32 ]] ; then
+ # bug #510890
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ elif [[ ${ABI} = arm ]] ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ fi
+
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+ einfo "Skipping tests."
+ fi
+}
+
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ dodoc -r "${S}/../doc/"*
+}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-09-29 2:56 Mike Gilbert
0 siblings, 0 replies; 117+ messages in thread
From: Mike Gilbert @ 2019-09-29 2:56 UTC (permalink / raw
To: gentoo-commits
commit: ad7c48b3422c2932d393d9a458f6c5ef81c19275
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 28 18:26:48 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 02:56:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7c48b3
media-libs/x265: Update subslot.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 599c1341251..a020423d9d5 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/176"
+SLOT="0/179"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-10-04 17:28 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2019-10-04 17:28 UTC (permalink / raw
To: gentoo-commits
commit: b487338cebaafec052137ff92a5d3f34d18f9f05
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 16:24:34 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 17:28:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b487338c
media-libs/x265: bump to 3.2
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-3.2.ebuild} | 0
media-libs/x265/x265-9999.ebuild | 2 +-
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index c1987c739fd..70a6b4cecfe 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -3,3 +3,4 @@ DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805
DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
+DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.2.ebuild
similarity index 100%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.2.ebuild
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index a020423d9d5..e946da2c3db 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/179"
+SLOT="0/180"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2019-12-29 19:34 Mike Gilbert
0 siblings, 0 replies; 117+ messages in thread
From: Mike Gilbert @ 2019-12-29 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 0e79c31988942e166877acf8ee4c43e0d522e2d1
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Dec 23 21:33:10 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 19:31:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e79c319
media-libs/x265: Update subslot.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d5d06452569..aaf2a4fe9a0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/180"
+SLOT="0/184"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-01-20 17:43 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2020-01-20 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 99173e7c992b7f640d41701f344d7c5e83eee3ec
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 16:33:33 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 17:43:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99173e7c
media-libs/x265: bump to 3.2.1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/x265-3.2.1.ebuild | 196 ++++++++++++++++++++++++++++++++++++++
2 files changed, 197 insertions(+)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 70a6b4cecfe..28249212eef 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -3,4 +3,5 @@ DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805
DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
+DIST x265_3.2.1.tar.gz 1426255 BLAKE2B 4184cfa290b36f497c5f3a5e3b597bf44e52dd20ba6af21c665d98709c9b984122a339d93aae572756a94549c0c1a293ee195c6c1d34902d298664ecf016f896 SHA512 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
diff --git a/media-libs/x265/x265-3.2.1.ebuild b/media-libs/x265/x265-3.2.1.ebuild
new file mode 100644
index 00000000000..a7c7ebc8e96
--- /dev/null
+++ b/media-libs/x265/x265-3.2.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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/179"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+)
+
+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="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local myabicmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [[ ${ABI} = x86 ]] ; then
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ elif [[ ${ABI} = x32 ]] ; then
+ # bug #510890
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ elif [[ ${ABI} = arm ]] ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ fi
+
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+ einfo "Skipping tests."
+ fi
+}
+
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ dodoc -r "${S}/../doc/"*
+}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 519fcb2b2d4b03d6c09a752f1fb8aff89c2e9cef
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 23:20:05 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519fcb2b
media-libs/x265: delete all static libraries
Closes: https://bugs.gentoo.org/724598
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index ca3553d0293..422b036bbd1 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -193,4 +193,9 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc -r "${S}/../doc/"*
+
+ # we don't install *.a files for all variants,
+ # so just delete these files instead of pretending
+ # real USE=static-libs support
+ find "${ED}" -name "*.a" -delete || die
}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 4fee8386545ab1ff0a28904f75c57c8775b3c4aa
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 15:14:28 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fee8386
media-libs/x265: package uses dev-lang/nasm
Closes: https://bugs.gentoo.org/676270
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index a8595e79d05..503dca0ef3e 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -24,7 +24,7 @@ IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power
# Test suite requires assembly support and is known to be broken
RESTRICT="test"
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: eba596db8a926adb18595549c89294ed0a1e929e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 15:07:04 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba596db
media-libs/x265: rework assembly support
Closes: https://bugs.gentoo.org/681878
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/metadata.xml | 1 +
media-libs/x265/x265-3.3.ebuild | 66 ++++++++++++++++++++---------------------
2 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 22a07293b83..c585d553631 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -5,6 +5,7 @@
<email>media-video@gentoo.org</email>
</maintainer>
<use>
+ <flag name="asm">Enable x86_64 assembly optimizations.</flag>
<flag name="10bit">Add support for producing 10bits HEVC.</flag>
<flag name="12bit">Add support for producing 12bits HEVC.</flag>
<flag name="numa">Build with support for NUMA nodes.</flag>
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 9fc0159bc00..f5c4fee6d97 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -19,15 +19,17 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/188"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon numa pic power8 test"
# Test suite requires assembly support and is known to be broken
RESTRICT="test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-BDEPEND="abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
+BDEPEND="asm? (
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )
+ )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -85,17 +87,6 @@ x265_variant_src_configure() {
-DENABLE_CLI=OFF
-DMAIN12=ON
)
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
;;
"main10")
mycmakeargs+=(
@@ -104,17 +95,6 @@ x265_variant_src_configure() {
-DENABLE_SHARED=OFF
-DENABLE_CLI=OFF
)
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -146,7 +126,6 @@ multilib_src_configure() {
append-cxxflags -fPIC
local myabicmakeargs=(
- -DENABLE_TESTS=$(usex test ON OFF)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
-DCPU_POWER8=$(usex power8 ON OFF)
@@ -154,18 +133,39 @@ multilib_src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
)
+ local supports_asm=yes
+
if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
+ if use asm && use pic ; then
+ # Bug #528202
ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ supports_asm=no
fi
elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ if use asm ; then
+ # bug #510890
+ ewarn "x32 ABI doesn't support asm"
+ supports_asm=no
+ fi
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ if use asm && use pic ; then
+ ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ supports_asm=no
+ elif use asm && use cpu_flags_arm_neon ; then
+ supports_asm=yes
+ elif use asm ; then
+ supports_asm=no
+ fi
+ fi
+
+ if [[ "${supports_asm}" = yes ]] && use asm ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=ON )
+
+ if multilib_is_native_abi ; then
+ myabicmakeargs+=( -DENABLE_TESTS=$(usex test ON OFF) )
+ fi
+ else
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 4e1676eccb226a3405add9c2a9420dbf0c917fba
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 14:49:22 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1676ec
media-libs/x265: disable broken test suite
Bug: https://bugs.gentoo.org/668438
Bug: https://bugs.gentoo.org/689006
Bug: https://bugs.gentoo.org/689736
Bug: https://bugs.gentoo.org/681174
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 422b036bbd1..c9bf91a4ba5 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -20,7 +20,9 @@ LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/188"
IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
-RESTRICT="!test? ( test )"
+
+# Test suite requires assembly support and is known to be broken
+RESTRICT="test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 04d3ea884dc9efac4476e9fd18793a1abc86bf14
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 14:51:20 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d3ea88
media-libs/x265: update HOMEPAGE
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index c9bf91a4ba5..41f53bc131e 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -14,7 +14,7 @@ else
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 4d93c54aa36af985f098b125ea53102ef145031f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 20:24:35 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:24:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d93c54a
media-libs/x265: update live ebuild
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 125 +++++++++++++++++++++------------------
1 file changed, 68 insertions(+), 57 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index aaf2a4fe9a0..9428b001e84 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="7"
inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
@@ -14,28 +14,35 @@ else
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/184"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
-RESTRICT="!test? ( test )"
+SLOT="0/188"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
+
+# Test suite requires assembly support and is known to be broken
+RESTRICT="test"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+
+BDEPEND="asm? (
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )
+ )"
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
+
+DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/arm.patch"
- "${FILESDIR}/neon.patch"
- "${FILESDIR}/ppc64.patch"
+ "${FILESDIR}"/${PN}-3.3-arm.patch
+ "${FILESDIR}"/${PN}-3.3-neon.patch
+ "${FILESDIR}"/${PN}-3.3-ppc64.patch
)
src_unpack() {
- if [[ ${PV} = 9999* ]]; then
+ if [[ ${PV} = 9999* ]] ; then
mercurial_src_unpack
# Can't set it at global scope due to mercurial.eclass limitations...
export S=${WORKDIR}/${P}/source
@@ -59,11 +66,11 @@ src_unpack() {
# allow disabling it: "main" *MUST* come last in the following list.
x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
+ local -a variants=()
+ use 12bit && variants+=( main12 )
+ use 10bit && variants+=( main10 )
+ variants+=( main )
+ echo "${variants[@]}"
}
x265_variant_src_configure() {
@@ -80,17 +87,6 @@ x265_variant_src_configure() {
-DENABLE_CLI=OFF
-DMAIN12=ON
)
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
;;
"main10")
mycmakeargs+=(
@@ -99,25 +95,14 @@ x265_variant_src_configure() {
-DENABLE_SHARED=OFF
-DENABLE_CLI=OFF
)
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist=""
+ local liblist="" v=
for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
@@ -131,34 +116,55 @@ x265_variant_src_configure() {
*)
die "Unknown variant: ${MULTIBUILD_VARIANT}";;
esac
+
cmake-utils_src_configure
popd >/dev/null || die
}
multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
local myabicmakeargs=(
- $(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_PIC=ON
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
+ local supports_asm=yes
+
if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ if use asm ; then
+ # Bug #528202
+ ewarn "x86 asm is not PIC-safe, disabling it."
+ supports_asm=no
fi
elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ if use asm ; then
+ # bug #510890
+ ewarn "x32 ABI doesn't support asm"
+ supports_asm=no
+ fi
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ if use asm && use cpu_flags_arm_neon ; then
+ supports_asm=yes
+ elif use asm ; then
+ ewarn "arm asm is not PIC-safe, disabling it."
+ supports_asm=no
+ fi
+ elif [[ ${ABI} = ppc* ]] ; then
+ myabicmakeargs+=(
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ )
+ fi
+
+ if [[ "${supports_asm}" = yes ]] && use asm ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=ON )
+
+ if multilib_is_native_abi ; then
+ myabicmakeargs+=( -DENABLE_TESTS=$(usex test ON OFF) )
+ fi
+ else
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
@@ -171,7 +177,7 @@ multilib_src_compile() {
}
x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
"${BUILD_DIR}/test/TestBench" || die
else
einfo "Unit tests check only assembly."
@@ -193,4 +199,9 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc -r "${S}/../doc/"*
+
+ # we don't install *.a files for all variants,
+ # so just delete these files instead of pretending
+ # real USE=static-libs support
+ find "${ED}" -name "*.a" -delete || die
}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: eaa562a9de31977fcf6f01360a21f7ef56058a9c
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 23:08:38 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa562a9
media-libs/x265: bump to v3.3
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/x265-3.3.ebuild | 196 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 197 insertions(+)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 28249212eef..7fdf4137f63 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -5,3 +5,4 @@ DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b
DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
DIST x265_3.2.1.tar.gz 1426255 BLAKE2B 4184cfa290b36f497c5f3a5e3b597bf44e52dd20ba6af21c665d98709c9b984122a339d93aae572756a94549c0c1a293ee195c6c1d34902d298664ecf016f896 SHA512 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
+DIST x265_3.3.tar.gz 1438685 BLAKE2B 43806915c3b22fabff71c307dc53e9a3408262528f8ec01bf81168826eee26b468b0e68c738e3c0371f6de6121a3ac090bfaeed0cbfca0a3b8c57710d7f25ad0 SHA512 3d56900ecd58e83d2ecc93d956524e3b0e622dbe3c74a137c7b21f98599245547403401e9ec7f679996fd09fca788aa10272bf17e58a68fce449c8cb555ad7c0
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
new file mode 100644
index 00000000000..ca3553d0293
--- /dev/null
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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/188"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+)
+
+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="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local myabicmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [[ ${ABI} = x86 ]] ; then
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ elif [[ ${ABI} = x32 ]] ; then
+ # bug #510890
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ elif [[ ${ABI} = arm ]] ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ fi
+
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+ einfo "Skipping tests."
+ fi
+}
+
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ dodoc -r "${S}/../doc/"*
+}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 132ec2330862d4305e3d450e08325862a88451b2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 15:12:10 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132ec233
media-libs/x265: add USE=cpu_flags_ppc_altivec
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index f5c4fee6d97..a8595e79d05 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/188"
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
# Test suite requires assembly support and is known to be broken
RESTRICT="test"
@@ -128,8 +128,6 @@ multilib_src_configure() {
local myabicmakeargs=(
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
@@ -156,6 +154,11 @@ multilib_src_configure() {
elif use asm ; then
supports_asm=no
fi
+ elif [[ ${ABI} = ppc* ]] ; then
+ myabicmakeargs+=(
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ )
fi
if [[ "${supports_asm}" = yes ]] && use asm ; then
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:25 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 6e149596cc76f1bbcee6720828c8c8c92420f2a3
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 19:47:08 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e149596
media-libs/x265: drop USE=pic
Gentoo's toolchain uses PIC by default. Since USE=asm was added,
we no longer need a USE flag to control that behavior.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 503dca0ef3e..9428b001e84 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/188"
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
# Test suite requires assembly support and is known to be broken
RESTRICT="test"
@@ -122,11 +122,9 @@ x265_variant_src_configure() {
}
multilib_src_configure() {
- append-cflags -fPIC
- append-cxxflags -fPIC
-
local myabicmakeargs=(
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_PIC=ON
-DENABLE_LIBNUMA=$(usex numa ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
@@ -134,9 +132,9 @@ multilib_src_configure() {
local supports_asm=yes
if [[ ${ABI} = x86 ]] ; then
- if use asm && use pic ; then
+ if use asm ; then
# Bug #528202
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ ewarn "x86 asm is not PIC-safe, disabling it."
supports_asm=no
fi
elif [[ ${ABI} = x32 ]] ; then
@@ -146,12 +144,10 @@ multilib_src_configure() {
supports_asm=no
fi
elif [[ ${ABI} = arm ]] ; then
- if use asm && use pic ; then
- ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
- supports_asm=no
- elif use asm && use cpu_flags_arm_neon ; then
+ if use asm && use cpu_flags_arm_neon ; then
supports_asm=yes
elif use asm ; then
+ ewarn "arm asm is not PIC-safe, disabling it."
supports_asm=no
fi
elif [[ ${ABI} = ppc* ]] ; then
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-24 20:59 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-05-24 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 1c7a7121ba5a02af6fb6c194135dcb7040b97a1c
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 20:59:02 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:59:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7a7121
media-libs/x265: switch to cmake-multilib eclass
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 9 +++++----
media-libs/x265/x265-9999.ebuild | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 9428b001e84..96fa1f5e454 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -3,7 +3,8 @@
EAPI="7"
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+CMAKE_ECLASS=cmake
+inherit flag-o-matic multibuild cmake-multilib
if [[ ${PV} = 9999* ]]; then
inherit mercurial
@@ -117,7 +118,7 @@ x265_variant_src_configure() {
die "Unknown variant: ${MULTIBUILD_VARIANT}";;
esac
- cmake-utils_src_configure
+ cmake_src_configure
popd >/dev/null || die
}
@@ -173,7 +174,7 @@ multilib_src_configure() {
multilib_src_compile() {
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
+ multibuild_foreach_variant cmake_src_compile
}
x265_variant_src_test() {
@@ -194,7 +195,7 @@ multilib_src_test() {
multilib_src_install() {
# Install only "main" variant since the others are already linked into it.
local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
+ multibuild_foreach_variant cmake_src_install
}
multilib_src_install_all() {
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9428b001e84..96fa1f5e454 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -3,7 +3,8 @@
EAPI="7"
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+CMAKE_ECLASS=cmake
+inherit flag-o-matic multibuild cmake-multilib
if [[ ${PV} = 9999* ]]; then
inherit mercurial
@@ -117,7 +118,7 @@ x265_variant_src_configure() {
die "Unknown variant: ${MULTIBUILD_VARIANT}";;
esac
- cmake-utils_src_configure
+ cmake_src_configure
popd >/dev/null || die
}
@@ -173,7 +174,7 @@ multilib_src_configure() {
multilib_src_compile() {
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake-utils_src_compile
+ multibuild_foreach_variant cmake_src_compile
}
x265_variant_src_test() {
@@ -194,7 +195,7 @@ multilib_src_test() {
multilib_src_install() {
# Install only "main" variant since the others are already linked into it.
local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake-utils_src_install
+ multibuild_foreach_variant cmake_src_install
}
multilib_src_install_all() {
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-25 5:11 Georgy Yakovlev
0 siblings, 0 replies; 117+ messages in thread
From: Georgy Yakovlev @ 2020-05-25 5:11 UTC (permalink / raw
To: gentoo-commits
commit: 8e0a5fb99616c7abe00edac7e36d6c61e4af3318
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 05:01:41 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 25 05:09:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0a5fb9
media-libs/x265: fix 3.3 on ppc64
Closes: https://bugs.gentoo.org/725134
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/x265/x265-3.3.ebuild | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 96fa1f5e454..736bea15bb8 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -88,6 +88,8 @@ x265_variant_src_configure() {
-DENABLE_CLI=OFF
-DMAIN12=ON
)
+ # disable altivec for 12bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main10")
mycmakeargs+=(
@@ -96,6 +98,8 @@ x265_variant_src_configure() {
-DENABLE_SHARED=OFF
-DENABLE_CLI=OFF
)
+ # disable altivec for 10bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -112,6 +116,14 @@ x265_variant_src_configure() {
-DLINKED_10BIT=$(usex 10bit)
-DLINKED_12BIT=$(usex 12bit)
)
+ # we have to handle ppc here and not in multilib_src_configure
+ # because we want those flags apply ONLY to "main" variant
+ if [[ ${ABI} = ppc* ]] ; then
+ myabicmakeargs+=(
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ )
+ fi
fi
;;
*)
@@ -152,10 +164,10 @@ multilib_src_configure() {
supports_asm=no
fi
elif [[ ${ABI} = ppc* ]] ; then
- myabicmakeargs+=(
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
- )
+ if use asm ; then
+ ewarn "ppc64 uses altivec instead of asm, disabling it."
+ supports_asm=no
+ fi
fi
if [[ "${supports_asm}" = yes ]] && use asm ; then
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-05-25 5:11 Georgy Yakovlev
0 siblings, 0 replies; 117+ messages in thread
From: Georgy Yakovlev @ 2020-05-25 5:11 UTC (permalink / raw
To: gentoo-commits
commit: fe5c3453d9b642af66fbbc09c9b0e844034bc21f
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 05:02:39 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 25 05:09:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5c3453
media-libs/x265: sync live ebuild
Bug: https://bugs.gentoo.org/725134
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 96fa1f5e454..736bea15bb8 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -88,6 +88,8 @@ x265_variant_src_configure() {
-DENABLE_CLI=OFF
-DMAIN12=ON
)
+ # disable altivec for 12bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main10")
mycmakeargs+=(
@@ -96,6 +98,8 @@ x265_variant_src_configure() {
-DENABLE_SHARED=OFF
-DENABLE_CLI=OFF
)
+ # disable altivec for 10bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -112,6 +116,14 @@ x265_variant_src_configure() {
-DLINKED_10BIT=$(usex 10bit)
-DLINKED_12BIT=$(usex 12bit)
)
+ # we have to handle ppc here and not in multilib_src_configure
+ # because we want those flags apply ONLY to "main" variant
+ if [[ ${ABI} = ppc* ]] ; then
+ myabicmakeargs+=(
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ )
+ fi
fi
;;
*)
@@ -152,10 +164,10 @@ multilib_src_configure() {
supports_asm=no
fi
elif [[ ${ABI} = ppc* ]] ; then
- myabicmakeargs+=(
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
- )
+ if use asm ; then
+ ewarn "ppc64 uses altivec instead of asm, disabling it."
+ supports_asm=no
+ fi
fi
if [[ "${supports_asm}" = yes ]] && use asm ; then
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-06-05 15:21 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2020-06-05 15:21 UTC (permalink / raw
To: gentoo-commits
commit: cfb43e2ae25d60d88c0a341fb86a57ef9b9ce12e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 15:18:51 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 15:19:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb43e2a
media-libs/x265: extend arm neon special cases to arm64
Fixes build on arm64
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 4 ++--
media-libs/x265/x265-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index e40ca0e0876..a3ce2faae8c 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -86,7 +86,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = x86 ]] ; then
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = arm ]] ; then
+ if [[ ${ABI} = arm* ]] ; then
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
@@ -103,7 +103,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = x86 ]] ; then
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = arm ]] ; then
+ if [[ ${ABI} = arm* ]] ; then
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e40ca0e0876..a3ce2faae8c 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -86,7 +86,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = x86 ]] ; then
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = arm ]] ; then
+ if [[ ${ABI} = arm* ]] ; then
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
@@ -103,7 +103,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = x86 ]] ; then
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = arm ]] ; then
+ if [[ ${ABI} = arm* ]] ; then
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-06-05 15:21 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2020-06-05 15:21 UTC (permalink / raw
To: gentoo-commits
commit: f4b9781a286d6d12811fc3dd8329492bba49b988
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 15:03:05 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 15:19:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b9781a
media-libs/x265: forward port ppc changes
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 22 +++++++++++-----------
media-libs/x265/x265-9999.ebuild | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index f973a0196a7..e40ca0e0876 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/192"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
RESTRICT="!test? ( test )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -90,10 +90,8 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
+ # disable altivec for 12bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main10")
mycmakeargs+=(
@@ -109,10 +107,8 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
+ # disable altivec for 10bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -129,6 +125,12 @@ x265_variant_src_configure() {
-DLINKED_10BIT=$(usex 10bit)
-DLINKED_12BIT=$(usex 12bit)
)
+ if [[ ${ABI} = ppc* ]] ; then
+ myabicmakeargs+=(
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ )
+ fi
fi
;;
*)
@@ -144,8 +146,6 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index f973a0196a7..e40ca0e0876 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/192"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
RESTRICT="!test? ( test )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -90,10 +90,8 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
+ # disable altivec for 12bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main10")
mycmakeargs+=(
@@ -109,10 +107,8 @@ x265_variant_src_configure() {
# 589674
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
- if [[ ${ABI} = ppc64 ]] ; then
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
- fi
+ # disable altivec for 10bit build #607802#c5
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -129,6 +125,12 @@ x265_variant_src_configure() {
-DLINKED_10BIT=$(usex 10bit)
-DLINKED_12BIT=$(usex 12bit)
)
+ if [[ ${ABI} = ppc* ]] ; then
+ myabicmakeargs+=(
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ )
+ fi
fi
;;
*)
@@ -144,8 +146,6 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-06-07 12:42 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2020-06-07 12:42 UTC (permalink / raw
To: gentoo-commits
commit: c0e7ffe1a6e34be0172d32d11f92b69cfe5a1efc
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 12:42:11 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 12:42:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e7ffe1
media-libs/x265: Fix typo for ppc asm on main variant
This was causing cmakeargs to be ignored
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 18 +++++++++++++++---
media-libs/x265/x265-9999.ebuild | 18 +++++++++++++++---
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index a3ce2faae8c..8d6664cdef2 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -73,6 +73,8 @@ x265_variant_src_configure() {
mkdir -p "${BUILD_DIR}" || die
pushd "${BUILD_DIR}" >/dev/null || die
+ einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
local mycmakeargs=( "${myabicmakeargs[@]}" )
case "${MULTIBUILD_VARIANT}" in
"main12")
@@ -91,7 +93,12 @@ x265_variant_src_configure() {
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
# disable altivec for 12bit build #607802#c5
- [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+ if [[ ${ABI} = ppc* ]] ; then
+ mycmakeargs+=(
+ -DENABLE_ALTIVEC=OFF
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ )
+ fi
;;
"main10")
mycmakeargs+=(
@@ -108,7 +115,12 @@ x265_variant_src_configure() {
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
# disable altivec for 10bit build #607802#c5
- [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+ if [[ ${ABI} = ppc* ]] ; then
+ mycmakeargs+=(
+ -DENABLE_ALTIVEC=OFF
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ )
+ fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -126,7 +138,7 @@ x265_variant_src_configure() {
-DLINKED_12BIT=$(usex 12bit)
)
if [[ ${ABI} = ppc* ]] ; then
- myabicmakeargs+=(
+ mycmakeargs+=(
-DCPU_POWER8=$(usex power8 ON OFF)
-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index a3ce2faae8c..8d6664cdef2 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -73,6 +73,8 @@ x265_variant_src_configure() {
mkdir -p "${BUILD_DIR}" || die
pushd "${BUILD_DIR}" >/dev/null || die
+ einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
local mycmakeargs=( "${myabicmakeargs[@]}" )
case "${MULTIBUILD_VARIANT}" in
"main12")
@@ -91,7 +93,12 @@ x265_variant_src_configure() {
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
# disable altivec for 12bit build #607802#c5
- [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+ if [[ ${ABI} = ppc* ]] ; then
+ mycmakeargs+=(
+ -DENABLE_ALTIVEC=OFF
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ )
+ fi
;;
"main10")
mycmakeargs+=(
@@ -108,7 +115,12 @@ x265_variant_src_configure() {
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
# disable altivec for 10bit build #607802#c5
- [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+ if [[ ${ABI} = ppc* ]] ; then
+ mycmakeargs+=(
+ -DENABLE_ALTIVEC=OFF
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ )
+ fi
;;
"main")
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -126,7 +138,7 @@ x265_variant_src_configure() {
-DLINKED_12BIT=$(usex 12bit)
)
if [[ ${ABI} = ppc* ]] ; then
- myabicmakeargs+=(
+ mycmakeargs+=(
-DCPU_POWER8=$(usex power8 ON OFF)
-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-06-07 23:24 Georgy Yakovlev
0 siblings, 0 replies; 117+ messages in thread
From: Georgy Yakovlev @ 2020-06-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 7954a8ed241574852dad7e932afd4276d58370b7
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 23:22:37 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 23:24:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7954a8ed
media-libs/x265: use cpu_flags_ppc_vsx2 in ver 9999
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8d6664cdef2..65ee36367ee 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/192"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -96,7 +96,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = ppc* ]] ; then
mycmakeargs+=(
-DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
;;
@@ -118,7 +118,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = ppc* ]] ; then
mycmakeargs+=(
-DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
;;
@@ -138,9 +138,13 @@ x265_variant_src_configure() {
-DLINKED_12BIT=$(usex 12bit)
)
if [[ ${ABI} = ppc* ]] ; then
+ # upstream uses mix of altivec + power8 vectors
+ # it's impossible to enable altivec without CPU_POWER8
+ # and it does not work on ppc32
+ # so we toggle both variables together
mycmakeargs+=(
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
fi
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-06-08 18:23 Georgy Yakovlev
0 siblings, 0 replies; 117+ messages in thread
From: Georgy Yakovlev @ 2020-06-08 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 6a40ed6d96df469070d907833f67663ce88cec6b
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 18:13:43 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 18:23:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a40ed6d
media-libs/x265: add cpu_flags_ppc_vsx2 to 3.4
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index 8d6664cdef2..65ee36367ee 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/192"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -96,7 +96,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = ppc* ]] ; then
mycmakeargs+=(
-DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
;;
@@ -118,7 +118,7 @@ x265_variant_src_configure() {
if [[ ${ABI} = ppc* ]] ; then
mycmakeargs+=(
-DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
;;
@@ -138,9 +138,13 @@ x265_variant_src_configure() {
-DLINKED_12BIT=$(usex 12bit)
)
if [[ ${ABI} = ppc* ]] ; then
+ # upstream uses mix of altivec + power8 vectors
+ # it's impossible to enable altivec without CPU_POWER8
+ # and it does not work on ppc32
+ # so we toggle both variables together
mycmakeargs+=(
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
fi
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-06-08 19:34 Georgy Yakovlev
0 siblings, 0 replies; 117+ messages in thread
From: Georgy Yakovlev @ 2020-06-08 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 7a9177eb6ef769dc342948c632b721426595ab41
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 18:39:32 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 19:33:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9177eb
media-libs/x265: migrate to cpu_flags_ppc_vsx2 instead of power8
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/x265/metadata.xml | 1 -
media-libs/x265/x265-2.8.ebuild | 8 ++++----
media-libs/x265/x265-2.9.ebuild | 8 ++++----
media-libs/x265/x265-3.0.ebuild | 8 ++++----
media-libs/x265/x265-3.1.2.ebuild | 8 ++++----
media-libs/x265/x265-3.1.ebuild | 8 ++++----
media-libs/x265/x265-3.2.1.ebuild | 6 +++---
media-libs/x265/x265-3.2.ebuild | 8 ++++----
media-libs/x265/x265-3.3.ebuild | 6 +++---
9 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index c585d553631..2049b41f26e 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -10,7 +10,6 @@
<flag name="12bit">Add support for producing 12bits HEVC.</flag>
<flag name="numa">Build with support for NUMA nodes.</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
- <flag name="power8">Enable support for Power 8 assembly optimizations.</flag>
</use>
<upstream>
<remote-id type="bitbucket">multicoreware/x265</remote-id>
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index f4bb545314b..3041c243b77 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/160"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -143,8 +143,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
index 5f28b491bab..ead3e157954 100644
--- a/media-libs/x265/x265-2.9.ebuild
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/165"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -143,8 +143,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-3.0.ebuild b/media-libs/x265/x265-3.0.ebuild
index 2d1942d399d..df633a2e1d7 100644
--- a/media-libs/x265/x265-3.0.ebuild
+++ b/media-libs/x265/x265-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/169"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild
index 71303686d68..b69d74af980 100644
--- a/media-libs/x265/x265-3.1.2.ebuild
+++ b/media-libs/x265/x265-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/176"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-3.1.ebuild b/media-libs/x265/x265-3.1.ebuild
index 71303686d68..b69d74af980 100644
--- a/media-libs/x265/x265-3.1.ebuild
+++ b/media-libs/x265/x265-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/176"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-3.2.1.ebuild b/media-libs/x265/x265-3.2.1.ebuild
index a7c7ebc8e96..6ce84bf0fa1 100644
--- a/media-libs/x265/x265-3.2.1.ebuild
+++ b/media-libs/x265/x265-3.2.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/179"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-3.2.ebuild b/media-libs/x265/x265-3.2.ebuild
index b1d719a14b6..6ce84bf0fa1 100644
--- a/media-libs/x265/x265-3.2.ebuild
+++ b/media-libs/x265/x265-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/179"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 736bea15bb8..1bcd7b28a79 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/188"
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa test"
# Test suite requires assembly support and is known to be broken
RESTRICT="test"
@@ -120,8 +120,8 @@ x265_variant_src_configure() {
# because we want those flags apply ONLY to "main" variant
if [[ ${ABI} = ppc* ]] ; then
myabicmakeargs+=(
- -DCPU_POWER8=$(usex power8 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+ -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
)
fi
fi
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-08-25 12:37 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2020-08-25 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 2f273e6e6ff443423db651dad539480da60648d2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 15:43:31 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:37:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f273e6e
media-libs/x265: migrate to git
Closes: https://bugs.gentoo.org/737900
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 65ee36367ee..3bd31a5364c 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -6,8 +6,9 @@ EAPI=7
inherit cmake multilib-minimal multilib multibuild flag-o-matic
if [[ ${PV} = 9999* ]]; then
- inherit mercurial
- EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+ inherit git-r3
+ EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
+ S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
@@ -18,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/192"
+SLOT="0/195"
IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
@@ -39,9 +40,7 @@ PATCHES=(
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
+ git-r3_src_unpack
else
unpack ${A}
export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-03 14:38 Thomas Deutschmann
0 siblings, 0 replies; 117+ messages in thread
From: Thomas Deutschmann @ 2020-09-03 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 7c188a749755cb917a4c566d49e4b3387ef29480
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 14:38:21 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 14:38:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c188a74
media-libs/x265: x86 stable (bug #729628)
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index 65ee36367ee..eaaed225752 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-04 0:21 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2020-09-04 0:21 UTC (permalink / raw
To: gentoo-commits
commit: a181b9037e0a677fe98122a29ecda3eee104140e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 00:20:18 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 00:20:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a181b903
media-libs/x265: Stabilize 3.4 arm, #729628
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index eaaed225752..6ee2328bf22 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-04 0:21 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2020-09-04 0:21 UTC (permalink / raw
To: gentoo-commits
commit: 8704d1e25f3bea343023a678afa32194222bea01
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 00:20:36 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 00:20:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8704d1e2
media-libs/x265: Stabilize 3.4 arm64, #729628
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index 6ee2328bf22..a04f085a13f 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-04 4:54 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2020-09-04 4:54 UTC (permalink / raw
To: gentoo-commits
commit: ed9c8fe1f25db03ec03b2aa5e5f98c0e6f963721
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 04:54:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 04:54:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9c8fe1
media-libs/x265: Stabilize 3.4 amd64, #729628
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index a04f085a13f..c8745f4ffde 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-06 7:49 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2020-09-06 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 29f5ccdaf195583806cc99936adfb81a865c5fc9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 07:46:26 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 07:49:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f5ccda
media-libs/x265: stable 3.4 for hppa
stable wrt bug #729628
Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index c8745f4ffde..cb98ea0841f 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-07 8:20 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2020-09-07 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 198a5540e296073b336bc48a3ab2e3c45dbd7b0f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 08:11:03 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 08:20:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198a5540
media-libs/x265: stable 3.4 for ppc
stable wrt bug #729628
Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index cb98ea0841f..74c32a2d7fa 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2020-09-07 8:47 Sergei Trofimovich
0 siblings, 0 replies; 117+ messages in thread
From: Sergei Trofimovich @ 2020-09-07 8:47 UTC (permalink / raw
To: gentoo-commits
commit: fc7ccb684cd5e8752cf3d2c6c1f9b1aaf7ee5f90
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 08:38:20 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 08:47:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7ccb68
media-libs/x265: stable 3.4 for ppc64
stable wrt bug #729628
Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
media-libs/x265/x265-3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index 74c32a2d7fa..beb228bbbe5 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
else
SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2021-08-03 7:35 Alexis Ballier
0 siblings, 0 replies; 117+ messages in thread
From: Alexis Ballier @ 2021-08-03 7:35 UTC (permalink / raw
To: gentoo-commits
commit: 7788f2443c1b21a25dec1b996ac7af941926cb17
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 2 19:22:02 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 07:35:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7788f244
media-libs/x265: bump to 3.5
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/x265/Manifest | 1 +
media-libs/x265/{x265-9999.ebuild => x265-3.5.ebuild} | 8 ++++----
media-libs/x265/x265-9999.ebuild | 8 ++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 54e9273750f..0cdf643f4c6 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1 +1,2 @@
DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
+DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.5.ebuild
similarity index 97%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.5.ebuild
index 3bd31a5364c..e956de4eab0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
S=${WORKDIR}/${P}/source
else
- SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/195"
+SLOT="0/199"
IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3bd31a5364c..e956de4eab0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
S=${WORKDIR}/${P}/source
else
- SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/195"
+SLOT="0/199"
IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2021-09-25 3:43 Ionen Wolkens
0 siblings, 0 replies; 117+ messages in thread
From: Ionen Wolkens @ 2021-09-25 3:43 UTC (permalink / raw
To: gentoo-commits
commit: d41450c586971bf48a4a8cdf04e057b7af77066d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 03:24:56 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 03:41:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41450c5
media-libs/x265: quickfix for missing lib and .pc if no git(1)
-DGIT_ARCHETYPE is not a real option but something the Version.cmake
would hard set(...) and overwrite, however if dev-vcs/git is not
found it skips that entirely.
i.e. if GIT_FOUND then use .git if found, else use .txt version.
Setting this tells it to use the latter if missing, if found then
doing so does nothing given cmake will overwrite it.
If no version/tag, the source/CMakeLists.txt acts on this comment:
"# shared library is not installed if a tag is not found"
Closes: https://bugs.gentoo.org/812398
Closes: https://bugs.gentoo.org/814116
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-libs/x265/{x265-9999.ebuild => x265-3.5-r1.ebuild} | 1 +
media-libs/x265/x265-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.5-r1.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.5-r1.ebuild
index e956de4eab0..3e0116c5da0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.5-r1.ebuild
@@ -161,6 +161,7 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DGIT_ARCHETYPE=1 #814116
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e956de4eab0..3e0116c5da0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -161,6 +161,7 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DGIT_ARCHETYPE=1 #814116
-DLIB_INSTALL_DIR="$(get_libdir)"
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2021-10-06 1:02 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2021-10-06 1:02 UTC (permalink / raw
To: gentoo-commits
commit: 1510b1a50b32499c4e54d0bd792e09bf83317cc7
Author: David Carlos Manuelda <StormByte <AT> gmail <DOT> com>
AuthorDate: Wed Oct 6 00:15:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 6 01:00:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1510b1a5
media-libs/x265: add HDR10+ support
Closes: https://bugs.gentoo.org/816300
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/{x265-3.5-r1.ebuild => x265-3.5-r2.ebuild} | 1 +
media-libs/x265/x265-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-libs/x265/x265-3.5-r1.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
similarity index 99%
rename from media-libs/x265/x265-3.5-r1.ebuild
rename to media-libs/x265/x265-3.5-r2.ebuild
index 3e0116c5da0..58018488f52 100644
--- a/media-libs/x265/x265-3.5-r1.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -105,6 +105,7 @@ x265_variant_src_configure() {
-DEXPORT_C_API=OFF
-DENABLE_SHARED=OFF
-DENABLE_CLI=OFF
+ -DENABLE_HDR10_PLUS=ON
)
if [[ ${ABI} = x86 ]] ; then
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3e0116c5da0..58018488f52 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -105,6 +105,7 @@ x265_variant_src_configure() {
-DEXPORT_C_API=OFF
-DENABLE_SHARED=OFF
-DENABLE_CLI=OFF
+ -DENABLE_HDR10_PLUS=ON
)
if [[ ${ABI} = x86 ]] ; then
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-19 3:38 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2022-02-19 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 1c731bf9d575f1b669ace40849feb0c0890ced51
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 03:34:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 03:34:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c731bf9
media-libs/x265: Stabilize 3.5 arm, #814662
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
index e956de4eab01..87cf8a5576b1 100644
--- a/media-libs/x265/x265-3.5.ebuild
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-19 3:38 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2022-02-19 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 73c131256eb5760a7968193568a48f255c498c98
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 03:35:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 03:35:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c13125
media-libs/x265: Stabilize 3.5 arm64, #814662
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
index 87cf8a5576b1..391057e2c311 100644
--- a/media-libs/x265/x265-3.5.ebuild
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-19 7:19 Arthur Zamarin
0 siblings, 0 replies; 117+ messages in thread
From: Arthur Zamarin @ 2022-02-19 7:19 UTC (permalink / raw
To: gentoo-commits
commit: 7f35949c8a6d2e94dbe6684fad5ae74b8f6e27f1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 07:18:47 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 07:18:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f35949c
media-libs/x265: Stabilize 3.5 ppc64, #814662
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/x265/x265-3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
index 391057e2c311..138b74c93d1a 100644
--- a/media-libs/x265/x265-3.5.ebuild
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-19 14:27 Jakov Smolić
0 siblings, 0 replies; 117+ messages in thread
From: Jakov Smolić @ 2022-02-19 14:27 UTC (permalink / raw
To: gentoo-commits
commit: cdf5b30f2e2f4dd8f2e5bd68822da31dfde7e2bf
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 14:26:54 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 14:26:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf5b30f
media-libs/x265: Stabilize 3.5 amd64, #814662
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
media-libs/x265/x265-3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
index 138b74c93d1a..2c50ef34952f 100644
--- a/media-libs/x265/x265-3.5.ebuild
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-19 14:27 Jakov Smolić
0 siblings, 0 replies; 117+ messages in thread
From: Jakov Smolić @ 2022-02-19 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 2c0abd50de59758d4115f1b1b7e4a6e8ccc9db07
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 14:26:58 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 14:26:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0abd50
media-libs/x265: Stabilize 3.5 x86, #814662
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
media-libs/x265/x265-3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
index 2c50ef34952f..ad7333090a3f 100644
--- a/media-libs/x265/x265-3.5.ebuild
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-20 1:48 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2022-02-20 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 80b3cdfccb45eff1e5bdb33b625c8f413dfe3905
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 01:47:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 01:47:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b3cdfc
media-libs/x265: drop 3.5
Bug: https://bugs.gentoo.org/814662
Bug: https://bugs.gentoo.org/833775
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5.ebuild | 218 ----------------------------------------
1 file changed, 218 deletions(-)
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
deleted file mode 100644
index ad7333090a3f..000000000000
--- a/media-libs/x265/x265-3.5.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
- S=${WORKDIR}/${P}/source
-else
- SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}/arm-r1.patch"
- "${FILESDIR}/neon.patch"
- "${FILESDIR}/x265-3.3-ppc64.patch"
- "${FILESDIR}/tests.patch"
- "${FILESDIR}/test-ns.patch"
-)
-
-src_unpack() {
- if [[ ${PV} = 9999* ]]; then
- git-r3_src_unpack
- else
- unpack ${A}
- export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm* ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- # disable altivec for 12bit build #607802#c5
- if [[ ${ABI} = ppc* ]] ; then
- mycmakeargs+=(
- -DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
- )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm* ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- # disable altivec for 10bit build #607802#c5
- if [[ ${ABI} = ppc* ]] ; then
- mycmakeargs+=(
- -DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
- )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist="" v=
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- if [[ ${ABI} = ppc* ]] ; then
- # upstream uses mix of altivec + power8 vectors
- # it's impossible to enable altivec without CPU_POWER8
- # and it does not work on ppc32
- # so we toggle both variables together
- mycmakeargs+=(
- -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
- )
- fi
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- local myabicmakeargs=(
- -DENABLE_TESTS=$(usex test ON OFF)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_PIC=ON
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-
- # we don't install *.a files for all variants,
- # so just delete these files instead of pretending
- # real USE=static-libs support
- find "${ED}" -name "*.a" -delete || die
-}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-20 1:48 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2022-02-20 1:48 UTC (permalink / raw
To: gentoo-commits
commit: a7ff89f33cf31c0238f3bdb2b095d8b1b75c7cdf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 01:47:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 01:47:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ff89f3
media-libs/x265: stabilize 3.5-r2 for amd64, arm, arm64, ppc64, x86
Forward stable kws from 3.5. Had meant to do 3.5-r2 and didn't realise
we still had 3.5. Oops.
Closes: https://bugs.gentoo.org/814662
Closes: https://bugs.gentoo.org/833775
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 58018488f52c..2673e6b12415 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-02-20 9:14 Agostino Sarubbo
0 siblings, 0 replies; 117+ messages in thread
From: Agostino Sarubbo @ 2022-02-20 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 19249fcf2d734bbc4a8be769602339c78eec1fd2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 09:14:53 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 09:14:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19249fcf
media-libs/x265: ppc stable wrt bug #814662
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 2673e6b12415..24b5b5f195d0 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-03-09 23:46 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2022-03-09 23:46 UTC (permalink / raw
To: gentoo-commits
commit: eb516382e8dd0e61efe9d221d7722996c424c60d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 23:36:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 23:36:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb516382
media-libs/x265: forward ~riscv
Dropped on bump (race condition, I think).
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 2 +-
media-libs/x265/x265-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 24b5b5f195d0..8ccbefead9ac 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d686f028c1da..4f853abbc5bd 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-11-12 17:48 Matt Turner
0 siblings, 0 replies; 117+ messages in thread
From: Matt Turner @ 2022-11-12 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 12c6c2bb6d2edd71a727cb85e8ec9e65729fbbfe
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 17:36:57 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 17:36:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c6c2bb
media-libs/x265: Drop unused inherits
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 2 +-
media-libs/x265/x265-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 8ccbefead9ac..a27421cf424d 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake multilib-minimal multilib multibuild flag-o-matic
+inherit cmake multilib-minimal multibuild
if [[ ${PV} = 9999* ]]; then
inherit git-r3
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 4f853abbc5bd..d7178b2765cc 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake multilib-minimal multilib multibuild flag-o-matic
+inherit cmake multilib-minimal multibuild
if [[ ${PV} = 9999* ]]; then
inherit git-r3
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2022-11-28 7:58 WANG Xuerui
0 siblings, 0 replies; 117+ messages in thread
From: WANG Xuerui @ 2022-11-28 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 7a333338bf1b130ad7d77b4aaf6eec3b9085d6be
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 12:52:03 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 07:58:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a333338
media-libs/x265: keyword 3.5-r2 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index a27421cf424d..69e3d5439171 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-03-03 6:28 Viorel Munteanu
0 siblings, 0 replies; 117+ messages in thread
From: Viorel Munteanu @ 2023-03-03 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 141e803d08d96b2ab7469aed1737afcb10fc0e88
Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Mar 3 01:04:19 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 06:25:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141e803d
media-libs/x265: Keyword 3.5-r2 mips, #896146
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 69e3d5439171..3fa4d5cb933f 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-03-10 7:45 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2023-03-10 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 77807a6e044818c3fec20827b5ac5a0cc811d8d9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 07:45:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 07:45:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77807a6e
media-libs/x265: update subslot for live
Closes: https://bugs.gentoo.org/820254
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d7178b2765cc..d7587145d46d 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/199"
+SLOT="0/207"
IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-03-25 3:32 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2023-03-25 3:32 UTC (permalink / raw
To: gentoo-commits
commit: 6c71de74350913d0a8c60de35c369c51fc439040
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 03:04:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 03:32:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c71de74
media-libs/x265: update upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index aac1076b701b..af1229eaf0d8 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -11,6 +11,6 @@
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
</use>
<upstream>
- <remote-id type="bitbucket">multicoreware/x265</remote-id>
+ <remote-id type="bitbucket">multicoreware/x265_git</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 9:57 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2023-12-21 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 95c1bdc571f49363a2e8c3acc9c65cb3d51131e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 08:16:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 09:56:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c1bdc5
media-libs/x265: always build as PIC
Linkers are getting stricter.
Closes: https://bugs.gentoo.org/913412
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../x265/{x265-9999.ebuild => x265-3.5-r3.ebuild} | 23 ++++++++++------------
media-libs/x265/x265-9999.ebuild | 15 ++++++--------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
similarity index 90%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.5-r3.ebuild
index d7587145d46d..83b194908714 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
@@ -19,8 +19,8 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/207"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
+SLOT="0/199"
+IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
RESTRICT="!test? ( test )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -31,9 +31,9 @@ BDEPEND="
abi_x86_64? ( ${ASM_DEPEND} )"
PATCHES=(
- "${FILESDIR}/${PN}-9999-arm.patch"
- #"${FILESDIR}/neon.patch"
- "${FILESDIR}/${PN}-9999-ppc64.patch"
+ "${FILESDIR}/arm-r1.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/x265-3.3-ppc64.patch"
"${FILESDIR}/tests.patch"
"${FILESDIR}/test-ns.patch"
)
@@ -166,18 +166,15 @@ multilib_src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
)
+ # Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
+ # Bug #528202, bug #913412
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d7587145d46d..38c1dc82e324 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
@@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/207"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
+IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
RESTRICT="!test? ( test )"
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -166,18 +166,15 @@ multilib_src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
)
+ # Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
+ # Bug #528202, bug #913412
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi
local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 11:55 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2023-12-21 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 059edceee3e31a89dac15de94450fa38c8869eaf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 11:54:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 11:54:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059edcee
media-libs/x265: Stabilize 3.5-r3 amd64, #920463
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 83b194908714..0bad09a685c6 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 12:56 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2023-12-21 12:56 UTC (permalink / raw
To: gentoo-commits
commit: afb73a5b0323aa7290c817c14c47203f06b1e8ea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 12:56:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 12:56:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb73a5b
media-libs/x265: Stabilize 3.5-r3 arm, #920463
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 0bad09a685c6..f510894becf4 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 14:12 Arthur Zamarin
0 siblings, 0 replies; 117+ messages in thread
From: Arthur Zamarin @ 2023-12-21 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 2752a87789a148ce27a0f1ad0349eb3ee2b97736
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 14:11:46 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:11:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2752a877
media-libs/x265: Stabilize 3.5-r3 x86, #920463
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index f510894becf4..f351caaaae63 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 14:12 Arthur Zamarin
0 siblings, 0 replies; 117+ messages in thread
From: Arthur Zamarin @ 2023-12-21 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 7fce903f7ec52ac7fd34834c2de978eb870a465f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 14:11:47 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:11:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fce903f
media-libs/x265: Stabilize 3.5-r3 ppc, #920463
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index f351caaaae63..20f75fca3c91 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 15:15 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2023-12-21 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 9018b8e3478941f4c827e41c70fa8162d68b642a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 15:14:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 15:14:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9018b8e3
media-libs/x265: Stabilize 3.5-r3 ppc64, #920463
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 20f75fca3c91..080e3d81579d 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2023-12-21 16:01 Arthur Zamarin
0 siblings, 0 replies; 117+ messages in thread
From: Arthur Zamarin @ 2023-12-21 16:01 UTC (permalink / raw
To: gentoo-commits
commit: a13b22b6d97c406b4b3b3fd3547c9eee90d84880
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 16:00:53 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 16:00:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13b22b6
media-libs/x265: Stabilize 3.5-r3 arm64, #920463
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 080e3d81579d..83e490d78ecf 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
S=${WORKDIR}/${P}/source
else
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2024-03-18 7:20 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2024-03-18 7:20 UTC (permalink / raw
To: gentoo-commits
commit: b7da321dd9f1964ad1f3534fb09edbce0fd0d397
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 06:14:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 07:20:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7da321d
media-libs/x265: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/875854
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 9 +++++++--
media-libs/x265/x265-9999.ebuild | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 83e490d78ecf..f3d6c8cbd76a 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake multilib-minimal multibuild
+inherit cmake flag-o-matic multilib-minimal multibuild
if [[ ${PV} = 9999* ]]; then
inherit git-r3
@@ -157,6 +157,11 @@ x265_variant_src_configure() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/875854
+ # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+ filter-lto
+
local myabicmakeargs=(
-DENABLE_TESTS=$(usex test ON OFF)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 7503475200d5..8fb553c069a6 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake multilib-minimal multibuild
+inherit cmake flag-o-matic multilib-minimal multibuild
if [[ ${PV} = 9999* ]]; then
inherit git-r3
@@ -156,6 +156,11 @@ x265_variant_src_configure() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/875854
+ # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+ filter-lto
+
local myabicmakeargs=(
-DENABLE_TESTS=$(usex test ON OFF)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2024-03-18 7:20 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2024-03-18 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 96bcc2c282cbfed74398ec8adb5b95e155589ae3
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 06:15:55 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 07:20:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96bcc2c2
media-libs/x265: update EAPI 7 -> 8
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/{x265-9999.ebuild => x265-3.5-r4.ebuild} | 9 +++++----
media-libs/x265/x265-9999.ebuild | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.5-r4.ebuild
similarity index 98%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.5-r4.ebuild
index 8fb553c069a6..11fbb36fc212 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.5-r4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake flag-o-matic multilib-minimal multibuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/208"
+SLOT="0/199"
IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
RESTRICT="!test? ( test )"
@@ -31,10 +31,11 @@ BDEPEND="
abi_x86_64? ( ${ASM_DEPEND} )"
PATCHES=(
- "${FILESDIR}/${PN}-9999-arm.patch"
+ "${FILESDIR}/arm-r1.patch"
"${FILESDIR}/neon.patch"
+ "${FILESDIR}/x265-3.3-ppc64.patch"
"${FILESDIR}/tests.patch"
- "${FILESDIR}/${PN}-9999-test-ns.patch"
+ "${FILESDIR}/test-ns.patch"
)
src_unpack() {
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8fb553c069a6..8be9f4a93e84 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake flag-o-matic multilib-minimal multibuild
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2024-08-25 15:44 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2024-08-25 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 45f88589b35ae1cb8ebd0dfdf03bafa98989f33e
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Aug 23 16:57:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 15:43:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f88589
media-libs/x265: drop 3.5-r2
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r2.ebuild | 220 -------------------------------------
1 file changed, 220 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
deleted file mode 100644
index 3fa4d5cb933f..000000000000
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal multibuild
-
-if [[ ${PV} = 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
- S=${WORKDIR}/${P}/source
-else
- SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}/arm-r1.patch"
- "${FILESDIR}/neon.patch"
- "${FILESDIR}/x265-3.3-ppc64.patch"
- "${FILESDIR}/tests.patch"
- "${FILESDIR}/test-ns.patch"
-)
-
-src_unpack() {
- if [[ ${PV} = 9999* ]]; then
- git-r3_src_unpack
- else
- unpack ${A}
- export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
- fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
- local variants=""
- use 12bit && variants+="main12 "
- use 10bit && variants+="main10 "
- variants+="main"
- echo "${variants}"
-}
-
-x265_variant_src_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
-
- einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
- local mycmakeargs=( "${myabicmakeargs[@]}" )
- case "${MULTIBUILD_VARIANT}" in
- "main12")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DMAIN12=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm* ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- # disable altivec for 12bit build #607802#c5
- if [[ ${ABI} = ppc* ]] ; then
- mycmakeargs+=(
- -DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
- )
- fi
- ;;
- "main10")
- mycmakeargs+=(
- -DHIGH_BIT_DEPTH=ON
- -DEXPORT_C_API=OFF
- -DENABLE_SHARED=OFF
- -DENABLE_CLI=OFF
- -DENABLE_HDR10_PLUS=ON
- )
- if [[ ${ABI} = x86 ]] ; then
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- if [[ ${ABI} = arm* ]] ; then
- # 589674
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- # disable altivec for 10bit build #607802#c5
- if [[ ${ABI} = ppc* ]] ; then
- mycmakeargs+=(
- -DENABLE_ALTIVEC=OFF
- -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
- )
- fi
- ;;
- "main")
- if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
- local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
- unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
- local liblist="" v=
- for v in "${myvariants[@]}" ; do
- ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
- liblist+="libx265_${v}.a;"
- done
- mycmakeargs+=(
- -DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS=-L.
- -DLINKED_10BIT=$(usex 10bit)
- -DLINKED_12BIT=$(usex 12bit)
- )
- if [[ ${ABI} = ppc* ]] ; then
- # upstream uses mix of altivec + power8 vectors
- # it's impossible to enable altivec without CPU_POWER8
- # and it does not work on ppc32
- # so we toggle both variables together
- mycmakeargs+=(
- -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
- )
- fi
- fi
- ;;
- *)
- die "Unknown variant: ${MULTIBUILD_VARIANT}";;
- esac
- cmake_src_configure
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- local myabicmakeargs=(
- -DENABLE_TESTS=$(usex test ON OFF)
- $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
- -DENABLE_PIC=ON
- -DENABLE_LIBNUMA=$(usex numa ON OFF)
- -DGIT_ARCHETYPE=1 #814116
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- if [[ ${ABI} = x86 ]] ; then
- # Bug #528202
- if use pic ; then
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- fi
- elif [[ ${ABI} = x32 ]] ; then
- # bug #510890
- myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
- elif [[ ${ABI} = arm ]] ; then
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
- use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
- fi
-
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
- if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
- "${BUILD_DIR}/test/TestBench" || die
- else
- einfo "Unit tests check only assembly."
- einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
- einfo "Skipping tests."
- fi
-}
-
-multilib_src_test() {
- local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
- multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
- # Install only "main" variant since the others are already linked into it.
- local MULTIBUILD_VARIANTS=( "main" )
- multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
- dodoc -r "${S}/../doc/"*
-
- # we don't install *.a files for all variants,
- # so just delete these files instead of pretending
- # real USE=static-libs support
- find "${ED}" -name "*.a" -delete || die
-}
^ permalink raw reply related [flat|nested] 117+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
@ 2024-08-26 7:15 Sam James
0 siblings, 0 replies; 117+ messages in thread
From: Sam James @ 2024-08-26 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 8c507834fcdb184870bfc49d0c441b75bf254bf8
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Aug 25 20:20:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 07:14:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c507834
media-libs/x265: fix ABI_X86_32 build
Closes: https://bugs.gentoo.org/938510
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r5.ebuild | 5 ++---
media-libs/x265/x265-3.6.ebuild | 5 ++---
media-libs/x265/x265-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r5.ebuild b/media-libs/x265/x265-3.5-r5.ebuild
index 47245cb0ed6a..ad78f487735a 100644
--- a/media-libs/x265/x265-3.5-r5.ebuild
+++ b/media-libs/x265/x265-3.5-r5.ebuild
@@ -102,7 +102,6 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA="$(usex numa)"
- -DENABLE_MULTIVIEW="yes"
-DENABLE_SVT_HEVC="no" # missing
-DENABLE_VTUNE="no" # missing
-DGIT_ARCHETYPE=1 #814116
@@ -140,13 +139,13 @@ multilib_src_configure() {
local liblist="" v=
for v in "${MULTIBUILD_VARIANTS[@]}" ; do
- ln -sf "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR%-*}/libx265_${v}.a" || die
+ ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
-DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS="-L${BUILD_DIR%-*}"
+ -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-DLINKED_10BIT"=$(usex 10bit)"
-DLINKED_12BIT="$(usex 12bit)"
)
diff --git a/media-libs/x265/x265-3.6.ebuild b/media-libs/x265/x265-3.6.ebuild
index 55b794f17e42..064bd95be46a 100644
--- a/media-libs/x265/x265-3.6.ebuild
+++ b/media-libs/x265/x265-3.6.ebuild
@@ -102,7 +102,6 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA="$(usex numa)"
- -DENABLE_MULTIVIEW="yes"
-DENABLE_SVT_HEVC="no" # missing
-DENABLE_VTUNE="no" # missing
-DGIT_ARCHETYPE=1 #814116
@@ -140,13 +139,13 @@ multilib_src_configure() {
local liblist="" v=
for v in "${MULTIBUILD_VARIANTS[@]}" ; do
- ln -sf "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR%-*}/libx265_${v}.a" || die
+ ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
-DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS="-L${BUILD_DIR%-*}"
+ -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-DLINKED_10BIT"=$(usex 10bit)"
-DLINKED_12BIT="$(usex 12bit)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e9c94f79c127..9e4c71595c06 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -139,13 +139,13 @@ multilib_src_configure() {
local liblist="" v=
for v in "${MULTIBUILD_VARIANTS[@]}" ; do
- ln -sf "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR%-*}/libx265_${v}.a" || die
+ ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
-DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS="-L${BUILD_DIR%-*}"
+ -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-DLINKED_10BIT"=$(usex 10bit)"
-DLINKED_12BIT="$(usex 12bit)"
)
^ permalink raw reply related [flat|nested] 117+ messages in thread
end of thread, other threads:[~2024-08-26 7:15 UTC | newest]
Thread overview: 117+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-25 3:32 [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-26 7:15 Sam James
2024-08-25 15:44 Sam James
2024-03-18 7:20 Sam James
2024-03-18 7:20 Sam James
2023-12-21 16:01 Arthur Zamarin
2023-12-21 15:15 Sam James
2023-12-21 14:12 Arthur Zamarin
2023-12-21 14:12 Arthur Zamarin
2023-12-21 12:56 Sam James
2023-12-21 11:55 Sam James
2023-12-21 9:57 Sam James
2023-03-10 7:45 Sam James
2023-03-03 6:28 Viorel Munteanu
2022-11-28 7:58 WANG Xuerui
2022-11-12 17:48 Matt Turner
2022-03-09 23:46 Sam James
2022-02-20 9:14 Agostino Sarubbo
2022-02-20 1:48 Sam James
2022-02-20 1:48 Sam James
2022-02-19 14:27 Jakov Smolić
2022-02-19 14:27 Jakov Smolić
2022-02-19 7:19 Arthur Zamarin
2022-02-19 3:38 Sam James
2022-02-19 3:38 Sam James
2021-10-06 1:02 Sam James
2021-09-25 3:43 Ionen Wolkens
2021-08-03 7:35 Alexis Ballier
2020-09-07 8:47 Sergei Trofimovich
2020-09-07 8:20 Sergei Trofimovich
2020-09-06 7:49 Sergei Trofimovich
2020-09-04 4:54 Sam James
2020-09-04 0:21 Sam James
2020-09-04 0:21 Sam James
2020-09-03 14:38 Thomas Deutschmann
2020-08-25 12:37 Alexis Ballier
2020-06-08 19:34 Georgy Yakovlev
2020-06-08 18:23 Georgy Yakovlev
2020-06-07 23:24 Georgy Yakovlev
2020-06-07 12:42 Alexis Ballier
2020-06-05 15:21 Alexis Ballier
2020-06-05 15:21 Alexis Ballier
2020-05-25 5:11 Georgy Yakovlev
2020-05-25 5:11 Georgy Yakovlev
2020-05-24 20:59 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-05-24 20:25 Thomas Deutschmann
2020-01-20 17:43 Alexis Ballier
2019-12-29 19:34 Mike Gilbert
2019-10-04 17:28 Alexis Ballier
2019-09-29 2:56 Mike Gilbert
2019-08-26 15:33 Alexis Ballier
2019-07-02 17:13 Alexis Ballier
2019-05-05 19:05 Mike Gilbert
2019-02-06 13:56 Alexis Ballier
2018-11-11 22:58 Andreas Sturmlechner
2018-10-15 18:12 Markus Meier
2018-10-11 16:28 Alexis Ballier
2018-10-07 21:27 Matt Turner
2018-10-07 21:27 Matt Turner
2018-10-06 22:08 Sergei Trofimovich
2018-10-01 0:07 Thomas Deutschmann
2018-09-30 21:38 Sergei Trofimovich
2018-09-28 8:01 Mikle Kolyada
2018-06-19 13:41 Alexis Ballier
2018-04-18 13:12 Mikle Kolyada
2018-04-12 14:43 Sergei Trofimovich
2018-04-03 6:26 Sergei Trofimovich
2018-02-25 18:21 Thomas Deutschmann
2018-02-24 11:06 Sergei Trofimovich
2018-02-24 7:20 Jason Zaman
2018-02-23 23:17 Sergei Trofimovich
2018-02-22 13:40 Alexis Ballier
2018-02-22 13:40 Alexis Ballier
2017-12-09 18:41 Craig Andrews
2017-11-30 13:57 Alexis Ballier
2017-08-31 12:37 Tim Harder
2017-08-31 12:37 Tim Harder
2017-07-16 12:17 Alexis Ballier
2017-07-16 12:17 Alexis Ballier
2017-06-17 15:08 Sergei Trofimovich
2017-06-17 15:08 Sergei Trofimovich
2017-06-16 9:36 Alexis Ballier
2017-06-16 9:36 Alexis Ballier
2017-04-23 15:12 Alexis Ballier
2017-03-12 11:39 Alexis Ballier
2017-02-24 8:30 Michael Weber
2017-02-17 11:10 Alexis Ballier
2017-02-16 5:00 Alexis Ballier
2017-02-07 11:51 Alexis Ballier
2017-02-07 11:51 Alexis Ballier
2017-02-04 15:21 Agostino Sarubbo
2017-02-04 12:12 Jeroen Roovers
2017-01-04 12:08 Alexis Ballier
2017-01-01 12:43 Agostino Sarubbo
2016-12-26 16:45 Alexis Ballier
2016-09-27 10:25 Alexis Ballier
2016-02-03 20:40 Markus Meier
2016-01-29 19:00 Alexis Ballier
2016-01-27 15:06 Jeroen Roovers
2016-01-25 10:25 Agostino Sarubbo
2016-01-25 10:25 Agostino Sarubbo
2015-11-08 7:22 Jeroen Roovers
2015-10-16 5:17 Jeroen Roovers
2015-10-15 16:40 Alexis Ballier
2015-10-15 14:41 Alexis Ballier
2015-10-15 14:28 Alexis Ballier
2015-10-15 14:13 Alexis Ballier
2015-10-11 11:48 Alexis Ballier
2015-10-11 11:29 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox