From be0c5b21a51f32938c8264716c19a47be5031c17 Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Fri, 24 May 2019 09:55:40 +0000 Subject: [PATCH] MFH: audio/lv2: r499627 r502442 audio/lv2: Fix Python (3.x) build, Add missing dependencies While lv2 itself works fine with any Python version we support, the build fails using a Python > 3.6, since the build bundles an old version of waf. waf upstream fixed the bug in a later version. [1] Restrict Python to up to 3.6 for now. [2] While here: - Add missing dependencies identified in QA. [3] - Pet portlint (USES order) [1] https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c PR: 235103 Reported by: cs [3] Submitted by: Charlie Li [2][3] Approved by: Michael Beer audio/lv2: Remove CONFLICTS_INSTALL lv2core expired and was deleted on 2016-11-30 in ports r427460 I only noted this after committing ports r499627, so remove it accordingly. PR: 235103 Approved by: Michael Beer (maintainer) Approved by: ports-secteam (blanket: build fix, missing dependencies) --- audio/lv2/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/audio/lv2/Makefile b/audio/lv2/Makefile index 87510afcb437..1b026fd9b57a 100644 --- a/audio/lv2/Makefile +++ b/audio/lv2/Makefile @@ -3,7 +3,7 @@ PORTNAME= lv2 PORTVERSION= 1.14.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://lv2plug.in/spec/ @@ -19,9 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib@${PY_FLAVOR} -CONFLICTS_INSTALL= lv2core +USES= python:-3.6 shebangfix tar:bzip2 waf -USES= python shebangfix tar:bzip2 waf SHEBANG_FILES= lv2specgen/lv2specgen.py OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES @@ -34,9 +33,11 @@ DOXYGEN_PORTDOCS= * DOXYGEN_IMPLIES= DOCS EXAMPLES_CONFIGURE_OFF= --no-plugins -EXAMPLES_LIB_DEPENDS= libsndfile.so:audio/libsndfile -EXAMPLES_USES= pkgconfig -EXAMPLES_USE= GNOME=cairo,gtk20 +EXAMPLES_LIB_DEPENDS= libsndfile.so:audio/libsndfile \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 +EXAMPLES_USES= pkgconfig gnome +EXAMPLES_USE= GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango EXAMPLES_CONFIGURE_ENV= CC='${CC} -Wl,--as-needed' # Gtk deps post-install: