subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/x265\/"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2024-09-22 Thread Sam James

commit: 4b7ffaeaa89f7cc50efc5e6b947f2853a0956aae
Author: Paul Zander  gmail  com>
AuthorDate: Fri Sep 20 22:56:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 22 11:07:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7ffaea

media-libs/x265: build cli for native_abi only, fix bug 939909

Old logic was $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF"), so we need !
here.

Closes: https://bugs.gentoo.org/939909
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38717
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/{x265-3.5-r5.ebuild => x265-3.5-r6.ebuild} | 4 ++--
 media-libs/x265/{x265-3.6.ebuild => x265-3.6-r1.ebuild}| 4 ++--
 media-libs/x265/x265-.ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-libs/x265/x265-3.5-r5.ebuild 
b/media-libs/x265/x265-3.5-r6.ebuild
similarity index 97%
rename from media-libs/x265/x265-3.5-r5.ebuild
rename to media-libs/x265/x265-3.5-r6.ebuild
index c9db10613904..f38a58ad7981 100644
--- a/media-libs/x265/x265-3.5-r5.ebuild
+++ b/media-libs/x265/x265-3.5-r6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake flag-o-matic multilib-minimal multibuild
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/";
+HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/";
 
 if [[ ${PV} = * ]]; then
inherit git-r3
@@ -108,7 +108,7 @@ multilib_src_configure() {
-DGIT_ARCHETYPE=1 #814116
-DLIB_INSTALL_DIR="$(get_libdir)"
)
-   if multilib_is_native_abi; then
+   if ! multilib_is_native_abi; then
mycmakeargs+=(
-DENABLE_CLI="no"
)

diff --git a/media-libs/x265/x265-3.6.ebuild 
b/media-libs/x265/x265-3.6-r1.ebuild
similarity index 97%
rename from media-libs/x265/x265-3.6.ebuild
rename to media-libs/x265/x265-3.6-r1.ebuild
index ba013c73d378..7fe46d01d35a 100644
--- a/media-libs/x265/x265-3.6.ebuild
+++ b/media-libs/x265/x265-3.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake flag-o-matic multilib-minimal multibuild
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/";
+HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/";
 
 if [[ ${PV} = * ]]; then
inherit git-r3
@@ -108,7 +108,7 @@ multilib_src_configure() {
-DGIT_ARCHETYPE=1 #814116
-DLIB_INSTALL_DIR="$(get_libdir)"
)
-   if multilib_is_native_abi; then
+   if ! multilib_is_native_abi; then
mycmakeargs+=(
-DENABLE_CLI="no"
)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index bf2855a23f64..472c0eb7e4fd 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake flag-o-matic multilib-minimal multibuild
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/";
+HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/";
 
 if [[ ${PV} = * ]]; then
inherit git-r3
@@ -108,7 +108,7 @@ multilib_src_configure() {
-DGIT_ARCHETYPE=1 #814116
-DLIB_INSTALL_DIR="$(get_libdir)"
)
-   if multilib_is_native_abi; then
+   if ! multilib_is_native_abi; then
mycmakeargs+=(
-DENABLE_CLI="no"
)

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/, media-libs/x265/files/

2024-08-26 Thread Sam James

commit: e3a0d61649d20884c6afc94588a8e7c58462b55e
Author: Paul Zander  gmail  com>
AuthorDate: Mon Aug 26 13:39:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 26 20:50:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a0d616

media-libs/x265: allow building with c++17, small ebuild fixes

The new x265-3.5-r5-cpp-std.patch disabled setting c++98 or c++11 as versions.
This made newer compilers default to c++17 and thus `register` a unused and
reserved keyword.

While on it fix some obvious things that might cause problems:
one shadowed variable
  use std::abs  in place of abs so we don't accidentally truncate values
use boolean instead of bitwise comparison when comparing bool

Move ENABLE_CLI=OFF for non native multilib builds to make it clearer.
Don't set ENABLE_TESTS=no on platforms where we set ENABLE_ASSEMBLY=OFF, because
it requires it to be ON and this the option is never created.

Closes: https://bugs.gentoo.org/938515
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38289
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/files/x265-3.6-cmake-cleanup.patch |  47 +++
 media-libs/x265/files/x265-3.6-code-cleanup.patch  | 140 +
 media-libs/x265/x265-3.5-r5.ebuild |  12 +-
 media-libs/x265/x265-3.6.ebuild|  12 +-
 media-libs/x265/x265-.ebuild   |  12 +-
 5 files changed, 217 insertions(+), 6 deletions(-)

diff --git a/media-libs/x265/files/x265-3.6-cmake-cleanup.patch 
b/media-libs/x265/files/x265-3.6-cmake-cleanup.patch
new file mode 100644
index ..7cbe3722f1e0
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-cmake-cleanup.patch
@@ -0,0 +1,47 @@
+From d6b009be2aa62c679ea994125c02310d4b8d401b Mon Sep 17 00:00:00 2001
+From: Paul Zander 
+Date: Mon, 26 Aug 2024 14:23:49 +0200
+Subject: [PATCH 1/2] cmake: cleanup old policies
+
+Signed-off-by: Paul Zander 
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -6,18 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
+ FORCE)
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+-if(POLICY CMP0025)
+-cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
+-endif()
+-if(POLICY CMP0042)
+-cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+-endif()
+-if(POLICY CMP0054)
+-cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as 
variables or keywords when unquoted
+-endif()
+ 
++cmake_minimum_required (VERSION 3.28) # OBJECT libraries require 2.8.8
+ project (x265)
+-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckSymbolExists)
+
+From 701cc9679e9453cc94afac7904657262109e56b5 Mon Sep 17 00:00:00 2001
+From: Paul Zander 
+Date: Mon, 26 Aug 2024 14:23:59 +0200
+Subject: [PATCH 2/2] cmake: fix nasm warning
+
+Signed-off-by: Paul Zander 
+
+--- a/cmake/FindNasm.cmake
 b/cmake/FindNasm.cmake
+@@ -20,6 +20,6 @@ if(NASM_EXECUTABLE)
+ endif()
+ 
+ # Provide standardized success/failure messages
+-find_package_handle_standard_args(nasm
++find_package_handle_standard_args(Nasm
+ REQUIRED_VARS NASM_EXECUTABLE
+ VERSION_VAR NASM_VERSION_STRING)

diff --git a/media-libs/x265/files/x265-3.6-code-cleanup.patch 
b/media-libs/x265/files/x265-3.6-code-cleanup.patch
new file mode 100644
index ..dbea7ef6c1ff
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-code-cleanup.patch
@@ -0,0 +1,140 @@
+From bca0b4b72977683794d441e57adc8c279ff4bfca Mon Sep 17 00:00:00 2001
+From: Paul Zander 
+Date: Mon, 26 Aug 2024 14:25:35 +0200
+Subject: [PATCH 1/4] use boolean compare instead of bitwise
+
+Signed-off-by: Paul Zander 
+
+diff --git a/common/cudata.cpp b/common/cudata.cpp
+index 19281de..d5b295f 100644
+--- a/common/cudata.cpp
 b/common/cudata.cpp
+@@ -73,7 +73,7 @@ inline bool isEqualRow(int addrA, int addrB)
+ /* Check whether 2 addresses point to the same row or column */
+ inline bool isEqualRowOrCol(int addrA, int addrB)
+ {
+-return isEqualCol(addrA, addrB) | isEqualRow(addrA, addrB);
++return isEqualCol(addrA, addrB) || isEqualRow(addrA, addrB);
+ }
+ 
+ /* Check whether one address points to the first column */
+
+From da3eb3ea55be74e440b272e24d7d8e67cb7a76db Mon Sep 17 00:00:00 2001
+From: Paul Zander 
+Date: Mon, 26 Aug 2024 14:44:55 +0200
+Subject: [PATCH 2/4] fix variable shadowing
+
+Signed-off-by: Paul Zander 
+
+diff --git a/common/cudata.h b/common/cudata.h
+index 8397f05..7f132e6 100644
+--- a/common/cudata.h
 b/common/cudata.h
+@@ -48,7 +48,7 @@ enum PartSize
+ SIZE_2NxnD, // asymmetric motion partition, 2Nx(3N/2) + 2Nx( N/2)
+ SIZE_nLx2N, // asymmetric motion partition, ( N/2)x2N + (3N/2)x2N
+ SIZE_nRx2N, // asymmetric motion partition, (3N/2)x2N + ( N/2)x2N
+-NUM_SIZES
++PART_NUM_SIZES
+ };
+ 
+ enum PredMode
+
+From 4ec09af244e2cfe3dfb739d74af7640ac114e775 Mon Sep 17 00:00:00 2001

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2024-08-26 Thread Sam James

commit: 8c507834fcdb184870bfc49d0c441b75bf254bf8
Author: Paul Zander  gmail  com>
AuthorDate: Sun Aug 25 20:20:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 26 07:14:41 2024 +
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  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/x265-3.5-r5.ebuild | 5 ++---
 media-libs/x265/x265-3.6.ebuild| 5 ++---
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index e9c94f79c127..9e4c71595c06 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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)"
)

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/, media-libs/x265/files/

