git: e0000f0e4693 - main - multimedia/mlt7: fix conflict with multimeda/mlt6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 Jul 2022 16:50:01 UTC
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