diff options
| -rw-r--r-- | media-video/handbrake/Manifest | 2 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-9999.ebuild | 35 |
2 files changed, 16 insertions, 21 deletions
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 8be319fc2958..f02b809317b0 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,4 +1,6 @@ DIST handbrake-1.9.0.tar.bz2 9427823 BLAKE2B 5e7c4aa054957dc61582956b7e2b9916f6746fac164e0f4a0ed85f863fe3b2aa2fd485761b1381e17ab39d9d3ed42de28266b2f664dad2b8dd0cd7d961886d5e SHA512 6d09a8fea8505dce665fa2d1b03ca2b21c9e0dc4cbb5f8e0b736d6eae39017b13ee48cd4bea172a6a3b8be9bb5deb6467584dadf9c15ce81e7b7a96d3322a179 DIST handbrake-1.9.2.tar.bz2 9431665 BLAKE2B 33591a9b576ba64ca0d8aabe4a14f7ef25b657a1b1553f8ffc18dc7a6a708b0b79443f018f6633c2ec437d25a7b0e4d803c2b46c672d57cb970eab75df48f239 SHA512 3c01b516aa7926c432773f37a311284e215ec6947b74b5c47306c7b3ac5e986e791c4d0adb4f6e614b4bb6bebecb57ac9a59644bdb535d485321e3be65dcc820 +DIST handbrake-ffmpeg-7.1.1.tar.bz2 13278839 BLAKE2B dbedc190d1b752f07e0dc30452fe37a02300da75c3269956f09a63ada6f510838b3e6fb12f9882dbac88a82750ef42a16ed34b2214dfbdc56455b17a2cdc63f8 SHA512 db2682bd3f7dbfe4a33a5a7f0803010258d14f92e98ff2a5fdd17197422bc5cbfd992a63b93c9c5fb2b2420371a82e34a16e155f135a2aaf03764ed71adbc16b DIST handbrake-ffmpeg-7.1.tar.bz2 13260188 BLAKE2B 32466fbefdeb30796a329869bf6fe547a0d3285ae8d9505758e5bff5103f5edf1bebd2dd8595822d0cd25e3754929ed47878ab42c420e248fb2d6ea51747145a SHA512 3f28af9a0c0779b4a7f4e5fbfd94616eb83265856ef060a8bb8afbb9f1b899885a218f15b7ac2c48f724d961dd2742ef6544b237118cb94563ecf49fbd740e3b +DIST handbrake-x265-snapshot-20250224-13212.tar.gz 1738751 BLAKE2B a1ffa6a74ff44af3c322aef34233eafb25f1f235b45d6c5f387c77a8c4c09771d0eb9a41b3eb4bdfcbcf504bec66c44dd3ac37dc2bbb5c4ea969a4a8a55ac81d SHA512 65f244ce56c39da2121ef0e5c6a188b8958e8ae1349a1cc7e6c20c68cb7a07d78e8951b7930c22828da262d4c722a336eb6777ef8d92cbcd87e99439b6a55feb DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126 SHA512 72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index 541054bbfa55..4c18487d9cc1 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit edo flag-o-matic multiprocessing python-any-r1 toolchain-funcs xdg @@ -25,12 +25,12 @@ declare -A BUNDLED=( # Heavily patched in an incompatible way. # Issues related to using system ffmpeg historically. # See bug #829595 and #922828 - [ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-7.1.tar.bz2;" + [ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-7.1.1.tar.bz2;" # Patched in an incompatible way - [x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265" - [x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265" - [x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265" - [x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265" + [x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265" + [x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265" + [x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265" + [x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265" ) bundle_src_uri() { @@ -111,6 +111,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/handbrake-1.9.0-link-libdovi-properly.patch "${FILESDIR}"/handbrake-1.9.0-include-vpl-properly.patch + "${FILESDIR}"/handbrake-1.9.2-set-ffmpeg-toolchain-explicitly.patch + "${FILESDIR}"/handbrake-1.9.2-allow-overriding-tools-via-env.patch ) src_unpack() { @@ -122,6 +124,8 @@ src_unpack() { } src_prepare() { + default + mkdir download || die for name in "${!BUNDLED[@]}"; do IFS=$';' read -r uri use <<< ${BUNDLED[${name}]} @@ -140,26 +144,15 @@ src_prepare() { # noop fetching sed -i -e '/DF..*.exe/ { s/= .*/= true/ }' make/include/tool.defs || die - # noop strip - sed -i \ - -e "s/\(strip\s*= ToolProbe( 'STRIP.exe',\s*'strip',\s*\)'strip'/\1'true'/" \ - make/configure.py || die - # Use whichever python is set by portage sed -i -e "s/for p in .*/for p in ${EPYTHON}/" configure || die - - for tool in ar ranlib libtool; do - # Detect system tools - bug 738110 - sed -i \ - -e "s/\(${tool}\s*= ToolProbe( '${tool^^}.exe',\s*'${tool}',\s*\)'${tool}'/\1os.environ.get('${tool^^}', '${tool}')/" \ - make/configure.py || die - done - - default } src_configure() { - tc-export AR RANLIB + tc-export CC CXX AR RANLIB NM + + # noop strip + local -x STRIP="true" # ODR violations, lto-type-mismatches # bug #878899 |