From 1c517d4fb4339fc06cfc30d5e72b125f517b4dc7 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 21 May 2018 23:00:46 -0300 Subject: [PATCH 1/6] x265: update to 2.8. --- common/shlibs | 2 +- srcpkgs/x265/template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 66c0a2aeba7..a8ce6a61330 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1942,7 +1942,7 @@ libQt5EglFsKmsSupport.so.5 qt5-5.7.1_1 libQt5WebKit.so.5 qt5-webkit-5.6.0_1 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1 libQt5TextToSpeech.so.5 qt5-speech-5.8.0_1 -libx265.so.151 x265-2.7_1 +libx265.so.160 x265-2.8_1 libQt5Xdg.so.3 libqtxdg-3.1.0_1 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1 libqwt.so.6 qwt-6.1.3_1 diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 379d08bf955..6102dd9f975 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,25 +1,25 @@ # Template file for 'x265' pkgname=x265 -version=2.7 +version=2.8 revision=1 -build_style=cmake build_wrksrc="source" wrksrc="x265_${version}" +build_style=cmake configure_args="-DENABLE_PIC=1" hostmakedepends="yasm" short_desc="Open Source H.265/HEVC video encoder" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="http://x265.org/" -license="GPL-2" distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz" -checksum=d5e75fa62ffe6ed49e691f8eb8ab8c1634ffcc0725dd553c6fdb4d5443b494a2 +checksum=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${CROSS_BUILD%-musl}" fi pre_configure() { - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then sed -i CMakeLists.txt -e "s; -mcpu=native;;" fi } @@ -30,6 +30,6 @@ x265-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a + vmove "usr/lib/*.a" } } From 0562cd914ea509d1a8ea8db614fa5452d7a48ab3 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 21 May 2018 23:01:04 -0300 Subject: [PATCH 2/6] avidemux: rebuild against libx265.so.160 --- srcpkgs/avidemux/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index 2006ddc174c..963995ffb7b 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,7 +1,7 @@ # Template file for 'avidemux' pkgname=avidemux version=2.7.0 -revision=4 +revision=5 wrksrc="${pkgname}_${version}" hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel yasm" makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-devel From 14122e20c5f5c1976052ca02cac7d3b4a7559fb4 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 21 May 2018 23:01:04 -0300 Subject: [PATCH 3/6] ffmpeg: rebuild against libx265.so.160 --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 83390ca2f6d..30b4314c04b 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,7 +1,7 @@ # Template file for 'ffmpeg' pkgname=ffmpeg version=3.4.2 -revision=4 +revision=5 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" From 62752bcee37421bf3bbd259f2d341222d93ffd3f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 21 May 2018 23:01:05 -0300 Subject: [PATCH 4/6] gst-plugins-bad1: rebuild against libx265.so.160 --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 97ebd36e8b5..f344b2d3ff4 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.14.0 -revision=3 +revision=4 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure From d4c43655283aa97eb91a7cccd0a32f6214722ea7 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 21 May 2018 23:01:05 -0300 Subject: [PATCH 5/6] handbrake: rebuild against libx265.so.160 --- srcpkgs/handbrake/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index f2beeca45e5..f049c89b13e 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -3,7 +3,7 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl" pkgname=handbrake version=1.0.7 -revision=5 +revision=6 wrksrc="HandBrake-${version}" build_options="fdk_aac" hostmakedepends="automake libtool cmake pkg-config intltool From d52ad47a4d795d2f47c7647793eb640c59553597 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 21 May 2018 23:01:05 -0300 Subject: [PATCH 6/6] vlc: rebuild against libx265.so.160 [ci skip] --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index d3bfb3fd6db..4707311f082 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-live555 --disable-fluidsynth --enable-dvdread