Date: Fri, 23 Dec 2016 02:38:07 +0000 (UTC) From: Alberto Villa <avilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429214 - in head/multimedia/mlt: . files Message-ID: <201612230238.uBN2c7Ro077655@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avilla Date: Fri Dec 23 02:38:07 2016 New Revision: 429214 URL: https://svnweb.freebsd.org/changeset/ports/429214 Log: multimedia/mlt: install (optional) OpenGL module Added: head/multimedia/mlt/files/patch-git_0c09544 (contents, props changed) Modified: head/multimedia/mlt/Makefile head/multimedia/mlt/pkg-plist Modified: head/multimedia/mlt/Makefile ============================================================================== --- head/multimedia/mlt/Makefile Fri Dec 23 02:35:32 2016 (r429213) +++ head/multimedia/mlt/Makefile Fri Dec 23 02:38:07 2016 (r429214) @@ -2,7 +2,7 @@ PORTNAME= mlt PORTVERSION= 6.4.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME} @@ -42,10 +42,11 @@ PORTDOCS= AUTHORS ChangeLog NEWS README PORTEXAMPLES= demo OPTIONS_DEFINE= DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 \ - SAMPLERATE SOX SWFDEC VIDSTAB # OPENCV VDPAU + OPENGL SAMPLERATE SOX SWFDEC VIDSTAB # OPENCV VDPAU OPTIONS_RADIO= QT OPTIONS_RADIO_QT= QT4 QT5 -OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 QT4 SAMPLERATE SOX SWFDEC VIDSTAB +OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 OPENGL QT4 SAMPLERATE SOX \ + SWFDEC VIDSTAB OPTIONS_SUB= yes GTK2_DESC= Images and text rendering via GTK+ 2 @@ -82,6 +83,10 @@ KDE4_IMPLIES= QT4 CONFIGURE_ARGS+= --disable-opencv OPENCV_CONFIGURE_ENABLE=opencv +OPENGL_LIB_DEPENDS= libmovit.so:graphics/movit +OPENGL_USE= GL=gl +OPENGL_CONFIGURE_ENABLE=opengl + QT4_USE= QT4=corelib,gui,opengl,svg,xml QT5_USE= QT5=core,gui,svg,widgets,xml QT5_PREVENTS= KDE4 Added: head/multimedia/mlt/files/patch-git_0c09544 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mlt/files/patch-git_0c09544 Fri Dec 23 02:38:07 2016 (r429214) @@ -0,0 +1,28 @@ +From 0c09544aafdd01477326fea971881a01834f93af Mon Sep 17 00:00:00 2001 +From: Alberto Villa <avilla@FreeBSD.org> +Date: Fri, 23 Dec 2016 03:13:55 +0100 +Subject: [PATCH] Use Movit CFLAGS even when building *.c files + +--- + src/modules/opengl/Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile +index 09e403f7..ffe542b1 100644 +--- ./src/modules/opengl/Makefile ++++ ./src/modules/opengl/Makefile +@@ -29,8 +29,9 @@ CPPOBJS += transition_movit_luma.o + CPPOBJS += transition_movit_mix.o + CPPOBJS += transition_movit_overlay.o + +-CXXFLAGS := -Wno-deprecated $(CFLAGS) $(CXXFLAGS) +-CXXFLAGS += $(shell pkg-config --cflags movit 2> /dev/null) ++CFLAGS += -Wno-deprecated ++CFLAGS += $(shell pkg-config --cflags movit 2> /dev/null) ++CXXFLAGS += $(CFLAGS) + + SHADERDIR = $(shell pkg-config --variable=shaderdir movit) + CXXFLAGS += -DSHADERDIR=\"$(SHADERDIR)\" +-- +2.11.0 + Modified: head/multimedia/mlt/pkg-plist ============================================================================== --- head/multimedia/mlt/pkg-plist Fri Dec 23 02:35:32 2016 (r429213) +++ head/multimedia/mlt/pkg-plist Fri Dec 23 02:38:07 2016 (r429214) @@ -69,6 +69,7 @@ lib/mlt/libmltlinsys.so lib/mlt/libmltmotion_est.so lib/mlt/libmltnormalize.so lib/mlt/libmltoldfilm.so +%%OPENGL%%lib/mlt/libmltopengl.so lib/mlt/libmltplus.so lib/mlt/libmltplusgpl.so %%QT%%lib/mlt/libmltqt.so @@ -219,6 +220,20 @@ man/man1/melt.1.gz %%DATADIR%%/oldfilm/oldfilm.svg %%DATADIR%%/oldfilm/tcolor.svg %%DATADIR%%/oldfilm/vignette.svg +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_blur.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_deconvolution_sharpen.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_diffusion.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_glow.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_lift_gamma_gain.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_mirror.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_opacity.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_rect.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_saturation.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_vignette.yml +%%OPENGL%%%%DATADIR%%/opengl/filter_movit_white_balance.yml +%%OPENGL%%%%DATADIR%%/opengl/transition_movit_luma.yml +%%OPENGL%%%%DATADIR%%/opengl/transition_movit_mix.yml +%%OPENGL%%%%DATADIR%%/opengl/transition_movit_overlay.yml %%DATADIR%%/plus/consumer_blipflash.yml %%DATADIR%%/plus/filter_affine.yml %%DATADIR%%/plus/filter_charcoal.yml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612230238.uBN2c7Ro077655>