SHA256
1
0
forked from pool/ladspa

Accepting request 663175 from home:plater

Update to version 1.15 removed incorporated patch:
  ladspa-ldcommand.patch and ladspa.diff

OBS-URL: https://build.opensuse.org/request/show/663175
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa?expand=0&rev=40
This commit is contained in:
Dave Plater 2019-01-06 13:47:40 +00:00 committed by Git OBS Bridge
parent e10f49ec3b
commit a5e2e191ee
6 changed files with 16 additions and 150 deletions

View File

@ -1,29 +0,0 @@
Index: src/Makefile
===================================================================
--- src/Makefile.orig 2019-01-03 17:08:22.000000000 +0200
+++ src/Makefile 2019-01-06 10:29:48.264066021 +0200
@@ -29,6 +29,7 @@ PROGRAMS = ../bin/analyseplugin \
../bin/listplugins
CC = cc
CPP = c++
+LD = ld
###############################################################################
#
@@ -37,10 +38,13 @@ CPP = c++
../plugins/%.so: plugins/%.c ladspa.h gcc_exports.map
$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
- $(LD) -o ../plugins/$*.so \
+ $(CC) -o ../plugins/$*.so \
plugins/$*.o \
- -shared \
- --version-script=gcc_exports.map
+ -shared \
+ ${LIBRARIES} \
+ $(CFLAGS) \
+ -s \
+ -Wl,--version-script=gcc_exports.map
../plugins/%.so: plugins/%.cpp ladspa.h gcc_exports.map
$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Jan 6 13:37:27 UTC 2019 - davejplater@gmail.com
- Update to version 1.15 removed incorporated patch:
ladspa-ldcommand.patch and ladspa.diff
- Upstream changes:
*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.
-------------------------------------------------------------------
Sat Jan 5 10:53:13 UTC 2019 - davejplater@gmail.com

View File

@ -1,112 +0,0 @@
---
src/plugins/amp.c | 8 ++++----
src/plugins/delay.c | 8 ++++----
src/plugins/filter.c | 8 ++++----
src/plugins/noise.c | 8 ++++----
5 files changed, 22 insertions(+), 19 deletions(-)
#
Index: src/plugins/amp.c
===================================================================
--- src/plugins/amp.c.orig 2019-01-04 15:15:04.192234406 +0200
+++ src/plugins/amp.c 2019-01-04 15:15:27.917159413 +0200
@@ -152,8 +152,8 @@ LADSPA_Descriptor * g_psStereoDescriptor
/* _init() is called automatically when the plugin library is first
loaded. */
-void
-_init() {
+static void __attribute__((constructor))
+init() {
char ** pcPortNames;
LADSPA_PortDescriptor * piPortDescriptors;
@@ -335,8 +335,8 @@ deleteDescriptor(LADSPA_Descriptor * psD
/*****************************************************************************/
/* _fini() is called automatically when the library is unloaded. */
-void
-_fini() {
+static void __attribute__ ((destructor))
+fini() {
deleteDescriptor(g_psMonoDescriptor);
deleteDescriptor(g_psStereoDescriptor);
}
Index: src/plugins/delay.c
===================================================================
--- src/plugins/delay.c.orig 2019-01-04 15:15:04.192234406 +0200
+++ src/plugins/delay.c 2019-01-04 15:15:27.917159413 +0200
@@ -228,8 +228,8 @@ static LADSPA_Descriptor * g_psDescripto
/* _init() is called automatically when the plugin library is first
loaded. */
-void
-_init() {
+static void __attribute__ ((constructor))
+init() {
char ** pcPortNames;
LADSPA_PortDescriptor * piPortDescriptors;
@@ -322,8 +322,8 @@ _init() {
/*****************************************************************************/
/* _fini() is called automatically when the library is unloaded. */
-void
-_fini() {
+static void __attribute__ ((destructor))
+fini() {
long lIndex;
if (g_psDescriptor) {
free((char *)g_psDescriptor->Label);
Index: src/plugins/filter.c
===================================================================
--- src/plugins/filter.c.orig 2019-01-04 15:15:04.192234406 +0200
+++ src/plugins/filter.c 2019-01-04 15:15:27.917159413 +0200
@@ -252,8 +252,8 @@ static LADSPA_Descriptor * g_psHPFDescri
/* _init() is called automatically when the plugin library is first
loaded. */
-void
-_init() {
+static void __attribute__ ((constructor))
+init() {
char ** pcPortNames;
LADSPA_PortDescriptor * piPortDescriptors;
@@ -431,8 +431,8 @@ deleteDescriptor(LADSPA_Descriptor * psD
/*****************************************************************************/
/* _fini() is called automatically when the library is unloaded. */
-void
-_fini() {
+static void __attribute__ ((destructor))
+fini() {
deleteDescriptor(g_psLPFDescriptor);
deleteDescriptor(g_psHPFDescriptor);
}
Index: src/plugins/noise.c
===================================================================
--- src/plugins/noise.c.orig 2019-01-04 15:15:04.192234406 +0200
+++ src/plugins/noise.c 2019-01-04 15:15:27.917159413 +0200
@@ -142,8 +142,8 @@ static LADSPA_Descriptor * g_psDescripto
/* _init() is called automatically when the plugin library is first
loaded. */
-void
-_init() {
+static void __attribute__ ((constructor))
+init() {
char ** pcPortNames;
LADSPA_PortDescriptor * piPortDescriptors;
@@ -219,8 +219,8 @@ _init() {
/*****************************************************************************/
/* _fini() is called automatically when the library is unloaded. */
-void
-_fini() {
+static void __attribute__ ((destructor))
+fini() {
long lIndex;
if (g_psDescriptor) {
free((char *)g_psDescriptor->Label);

View File

@ -17,7 +17,7 @@
Name: ladspa
Version: 1.14
Version: 1.15
Release: 0
Summary: The Linux Audio Developer's Simple Plug-In API
License: LGPL-2.1-or-later
@ -25,10 +25,6 @@ Group: Productivity/Multimedia/Sound/Utilities
Url: http://www.ladspa.org/
Source: http://www.ladspa.org/download/%{name}_sdk_%{version}.tgz
Source1: baselibs.conf
Patch0: ladspa.dif
#PATCH-FIX-UPSTREAM ladspa-ldcommand.patch davejplater@gmail.com - ld commands linked static libs,
# and generated Missing build-id warnings so use cc instead.
Patch1: ladspa-ldcommand.patch
BuildRequires: gcc-c++
AutoReq: on
Autoprov: off
@ -52,7 +48,7 @@ This package contains include files to develop LADSPA plugins.
%build
export LADSPA_PATH="%{_libdir}/ladspa"
make -C src CFLAGS='-I. %{optflags} -fPIC -ggdb -DDEFAULT_LADSPA_PATH=\"%{_libdir}/ladspa/\"' targets
make -C src CFLAGS="-I. %{optflags} -fPIC -ggdb -DDEFAULT_LADSPA_PATH=%{_libdir}/ladspa" targets
%install
make -C src \

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0e744f5b46801cb282e734091f5e8d9b87d841173183564c88ff2157f80d6e9
size 70614

3
ladspa_sdk_1.15.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4229959b09d20c88c8c86f4aa76427843011705df22d9c28b38359fd1829fded
size 71179