2024-08-25 Thread Sam James

commit: 86fff0790dd62c7e91afbfecbf52ed9300a83e19
Author: Paul Zander  gmail  com>
AuthorDate: Fri Aug 23 16:43:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 25 15:43:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86fff079

media-libs/x265: add 3.5-r5, ebuild cleanup

Clean up cruft and duplicate code.

Split up patches so we can re-use them.

Silently disable tests on x86, x32 and arm32. They never worked, have no deps
and were failing before because the options was not visible.

Closes: https://bugs.gentoo.org/728748
Closes: https://bugs.gentoo.org/937416
Closes: https://bugs.gentoo.org/937750
Closes: https://bugs.gentoo.org/937753
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/files/test-ns.patch   |  55 +++---
 media-libs/x265/files/x265-3.5-r5-cpp-std.patch   |  23 +++
 media-libs/x265/files/x265-3.5-r5-gcc15.patch |  29 
 media-libs/x265/files/x265-3.5-r5-test-ns_2.patch |  11 ++
 media-libs/x265/files/x265--test-ns.patch | 157 +
 media-libs/x265/metadata.xml  |   1 -
 media-libs/x265/x265-3.5-r3.ebuild|   1 +
 media-libs/x265/x265-3.5-r4.ebuild|   1 +
 media-libs/x265/x265-3.5-r5.ebuild| 195 ++
 media-libs/x265/x265-.ebuild  | 195 ++
 10 files changed, 452 insertions(+), 216 deletions(-)

diff --git a/media-libs/x265/files/test-ns.patch 
b/media-libs/x265/files/test-ns.patch
index 898751a7ae2d..86cadade6a09 100644
--- a/media-libs/x265/files/test-ns.patch
+++ b/media-libs/x265/files/test-ns.patch
@@ -1,7 +1,5 @@
 Namespace functions for multi-bitdepth builds so that libraries are 
self-contained.
 
-Index: source/common/param.h
-===
 --- source.orig/common/param.h
 +++ source/common/param.h
 @@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param
@@ -23,8 +21,6 @@ Index: source/common/param.h
  #define PARAM_NS X265_NS
  #endif
  }
-Index: source/encoder/api.cpp
-===
 --- source.orig/encoder/api.cpp
 +++ source/encoder/api.cpp
 @@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_par
@@ -58,15 +54,6 @@ Index: source/encoder/api.cpp
  }
  x265_copy_params(&save, encoder->m_latestParam);
  int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
-@@ -604,7 +604,7 @@ fail:
- *pi_nal = 0;
- 
- if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount 
>= encoder->m_latestParam->chunkStart)
--x265_csvlog_frame(encoder->m_param, pic_out);
-+PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
- 
- if (numEncoded < 0)
- encoder->m_aborted = true;
 @@ -637,7 +637,7 @@ void x265_vmaf_encoder_log(x265_encoder*
  encoder->fetchStats(&stats, sizeof(stats));
  int padx = encoder->m_sps.conformanceWindow.rightOffset;
@@ -76,15 +63,6 @@ Index: source/encoder/api.cpp
  }
  }
  #endif
-@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc,
- encoder->fetchStats(&stats, sizeof(stats));
- int padx = encoder->m_sps.conformanceWindow.rightOffset;
- int pady = encoder->m_sps.conformanceWindow.bottomOffset;
--x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-+PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, 
argc, argv);
- }
- }
- 
 @@ -872,7 +872,7 @@ void x265_alloc_analysis_data(x265_param
  return;
  
@@ -94,8 +72,6 @@ Index: source/encoder/api.cpp
  }
  
  void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis)
-Index: source/encoder/encoder.cpp
-===
 --- source.orig/encoder/encoder.cpp
 +++ source/encoder/encoder.cpp
 @@ -186,8 +186,8 @@ void Encoder::create()
@@ -127,15 +103,6 @@ Index: source/encoder/encoder.cpp
  X265_FREE(m_dupBuffer[i]);
  }
  
-@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture*
- if (m_exportedPic)
- {
- if (!m_param->bUseAnalysisFile && m_param->analysisSave)
--x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-+PARAM_NS::x265_free_analysis_data(m_param, 
&m_exportedPic->m_analysisData);
- ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
- m_exportedPic = NULL;
- m_dpb->recycleUnreferenced();
 @@ -1968,7 +1968,7 @@ int Encoder::encode(const x265_picture*
  
  /* Free up inputPic->analysisData since it has already been used 
*/
@@ -280,8 +247,6 @@ Index: source/encoder/encoder.cpp
  m_aborted = true; \
  return; \
  }\
-Index: source/common/param.cpp
-===
 --- source.orig/common/param.cpp
 +++ source/common/param.

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2024-08-25 Thread Sam James

commit: bdc98b2ac3b1948e5fa197fbef055358cd0bb125
Author: Paul Zander  gmail  com>
AuthorDate: Fri Aug 23 16:53:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 25 15:43:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc98b2a

media-libs/x265: add 3.6

Closes: https://bugs.gentoo.org/937756
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38267
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/Manifest   |   1 +
 media-libs/x265/files/x265-3.6-test-ns_2.patch |  30 
 media-libs/x265/x265-3.6.ebuild| 195 +
 3 files changed, 226 insertions(+)

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index c27eb2713e67..2ea6fb64ce0a 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1 +1,2 @@
+DIST x265-3.6.tar.gz 1655889 BLAKE2B 
2598421e2e21974998b0b20895dc7e12dbf6ebe1b6c23bb5a7710b575d3db773335cd1f0b3ef110b79cf4d6dd01e543e9807a0509963497edc25f617f80c29f3
 SHA512 
570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 
4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05
 SHA512 
230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997

diff --git a/media-libs/x265/files/x265-3.6-test-ns_2.patch 
b/media-libs/x265/files/x265-3.6-test-ns_2.patch
new file mode 100644
index ..63308e5bb48d
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-test-ns_2.patch
@@ -0,0 +1,30 @@
+--- source.orig/encoder/encoder.cpp
 source/encoder/encoder.cpp
+@@ -1478,7 +1478,7 @@ int Encoder::encode(const x265_picture* pic_in, 
x265_picture* pic_out)
+ if (m_exportedPic)
+ {
+ if (!m_param->bUseAnalysisFile && m_param->analysisSave)
+-x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
++PARAM_NS::x265_free_analysis_data(m_param, 
&m_exportedPic->m_analysisData);
+ 
+ ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
+ 
+--- a/common/threadpool.cpp
 b/common/threadpool.cpp
+@@ -25,6 +25,7 @@
+ #include "common.h"
+ #include "threadpool.h"
+ #include "threading.h"
++#include "param.h"
+ 
+ #include 
+ 
+@@ -314,7 +315,7 @@ ThreadPool* ThreadPool::allocThreadPools(x265_param* p, 
int& numPools, bool isTh
+sprintf(nextCount, "%d", cpusPerNode[i]);
+  strcat(poolString, nextCount);
+  }
+- x265_param_parse(p, "pools", poolString);
++ PARAM_NS::x265_param_parse(p, "pools", poolString);
+  }
+ #endif
+ if (p->numaPools && *p->numaPools)

diff --git a/media-libs/x265/x265-3.6.ebuild b/media-libs/x265/x265-3.6.ebuild
new file mode 100644
index ..55b794f17e42
--- /dev/null
+++ b/media-libs/x265/x265-3.6.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic multilib-minimal multibuild
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/";
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/";
+   MY_P="${PN}-${PV}"
+else
+   
SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz
 -> ${PN}-${PV}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+   MY_P="${PN}_${PV}"
+fi
+
+S="${WORKDIR}/${MY_P}/source"
+unset MY_P
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/209"
+IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa 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}/${PN}--arm.patch"
+   "${FILESDIR}/neon.patch"
+   "${FILESDIR}/tests.patch"
+   "${FILESDIR}/test-ns.patch"
+   "${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
+   "${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
+   "${FILESDIR}/${PN}-3.6-test-ns_2.patch"
+)
+
+pkg_setup() {
+   variants=(
+   $(usev 12bit "main12")
+   $(usev 10bit "main10")
+   )
+}
+
+# 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
+# inste

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2024-08-25 Thread Sam James

commit: 45f88589b35ae1cb8ebd0dfdf03bafa98989f33e
Author: Paul Zander  gmail  com>
AuthorDate: Fri Aug 23 16:57:27 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 25 15:43:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f88589

media-libs/x265: drop 3.5-r2

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  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..
--- 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} = * ]]; 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} = * ]]; 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+=( -D

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2024-03-18 Thread Sam James

commit: b7da321dd9f1964ad1f3534fb09edbce0fd0d397
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 18 06:14:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 07:20:20 2024 +
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  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/x265-3.5-r3.ebuild | 9 +++--
 media-libs/x265/x265-.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} = * ]]; 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-.ebuild b/media-libs/x265/x265-.ebuild
