Commit 5c8adda9 authored by Tobias C. Berner's avatar Tobias C. Berner
Browse files

multimedia/{py-,}mlt{-qt5,}: rename to multimedia/{py-,}mlt6{-qt5,}:

- To make it possible to easily import mlt-7 move the current port to
  a versioned directory.

- Add Mk/Uses/mlt.mk to make it easily possible to depend on a given mlt
  version:

  	USES=mlt:6

  will get you a dependency on multimedia/mlt6, while

	USES=mlt:7

  will get you a dependency on the soon to be added multimedia/mlt7

- Switch the port to use cmake as a build system
- While here, provide some more options to make it possible to have
  a leaner package if required

- Bump consumers after rename of the dependency
parent f8617a24
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -10,6 +10,17 @@ in the release notes and/or placed into UPDATING.

All ports committers are allowed to commit to this file.

20210730:
AUTHOR: tcberner@FreeBSD.org

  A new USES has been added to depend on the mlt multimedia framework.

  Ports that depend on mlt should now use USES=mlt:<version> to specify
  their dependency.

  At the moment the supported version is 6, but will be extended to also 
  allow for selection of mlt 7 shortly.

20210604:
AUTHOR: mat@FreeBSD.org

+3 −0
Original line number Diff line number Diff line
@@ -16471,3 +16471,6 @@ devel/rubygem-grape-entity07|devel/rubygem-grape-entity|2021-07-25|Obsolete, use
net/rubygem-gitlab-fog-google|net/rubygem-fog-google|2021-07-25|Obsolete, use net/rubygem-fog-google
devel/rubygem-gitlab-rdoc|devel/rubygem-rdoc|2021-07-25|Obsolete, use devel/rubygem-rdoc
databases/rubygem-redis-namespace17|databases/rubygem-redis-namespace|2021-07-25|Obsolete, use databases/rubygem-redis-namespace
multimedia/mlt|multimedia/mlt6|2021-07-30|Moved to a versioned directory to make place for future versions
multimedia/mlt-qt5|multimedia/mlt6-qt5|2021-07-30|Moved to a versioned directory to make place for future versions
multimedia/py-mlt|multimedia/py-mlt6|2021-07-30|Moved to a versioned directory to make place for future versions

Mk/Uses/mlt.mk

0 → 100644
+66 −0
Original line number Diff line number Diff line
# Handle dependency on mlt
#
# Feature:	mlt
# Usage:	USES=mlt:ARGS
# Valid ARGS:	<version>,nodepend
#
# version	The chooseable versions are 6 and 7.
#		USES=mlt:6 # Use mlt 6.x
#		USES=mlt:7 # Use mlt 7.x
# nodepend	If nodepend is set, no LIB_DEPENDS line
#		will be generated (useful for the mlt-ports)
#
# MAINTAINER: kde@FreeBSD.org
#

.if ! defined(_INCLUDE_USES_MLT_MK)
_INCLUDE_USES_MLT_MK=	YES

_MLT_SUPPORTED=	6 7

_mlt_version=	#
.  for _ver in ${_MLT_SUPPORTED:O:u}
.    if ${mlt_ARGS:M${_ver}}
.      if empty(_mlt_version)
_mlt_version=	${_ver}
.      else
IGNORE=		Incorrect USES=mlt:${mlt_ARGS} - multiple versions defined
.      endif
.    endif
.  endfor

.  if empty(_mlt_version)
IGNORE=		Incorrect USES=mlt:${mlt_ARGS} - no version defined (valid: ${_MLT_SUPPORTED})
.  endif

.  if ! empty(mlt_ARGS:Mnodepend)
_MLT_NODEPEND=	yes
.  endif

# Library dependencies
_MLT6_VERSION=	6.26.1
_MLT7_VERSION=	7.0.1
_MLT6_PORTNAME=	mlt6
_MLT7_PORTNAME=	mlt7
_MLT6_LIB=	libmlt.so
_MLT6_MELT=	${LOCALBASE}/bin/melt
_MLT7_LIB=	libmlt-7.so
_MLT7_MELT=	${LOCALBASE}/bin/melt-7

# Export the version of the chosen mlt port
_MLT_VERSION=	${_MLT${_mlt_version}_VERSION}
_MLT_PORTNAME=	${_MLT${_mlt_version}_PORTNAME}
_MLT_PORT=	multimedia/${_MLT_PORTNAME}
_MLT_LIB=	${_MLT${_mlt_version}_LIB}
_MLT_DEP=	${_MLT_LIB}:${_MLT_PORT}
_MLT_MELT=	${_MLT${_mlt_version}_MELT}

# Append the correct LIB_DEPENDS
.  if !defined(_MLT_NODEPEND)
LIB_DEPENDS+=	${_MLT_DEP}
.  endif

# Append version to PLIST_SUB
PLIST_SUB+=	MLT_VERSION=${_MLT_VERSION}

.endif
+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20210730:
  AFFECTS: users of multimedia/mlt, multimedia/mlt-qt and multimedia/py-mlt
  AUTHOR:  kde@FreeBSD.org
  multimedia/{py-,}mlt{-qt5,} has been moved to multimedia/{py-,}mlt6{-qt5,}
  to make room for importin the next major version of the mlt framework.
20210721:
  AFFECTS: users of x11/rxvt-unicode
  AUTHOR: thierry@FreeBSD.org
+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
PORTNAME=	synfig
PORTVERSION=	1.2.2
DISTVERSIONPREFIX=v
PORTREVISION=	15
PORTREVISION=	16
CATEGORIES=	graphics devel multimedia

MAINTAINER=	portmaster@BSDforge.com
@@ -23,7 +23,6 @@ LIB_DEPENDS= libImath.so:math/Imath \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libltdl.so:devel/libltdl \
		libmlt.so:multimedia/mlt \
		libmng.so:graphics/libmng \
		libpng.so:graphics/png \
		libtiff.so:graphics/tiff
@@ -31,7 +30,7 @@ LIB_DEPENDS= libImath.so:math/Imath \
PORTSCOUT=	limitw:1,even

USES=		autoreconf compiler:c++11-lang gmake gnome iconv jpeg \
		libtool localbase pathfix pkgconfig
		libtool localbase mlt:6 pathfix pkgconfig
USE_CXXSTD=	c++11
USE_GITHUB=	yes
USE_GNOME=	cairo glibmm intltool libxml++26 pango
Loading