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>
This commit is contained in:
parent
eb8c5bb611
commit
e0000f0e46
3 changed files with 18 additions and 1 deletions
|
@ -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.
|
||||
|
|
17
multimedia/mlt7/files/patch-src_melt_CMakeLists.txt
Normal file
17
multimedia/mlt7/files/patch-src_melt_CMakeLists.txt
Normal file
|
@ -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()
|
|
@ -1,4 +1,3 @@
|
|||
bin/melt
|
||||
bin/melt-7
|
||||
include/mlt-7/framework/mlt.h
|
||||
include/mlt-7/framework/mlt_animation.h
|
||||
|
|
Loading…
Reference in a new issue