index 7503475200d5..8fb553c069a6 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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} = * ]]; 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")

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2024-03-18 Thread Sam James

commit: 96bcc2c282cbfed74398ec8adb5b95e155589ae3
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 18 06:15:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 07:20:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96bcc2c2

media-libs/x265: update EAPI 7 -> 8

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/{x265-.ebuild => x265-3.5-r4.ebuild} | 9 +
 media-libs/x265/x265-.ebuild | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild 
b/media-libs/x265/x265-3.5-r4.ebuild
similarity index 98%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.5-r4.ebuild
index 8fb553c069a6..11fbb36fc212 100644
--- a/media-libs/x265/x265-.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}--arm.patch"
+   "${FILESDIR}/arm-r1.patch"
"${FILESDIR}/neon.patch"
+   "${FILESDIR}/x265-3.3-ppc64.patch"
"${FILESDIR}/tests.patch"
-   "${FILESDIR}/${PN}--test-ns.patch"
+   "${FILESDIR}/test-ns.patch"
 )
 
 src_unpack() {

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 8fb553c069a6..8be9f4a93e84 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/

2023-12-27 Thread Conrad Kostecki

commit: 97db9458212082186b2dd2299c7007caaaf9db54
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Dec 26 09:50:13 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Dec 28 01:03:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97db9458

media-libs/x265: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34488
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-libs/x265/files/x265--ppc64.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/media-libs/x265/files/x265--ppc64.patch 
b/media-libs/x265/files/x265--ppc64.patch
deleted file mode 100644
index 8219dabf7c4f..
--- a/media-libs/x265/files/x265--ppc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@
- list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
- list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
- list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
--set(POWER_ALIASES ppc64 ppc64le)
-+set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
- list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
- if(X86MATCH GREATER "-1")
- set(X86 1)

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Arthur Zamarin

commit: a13b22b6d97c406b4b3b3fd3547c9eee90d84880
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 21 16:00:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 21 16:00:53 2023 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Sam James

commit: 9018b8e3478941f4c827e41c70fa8162d68b642a
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 21 15:14:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 21 15:14:54 2023 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Arthur Zamarin

commit: 7fce903f7ec52ac7fd34834c2de978eb870a465f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 21 14:11:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 21 14:11:47 2023 +
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  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 f351ce63..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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Arthur Zamarin

commit: 2752a87789a148ce27a0f1ad0349eb3ee2b97736
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 21 14:11:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 21 14:11:46 2023 +
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  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..f351ce63 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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Sam James

commit: afb73a5b0323aa7290c817c14c47203f06b1e8ea
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 21 12:56:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 21 12:56:01 2023 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Sam James

commit: 059edceee3e31a89dac15de94450fa38c8869eaf
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 21 11:54:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 21 11:54:02 2023 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2023-12-21 Thread Sam James

commit: b0bd48f0746c68d5bb9b597e232d17bc630541cb
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 21 08:56:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 21 09:56:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd48f0

media-libs/x265: rebase 

Still seems broken though and not going to spend more time on this today:
```
 * QA Notice: Unresolved soname dependencies:
 *
 *  /usr/bin/x265: libx265.so.208
 *
```

Closes: https://bugs.gentoo.org/878367
Closes: https://bugs.gentoo.org/914833
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/files/x265--test-ns.patch | 286 ++
 media-libs/x265/x265-.ebuild  |   7 +-
 2 files changed, 289 insertions(+), 4 deletions(-)

diff --git a/media-libs/x265/files/x265--test-ns.patch 
b/media-libs/x265/files/x265--test-ns.patch
new file mode 100644
index ..ed3de18ae83e
--- /dev/null
+++ b/media-libs/x265/files/x265--test-ns.patch
@@ -0,0 +1,286 @@
+Namespace functions for multi-bitdepth builds so that libraries are 
self-contained.
+--- a/common/param.cpp
 b/common/param.cpp
+@@ -102,7 +102,7 @@ x265_param *x265_param_alloc()
+ 
+ void x265_param_free(x265_param* p)
+ {
+-x265_zone_free(p);
++PARAM_NS::x265_zone_free(p);
+ #ifdef SVT_HEVC
+  x265_free(p->svtHevcParam);
+ #endif
+--- a/common/param.h
 b/common/param.h
+@@ -55,6 +55,18 @@ int x265_param_apply_profile(x265_param *, const char 
*profile);
+ int x265_param_parse(x265_param *p, const char *name, const char *value);
+ int x265_scenecut_aware_qp_param_parse(x265_param* p, const char* name, const 
char* value);
+ int x265_zone_param_parse(x265_param* p, const char* name, const char* value);
++void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis);
++void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* 
analysis);
++void x265_picture_free(x265_picture *);
++x265_zone *x265_zone_alloc(int zoneCount, int isZoneFile);
++void x265_zone_free(x265_param *param);
++FILE* x265_csvlog_open(const x265_param *);
++void x265_csvlog_frame(const x265_param *, const x265_picture *);
++void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int 
pady, int argc, char** argv);
++void x265_dither_image(x265_picture *, int picWidth, int picHeight, int16_t 
*errorBuf, int bitDepth);
++int x265_encoder_reconfig(x265_encoder *, x265_param *);
++x265_picture *x265_picture_alloc(void);
++void x265_picture_init(x265_param *param, x265_picture *pic);
+ #define PARAM_NS X265_NS
+ #endif
+ }
+--- a/encoder/api.cpp
 b/encoder/api.cpp
+@@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_param *p)
+ if (p->rc.zoneCount || p->rc.zonefileCount)
+ {
+ int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : 
p->rc.zoneCount;
+-param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+-latestParam->rc.zones = x265_zone_alloc(zoneCount, 
!!p->rc.zonefileCount);
+-zoneParam->rc.zones = x265_zone_alloc(zoneCount, 
!!p->rc.zonefileCount);
++param->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, 
!!p->rc.zonefileCount);
++latestParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, 
!!p->rc.zonefileCount);
++zoneParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, 
!!p->rc.zonefileCount);
+ }
+ 
+ x265_copy_params(param, p);
+@@ -214,7 +214,7 @@ x265_encoder *x265_encoder_open(x265_param *p)
+ /* Try to open CSV file handle */
+ if (encoder->m_param->csvfn)
+ {
+-encoder->m_param->csvfpt = x265_csvlog_open(encoder->m_param);
++encoder->m_param->csvfpt = 
PARAM_NS::x265_csvlog_open(encoder->m_param);
+ if (!encoder->m_param->csvfpt)
+ {
+ x265_log(encoder->m_param, X265_LOG_ERROR, "Unable to open CSV 
log file <%s>, aborting\n", encoder->m_param->csvfn);
+@@ -319,7 +319,7 @@ int x265_encoder_reconfig(x265_encoder* enc, x265_param* 
param_in)
+ if (encoder->m_latestParam->rc.zoneCount || 
encoder->m_latestParam->rc.zonefileCount)
+ {
+ int zoneCount = encoder->m_latestParam->rc.zonefileCount ? 
encoder->m_latestParam->rc.zonefileCount : encoder->m_latestParam->rc.zoneCount;
+-save.rc.zones = x265_zone_alloc(zoneCount, 
!!encoder->m_latestParam->rc.zonefileCount);
++save.rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, 
!!encoder->m_latestParam->rc.zonefileCount);
+ }
+ x265_copy_params(&save, encoder->m_latestParam);
+ int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
+@@ -602,7 +602,7 @@ fail:
+ *pi_nal = 0;
+ 
+ if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount 
>= encoder->m_latestParam->chunkStart)
+-x265_csvlog_frame(encoder->m_param, pic_out);
++PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
+ 
+ if (numEncoded < 0)
+ encoder->m_aborted = true;
+@@

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-12-21 Thread Sam James

commit: 95c1bdc571f49363a2e8c3acc9c65cb3d51131e3
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 21 08:16:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 21 09:56:23 2023 +
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  gentoo.org>

 .../x265/{x265-.ebuild => x265-3.5-r3.ebuild}  | 23 ++
 media-libs/x265/x265-.ebuild   | 15 ++
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild 
b/media-libs/x265/x265-3.5-r3.ebuild
similarity index 90%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.5-r3.ebuild
index d7587145d46d..83b194908714 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = * ]]; 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}--arm.patch"
-   #"${FILESDIR}/neon.patch"
-   "${FILESDIR}/${PN}--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-.ebuild b/media-libs/x265/x265-.ebuild
index d7587145d46d..38c1dc82e324 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = * ]]; 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
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-03-24 Thread Sam James

commit: 6c71de74350913d0a8c60de35c369c51fc439040
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 25 03:04:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 25 03:32:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c71de74

media-libs/x265: update upstream metadata

Signed-off-by: Sam James  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 @@
 Disable optimized assembly code that is not PIC 
friendly
   
   
-multicoreware/x265
+multicoreware/x265_git

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-03-09 Thread Sam James

