diff options
| author | Danny Rawlins <contact@romster.me> | 2020-11-09 22:17:36 +1100 |
|---|---|---|
| committer | Danny Rawlins <contact@romster.me> | 2020-11-09 22:17:36 +1100 |
| commit | ac04fb465f3fcc22a3e0f89b49e70fc25ba659c4 (patch) | |
| tree | d78d666bfed730a0f015ba8b103c3cc897e39a97 /x265 | |
| parent | dbc90783dfd89d59e386b3f1a7418630f0b4ffbc (diff) | |
| download | contrib-ac04fb465f3fcc22a3e0f89b49e70fc25ba659c4.tar.gz contrib-ac04fb465f3fcc22a3e0f89b49e70fc25ba659c4.tar.xz | |
x265: fix source and quiet asm/c++ compile
Diffstat (limited to 'x265')
| -rw-r--r-- | x265/.signature | 4 | ||||
| -rw-r--r-- | x265/Pkgfile | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/x265/.signature b/x265/.signature index 880e0367b..e02b13f40 100644 --- a/x265/.signature +++ b/x265/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3419JwbWNtUHpgAkcUsc8I2X1St0fdIcIJPeDMweR0JnoKZKQJYfgXxjB812F/zU9kWuB8Y34JJBzIK/ovBccAg= -SHA256 (Pkgfile) = d79ca12ccbcec5111912d4932c8148763f4a93826ee61e48de9923df0e219b9e +RWSagIOpLGJF30aoCqrGzKTPXoAUzlCLbmmsOJpri4sRAS15m6gsuALkYj0NEdzvtWWXP8slRV3zNh2z+yPTDaPP6pHG9ikrlws= +SHA256 (Pkgfile) = 1ddb16703ca5fc2eb98552d28ec2ad653707b3f9d76e1c3d3a91f107ccb799b3 SHA256 (.footprint) = 69ed2110e482df297278785cb91c53864871982ea4a281fdc7c8ecf53cbb0806 SHA256 (x265_3.4.tar.gz) = c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672 diff --git a/x265/Pkgfile b/x265/Pkgfile index f517e03f9..e8bfe9bc6 100644 --- a/x265/Pkgfile +++ b/x265/Pkgfile @@ -1,22 +1,23 @@ # Description: Open Source H265/HEVC video encoder. -# URL: https://bitbucket.org/multicoreware/x265/wiki/Home +# URL: https://bitbucket.org/multicoreware/x265_git/wiki/Home # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: yasm cmake +# Depends on: cmake name=x265 version=3.4 release=1 -source=(https://bitbucket.org/multicoreware/$name/downloads/${name}_$version.tar.gz) +source=(#https://bitbucket.org/multicoreware/$name/downloads/${name}_$version.tar.gz + https://crux.ster.zone/downloads/$name/${name}_$version.tar.gz) build() { - [[ -e /usr/bin/ninja ]] && PKGMK_X265+=' -G Ninja' + [[ -e '/usr/bin/ninja' ]] && PKGMK_X265+=' -G Ninja' # build 12 cmake -S $SRC/${name}_$version/source -B build-12 $PKGMK_X265 \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG -Wno-deprecated" \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG -Wno-deprecated" \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG -Wno-restrict -Wno-format-overflow" \ + -D CMAKE_ASM_NASM_FLAGS_RELEASE=' -wno-macro-params-legacy' \ -D HIGH_BIT_DEPTH=TRUE \ -D MAIN12=TRUE \ -D EXPORT_C_API=FALSE \ @@ -29,8 +30,8 @@ build() { cmake -S $SRC/${name}_$version/source -B build-10 $PKGMK_X265 \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG -Wno-restrict -Wno-format-overflow" \ + -D CMAKE_ASM_NASM_FLAGS_RELEASE=' -wno-macro-params-legacy' \ -D HIGH_BIT_DEPTH=TRUE \ -D EXPORT_C_API=FALSE \ -D ENABLE_CLI=FALSE \ @@ -46,8 +47,8 @@ build() { cmake -S $SRC/${name}_$version/source -B build-8 $PKGMK_X265 \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG -Wno-restrict -Wno-format-overflow" \ + -D CMAKE_ASM_NASM_FLAGS_RELEASE=' -wno-macro-params-legacy' \ -D ENABLE_SHARED=TRUE \ -D EXTRA_LIB='x265_main10.a;x265_main12.a' \ -D EXTRA_LINK_FLAGS='-L.' \ |