aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/calf/Makefile6
-rw-r--r--audio/linuxsampler/Makefile21
-rw-r--r--audio/linuxsampler/pkg-plist8
-rw-r--r--audio/lv2core/Makefile3
-rw-r--r--audio/slv2/Makefile5
5 files changed, 23 insertions, 20 deletions
diff --git a/audio/calf/Makefile b/audio/calf/Makefile
index 81c7927d6b8a..4356791b3242 100644
--- a/audio/calf/Makefile
+++ b/audio/calf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= calf
PORTVERSION= 0.0.60
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://calf-studio-gear.org/files/
@@ -33,8 +33,8 @@ OPTIONS_SUB= yes
LASH_LIB_DEPENDS= liblash.so:audio/lash
LASH_CONFIGURE_WITH= lash
LV2_DESC= LV2 audio plugin
-LV2_BUILD_DEPENDS= lv2core>0:audio/lv2core
-LV2_RUN_DEPENDS= lv2core>0:audio/lv2core
+LV2_BUILD_DEPENDS= lv2>0:audio/lv2
+LV2_RUN_DEPENDS= lv2>0:audio/lv2
LV2_CONFIGURE_WITH= lv2
.include <bsd.port.pre.mk>
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 0dd2c4c479ab..61019c3a08cb 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -3,7 +3,7 @@
PORTNAME= linuxsampler
PORTVERSION= 1.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://download.linuxsampler.org/packages/
@@ -17,10 +17,10 @@ RESTRICTED= no commercial use
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= "not yet ported"
-OPTIONS_DEFINE= JACK ALSA DSSI LV2CORE
+OPTIONS_DEFINE= JACK ALSA DSSI LV2
OPTIONS_DEFAULT= JACK
DSSI_DESC= Enable DSSI support
-LV2CORE_DESC= Enable LV2 support
+LV2_DESC= Enable LV2 support
USES= tar:bzip2 libtool gmake pathfix pkgconfig sqlite:3
GNU_CONFIGURE= yes
@@ -57,19 +57,18 @@ CONFIGURE_ENV+= ac_cv_header_dssi_h=no
PLIST_SUB+= DSSI="@comment "
.endif
-.if ${PORT_OPTIONS:MLV2CORE}
-BUILD_DEPENDS+= lv2core>=0:audio/lv2core
-RUN_DEPENDS+= lv2core>=0:audio/lv2core
-PLIST_SUB+= LV2CORE=""
+.if ${PORT_OPTIONS:MLV2}
+BUILD_DEPENDS+= lv2>=0:audio/lv2
+RUN_DEPENDS+= lv2>=0:audio/lv2
+PLIST_SUB+= LV2=""
.else
CONFIGURE_ENV+= ac_cv_header_lv2_h=no
-PLIST_SUB+= LV2CORE="@comment "
+PLIST_SUB+= LV2="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e \
- 's|CXX_CPU_SWITCH=.*|CXX_CPU_SWITCH=|g ; \
- s|"lv2core"|"_lv2core_"|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/CXX_CPU_SWITCH=/d' \
+ ${WRKSRC}/configure
post-install:
@${TOUCH} ${STAGEDIR}${PREFIX}/lib/linuxsampler/plugins/.keep_me
diff --git a/audio/linuxsampler/pkg-plist b/audio/linuxsampler/pkg-plist
index fa0bcb2bc80e..76d64519c50a 100644
--- a/audio/linuxsampler/pkg-plist
+++ b/audio/linuxsampler/pkg-plist
@@ -33,10 +33,10 @@ lib/linuxsampler/liblinuxsampler.so
lib/linuxsampler/liblinuxsampler.so.3
lib/linuxsampler/liblinuxsampler.so.3.0.0
lib/linuxsampler/plugins/.keep_me
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.a
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.so
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.ttl
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/manifest.ttl
+%%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.a
+%%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.so
+%%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.ttl
+%%LV2%%lib/lv2/linuxsampler.lv2/manifest.ttl
libdata/pkgconfig/linuxsampler.pc
man/man1/linuxsampler.1.gz
/var/lib/linuxsampler/instruments.db
diff --git a/audio/lv2core/Makefile b/audio/lv2core/Makefile
index 9769cb6f07b4..b85e6b19e3bb 100644
--- a/audio/lv2core/Makefile
+++ b/audio/lv2core/Makefile
@@ -14,6 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= lv2
+DEPRECATED= Superseded by audio/lv2
+EXPIRATION_DATE= 2016-11-31
+
USES= pkgconfig python:build tar:bzip2 waf
post-patch:
diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index 2bab5aab55bb..e4e98b115f0a 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= slv2
PORTVERSION= 0.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.drobilla.net/
@@ -13,7 +13,7 @@ COMMENT= LV2 Application Support Library
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:audio/lv2core
+BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:audio/lv2
LIB_DEPENDS= libjack.so:audio/jack \
librdf.so:textproc/redland
@@ -25,6 +25,7 @@ post-patch:
'/pkgconfig/s|$${LIBDIRNAME}|libdata|' ${WRKSRC}/autowaf.py
@${REINPLACE_CMD} -e \
'/autowaf.build_dox/s|^|#| ; \
+ s/lv2core/lv2/ ; \
/HTMLDIR/s|^|#| ; \
/MANDIR/s|^|#|' ${WRKSRC}/wscript
@${REINPLACE_CMD} -e \