commit: 77807a6e044818c3fec20827b5ac5a0cc811d8d9
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 10 07:45:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 10 07:45:41 2023 +
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  gentoo.org>

 media-libs/x265/x265-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index d7178b2765cc..d7587145d46d 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2023-03-02 Thread Viorel Munteanu

commit: 141e803d08d96b2ab7469aed1737afcb10fc0e88
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Fri Mar  3 01:04:19 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Mar  3 06:25:06 2023 +
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  users.noreply.github.com>
Signed-off-by: Viorel Munteanu  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-11-27 Thread WANG Xuerui

commit: 7a38bf1b130ad7d77b4aaf6eec3b9085d6be
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Nov 27 12:52:03 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Nov 28 07:58:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a38

media-libs/x265: keyword 3.5-r2 for ~loong

Signed-off-by: WANG Xuerui  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-11-12 Thread Matt Turner

commit: 12c6c2bb6d2edd71a727cb85e8ec9e65729fbbfe
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:36:57 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:36:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c6c2bb

media-libs/x265: Drop unused inherits

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/x265/x265-3.5-r2.ebuild | 2 +-
 media-libs/x265/x265-.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} = * ]]; then
inherit git-r3

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 4f853abbc5bd..d7178b2765cc 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake multilib-minimal multilib multibuild flag-o-matic
+inherit cmake multilib-minimal multibuild
 
 if [[ ${PV} = * ]]; then
inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-03-09 Thread Sam James

commit: eb516382e8dd0e61efe9d221d7722996c424c60d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  9 23:36:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  9 23:36:42 2022 +
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  gentoo.org>

 media-libs/x265/x265-3.5-r2.ebuild | 2 +-
 media-libs/x265/x265-.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} = * ]]; 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-.ebuild b/media-libs/x265/x265-.ebuild
index d686f028c1da..4f853abbc5bd 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-20 Thread Agostino Sarubbo

commit: 19249fcf2d734bbc4a8be769602339c78eec1fd2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 20 09:14:53 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 20 09:14:53 2022 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-19 Thread Sam James

commit: 80b3cdfccb45eff1e5bdb33b625c8f413dfe3905
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 01:47:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 20 01:47:54 2022 +
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  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..
--- 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} = * ]]; 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} = * ]]; 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 )
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-19 Thread Sam James

commit: a7ff89f33cf31c0238f3bdb2b095d8b1b75c7cdf
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 01:47:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 20 01:47:27 2022 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-19 Thread Jakov Smolić

commit: cdf5b30f2e2f4dd8f2e5bd68822da31dfde7e2bf
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Feb 19 14:26:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Feb 19 14:26:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf5b30f

media-libs/x265: Stabilize 3.5 amd64, #814662

Signed-off-by: Jakov Smolić  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-19 Thread Jakov Smolić

commit: 2c0abd50de59758d4115f1b1b7e4a6e8ccc9db07
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Feb 19 14:26:58 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Feb 19 14:26:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0abd50

media-libs/x265: Stabilize 3.5 x86, #814662

Signed-off-by: Jakov Smolić  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-18 Thread Arthur Zamarin

commit: 7f35949c8a6d2e94dbe6684fad5ae74b8f6e27f1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 19 07:18:47 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 19 07:18:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f35949c

media-libs/x265: Stabilize 3.5 ppc64, #814662

Signed-off-by: Arthur Zamarin  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-18 Thread Sam James

commit: 73c131256eb5760a7968193568a48f255c498c98
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 03:35:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 03:35:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c13125

media-libs/x265: Stabilize 3.5 arm64, #814662

Signed-off-by: Sam James  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2022-02-18 Thread Sam James

commit: 1c731bf9d575f1b669ace40849feb0c0890ced51
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 03:34:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 03:34:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c731bf9

media-libs/x265: Stabilize 3.5 arm, #814662

Signed-off-by: Sam James  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2021-12-01 Thread Sam James

commit: 9591e8238da4f5ddab702a01f93fba05943f2a0d
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  1 15:45:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 15:45:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9591e823

media-libs/x265: rebase  patches

Closes: https://bugs.gentoo.org/808462
Thanks-to: soundbastlerlive  gmx.at (rebasing ppc64)
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/files/x265--arm.patch   | 64 +
 media-libs/x265/files/x265--ppc64.patch | 11 +
 media-libs/x265/x265-.ebuild|  6 +--
 3 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/media-libs/x265/files/x265--arm.patch 
b/media-libs/x265/files/x265--arm.patch
new file mode 100644
index ..218d92a0ab41
--- /dev/null
+++ b/media-libs/x265/files/x265--arm.patch
@@ -0,0 +1,64 @@
+From 85ee373b0d1f03e7600366eae64a767e07298688 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 1 Dec 2021 15:42:38 +
+Subject: [PATCH] Respect CFLAGS for arm*
+
+---
+ CMakeLists.txt  | 6 +++---
+ dynamicHDR10/CMakeLists.txt | 8 
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9580413..737bf14 100755
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -249,14 +249,14 @@ if(GCC)
+ endif()
+ if(ARM AND CROSS_COMPILE_ARM)
+ message(STATUS "cross compile arm")
+-  set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm 
-fPIC)
++  set(ARM_ARGS -fPIC)
+ elseif(ARM)
+ find_package(Neon)
+ if(CPU_HAS_NEON)
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++set(ARM_ARGS -mfpu=neon -fPIC)
+ add_definitions(-DHAVE_NEON)
+ else()
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++set(ARM_ARGS -fPIC)
+ endif()
+ endif()
+   if(ARM64 OR CROSS_COMPILE_ARM64)
+diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt
+index 22fb79d..3639281 100644
+--- a/dynamicHDR10/CMakeLists.txt
 b/dynamicHDR10/CMakeLists.txt
+@@ -43,14 +43,14 @@ if(GCC)
+ endif()
+ endif()
+ if(ARM AND CROSS_COMPILE_ARM)
+-set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
++set(ARM_ARGS -fPIC)
+ elseif(ARM)
+ find_package(Neon)
+ if(CPU_HAS_NEON)
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++set(ARM_ARGS -mfpu=neon -fPIC)
+ add_definitions(-DHAVE_NEON)
+ else()
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++set(ARM_ARGS -fPIC)
+ endif()
+ endif()
+ add_definitions(${ARM_ARGS})
+@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of 
executables")
+ option(ENABLE_SHARED "Build shared library" OFF)
+ 
+ install(FILES hdr10plus.h DESTINATION include)
+-endif()
+\ No newline at end of file
++endif()
+-- 
+2.34.1
+

diff --git a/media-libs/x265/files/x265--ppc64.patch 
b/media-libs/x265/files/x265--ppc64.patch
new file mode 100644
index ..8219dabf7c4f
--- /dev/null
+++ b/media-libs/x265/files/x265--ppc64.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
+-set(POWER_ALIASES ppc64 ppc64le)
++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+ if(X86MATCH GREATER "-1")
+ set(X86 1)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 58018488f52c..d686f028c1da 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -31,9 +31,9 @@ BDEPEND="
abi_x86_64? ( ${ASM_DEPEND} )"
 
 PATCHES=(
-   "${FILESDIR}/arm-r1.patch"
-   "${FILESDIR}/neon.patch"
-   "${FILESDIR}/x265-3.3-ppc64.patch"
+   "${FILESDIR}/${PN}--arm.patch"
+   #"${FILESDIR}/neon.patch"
+   "${FILESDIR}/${PN}--ppc64.patch"
"${FILESDIR}/tests.patch"
"${FILESDIR}/test-ns.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/

2021-10-07 Thread Sam James

commit: fbb77bdce07e7e84d3d958f00065fc98093794d2
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  8 01:06:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  8 01:06:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb77bdc

media-libs/x265: fix build for arm with main10

Closes: https://bugs.gentoo.org/816795
Thanks-to: Tee KOBAYASHI  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/x265/files/arm-r1.patch | 34 ++
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/media-libs/x265/files/arm-r1.patch 
b/media-libs/x265/files/arm-r1.patch
index 8a8102dd258..69aa3036eff 100644
--- a/media-libs/x265/files/arm-r1.patch
+++ b/media-libs/x265/files/arm-r1.patch
@@ -1,10 +1,8 @@
 More aliases for ARM.
 Do not force CFLAGS for ARM.
 
-Index: source/CMakeLists.txt
-===
 source.orig/CMakeLists.txt
-+++ source/CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
  # System architecture detection
  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
@@ -40,3 +38,31 @@ Index: source/CMakeLists.txt
  endif()
  endif()
  endif()
+--- a/dynamicHDR10/CMakeLists.txt
 b/dynamicHDR10/CMakeLists.txt
+@@ -43,14 +43,14 @@ if(GCC)
+ endif()
+ endif()
+ if(ARM AND CROSS_COMPILE_ARM)
+-set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
++set(ARM_ARGS -fPIC)
+ elseif(ARM)
+ find_package(Neon)
+ if(CPU_HAS_NEON)
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++set(ARM_ARGS -fPIC)
+ add_definitions(-DHAVE_NEON)
+ else()
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++set(ARM_ARGS -fPIC)
+ endif()
+ endif()
+ add_definitions(${ARM_ARGS})
+@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of 
executables")
+ option(ENABLE_SHARED "Build shared library" OFF)
+ 
+ install(FILES hdr10plus.h DESTINATION include)
+-endif()
+\ No newline at end of file
++endif()
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2021-10-05 Thread Sam James

commit: 1510b1a50b32499c4e54d0bd792e09bf83317cc7
Author: David Carlos Manuelda  gmail  com>
AuthorDate: Wed Oct  6 00:15:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  6 01:00:51 2021 +
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  gentoo.org>

 media-libs/x265/{x265-3.5-r1.ebuild => x265-3.5-r2.ebuild} | 1 +
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index 3e0116c5da0..58018488f52 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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 )

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2021-09-24 Thread Ionen Wolkens

commit: d41450c586971bf48a4a8cdf04e057b7af77066d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep 25 03:24:56 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep 25 03:41:02 2021 +
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  gentoo.org>

 media-libs/x265/{x265-.ebuild => x265-3.5-r1.ebuild} | 1 +
 media-libs/x265/x265-.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-libs/x265/x265-.ebuild 
b/media-libs/x265/x265-3.5-r1.ebuild
similarity index 99%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.5-r1.ebuild
index e956de4eab0..3e0116c5da0 100644
--- a/media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index e956de4eab0..3e0116c5da0 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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)"
)

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2021-08-03 Thread Alexis Ballier

commit: 7788f2443c1b21a25dec1b996ac7af941926cb17
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Aug  2 19:22:02 2021 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug  3 07:35:52 2021 +
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  gentoo.org>

 media-libs/x265/Manifest  | 1 +
 media-libs/x265/{x265-.ebuild => x265-3.5.ebuild} | 8 
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-3.5.ebuild
similarity index 97%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.5.ebuild
index 3bd31a5364c..e956de4eab0 100644
--- a/media-libs/x265/x265-.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} = * ]]; 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-.ebuild b/media-libs/x265/x265-.ebuild
index 3bd31a5364c..e956de4eab0 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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} = * ]]; 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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/, media-libs/x265/files/

2020-09-08 Thread Andreas Sturmlechner

commit: 91c314279cf31e6605927cf49e144fc2ddb2896d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep  8 17:10:38 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep  8 18:07:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c31427

media-libs/x265: Drop 2.8, 2.9, 3.0, 3.1*, 3.2*, 3.3

Closes: https://bugs.gentoo.org/729628
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/x265/Manifest   |   8 -
 media-libs/x265/files/arm.patch|  34 
 media-libs/x265/files/non_x86.patch|  20 ---
 media-libs/x265/files/ppc64.patch  |  15 --
 media-libs/x265/files/x265-2.9-detect512.patch |  25 ---
 media-libs/x265/files/x265-3.3-arm.patch   |  34 
 media-libs/x265/files/x265-3.3-neon.patch  |  16 --
 media-libs/x265/metadata.xml   |   1 -
 media-libs/x265/x265-2.8.ebuild| 197 --
 media-libs/x265/x265-2.9.ebuild| 197 --
 media-libs/x265/x265-3.0.ebuild| 196 --
 media-libs/x265/x265-3.1.2.ebuild  | 196 --
 media-libs/x265/x265-3.1.ebuild| 196 --
 media-libs/x265/x265-3.2.1.ebuild  | 196 --
 media-libs/x265/x265-3.2.ebuild| 196 --
 media-libs/x265/x265-3.3.ebuild| 220 -
 16 files changed, 1747 deletions(-)

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 0d4b2ec0e0c..54e9273750f 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,9 +1 @@
-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
-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
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 
1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e
 SHA512 
576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e

diff --git a/media-libs/x265/files/arm.patch b/media-libs/x265/files/arm.patch
deleted file mode 100644
index 69edcdecfb9..000
--- a/media-libs/x265/files/arm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-More aliases for ARM.
-Do not force CFLAGS for ARM.
-
-Index: source/CMakeLists.txt
-===
 source.orig/CMakeLists.txt
-+++ source/CMakeLists.txt
-@@ -41,7 +41,7 @@ SET(CMAKE_M

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-07 Thread Sergei Trofimovich

commit: fc7ccb684cd5e8752cf3d2c6c1f9b1aaf7ee5f90
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 08:38:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 08:47:37 2020 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-07 Thread Sergei Trofimovich

commit: 198a5540e296073b336bc48a3ab2e3c45dbd7b0f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 08:11:03 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 08:20:05 2020 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-06 Thread Sergei Trofimovich

commit: 29f5ccdaf195583806cc99936adfb81a865c5fc9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  6 07:46:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  6 07:49:22 2020 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-03 Thread Sam James

commit: ed9c8fe1f25db03ec03b2aa5e5f98c0e6f963721
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  4 04:54:35 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  4 04:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9c8fe1

media-libs/x265: Stabilize 3.4 amd64, #729628

Signed-off-by: Sam James  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-03 Thread Sam James

commit: 8704d1e25f3bea343023a678afa32194222bea01
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  4 00:20:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  4 00:20:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8704d1e2

media-libs/x265: Stabilize 3.4 arm64, #729628

Signed-off-by: Sam James  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-03 Thread Sam James

commit: a181b9037e0a677fe98122a29ecda3eee104140e
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  4 00:20:18 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  4 00:20:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a181b903

media-libs/x265: Stabilize 3.4 arm, #729628

Signed-off-by: Sam James  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-09-03 Thread Thomas Deutschmann

commit: 7c188a749755cb917a4c566d49e4b3387ef29480
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Sep  3 14:38:21 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Sep  3 14:38:21 2020 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-08-25 Thread Alexis Ballier

commit: 2f273e6e6ff443423db651dad539480da60648d2
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Aug 24 15:43:31 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug 25 12:37:25 2020 +
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  gentoo.org>

 media-libs/x265/x265-.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 65ee36367ee..3bd31a5364c 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -6,8 +6,9 @@ EAPI=7
 inherit cmake multilib-minimal multilib multibuild flag-o-matic
 
 if [[ ${PV} = * ]]; 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} = * ]]; 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")"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-06-08 Thread Georgy Yakovlev

commit: 7a9177eb6ef769dc342948c632b721426595ab41
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jun  8 18:39:32 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jun  8 19:33:09 2020 +
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  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 @@
 Add support for producing 12bits HEVC.
 Build with support for NUMA nodes.
 Disable optimized assembly code that is not PIC 
friendly
-Enable support for Power 8 assembly 
optimizations.
   
   
 multicoreware/x265

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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-06-08 Thread Georgy Yakovlev

commit: 6a40ed6d96df469070d907833f67663ce88cec6b
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jun  8 18:13:43 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jun  8 18:23:18 2020 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-06-07 Thread Georgy Yakovlev

commit: 7954a8ed241574852dad7e932afd4276d58370b7
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Jun  7 23:22:37 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jun  7 23:24:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7954a8ed

media-libs/x265: use cpu_flags_ppc_vsx2 in ver 

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev  gentoo.org>

 media-libs/x265/x265-.ebuild | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 8d6664cdef2..65ee36367ee 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-06-07 Thread Alexis Ballier

commit: c0e7ffe1a6e34be0172d32d11f92b69cfe5a1efc
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Jun  7 12:42:11 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun  7 12:42:18 2020 +
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  gentoo.org>

 media-libs/x265/x265-3.4.ebuild  | 18 +++---
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index a3ce2faae8c..8d6664cdef2 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-06-05 Thread Alexis Ballier

commit: f4b9781a286d6d12811fc3dd8329492bba49b988
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun  5 15:03:05 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun  5 15:19:54 2020 +
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  gentoo.org>

 media-libs/x265/x265-3.4.ebuild  | 22 +++---
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index f973a0196a7..e40ca0e0876 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-06-05 Thread Alexis Ballier

commit: cfb43e2ae25d60d88c0a341fb86a57ef9b9ce12e
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun  5 15:18:51 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun  5 15:19:54 2020 +
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  gentoo.org>

 media-libs/x265/x265-3.4.ebuild  | 4 ++--
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index e40ca0e0876..a3ce2faae8c 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2020-06-05 Thread Alexis Ballier

commit: 3c02fc3caa35538b36de5d96aa7de5ef804a404b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun  5 14:30:05 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun  5 15:19:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c02fc3c

media-libs/x265: restore previous behavior wrt asm. bump to 3.4.

