Accepting request 210502 from multimedia:libs

- Merge ladspa-devel.spec into ladspa.spec; back to root, as OBS
  doesn't like split packages (the submitreq always declined),
  and the development activity of this package is pretty low, so
  no worth to resist (forwarded request 209420 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/210502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ladspa?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-12-12 10:16:46 +00:00 committed by Git OBS Bridge
commit a148b9c6ad
5 changed files with 88 additions and 84 deletions

21
caps-fix-double-free.diff Normal file
View File

@ -0,0 +1,21 @@
---
interface.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/interface.cc
+++ b/interface.cc
@@ -123,8 +123,12 @@ void _init()
__attribute__ ((destructor))
void _fini()
{
- for (ulong i = 0; i < N; ++i)
- delete descriptors[i];
+ for (ulong i = 0; i < N; ++i) {
+ if (descriptors[i]) {
+ delete descriptors[i];
+ descriptors[i] = NULL;
+ }
+ }
}
/* /////////////////////////////////////////////////////////////////////// */

View File

@ -1,15 +0,0 @@
-------------------------------------------------------------------
Thu Jan 21 07:27:40 UTC 2010 - davejplater@gmail.com
- Update to 1.13
-------------------------------------------------------------------
Wed Feb 13 13:50:30 CET 2008 - adrian@suse.de
- remove NoSource flag according to our policy
-------------------------------------------------------------------
Wed Apr 18 13:01:02 CEST 2007 - tiwai@suse.de
- split ladspa-devel.spec to reduce the build dependency

View File

@ -1,55 +0,0 @@
#
# spec file for package ladspa-devel
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: ladspa-devel
Summary: Include Files mandatory for Development
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Version: 1.13
Release: 0
Source: ladspa_sdk_1.13.tar.bz2
Url: http://www.ladspa.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Provides: ladspa-devel > 1.12.code10.3.1
%description
This package contains include files to develop LADSPA plugins.
%prep
%setup -n ladspa_sdk
%build
%install
mkdir -p $RPM_BUILD_ROOT%{_includedir}
cp src/ladspa.h $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
cp -av README $RPM_BUILD_ROOT%{_docdir}/%{name}
cp -av doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}
ln -sf %{_includedir}/ladspa.h $RPM_BUILD_ROOT%{_docdir}/%{name}/ladspa.h.txt
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc %{_docdir}/%{name}
%{_includedir}/*
%changelog

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Dec 4 15:55:53 CET 2013 - tiwai@suse.de
- Merge ladspa-devel.spec into ladspa.spec; back to root, as OBS
doesn't like split packages (the submitreq always declined),
and the development activity of this package is pretty low, so
no worth to resist
-------------------------------------------------------------------
Thu Sep 26 14:37:25 CEST 2013 - tiwai@suse.de
- caps-fix-double-free.diff:
Fix double free in destructor of caps plugin (bnc#842420)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 14 07:51:10 UTC 2012 - coolo@suse.com Tue Feb 14 07:51:10 UTC 2012 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ladspa # spec file for package ladspa
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -50,16 +50,34 @@ Release: 0
AutoReq: on AutoReq: on
Autoprov: off Autoprov: off
Provides: ladspa > 1.12.code10.3.1 Provides: ladspa > 1.12.code10.3.1
Provides: ladspa-swh-plugins = %{swh_version} ladspa-AMB = %{AMB_version} ladspa-FIL = %{FIL_version} Provides: ladspa-AMB = %{AMB_version}
Provides: ladspa-REV = %{REV_version} ladspa-VCO = %{VCO_version} ladspa-alienwah = %{alienwah_version} Provides: ladspa-FIL = %{FIL_version}
Provides: ladspa-caps = %{caps_version} ladspa-pvoc = %{pvoc_version} ladspa-tap-plugins = %{tap_version} Provides: ladspa-MCP = %{MCP_version}
Provides: ladspa-vlevel = %{vlevel_version} ladspa-vocoder = %{vocoder_version} ladspa-blop = %{blop_version} Provides: ladspa-REV = %{REV_version}
Provides: ladspa-vcf = %{vcf_version} ladspa-MCP = %{MCP_version} Provides: ladspa-VCO = %{VCO_version}
Obsoletes: ladspa-swh-plugins < %{swh_version} ladspa-AMB < %{AMB_version} ladspa-FIL < %{FIL_version} Provides: ladspa-alienwah = %{alienwah_version}
Obsoletes: ladspa-REV < %{REV_version} ladspa-VCO < %{VCO_version} ladspa-alienwah < %{alienwah_version} Provides: ladspa-blop = %{blop_version}
Obsoletes: ladspa-caps < %{caps_version} ladspa-pvoc < %{pvoc_version} ladspa-tap-plugins < %{tap_version} Provides: ladspa-caps = %{caps_version}
Obsoletes: ladspa-vlevel < %{vlevel_version} ladspa-vocoder < %{vocoder_version} ladspa-blop < %{blop_version} Provides: ladspa-pvoc = %{pvoc_version}
Obsoletes: ladspa-vcf < %{vcf_version} ladspa-MCP < %{MCP_version} Provides: ladspa-swh-plugins = %{swh_version}
Provides: ladspa-tap-plugins = %{tap_version}
Provides: ladspa-vcf = %{vcf_version}
Provides: ladspa-vlevel = %{vlevel_version}
Provides: ladspa-vocoder = %{vocoder_version}
Obsoletes: ladspa-AMB < %{AMB_version}
Obsoletes: ladspa-FIL < %{FIL_version}
Obsoletes: ladspa-MCP < %{MCP_version}
Obsoletes: ladspa-REV < %{REV_version}
Obsoletes: ladspa-VCO < %{VCO_version}
Obsoletes: ladspa-alienwah < %{alienwah_version}
Obsoletes: ladspa-blop < %{blop_version}
Obsoletes: ladspa-caps < %{caps_version}
Obsoletes: ladspa-pvoc < %{pvoc_version}
Obsoletes: ladspa-swh-plugins < %{swh_version}
Obsoletes: ladspa-tap-plugins < %{tap_version}
Obsoletes: ladspa-vcf < %{vcf_version}
Obsoletes: ladspa-vlevel < %{vlevel_version}
Obsoletes: ladspa-vocoder < %{vocoder_version}
Source1: ladspa_sdk_1.13.tar.bz2 Source1: ladspa_sdk_1.13.tar.bz2
Source2: cmt_src_1.15.tar.bz2 Source2: cmt_src_1.15.tar.bz2
Source3: swh-plugins-%{swh_version}.tar.bz2 Source3: swh-plugins-%{swh_version}.tar.bz2
@ -116,6 +134,7 @@ Patch25: pvoc-0.1.10-depend-copts-fix.diff
Patch26: swh-nostatic-lib.diff Patch26: swh-nostatic-lib.diff
Patch27: blop-ladspa_dir.diff Patch27: blop-ladspa_dir.diff
Patch28: blop-wdautil-fix.diff Patch28: blop-wdautil-fix.diff
Patch29: caps-fix-double-free.diff
Url: http://www.ladspa.org/ Url: http://www.ladspa.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -125,6 +144,15 @@ ability to write simple plug-in audio processors in C/C++ and link them
dynamically. The package contains the LADSPA SDK, the CMT plug-in dynamically. The package contains the LADSPA SDK, the CMT plug-in
libraries (including Freeverb), and the swh plug-ins. libraries (including Freeverb), and the swh plug-ins.
%package devel
Summary: Include Files mandatory for Development
Group: Development/Libraries/C and C++
BuildArch: noarch
Provides: ladspa-devel > 1.12.code10.3.1
%description devel
This package contains include files to develop LADSPA plugins.
%prep %prep
# #
# More URLs # More URLs
@ -199,6 +227,9 @@ touch config.rpath
%patch16 %patch16
%patch25 %patch25
) )
(cd caps-%{caps_version}
%patch29 -p1
)
%build %build
# This package failed when testing with -Wl,-as-needed being default. # This package failed when testing with -Wl,-as-needed being default.
@ -392,8 +423,12 @@ cp -av vlevel-%{vlevel_version}/docs $RPM_BUILD_ROOT%{_docdir}/%{name}/vlevel
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel
cp -av vlevel-%{vlevel_version}/utils/* $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel cp -av vlevel-%{vlevel_version}/utils/* $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel
chmod 644 $RPM_BUILD_ROOT%{_docdir}/%{name}/cmt/plugins.html chmod 644 $RPM_BUILD_ROOT%{_docdir}/%{name}/cmt/plugins.html
# remove incldue file (already in devel package) # devel package
rm -f $RPM_BUILD_ROOT%{_includedir}/* mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
cp -av ladspa_sdk/README $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
cp -av ladspa_sdk/doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
ln -sf %{_includedir}/ladspa.h $RPM_BUILD_ROOT%{_docdir}/%{name}-devel/ladspa.h.txt
#
%find_lang %{name} --all-name %find_lang %{name} --all-name
%fdupes -s $RPM_BUILD_ROOT %fdupes -s $RPM_BUILD_ROOT
@ -403,9 +438,13 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_docdir}/%{name} %doc %{_docdir}/%{name}
%doc %{_docdir}/%{name}/examples
%{_libdir}/ladspa %{_libdir}/ladspa
%{_bindir}/* %{_bindir}/*
%{_datadir}/ladspa %{_datadir}/ladspa
%files devel
%defattr(-,root,root)
%doc %{_docdir}/%{name}-devel
%{_includedir}/*
%changelog %changelog