From nobody Fri Jul 29 16:50:01 2022
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LvYQy0Z3kz4Xk8g;
Fri, 29 Jul 2022 16:50:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(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
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4LvYQy04ZLz3bvh;
Fri, 29 Jul 2022 16:50:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1659113402;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=kiLcOS94FTFWO/tlimqMNxHI6prJRP/MFp8vtoEtDIs=;
b=G9APrHH/Y5wnDG49cd1Dmt3mgBOOsTN9Nya9HpboKTa6RMvzMmKUiyQ3nV6p9C9HCBBkyk
4eYSgaXNzXWNsFYeRqfdcXVfTOK61PpKAnRv1ampY5yckAMpoh39K7ztKClf5EWiSVW2Bo
R17PCIfym2OB+hoSJ9Rr4y0DT7NL4E78b61nsdLqxFD7xGGnyUrUVd0pr7Iyg8dUsF8f2T
5pGXWkGseRKmjhAVt0tawcsIr2cgkU/0ypMF200Vh82/dHSBd0lOz7ul1Kwakz47/sJvig
SRTxWeK2PVKoE1b2ie0YqH4nv653D9nyJ2p/MUp3rAw/5AOwcmbiWYq+tBYffQ==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LvYQx687czjRg;
Fri, 29 Jul 2022 16:50:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26TGo1nt062068;
Fri, 29 Jul 2022 16:50:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TGo1MV062065;
Fri, 29 Jul 2022 16:50:01 GMT
(envelope-from git)
Date: Fri, 29 Jul 2022 16:50:01 GMT
Message-Id: <202207291650.26TGo1MV062065@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Subject: git: e0000f0e4693 - main - multimedia/mlt7: fix conflict with multimeda/mlt6
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tcberner
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e0000f0e4693a149dec41cd3bc92261d02de7442
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1659113402;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=kiLcOS94FTFWO/tlimqMNxHI6prJRP/MFp8vtoEtDIs=;
b=U4FGXrISivigoyohytbr8wGvZa2+ZYJQQSJ0AlZpJo5MkyMp3buMW7BoEIzMF4er823R5B
bHxAv2DHx2PtA4ehfIgWtzCW6aS6ffSLkDNO585+QOf3iZrVQeihzI8KPUZqrQnh1u0kKT
DHpIrxnt7FhjJBqeQ1UxTkKQ6HEryxMLrrlV8eMvNWT87QEuRSzxhWHyQVX5wwzmZ4VUkl
Jm8JFc0TzQTjz9N4gXKTwr6Btn53ndzDWFi6Mxk9n/UQQnzHXj4IyhybkDphpiH7JC0MKA
z87Oi1bzY7L2lAmWmYAl7+jw2JZl7MxAryuXaydkucRuZ8aENvBRwDWf7lsPDQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659113402; a=rsa-sha256; cv=none;
b=b9yXHqpOU9mMtgGrjhBTFLSC5tTzS7+8uthEidTg7kB6jc8xzE9blpJzxp/IrulKROIjfi
vDBfKfWNIA+GwxJZGMLYX6vox75zunofXFe4R+lSq7rTH67zosULJr7q9m2A2vIjezmaFL
vkfme5IoiQem84vKCqbRlXWDVqS1I23GZBJqmr7b5GNfzDq7QZazsfgsiU2gKeYuQKEj9n
5e/VAg42Bp42BxqWtawQY7oZ5sm7/uFaP4Lx98KRm+guWsphudh0wZ7wYLAuxmDOSAegRT
Bg9S/KwmkIfYy8YoDfND/98UcmD2dpyDFxPxuO7+vbpCF0Jy6FJslcM7Vp/XkA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e0000f0e4693a149dec41cd3bc92261d02de7442
commit e0000f0e4693a149dec41cd3bc92261d02de7442
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-07-29 16:48:24 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-07-29 16:49:32 +0000
multimedia/mlt7: fix conflict with multimeda/mlt6
- the recent updated to 7.8.0 brought back the conflicting file
bin/melt -- remove that one again from this port.
- note the idea is to get rid of multimedia/mlt6 soon, so that
this is no longer needed.
Reported by: VVD <vvd@unislabs.com>
---
multimedia/mlt7/Makefile | 1 +
multimedia/mlt7/files/patch-src_melt_CMakeLists.txt | 17 +++++++++++++++++
multimedia/mlt7/pkg-plist | 1 -
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index d70209425b9c..81ccf35a9247 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ${_MLT_PORTNAME}
DISTVERSION= ${_MLT_VERSION}
+PORTREVISION= 1
CATEGORIES?= multimedia
# Don't use GitHub "fake" downloads that are auto-generated from a
# tag; the project uploads tarballs for each release.
diff --git a/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt b/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt
new file mode 100644
index 000000000000..f67476d2a4ba
--- /dev/null
+++ b/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt
@@ -0,0 +1,17 @@
+--- src/melt/CMakeLists.txt.orig 2022-07-29 16:08:23 UTC
++++ src/melt/CMakeLists.txt
+@@ -24,13 +24,5 @@ endif()
+ )
+ endif()
+
++set_target_properties(melt PROPERTIES OUTPUT_NAME "melt-${MLT_VERSION_MAJOR}")
+ install(TARGETS melt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-
+-if(UNIX AND NOT APPLE)
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E rename melt melt-${MLT_VERSION_MAJOR} \
+- WORKING_DIRECTORY \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR})"
+- )
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink melt-${MLT_VERSION_MAJOR} melt \
+- WORKING_DIRECTORY \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR})"
+- )
+-endif()
diff --git a/multimedia/mlt7/pkg-plist b/multimedia/mlt7/pkg-plist
index 651565b0ce44..3ceac493142c 100644
--- a/multimedia/mlt7/pkg-plist
+++ b/multimedia/mlt7/pkg-plist
@@ -1,4 +1,3 @@
-bin/melt
bin/melt-7
include/mlt-7/framework/mlt.h
include/mlt-7/framework/mlt_animation.h