Fix tests properly.

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexis Ballier  gentoo.org>

 media-libs/x265/Manifest   |   1 +
 media-libs/x265/files/arm-r1.patch |  42 +++
 media-libs/x265/files/test-ns.patch| 295 +
 media-libs/x265/files/tests.patch  |  16 ++
 .../x265/{x265-.ebuild => x265-3.4.ebuild} | 127 -
 media-libs/x265/x265-.ebuild   | 127 -
 6 files changed, 464 insertions(+), 144 deletions(-)

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 7fdf4137f63..0d4b2ec0e0c 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -6,3 +6,4 @@ DIST x265_3.1.tar.gz 1419649 BLAKE2B 
b9151f136fdc6c0512f481af6c8d4d575ce4c75ef88
 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
+DIST x265_3.4.tar.gz 1469365 BLAKE2B 
1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e
 SHA512 
576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e

diff --git a/media-libs/x265/files/arm-r1.patch 
b/media-libs/x265/files/arm-r1.patch
new file mode 100644
index 000..8a8102dd258
--- /dev/null
+++ b/media-libs/x265/files/arm-r1.patch
@@ -0,0 +1,42 @@
+More aliases for ARM.
+Do not force CFLAGS for ARM.
+
+Index: source/CMakeLists.txt
+===
+--- source.orig/CMakeLists.txt
 source/CMakeLists.txt
+@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
+ # System architecture detection
+ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+-set(ARM_ALIASES armv6l armv7l aarch64)
++set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ set(POWER_ALIASES ppc64 ppc64le)
+@@ -239,11 +239,7 @@ if(GCC)
+ endif()
+ endif()
+ if(ARM AND CROSS_COMPILE_ARM)
+-if(ARM64)
+-set(ARM_ARGS -fPIC)
+-else()
+-set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+-endif()
++set(ARM_ARGS -fPIC)
+ message(STATUS "cross compile arm")
+ elseif(ARM)
+ if(ARM64)
+@@ -252,10 +248,10 @@ if(GCC)
+ else()
+ find_package(Neon)
+ if(CPU_HAS_NEON)
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm 
-fPIC)
++set(ARM_ARGS -mfpu=neon -fPIC)
+ add_definitions(-DHAVE_NEON)
+ else()
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++  set(ARM_ARGS -fPIC)
+ endif()
+ endif()
+ endif()

diff --git a/media-libs/x265/files/test-ns.patch 
b/media-libs/x265/files/test-ns.patch
new file mode 100644
index 000..898751a7ae2
--- /dev/null
+++ b/media-libs/x265/files/test-ns.patch
@@ -0,0 +1,295 @@
+Namespace functions for multi-bitdepth builds so that libraries are 
self-contained.
+
+Index: source/common/param.h
+===
+--- source.orig/common/param.h
 source/common/param.h
+@@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param
+ int x265_param_apply_profile(x265_param *, const char *profile);
+ int x265_param_parse(x265_param *p, const char *name, const char *value);
+ int x265_zone_param_parse(x265_param* p, const char* name, const char* value);
++void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis);
++void x265_alloc_analysis_data(x265_param *pa

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Georgy Yakovlev

commit: 8e0a5fb99616c7abe00edac7e36d6c61e4af3318
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon May 25 05:01:41 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon May 25 05:09:15 2020 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Georgy Yakovlev

commit: fe5c3453d9b642af66fbbc09c9b0e844034bc21f
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon May 25 05:02:39 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon May 25 05:09:58 2020 +
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  gentoo.org>

 media-libs/x265/x265-.ebuild | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 96fa1f5e454..736bea15bb8 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 1c7a7121ba5a02af6fb6c194135dcb7040b97a1c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 20:59:02 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:59:18 2020 +
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  gentoo.org>

 media-libs/x265/x265-3.3.ebuild  | 9 +
 media-libs/x265/x265-.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} = * ]]; 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-.ebuild b/media-libs/x265/x265-.ebuild
index 9428b001e84..96fa1f5e454 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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} = * ]]; 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() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 4d93c54aa36af985f098b125ea53102ef145031f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 20:24:35 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:24:35 2020 +
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  gentoo.org>

 media-libs/x265/x265-.ebuild | 125 +--
 1 file changed, 68 insertions(+), 57 deletions(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index aaf2a4fe9a0..9428b001e84 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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} = * ]]; then
+   if [[ ${PV} = * ]] ; 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=""

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: eba596db8a926adb18595549c89294ed0a1e929e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 15:07:04 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:50 2020 +
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  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 @@
 media-vi...@gentoo.org
   
   
+Enable x86_64 assembly optimizations.
 Add support for producing 10bits HEVC.
 Add support for producing 12bits HEVC.
 Build with support for NUMA nodes.

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_AS

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: e2661dbb76e81cc081c1220350c11e0a82401dd4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 14:58:19 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2661dbb

media-libs/x265: migrate to EAPI=7

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/x265/files/x265-3.3-arm.patch   | 34 ++
 media-libs/x265/files/x265-3.3-neon.patch  | 16 
 media-libs/x265/files/x265-3.3-ppc64.patch | 15 
 media-libs/x265/x265-3.3.ebuild| 39 +-
 4 files changed, 87 insertions(+), 17 deletions(-)

diff --git a/media-libs/x265/files/x265-3.3-arm.patch 
b/media-libs/x265/files/x265-3.3-arm.patch
new file mode 100644
index 000..7e7c8c58b72
--- /dev/null
+++ b/media-libs/x265/files/x265-3.3-arm.patch
@@ -0,0 +1,34 @@
+More aliases for ARM.
+Do not force CFLAGS for ARM.
+
+Index: source/CMakeLists.txt
+===
+--- old/CMakeLists.txt
 new/CMakeLists.txt
+@@ -41,7 +41,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
+ # System architecture detection
+ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+-set(ARM_ALIASES armv6l armv7l)
++set(ARM_ALIASES armv6l armv6j armv7l armv7a)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ set(POWER_ALIASES ppc64 ppc64le)
+@@ -208,15 +208,11 @@ if(GCC)
+ endif()
+ endif()
+ endif()
+-if(ARM AND CROSS_COMPILE_ARM)
+-set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+-elseif(ARM)
++if(ARM)
+ find_package(Neon)
+ if(CPU_HAS_NEON)
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++set(ARM_ARGS -mfpu=neon)
+ add_definitions(-DHAVE_NEON)
+-else()
+-set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+ endif()
+ endif()
+ add_definitions(${ARM_ARGS})

diff --git a/media-libs/x265/files/x265-3.3-neon.patch 
b/media-libs/x265/files/x265-3.3-neon.patch
new file mode 100644
index 000..316e670febe
--- /dev/null
+++ b/media-libs/x265/files/x265-3.3-neon.patch
@@ -0,0 +1,16 @@
+These functions are only built when enabling assembly on ARM; use proper check
+to avoid undefined symbols.
+
+Index: source/common/primitives.cpp
+===
+--- old/common/primitives.cpp
 new/common/primitives.cpp
+@@ -270,7 +270,7 @@ void PFX(cpu_emms)(void) {}
+ void PFX(cpu_cpuid)(uint32_t, uint32_t *eax, uint32_t *, uint32_t *, uint32_t 
*) { *eax = 0; }
+ void PFX(cpu_xgetbv)(uint32_t, uint32_t *, uint32_t *) {}
+ 
+-#if X265_ARCH_ARM == 0
++#if X265_ARCH_ARM == 0 || !defined(ENABLE_ASSEMBLY)
+ void PFX(cpu_neon_test)(void) {}
+ int PFX(cpu_fast_neon_mrc_test)(void) { return 0; }
+ #endif // X265_ARCH_ARM

diff --git a/media-libs/x265/files/x265-3.3-ppc64.patch 
b/media-libs/x265/files/x265-3.3-ppc64.patch
new file mode 100644
index 000..8e739e3fab1
--- /dev/null
+++ b/media-libs/x265/files/x265-3.3-ppc64.patch
@@ -0,0 +1,15 @@
+More complete ppc64 matches.
+
+Index: x265_2.2/source/CMakeLists.txt
+===
+--- old/CMakeLists.txt
 new/CMakeLists.txt
+@@ -44,7 +44,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd
+ set(ARM_ALIASES armv6l armv6j armv7l armv7a)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+-set(POWER_ALIASES ppc64 ppc64le)
++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+ if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
+ set(X86 1)

diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 41f53bc131e..9fc0159bc00 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -1,7 +1,7 @@
 # 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
 
@@ -25,19 +25,22 @@ IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
 RESTRICT="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} )
+
+BDEPEND="abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
 
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-   "${FILESDIR}/arm.patch"
-   "${FILESDIR}/neon.patch"
-   "${FILESDIR}/ppc64.patch"
+   "${FILESDIR}"/${PN}-3.3-arm.patch
+   "${FILESDIR}"/${P

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: eaa562a9de31977fcf6f01360a21f7ef56058a9c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat May 23 23:08:38 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:45 2020 +
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  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 000..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} = * ]]; 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} = * ]]; 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_B

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 519fcb2b2d4b03d6c09a752f1fb8aff89c2e9cef
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat May 23 23:20:05 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:46 2020 +
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  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
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 04d3ea884dc9efac4476e9fd18793a1abc86bf14
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 14:51:20 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:48 2020 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 4fee8386545ab1ff0a28904f75c57c8775b3c4aa
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 15:14:28 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:52 2020 +
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  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} )

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 4e1676eccb226a3405add9c2a9420dbf0c917fba
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 14:49:22 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:47 2020 +
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  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}] )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 132ec2330862d4305e3d450e08325862a88451b2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 15:12:10 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:51 2020 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-05-24 Thread Thomas Deutschmann

