From d978d1c6cf64106c9b2e67466e60a30e76a1fc4c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Feb 2022 00:42:37 +0100 Subject: [PATCH] libopenshot: update to 0.2.7. enable for all archs and libc --- common/shlibs | 2 +- .../patches/AV_GET_CODEC_CONTEXT-macro.patch | 34 ------------------- srcpkgs/libopenshot/template | 19 ++++++----- 3 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/libopenshot/patches/AV_GET_CODEC_CONTEXT-macro.patch diff --git a/common/shlibs b/common/shlibs index 8e2feccbee..db11c39550 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2598,7 +2598,7 @@ libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libykneomgr.so.0 libykneomgr-0.1.8_1 libopenshot-audio.so.8 libopenshot-audio-0.2.2_1 -libopenshot.so.19 libopenshot-0.2.5_3 +libopenshot.so.21 libopenshot-0.2.7_1 libpqxx-6.3.so libpqxx-6.3.3_1 libndpi.so.3 ndpi-3.4_1 liblog.so android-studio-3.0.1_1 diff --git a/srcpkgs/libopenshot/patches/AV_GET_CODEC_CONTEXT-macro.patch b/srcpkgs/libopenshot/patches/AV_GET_CODEC_CONTEXT-macro.patch deleted file mode 100644 index e6c640a8e1..0000000000 --- a/srcpkgs/libopenshot/patches/AV_GET_CODEC_CONTEXT-macro.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/include/FFmpegUtilities.h 2020-03-03 09:00:06.000000000 +0100 -+++ b/include/FFmpegUtilities.h 2020-08-19 17:04:58.535806744 +0200 -@@ -163,11 +163,10 @@ - #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context) - #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type - #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id -- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \ -- AVCodecContext *context = avcodec_alloc_context3(av_codec); \ -- avcodec_parameters_to_context(context, av_stream->codecpar); \ -- return context; \ -- }; -+ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \ -+ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \ -+ avcodec_parameters_to_context(context, av_stream->codecpar); \ -+ context; }) - #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec; - #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in) - #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar -@@ -199,11 +198,10 @@ - #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context) - #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type - #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id -- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \ -- AVCodecContext *context = avcodec_alloc_context3(av_codec); \ -- avcodec_parameters_to_context(context, av_stream->codecpar); \ -- return context; \ -- }; -+ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \ -+ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \ -+ avcodec_parameters_to_context(context, av_stream->codecpar); \ -+ context; }) - #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec; - #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in) - #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index b59472105b..71dff12b5d 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,11 +1,11 @@ # Template file for 'libopenshot' pkgname=libopenshot -version=0.2.5 -revision=6 -archs="i686 x86_64 ppc64le" +version=0.2.7 +revision=1 build_style=cmake -configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1 -hostmakedepends="swig doxygen ruby python3 pkg-config" +# Builds fail with Ruby-2.4.1 +configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" +hostmakedepends="swig doxygen ruby python3 pkg-config qt5-qmake qt5-host-tools" makedepends="python3-devel ffmpeg-devel libmagick-devel qt5-devel libgomp-devel libopenshot-audio-devel qt5-multimedia-devel unittest-cpp zeromq-devel cppzmq jsoncpp-devel" @@ -15,9 +15,12 @@ maintainer="Spencer Hill " license="LGPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot" distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz" -checksum=8ae7d226fbd2efbc84da4f7d9d8c7f3cc9616e4de46e1233e3b0a84ac0a429bc -# FIXME: tests segfault -make_check=extended +checksum=568eab6d69d469c5f745f0e25387ca5e000f7c28be48417b0d7770577ac74a28 + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libexecinfo-devel" + LIBS="-lexecinfo" +fi libopenshot-devel_package() { short_desc+=" - development files"