From b6918599c368f842271e519c139564343290e670 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Fri, 15 Oct 2021 19:39:52 +0200 Subject: [PATCH] x265: fixed build error where without git the final shared library wouldn't be built, also enabled HDR10 support --- x265/.footprint | 4 ---- x265/.signature | 7 ++++--- x265/Pkgfile | 10 ++++++++-- x265/Version.cmake | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 x265/Version.cmake diff --git a/x265/.footprint b/x265/.footprint index 9dd3f5364..b014e04f7 100644 --- a/x265/.footprint +++ b/x265/.footprint @@ -6,7 +6,3 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/x265_config.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libx265.a -lrwxrwxrwx root/root usr/lib/libx265.so -> libx265.so.199 --rwxr-xr-x root/root usr/lib/libx265.so.199 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/x265.pc diff --git a/x265/.signature b/x265/.signature index 2cc4411ee..1b56f7023 100644 --- a/x265/.signature +++ b/x265/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wpWs6pHo7GdwYmNKdZb9qJGIthiMVYMp9MShA4ZcZEZ2TgJrUaGLv2PWkUK5bAKviAzzy6soPMmdI7hye9GMgY= -SHA256 (Pkgfile) = 43e0a61011508f1e5545258d9b02cb409f72bc56bf3edf41fed5e902576c221b -SHA256 (.footprint) = 4b0a871c6a674754d1fff0d01506d7cb32f36848b4fb8cd6933db2c840923fdc +RWSagIOpLGJF3+qqgiMoGLP2rsV6/JGMTo2hYFNpvZlqYvgG+L8yWA5xAPP82aUC+peF7i5FXwn69xlkIx0aQrPM8vvdR12V8gg= +SHA256 (Pkgfile) = 999fc8c7fee8608727cee087b386581ac42edfc5bd8147bf4f7493d7f450d811 +SHA256 (.footprint) = d652428f64df82350e255ea9b09e84d8d6b792e05b5e3d20e18856249ca32dc0 SHA256 (x265_3.5.tar.gz) = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8 +SHA256 (Version.cmake) = 5e07454b6b0e68f9157d546ad796855542b6e98fcc5815362773dce27fd20b94 diff --git a/x265/Pkgfile b/x265/Pkgfile index 3d6467359..5b4aa2b64 100644 --- a/x265/Pkgfile +++ b/x265/Pkgfile @@ -5,10 +5,15 @@ name=x265 version=3.5 -release=1 -source=(https://bitbucket.org/multicoreware/${name}_git/downloads/${name}_$version.tar.gz) +release=2 +source=(https://bitbucket.org/multicoreware/${name}_git/downloads/${name}_$version.tar.gz + Version.cmake) build() { + # https://bitbucket.org/multicoreware/x265_git/src/ce882936d5f62ea94c13972fa42cab6192864a7d/source/CMakeLists.txt#lines-676 + # we don't depend on git to figure out which version we are building, do we? + sed "s!@@VERSION@@!$version!g" -i Version.cmake && mv Version.cmake ${name}_$version/source/cmake/Version.cmake + [[ -e '/usr/bin/ninja' ]] && PKGMK_X265+=' -G Ninja' # common args @@ -48,6 +53,7 @@ build() { -D EXTRA_LINK_FLAGS='-L.' \ -D LINKED_10BIT=TRUE \ -D LINKED_12BIT=TRUE \ + -D ENABLE_HDR10_PLUS=TRUE \ -Wno-dev cmake --build build-8 DESTDIR=$PKG cmake --install build-8 diff --git a/x265/Version.cmake b/x265/Version.cmake new file mode 100644 index 000000000..1facd2652 --- /dev/null +++ b/x265/Version.cmake @@ -0,0 +1,33 @@ + ################################################################################################################# + # + # Copyright (C) 2013-2020 MulticoreWare, Inc + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + # + # This program is also available under a commercial proprietary license. + # For more information, contact us at license @ x265.com + # + # Authors: Janani T.E , Srikanth Kurapati + # + ################################################################################################################# + # PURPOSE: Identity version control software version display, also read version files to present x265 version. + ################################################################################################################# + #Default Settings, for user to be vigilant about x265 version being reported during product build. +set(X265_VERSION "@@VERSION@@_Release") +set(X265_LATEST_TAG "@@VERSION@@") +set(X265_TAG_DISTANCE "1") + +#will always be printed in its entirety based on version file configuration to avail revision monitoring by repo owners +message(STATUS "X265 RELEASE VERSION ${X265_VERSION}")