commit: 6e149596cc76f1bbcee6720828c8c8c92420f2a3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 24 19:47:08 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 24 20:23:53 2020 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2020-01-20 Thread Alexis Ballier

commit: 99173e7c992b7f640d41701f344d7c5e83eee3ec
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jan 20 16:33:33 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jan 20 17:43:18 2020 +
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  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 000..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} = * ]]; 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} = * ]]; 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_varian

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-12-29 Thread Mike Gilbert

commit: 0e79c31988942e166877acf8ee4c43e0d522e2d1
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Dec 23 21:33:10 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 29 19:31:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e79c319

media-libs/x265: Update subslot.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 media-libs/x265/x265-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index d5d06452569..aaf2a4fe9a0 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-10-04 Thread Alexis Ballier

commit: b487338cebaafec052137ff92a5d3f34d18f9f05
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Oct  4 16:24:34 2019 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct  4 17:28:45 2019 +
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  gentoo.org>

 media-libs/x265/Manifest  | 1 +
 media-libs/x265/{x265-.ebuild => x265-3.2.ebuild} | 0
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-3.2.ebuild
similarity index 100%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.2.ebuild

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index a020423d9d5..e946da2c3db 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-09-28 Thread Mike Gilbert

commit: ad7c48b3422c2932d393d9a458f6c5ef81c19275
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Sep 28 18:26:48 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep 29 02:56:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7c48b3

media-libs/x265: Update subslot.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 media-libs/x265/x265-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 599c1341251..a020423d9d5 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-08-26 Thread Alexis Ballier

commit: b2ec483688f1a28df945e5c220330da2f96ecc21
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Aug 26 15:33:36 2019 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Aug 26 15:33:54 2019 +
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  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 000..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} = * ]]; 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} = * ]]; 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
+
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-07-02 Thread Alexis Ballier

commit: c49669e635143d33086ffb14e456f0327c174a4f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jul  2 17:12:45 2019 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jul  2 17:13:23 2019 +
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  gentoo.org>

 media-libs/x265/Manifest  | 1 +
 media-libs/x265/{x265-.ebuild => x265-3.1.ebuild} | 2 +-
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-3.1.ebuild
similarity index 99%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.1.ebuild
index 32a290b75dd..599c1341251 100644
--- a/media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index 32a290b75dd..599c1341251 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-05-05 Thread Mike Gilbert

commit: 1b26672c072385c1e9f622a2f8047cd603bbf1c7
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun May  5 03:19:23 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun May  5 19:04:03 2019 +
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  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 media-libs/x265/x265-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/x265/x265-.ebuild b/media-libs/x265/x265-.ebuild
index 8fff39d6afb..32a290b75dd 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2019-02-06 Thread Alexis Ballier

commit: 2436a43144a0bdfaab4139b08dd45875fe7410ec
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Feb  6 13:41:50 2019 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Feb  6 13:56:03 2019 +
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  gentoo.org>

 media-libs/x265/Manifest  | 1 +
 media-libs/x265/{x265-.ebuild => x265-3.0.ebuild} | 4 ++--
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-3.0.ebuild
similarity index 99%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-3.0.ebuild
index b62476a545d..8fff39d6afb 100644
--- a/media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index b62476a545d..8fff39d6afb 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/

2018-11-13 Thread Andreas Sturmlechner

commit: 1a4c261796cd34423633d99a4c593763204185a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 13 10:00:21 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 13 10:00:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4c2617

media-libs/x265: Restore non_x86.patch

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/x265/files/non_x86.patch | 20 
 1 file changed, 20 insertions(+)

diff --git a/media-libs/x265/files/non_x86.patch 
b/media-libs/x265/files/non_x86.patch
new file mode 100644
index 000..3c7e389329a
--- /dev/null
+++ b/media-libs/x265/files/non_x86.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Jayashree 
+# Date 1527224165 -19800
+#  Fri May 25 10:26:05 2018 +0530
+# Node ID 4504219210793536d921ee4e0b3058698c630bf4
+# Parent  cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704
+Fix build error on on ppc64le
+
+diff -r cc2c5e46f3c8 -r 450421921079 source/common/param.cpp
+--- a/source/common/param.cpp  Mon May 21 18:42:29 2018 +0530
 b/source/common/param.cpp  Fri May 25 10:26:05 2018 +0530
+@@ -633,7 +633,7 @@
+ if (bValueWasNull)
+ p->cpuid = atobool(value);
+ else
+-p->cpuid = parseCpuName(value, bError);
++p->cpuid = parseCpuName(value, bError, false);
+ #endif
+ }
+ OPT("fps")

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-11-11 Thread Andreas Sturmlechner

commit: 762ef9d2081ac5d197f19ece0f7f4dcc102c9125
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 11 22:58:10 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 11 22:58:40 2018 +
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  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 000..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} = * ]]; 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} = * ]]; 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/s

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2018-11-11 Thread Andreas Sturmlechner

commit: 6ffd5fa657a7fa35f4ac561d294f5722c9dc1a50
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 11 09:14:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 11 21:34:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffd5fa6

media-libs/x265: Drop old

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/x265/Manifest|   4 -
 media-libs/x265/files/non_x86.patch |  20 
 media-libs/x265/x265-2.2.ebuild | 193 ---
 media-libs/x265/x265-2.6.ebuild | 195 ---
 media-libs/x265/x265-2.7.ebuild | 195 ---
 media-libs/x265/x265-2.8.ebuild | 196 
 6 files changed, 803 deletions(-)

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 7740dc8a147..922e51a3e7e 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,5 +1 @@
-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
 DIST x265_2.9.tar.gz 1385848 BLAKE2B 
ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179
 SHA512 
270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3

diff --git a/media-libs/x265/files/non_x86.patch 
b/media-libs/x265/files/non_x86.patch
deleted file mode 100644
index 3c7e389329a..000
--- a/media-libs/x265/files/non_x86.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Jayashree 
-# Date 1527224165 -19800
-#  Fri May 25 10:26:05 2018 +0530
-# Node ID 4504219210793536d921ee4e0b3058698c630bf4
-# Parent  cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704
-Fix build error on on ppc64le
-
-diff -r cc2c5e46f3c8 -r 450421921079 source/common/param.cpp
 a/source/common/param.cpp  Mon May 21 18:42:29 2018 +0530
-+++ b/source/common/param.cpp  Fri May 25 10:26:05 2018 +0530
-@@ -633,7 +633,7 @@
- if (bValueWasNull)
- p->cpuid = atobool(value);
- else
--p->cpuid = parseCpuName(value, bError);
-+p->cpuid = parseCpuName(value, bError, false);
- #endif
- }
- OPT("fps")

diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
deleted file mode 100644
index 9ca662332ee..000
--- a/media-libs/x265/x265-2.2.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} = * ]]; 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/102"
-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} = * ]]; then
-   mercurial_src_unpack
-   # Can't set it at global scope due to mercurial.eclass 
limitations...
-   export S=${WORKDIR}

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2018-10-17 Thread Jeroen Roovers

commit: 432f45bd8ece2a10ea64b7b07f951d0ac6aa0666
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct 17 12:40:22 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct 17 12:48:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432f45bd

media-libs/x265: Let everybody have detect512

Upstream commit d55132eb4201 introduced detect512() but the function is
defined only when X265_ARCH_X86 so the linker fails with non x86
targets:

