Date: Sun, 1 Dec 2024 06:04:13 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1c45c79f5b6d - main - multimedia/mlt7: Fix symbol export on 32-bit archs Message-ID: <202412010604.4B164DxO028494@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c45c79f5b6d09a8392a54b194e42521cae2261f commit 1c45c79f5b6d09a8392a54b194e42521cae2261f Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-12-01 05:20:04 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-12-01 06:03:31 +0000 multimedia/mlt7: Fix symbol export on 32-bit archs Add upstream patches to fix export of Mlt::Producer::set_creation_time() on 32-bit archs. While here: Clean up excess whitespace and remove unused OPENGL_* variables. --- multimedia/mlt7/Makefile | 73 ++++++++++++++++++++++++------------------------ multimedia/mlt7/distinfo | 8 +++++- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile index 3f2d209bdca9..93b9974a94ef 100644 --- a/multimedia/mlt7/Makefile +++ b/multimedia/mlt7/Makefile @@ -1,42 +1,48 @@ -PORTNAME= ${_MLT_PORTNAME} -DISTVERSION= ${_MLT_VERSION} -PORTREVISION?= 1 -CATEGORIES?= multimedia -MASTER_SITES= https://github.com/mltframework/mlt/releases/download/v${DISTVERSION}/ -DISTFILES= mlt-${DISTVERSION}${EXTRACT_SUFX} -WRKSRC= ${WRKDIR}/mlt-${DISTVERSION} +PORTNAME= ${_MLT_PORTNAME} +DISTVERSION= ${_MLT_VERSION} +PORTREVISION?= 2 +CATEGORIES?= multimedia +MASTER_SITES= https://github.com/mltframework/mlt/releases/download/v${DISTVERSION}/ +DISTFILES= mlt-${DISTVERSION}${EXTRACT_SUFX} -MAINTAINER= kde@FreeBSD.org -COMMENT?= Multimedia framework for TV broadcasting -WWW= https://www.mltframework.org/ +PATCH_SITES= https://github.com/mltframework/mlt/commit/ +PATCHFILES+= 6f533e7b8999bc4017c1a6685bf2baea6570d44c.patch:-p1 # Fix export of Mlt::Producer::set_creation_time() on 32-bit archs +PATCHFILES+= 2072c6b3596854f1a7165d7ddd5994204e741db8.patch:-p1 # Fix export of Mlt::Producer::set_creation_time() on 32-bit archs +PATCHFILES+= 63953cf7338181c82eb6eb9f93c8c9a11aaee5f7.patch:-p1 # Fix export of Mlt::Producer::set_creation_time() on 32-bit archs -LICENSE?= GPLv2 GPLv3 LGPL21 -LICENSE_COMB?= multi +MAINTAINER= kde@FreeBSD.org +COMMENT?= Multimedia framework for TV broadcasting +WWW= https://www.mltframework.org/ -USES+= alias cmake compiler:c++11-lang eigen:3 localbase \ - pathfix pkgconfig -USE_LDCONFIG= yes +LICENSE?= GPLv2 GPLv3 LGPL21 +LICENSE_COMB?= multi + +USES+= alias cmake compiler:c++11-lang eigen:3 localbase \ + pathfix pkgconfig +USE_LDCONFIG= yes # Suppress errors with lld >= 17 due to undefined symbols. -LDFLAGS+= -Wl,--undefined-version +LDFLAGS+= -Wl,--undefined-version + +DATADIR= ${PREFIX}/share/mlt-7 -DATADIR= ${PREFIX}/share/mlt-7 +WRKSRC= ${WRKDIR}/mlt-${DISTVERSION} .ifndef(SLAVEPORT) # Master port. -USES+= gnome mlt:7,nodepend -USE_GNOME= libxml2 +USES+= gnome mlt:7,nodepend +USE_GNOME= libxml2 -CMAKE_ON= MOD_XML +CMAKE_ON= MOD_XML # Explicitly disabled modules that are ouddated, unnecessary, or have # their own port. -CMAKE_OFF= MOD_GLAXNIMATE MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT \ - MOD_QT6 MOD_NDI \ - SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ - SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL +CMAKE_OFF= MOD_GLAXNIMATE MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT \ + MOD_QT6 MOD_NDI \ + SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ + SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL -PORTDOCS= AUTHORS NEWS -PORTEXAMPLES= demo +PORTDOCS= AUTHORS NEWS +PORTEXAMPLES= demo OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= AVFORMAT FREI0R GDK MOVIT KDENLIVE NORMALIZE PLUS PLUSGPL RESAMPLE SDL2 SOX \ @@ -76,7 +82,7 @@ JACKRACK_CMAKE_BOOL= MOD_JACKRACK KDENLIVE_DESC= Enable kdenlive module KDENLIVE_CMAKE_BOOL= MOD_KDENLIVE -MOVIT_DESC= Enable OpenGL module +MOVIT_DESC= Enable Movit module MOVIT_USES= gl xorg MOVIT_USE= gl=opengl xorg=x11 MOVIT_LIB_DEPENDS= libmovit.so:graphics/movit \ @@ -93,13 +99,6 @@ OPENCV_DESC= Enable OpenCV module OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv OPENCV_CMAKE_BOOL= MOD_OPENCV -OPENGL_DESC= Enable OpenGL module -OPENGL_CMAKE_BOOL= MOD_OPENGL -OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ - libmovit.so:graphics/movit -OPENGL_USES= gl xorg -OPENGL_USE= gl=gl xorg=x11 - PLUSGPL_DESC= Enable plus GPL module PLUSGPL_CMAKE_BOOL= MOD_PLUSGPL @@ -161,11 +160,11 @@ post-install-EXAMPLES-on: .endfor .else # Slave port. -PORTSCOUT= ignore:1 +PORTSCOUT= ignore:1 # Depend on multimedia/mlt7 for child ports -USES+= mlt:7 -PLIST?= ${.CURDIR}/pkg-plist +USES+= mlt:7 +PLIST?= ${.CURDIR}/pkg-plist INSTALL_WRKSRC?= ${BUILD_WRKSRC} .endif diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo index 16ea47575537..160b3e024d71 100644 --- a/multimedia/mlt7/distinfo +++ b/multimedia/mlt7/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1729745635 +TIMESTAMP = 1733025976 SHA256 (mlt-7.28.0.tar.gz) = bc425bf9602213f5f4855b78cfbbcd43eeb78097c508588bde44415963955aa1 SIZE (mlt-7.28.0.tar.gz) = 1713069 +SHA256 (6f533e7b8999bc4017c1a6685bf2baea6570d44c.patch) = a7d205cf2ee9c7cf8f1ba577752d121115af224c11e4380f1d9c2a85cc28d4ad +SIZE (6f533e7b8999bc4017c1a6685bf2baea6570d44c.patch) = 866 +SHA256 (2072c6b3596854f1a7165d7ddd5994204e741db8.patch) = 2636d637cab4fb480a0233cbac00dc7165bbeb891dcceb9a9787ea9811787603 +SIZE (2072c6b3596854f1a7165d7ddd5994204e741db8.patch) = 883 +SHA256 (63953cf7338181c82eb6eb9f93c8c9a11aaee5f7.patch) = 4bec2860cdc605e5e9905c94b94e4d18f8f24b244489a3cdd8df8c3e93160caa +SIZE (63953cf7338181c82eb6eb9f93c8c9a11aaee5f7.patch) = 1469
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412010604.4B164DxO028494>