From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 77691158008 for ; Mon, 12 Jun 2023 18:04:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DF08E0932; Mon, 12 Jun 2023 18:04:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80EA1E0932 for ; Mon, 12 Jun 2023 18:04:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4EF2C340CEA for ; Mon, 12 Jun 2023 18:04:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6ECA38B7 for ; Mon, 12 Jun 2023 18:04:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1686592989.54270ba63127af2de00546cbdd15c560fd820146.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/, media-libs/mlt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/files/mlt-7.14.0-int-conversion.patch media-libs/mlt/mlt-7.14.0-r1.ebuild media-libs/mlt/mlt-7.14.0.ebuild X-VCS-Directories: media-libs/mlt/files/ media-libs/mlt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 54270ba63127af2de00546cbdd15c560fd820146 X-VCS-Branch: master Date: Mon, 12 Jun 2023 18:04:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b9dcaed-7e82-46cc-9842-d97d74a43bf5 X-Archives-Hash: 34131c8c48d00c177cfdb343cc06b824 commit: 54270ba63127af2de00546cbdd15c560fd820146 Author: Violet Purcell inventati org> AuthorDate: Mon Jun 12 18:01:51 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 12 18:03:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54270ba6 media-libs/mlt: Backport -Wint-conversion fix Signed-off-by: Violet Purcell inventati.org> Signed-off-by: Sam James gentoo.org> .../mlt/files/mlt-7.14.0-int-conversion.patch | 53 ++++++++++++++++++++++ .../{mlt-7.14.0.ebuild => mlt-7.14.0-r1.ebuild} | 1 + 2 files changed, 54 insertions(+) diff --git a/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch b/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch new file mode 100644 index 000000000000..8a3acdcc7048 --- /dev/null +++ b/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch @@ -0,0 +1,53 @@ +Upstream: https://github.com/mltframework/mlt/commit/db1f3ceff723912c2ff4b6207a3f446f6677e8f8 + +From db1f3ceff723912c2ff4b6207a3f446f6677e8f8 Mon Sep 17 00:00:00 2001 +From: j-b-m +Date: Sun, 2 Apr 2023 18:14:20 +0200 +Subject: [PATCH] Fix compilation: parameter type mismatch + +* Fix compilation: parameter type mismatch + +* Fix incompatible arg +--- a/src/modules/avformat/factory.c ++++ b/src/modules/avformat/factory.c +@@ -31,7 +31,7 @@ extern mlt_filter filter_swresample_init( mlt_profile profile, char *arg ); + extern mlt_filter filter_swscale_init( mlt_profile profile, char *arg ); + extern mlt_producer producer_avformat_init( mlt_profile profile, const char *service, char *file ); + extern mlt_filter filter_avfilter_init( mlt_profile, mlt_service_type, const char*, char* ); +-extern mlt_link link_swresample_init( mlt_profile profile, char *arg ); ++extern mlt_link link_swresample_init( mlt_profile profile, mlt_service_type, const char *, char * ); + + // ffmpeg Header files + #include +@@ -94,7 +94,7 @@ static void *create_service( mlt_profile profile, mlt_service_type type, const c + if ( type == mlt_service_filter_type ) + return filter_swresample_init( profile, arg ); + else if ( type == mlt_service_link_type ) +- return link_swresample_init( profile, arg ); ++ return link_swresample_init( profile, type, id, arg ); + #endif + return NULL; + } +--- a/src/win32/win32.c ++++ b/src/win32/win32.c +@@ -70,7 +70,7 @@ int setenv(const char *name, const char *value, int overwrite) + + static int iconv_from_utf8( mlt_properties properties, const char *prop_name, const char *prop_name_out, const char* encoding ) + { +- char *text = mlt_properties_get( properties, prop_name ); ++ const char *text = mlt_properties_get( properties, prop_name ); + int result = 0; + + if ( text ) { +@@ -99,7 +99,7 @@ static int iconv_from_utf8( mlt_properties properties, const char *prop_name, co + + static int iconv_to_utf8( mlt_properties properties, const char *prop_name, const char *prop_name_out, const char* encoding ) + { +- char *text = mlt_properties_get( properties, prop_name ); ++ const char *text = mlt_properties_get( properties, prop_name ); + int result = 0; + + if ( text ) { +-- +2.41.0 + diff --git a/media-libs/mlt/mlt-7.14.0.ebuild b/media-libs/mlt/mlt-7.14.0-r1.ebuild similarity index 98% rename from media-libs/mlt/mlt-7.14.0.ebuild rename to media-libs/mlt/mlt-7.14.0-r1.ebuild index 3f53d04db981..2e4aa2447770 100644 --- a/media-libs/mlt/mlt-7.14.0.ebuild +++ b/media-libs/mlt/mlt-7.14.0-r1.ebuild @@ -84,6 +84,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch "${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch + "${FILESDIR}"/${PN}-7.14.0-int-conversion.patch ) pkg_setup() {