libx265.so.165: undefined reference to `x265_12bit::detect512()'
libx265.so.165: undefined reference to `x265_10bit::detect512()'
libx265.so.165: undefined reference to `x265::detect512()'

Fix it by defining the function unconditionally.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-libs/x265/files/x265-2.9-detect512.patch | 25 +
 media-libs/x265/x265-2.9.ebuild|  1 +
 2 files changed, 26 insertions(+)

diff --git a/media-libs/x265/files/x265-2.9-detect512.patch 
b/media-libs/x265/files/x265-2.9-detect512.patch
new file mode 100644
index 000..8437ed09b88
--- /dev/null
+++ b/media-libs/x265/files/x265-2.9-detect512.patch
@@ -0,0 +1,25 @@
+--- a/source/common/cpu.cpp
 b/source/common/cpu.cpp
+@@ -110,6 +110,11 @@
+ { "", 0 },
+ };
+ 
++bool detect512()
++{
++return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 

diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
index b62476a545d..38316ce55ea 100644
--- a/media-libs/x265/x265-2.9.ebuild
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}/arm.patch"
"${FILESDIR}/neon.patch"
"${FILESDIR}/ppc64.patch"
+   "${FILESDIR}"/${PN}-2.9-detect512.patch
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-10-15 Thread Markus Meier

commit: b94f850b3d762de82c7068a9862ef0890f52871e
Author: Markus Meier  gentoo  org>
AuthorDate: Mon Oct 15 18:09:53 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Mon Oct 15 18:09:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94f850b

media-libs/x265: arm stable, bug #666486

Signed-off-by: Markus Meier  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-10-11 Thread Alexis Ballier

commit: 31e2b6f15eb2ff36dc03456f6c0be0e4d259df5a
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Oct 11 16:16:23 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Oct 11 16:28:28 2018 +
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  gentoo.org>

 media-libs/x265/Manifest  | 1 +
 media-libs/x265/{x265-.ebuild => x265-2.9.ebuild} | 4 ++--
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-2.9.ebuild
similarity index 99%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-2.9.ebuild
index a8bb14b86fa..b62476a545d 100644
--- a/media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index a8bb14b86fa..b62476a545d 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-10-07 Thread Matt Turner

commit: 397286eba9f050fbff68c4466cf8108557f5a79f
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Oct  7 21:26:59 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Oct  7 21:27:11 2018 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-10-07 Thread Matt Turner

commit: e664dd9d017a0310e080bad46f8bc97b496c1b67
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Oct  7 21:26:56 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Oct  7 21:27:11 2018 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-10-06 Thread Sergei Trofimovich

commit: bd03069029d9fe7b4833dfe704ea864b889162a2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct  6 21:15:00 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct  6 22:07:46 2018 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-09-30 Thread Thomas Deutschmann

commit: 3099d1ddc4324f4b5bca8c56adbf2fb17bd67efa
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct  1 00:02:21 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct  1 00:06:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3099d1dd

media-libs/x265: x86 stable (bug #666486)

Signed-off-by: Thomas Deutschmann  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-09-30 Thread Sergei Trofimovich

commit: 9ae32e7a87624f8f001f46c956d6565afa3cc428
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 30 21:30:35 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 30 21:37:50 2018 +
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  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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-09-28 Thread Mikle Kolyada

commit: b18d7422750ee7d0c541abd6f50ec2c54cfe3a90
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 28 08:01:20 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 28 08:01:20 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/

2018-06-29 Thread Alexis Ballier

commit: 47c0313dd95bf0284fd9eef981f742124f1d2d01
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun 29 07:39:06 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun 29 07:39:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c0313d

media-libs/x265: backport upstream patch to fix build error

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-libs/x265/files/non_x86.patch | 20 
 media-libs/x265/x265-2.8.ebuild |  1 +
 2 files changed, 21 insertions(+)

diff --git a/media-libs/x265/files/non_x86.patch 
b/media-libs/x265/files/non_x86.patch
new file mode 100644
index 000..3c7e389329a
--- /dev/null
+++ b/media-libs/x265/files/non_x86.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Jayashree 
+# Date 1527224165 -19800
+#  Fri May 25 10:26:05 2018 +0530
+# Node ID 4504219210793536d921ee4e0b3058698c630bf4
+# Parent  cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704
+Fix build error on on ppc64le
+
+diff -r cc2c5e46f3c8 -r 450421921079 source/common/param.cpp
+--- a/source/common/param.cpp  Mon May 21 18:42:29 2018 +0530
 b/source/common/param.cpp  Fri May 25 10:26:05 2018 +0530
+@@ -633,7 +633,7 @@
+ if (bValueWasNull)
+ p->cpuid = atobool(value);
+ else
+-p->cpuid = parseCpuName(value, bError);
++p->cpuid = parseCpuName(value, bError, false);
+ #endif
+ }
+ OPT("fps")

diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index b7f4c3f2050..7f60a7f1134 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}/arm.patch"
"${FILESDIR}/neon.patch"
"${FILESDIR}/ppc64.patch"
+   "${FILESDIR}/non_x86.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-06-19 Thread Alexis Ballier

commit: d3359a2c90cace583c66b1ca85deb0b6751ba23f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jun 19 13:41:11 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jun 19 13:41:18 2018 +
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-.ebuild => x265-2.8.ebuild} | 2 +-
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-2.8.ebuild
similarity index 99%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-2.8.ebuild
index 8515b0a5613..b7f4c3f2050 100644
--- a/media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index 8515b0a5613..a8bb14b86fa 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-04-18 Thread Mikle Kolyada

commit: 3f6b5100d4f12532600f8025f808d627f0b423b5
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Apr 18 13:12:14 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Apr 18 13:12:27 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-04-12 Thread Sergei Trofimovich

commit: 52257c2f46037aa4ea285ee1cedd624fdce80e02
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Apr 12 14:43:27 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Apr 12 14:43:48 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-04-02 Thread Sergei Trofimovich

commit: f5eb214345e477b88e1d6583543121e8a811c1fb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Apr  3 06:25:40 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Apr  3 06:25:59 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-02-25 Thread Thomas Deutschmann

commit: 01bb0a96c5fd32c8054979c83434a897b8634faf
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 25 18:16:28 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 25 18:16:28 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-02-24 Thread Sergei Trofimovich

commit: 91019147a6314ccaf3256c5491e332b13a4fc053
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb 24 11:06:02 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb 24 11:06:11 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-02-23 Thread Jason Zaman

commit: d8dd0842c26c2c3b9d2ba86885ea90cbf946c4fc
Author: Jason Zaman  gentoo  org>
AuthorDate: Sat Feb 24 07:12:32 2018 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Feb 24 07:20:37 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-02-23 Thread Sergei Trofimovich

commit: 0e0f13e03bf1b4322e2087e2d5e588418eb7e13c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Feb 23 23:14:18 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Feb 23 23:17:48 2018 +
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} = * ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-02-22 Thread Alexis Ballier

commit: 34f6dee14a6eaa6e17784a6e95784df76d79dd56
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Feb 22 12:57:44 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Feb 22 13:40:14 2018 +
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-.ebuild => x265-2.7.ebuild} | 4 ++--
 media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-2.7.ebuild
similarity index 99%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-2.7.ebuild
index f9064b970c6..8515b0a5613 100644
--- a/media-libs/x265/x265-.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-.ebuild b/media-libs/x265/x265-.ebuild
index f9064b970c6..8515b0a5613 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2018-02-22 Thread Alexis Ballier

commit: 04319f013e87c09cc6bbd3aa77a0caa01f10f86a
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Feb 22 12:46:02 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Feb 22 13:40:14 2018 +
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 
40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a17ce44f07dbe
-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..000
--- 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} = * ]]; 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} = * ]]; 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+

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2017-12-09 Thread Craig Andrews

commit: 8292c7fe4fbbf5cf93098500bc151a5d00375096
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Dec  9 18:21:12 2017 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Dec  9 18:41:15 2017 +
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} = * ]]; 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} = * ]]; 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} = * ]]; 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} = * ]]; 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

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2017-11-30 Thread Alexis Ballier

commit: 84e17d10fbb46911ff3e05774855dfc57c02ddb9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Nov 30 13:54:41 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Nov 30 13:57:00 2017 +
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-.ebuild => x265-2.6.ebuild} | 6 ++
 media-libs/x265/x265-.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 
40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a17ce44f07dbe
 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 
40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a17ce44f07dbe
+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-.ebuild b/media-libs/x265/x265-2.6.ebuild
similarity index 97%
copy from media-libs/x265/x265-.ebuild
copy to media-libs/x265/x265-2.6.ebuild
index 9b814039f1c..f9064b970c6 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -9,9 +9,7 @@ if [[ ${PV} = * ]]; 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-.ebuild b/media-libs/x265/x265-.ebuild
index 9b814039f1c..f9064b970c6 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -9,9 +9,7 @@ if [[ ${PV} = * ]]; then
inherit mercurial
EHG_REPO_URI="https://bitbucket.org/multicoreware/x265";
 else
-   SRC_URI="
-   
https://bitbucket.org/multicoreware/x265/downloads/${PN}_$

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2017-08-31 Thread Tim Harder

commit: 001072fe4b306fc8d942e9c14b6aec30c6a407a0
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 12:36:52 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 12:36:52 2017 +
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 @@
 Add support for producing 12bits HEVC.
 Build with support for NUMA nodes.
 Disable optimized assembly code that is not PIC 
friendly
-   Enable support for Power 8 assembly 
optimizations.
+Enable support for Power 8 assembly 
optimizations.
   
   
 multicoreware/x265

[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

2017-08-31 Thread Tim Harder

commit: c72f67775569ee9a9397c01f25c3528d05166a39
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 12:33:01 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 12:34:45 2017 +
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-.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} = * ]]; 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} = * ]]; 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} = * ]]; 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} = * ]]; 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-.ebuild b/media-libs/x265/x265-.ebuild
index 1ef57ee3ddc..9b814039f1c 100644
--- a/media-libs/x265/x265-.ebuild
+++ b/media-libs/x265/x265-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = * ]]; 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

1 2 >

1 - 100 of 138 matches

Mail list logo