pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/ladspa
Module Name: pkgsrc
Committed By: nia
Date: Sat Oct 5 17:39:38 UTC 2019
Modified Files:
pkgsrc/audio/ladspa: Makefile PLIST distinfo
Added Files:
pkgsrc/audio/ladspa/patches: patch-src_Makefile patch-src_applyplugin.c
Removed Files:
pkgsrc/audio/ladspa/patches: patch-aa patch-ab patch-ac
patch-plugins_amp.c patch-plugins_delay.c patch-plugins_filter.c
patch-plugins_noise.c
Log Message:
ladspa: Update to 1.15
Version 1.14 - 3 Jan 2019
Rename Makefile.
Modernise C++ #include style.
Make some globals static.
Use mkdir -p rather than mkdirhier during build.
Use GCC export map to ensure only the ladspa_descriptor() exported.
Put libraries at the end of link instructions.
Package with version number in archive and directory names.
Tweaks to documentation processing.
Fix bug in LADSPA plugin search which did not handle shared libraries that are not plugins correctly.
Introduce a default LADSPA plugin search path.
Version 1.15 - 6 Jan 2019
Perform macro string expansion in C code rather than in Makefile for better portability.
Modernise init()/fini() style in GNU C plugin builds (not C++), tweak link line to correspond.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/ladspa/Makefile \
pkgsrc/audio/ladspa/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/ladspa/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/audio/ladspa/patches/patch-aa
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/ladspa/patches/patch-ab
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/ladspa/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/ladspa/patches/patch-plugins_amp.c \
pkgsrc/audio/ladspa/patches/patch-plugins_delay.c \
pkgsrc/audio/ladspa/patches/patch-plugins_filter.c \
pkgsrc/audio/ladspa/patches/patch-plugins_noise.c
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/ladspa/patches/patch-src_Makefile \
pkgsrc/audio/ladspa/patches/patch-src_applyplugin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/ladspa/Makefile
diff -u pkgsrc/audio/ladspa/Makefile:1.15 pkgsrc/audio/ladspa/Makefile:1.16
--- pkgsrc/audio/ladspa/Makefile:1.15 Mon Jul 15 22:58:50 2019
+++ pkgsrc/audio/ladspa/Makefile Sat Oct 5 17:39:38 2019
@@ -1,33 +1,37 @@
-# $NetBSD: Makefile,v 1.15 2019/07/15 22:58:50 nia Exp $
+# $NetBSD: Makefile,v 1.16 2019/10/05 17:39:38 nia Exp $
-DISTNAME= ladspa_sdk_1.13
+DISTNAME= ladspa_sdk_1.15
PKGNAME= ${DISTNAME:S/_sdk_/-/}
-PKGREVISION= 2
CATEGORIES= audio
-MASTER_SITES= http://www.ladspa.org/download/
+MASTER_SITES= https://www.ladspa.org/download/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.ladspa.org/
+HOMEPAGE= https://www.ladspa.org/
COMMENT= Linux Audio Developers Simple Plugin API
LICENSE= gnu-lgpl-v2.1
-USE_LIBTOOL= yes
+WRKSRC= ${WRKDIR}/ladspa_sdk_${PKGVERSION_NOREV}
-WRKSRC= ${WRKDIR}/ladspa_sdk/src
+BUILD_DIRS= src
USE_TOOLS+= gmake
+USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-MAKE_FILE= makefile
-
-BUILDLINK_LIBS.dl+= ${BUILDLINK_LDADD.dl}
-
-
-MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
-
-#do-test:
-# cd ${WRKSRC} && && ${BUILD_MAKE_CMD} test
+MAKE_FILE= Makefile
+BUILD_TARGET= targets
+TEST_TARGET= test
+
+INSTALLATION_DIRS+= bin include
+INSTALLATION_DIRS+= lib/ladspa
+INSTALLATION_DIRS+= share/doc/ladspa
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/ladspa
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/*.la ${DESTDIR}${PREFIX}/lib/ladspa
+ ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/src/ladspa.h ${DESTDIR}${PREFIX}/include
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
.include "../../mk/dlopen.buildlink3.mk"
+LDFLAGS+= ${BUILDLINK_LDADD.dl}
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/ladspa/distinfo
diff -u pkgsrc/audio/ladspa/distinfo:1.15 pkgsrc/audio/ladspa/distinfo:1.16
--- pkgsrc/audio/ladspa/distinfo:1.15 Sat Jul 20 19:45:57 2019
+++ pkgsrc/audio/ladspa/distinfo Sat Oct 5 17:39:38 2019
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.15 2019/07/20 19:45:57 nia Exp $
+$NetBSD: distinfo,v 1.16 2019/10/05 17:39:38 nia Exp $
-SHA1 (ladspa_sdk_1.13.tgz) = 2b69e28afb62c0d97943124f48ed82de796f83ed
-RMD160 (ladspa_sdk_1.13.tgz) = e9eeae8edd24a6890fac3e34c4b55f844f44f8a0
-SHA512 (ladspa_sdk_1.13.tgz) = a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
-Size (ladspa_sdk_1.13.tgz) = 70540 bytes
-SHA1 (patch-aa) = c233427fd90b701841f113bd980e7538cb4b2b62
-SHA1 (patch-ab) = 1357f25ef53c24c737a4888ba7d01fb724a3f315
-SHA1 (patch-ac) = 40108e5e4fdba9b2be322d0de532a97322d22325
-SHA1 (patch-plugins_amp.c) = e0336ff7fe078aa6b4e6b3d25b21b70ac6dc127d
-SHA1 (patch-plugins_delay.c) = ee551be35938b69d7b535640858d67ceeb261ee0
-SHA1 (patch-plugins_filter.c) = 79b050f99a68ebd87e76f552054592331c31828e
-SHA1 (patch-plugins_noise.c) = 9e996f5f9ad4e39974cafea52af143e9db4603f7
+SHA1 (ladspa_sdk_1.15.tgz) = b7bbbf47e00b6c5248b35796a362644393457878
+RMD160 (ladspa_sdk_1.15.tgz) = 94ade7b6286d0536a80d748e33ed94162beef9cf
+SHA512 (ladspa_sdk_1.15.tgz) = a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
+Size (ladspa_sdk_1.15.tgz) = 71179 bytes
+SHA1 (patch-src_Makefile) = 9b5f12cdb32b88e9d0354ddc4f7539ca8da95eb0
+SHA1 (patch-src_applyplugin.c) = 88127403707150d8646f85a7a5d6a146c812b34e
Index: pkgsrc/audio/ladspa/PLIST
diff -u pkgsrc/audio/ladspa/PLIST:1.3 pkgsrc/audio/ladspa/PLIST:1.4
--- pkgsrc/audio/ladspa/PLIST:1.3 Mon Jul 15 22:58:50 2019
+++ pkgsrc/audio/ladspa/PLIST Sat Oct 5 17:39:38 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/07/15 22:58:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/10/05 17:39:38 nia Exp $
bin/analyseplugin
bin/applyplugin
bin/listplugins
@@ -8,3 +8,15 @@ lib/ladspa/delay.la
lib/ladspa/filter.la
lib/ladspa/noise.la
lib/ladspa/sine.la
+share/doc/ladspa/COPYING
+share/doc/ladspa/background.html
+share/doc/ladspa/changes.html
+share/doc/ladspa/download.html
+share/doc/ladspa/example_plugins.html
+share/doc/ladspa/index.html
+share/doc/ladspa/installation.html
+share/doc/ladspa/ladspa.h.txt
+share/doc/ladspa/license.html
+share/doc/ladspa/overview.html
+share/doc/ladspa/shared_plugins.html
+share/doc/ladspa/unique_ids.html
Added files:
Index: pkgsrc/audio/ladspa/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/audio/ladspa/patches/patch-src_Makefile:1.1
--- /dev/null Sat Oct 5 17:39:38 2019
+++ pkgsrc/audio/ladspa/patches/patch-src_Makefile Sat Oct 5 17:39:38 2019
@@ -0,0 +1,161 @@
+$NetBSD: patch-src_Makefile,v 1.1 2019/10/05 17:39:38 nia Exp $
+
+Libtool support.
+
+--- src/Makefile.orig 2019-01-06 12:27:52.000000000 +0000
++++ src/Makefile
+@@ -4,9 +4,9 @@
+ #
+ # Change these if you want to install somewhere else.
+
+-INSTALL_PLUGINS_DIR = /usr/lib/ladspa/
+-INSTALL_INCLUDE_DIR = /usr/include/
+-INSTALL_BINARY_DIR = /usr/bin/
++INSTALL_PLUGINS_DIR = ${PREFIX}/lib/ladspa/
++INSTALL_INCLUDE_DIR = ${PREFIX}/include/
++INSTALL_BINARY_DIR = ${PREFIX}/bin/
+
+ ###############################################################################
+ #
+@@ -14,11 +14,12 @@ INSTALL_BINARY_DIR = /usr/bin/
+ #
+
+ INCLUDES = -I.
+-LIBRARIES = -ldl -lm
+-CFLAGS = $(INCLUDES) -Wall -Werror -O2 -fPIC \
++LIBRARIES += -lm
++CFLAGS += $(INCLUDES) -Wall -fPIC \
++ -DDEFAULT_LADSPA_PATH=$(INSTALL_PLUGINS_DIR)
++CXXFLAGS += $(INCLUDES) -Wall -fPIC \
+ -DDEFAULT_LADSPA_PATH=$(INSTALL_PLUGINS_DIR)
+ BINFLAGS = -fPIE -pie
+-CXXFLAGS = $(CFLAGS)
+ PLUGINS = ../plugins/amp.so \
+ ../plugins/delay.so \
+ ../plugins/filter.so \
+@@ -27,35 +28,19 @@ PLUGINS = ../plugins/amp.so \
+ PROGRAMS = ../bin/analyseplugin \
+ ../bin/applyplugin \
+ ../bin/listplugins
+-CC = cc
+-CPP = c++
+
+ ###############################################################################
+ #
+ # RULES TO BUILD PLUGINS FROM C OR C++ CODE
+ #
+
+-../plugins/%.so: plugins/%.c ladspa.h gcc_exports.map
+- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
+- $(CC) -o ../plugins/$*.so \
+- plugins/$*.o \
+- -shared \
+- $(CFLAGS) \
+- -fvisibility=hidden \
+- -fvisibility-inlines-hidden \
+- -s \
+- -Wl,--version-script=gcc_exports.map
+-
+-../plugins/%.so: plugins/%.cpp ladspa.h gcc_exports.map
+- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
+- $(CPP) -o ../plugins/$*.so \
+- plugins/$*.o \
+- -shared \
+- $(CXXFLAGS) \
+- -fvisibility=hidden \
+- -fvisibility-inlines-hidden \
+- -s \
+- -Wl,--version-script=gcc_exports.map
++../plugins/%.so: plugins/%.c ladspa.h gcc_exports.map
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o plugins/$*.lo -c plugins/$*.c
++ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o ../plugins/$*.la plugins/$*.lo -rpath $(INSTALL_PLUGINS_DIR) -module -avoid-version
++
++../plugins/%.so: plugins/%.cpp ladspa.h
++ ${LIBTOOL} --tag=CXX --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o plugins/$*.lo -c plugins/$*.cpp
++ ${LIBTOOL} --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o ../plugins/$*.la plugins/$*.lo -rpath $(INSTALL_PLUGINS_DIR) -module -avoid-version
+
+ ###############################################################################
+ #
+@@ -84,19 +69,19 @@ install: targets
+
+ /tmp/test.wav: targets ../snd/noise.wav
+ ../bin/listplugins
+- ../bin/analyseplugin ../plugins/filter.so
+- ../bin/analyseplugin ../plugins/delay.so
+- ../bin/analyseplugin ../plugins/sine.so
+- echo ; ../bin/analyseplugin -l ../plugins/sine.so ; echo
+- ../bin/analyseplugin ../plugins/amp.so
+- ../bin/analyseplugin ../plugins/noise.so
+- ../bin/applyplugin -s 1 \
+- ../snd/noise.wav /tmp/test.wav \
+- ../plugins/filter.so lpf 500 \
+- ../plugins/filter.so lpf 500 \
+- ../plugins/sine.so sine_fcaa 6000 \
+- ../plugins/delay.so delay_5s 1 0.1 \
+- ../plugins/amp.so amp_mono 4 \
++ ../bin/analyseplugin ../plugins/.libs/filter.so
++ ../bin/analyseplugin ../plugins/.libs/delay.so
++ ../bin/analyseplugin ../plugins/.libs/sine.so
++ echo ; ../bin/analyseplugin -l ../plugins/.libs/sine.so ; echo
++ ../bin/analyseplugin ../plugins/.libs/amp.so
++ ../bin/analyseplugin ../plugins/.libs/noise.so
++ ../bin/applyplugin -s 1 \
++ ../snd/noise.wav /tmp/test.wav \
++ ../plugins/.libs/filter.so lpf 500 \
++ ../plugins/.libs/filter.so lpf 500 \
++ ../plugins/.libs/sine.so sine_fcaa 6000 \
++ ../plugins/.libs/delay.so delay_5s 1 0.1 \
++ ../plugins/.libs/amp.so amp_mono 4 \
+
+ targets: $(PLUGINS) $(PROGRAMS)
+
+@@ -105,23 +90,32 @@ targets: $(PLUGINS) $(PROGRAMS)
+ # PROGRAMS
+ #
+
+-../bin/applyplugin: applyplugin.o load.o default.o
+- $(CC) $(CFLAGS) $(BINFLAGS) \
+- -o ../bin/applyplugin \
+- applyplugin.o load.o default.o \
+- $(LIBRARIES)
+-
+-../bin/analyseplugin: analyseplugin.o load.o default.o
+- $(CC) $(CFLAGS) $(BINFLAGS) \
+- -o ../bin/analyseplugin \
+- analyseplugin.o load.o default.o \
+- $(LIBRARIES)
+-
+-../bin/listplugins: listplugins.o search.o
+- $(CC) $(CFLAGS) $(BINFLAGS) \
+- -o ../bin/listplugins \
+- listplugins.o search.o \
+- $(LIBRARIES)
++default.o:
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c default.c
++
++load.o:
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c load.c
++
++applyplugin.o:
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c applyplugin.c
++
++analyseplugin.o:
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c analyseplugin.c
++
++listplugins.o:
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c listplugins.c
++
++search.o:
++ ${LIBTOOL} --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c search.c
++
++../bin/applyplugin: applyplugin.o load.o default.o
++ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $(^:.o=.lo) $(LIBRARIES) \
++
++../bin/analyseplugin: analyseplugin.o load.o default.o
++ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $(^:.o=.lo) $(LIBRARIES)
++
++../bin/listplugins: listplugins.o search.o
++ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $(^:.o=.lo) $(LIBRARIES)
+
+ ###############################################################################
+ #
Index: pkgsrc/audio/ladspa/patches/patch-src_applyplugin.c
diff -u /dev/null pkgsrc/audio/ladspa/patches/patch-src_applyplugin.c:1.1
--- /dev/null Sat Oct 5 17:39:38 2019
+++ pkgsrc/audio/ladspa/patches/patch-src_applyplugin.c Sat Oct 5 17:39:38 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_applyplugin.c,v 1.1 2019/10/05 17:39:38 nia Exp $
+
+Endian support for SunOS and macOS.
+
+--- src/applyplugin.c.orig 2019-01-06 12:27:52.000000000 +0000
++++ src/applyplugin.c
+@@ -6,7 +6,19 @@
+ /*****************************************************************************/
+
+ #include <dlfcn.h>
+-#include <endian.h>
++#ifdef __linux__
++# include <endian.h>
++#elif defined(__sun)
++# include <sys/byteorder.h>
++# ifdef _LITTLE_ENDIAN
++# define LITTLE_ENDIAN 1234
++# define BYTE_ORDER LITTLE_ENDIAN
++# endif
++#elif defined(__APPLE__)
++# include <machine/endian.h>
++#else
++# include <sys/endian.h>
++#endif
+ #include <errno.h>
+ #include <math.h>
+ #include <stdlib.h>
Home |
Main Index |
Thread Index |
Old Index