From cdd8b4ba1fd882f0eeeb306a3d1a63fe1ef40f9c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:14:36 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for vamp-plugin-sdk --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 0fb0c967a8c9f05c018a41697da532f00379e553 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:11:47 +0000 Subject: [PATCH 2/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 882f694..4f35bfc 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vamp-plugin-sdk -# $Id$ +# $Id: Makefile,v 1.1 2008/01/31 04:48:43 ausil Exp $ NAME := vamp-plugin-sdk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f6c7c2f4141ea08a7fca558de8d575f8d3718129 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 13 Jun 2010 21:17:43 +0000 Subject: [PATCH 3/4] vamp-plugin-sdk: update F-1{2,3} to 2.1 --- .cvsignore | 2 +- sources | 2 +- vamp-plugin-sdk-2.0-libdir.patch | 22 ---------------------- vamp-plugin-sdk-2.1-libdir.patch | 22 ++++++++++++++++++++++ vamp-plugin-sdk.spec | 14 ++++++++++---- 5 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 vamp-plugin-sdk-2.0-libdir.patch create mode 100644 vamp-plugin-sdk-2.1-libdir.patch diff --git a/.cvsignore b/.cvsignore index 8fa6f55..d8522cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vamp-plugin-sdk-2.0.tar.gz +vamp-plugin-sdk-2.1.tar.gz diff --git a/sources b/sources index 3be1637..bc1234d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f52328254330389d130a61f8def8afc vamp-plugin-sdk-2.0.tar.gz +13252077a73987dae72a9174e529b6b9 vamp-plugin-sdk-2.1.tar.gz diff --git a/vamp-plugin-sdk-2.0-libdir.patch b/vamp-plugin-sdk-2.0-libdir.patch deleted file mode 100644 index b0e0bd1..0000000 --- a/vamp-plugin-sdk-2.0-libdir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vamp-plugin-sdk-2.0/Makefile.in.libdir 2008-12-01 06:48:41.000000000 -0500 -+++ vamp-plugin-sdk-2.0/Makefile.in 2008-12-14 17:04:13.000000000 -0500 -@@ -71,8 +71,8 @@ - INSTALL_API_HEADERS := $(INSTALL_PREFIX)/include/vamp - INSTALL_SDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk - INSTALL_HOSTSDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-hostsdk --INSTALL_SDK_LIBS := $(INSTALL_PREFIX)/lib --INSTALL_PLUGINS := $(INSTALL_PREFIX)/lib/vamp -+INSTALL_SDK_LIBS := @libdir@ -+INSTALL_PLUGINS := $(INSTALL_SDK_LIBS)/vamp - INSTALL_BINARIES := $(INSTALL_PREFIX)/bin - - INSTALL_SDK_LIBNAME := libvamp-sdk.so.2.0.0 -@@ -87,7 +87,7 @@ - INSTALL_HOSTSDK_STATIC := libvamp-hostsdk.a - INSTALL_HOSTSDK_LA := libvamp-hostsdk.la - --INSTALL_PKGCONFIG := $(INSTALL_PREFIX)/lib/pkgconfig -+INSTALL_PKGCONFIG := $(INSTALL_SDK_LIBS)/pkgconfig - - # Flags required to tell the compiler to create a dynamically loadable object - # diff --git a/vamp-plugin-sdk-2.1-libdir.patch b/vamp-plugin-sdk-2.1-libdir.patch new file mode 100644 index 0000000..4c3f4f9 --- /dev/null +++ b/vamp-plugin-sdk-2.1-libdir.patch @@ -0,0 +1,22 @@ +--- vamp-plugin-sdk-2.1/Makefile.in.libdir 2009-09-24 14:05:26.000000000 +0200 ++++ vamp-plugin-sdk-2.1/Makefile.in 2010-06-03 18:18:18.404376697 +0200 +@@ -71,8 +71,8 @@ + INSTALL_API_HEADERS = $(INSTALL_PREFIX)/include/vamp + INSTALL_SDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-sdk + INSTALL_HOSTSDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-hostsdk +-INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/lib +-INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp ++INSTALL_SDK_LIBS = @libdir@ ++INSTALL_PLUGINS = $(INSTALL_SDK_LIBS)/vamp + INSTALL_BINARIES = $(INSTALL_PREFIX)/bin + + INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.1.0 +@@ -87,7 +87,7 @@ + INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a + INSTALL_HOSTSDK_LA = libvamp-hostsdk.la + +-INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig ++INSTALL_PKGCONFIG = $(INSTALL_SDK_LIBS)/pkgconfig + + # Flags required to tell the compiler to create a dynamically loadable object + # diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 476b398..461ccb8 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,13 +1,15 @@ Name: vamp-plugin-sdk -Version: 2.0 -Release: 6%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: An API for audio analysis and feature extraction plugins Group: System Environment/Libraries License: BSD URL: http://www.vamp-plugins.org/ Source0: http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-%{version}.tar.gz -Patch0: %{name}-2.0-libdir.patch +# https://sourceforge.net/tracker/?func=detail&aid=1884043&group_id=192001&atid=939644 +Patch0: %{name}-2.1-libdir.patch +# https://sourceforge.net/tracker/?func=detail&aid=1884030&group_id=192001&atid=939644 Patch1: %{name}-2.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,7 +63,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' # create Makefile for examples cd examples -echo CXXFLAGS=$RPM_OPT_FLAGS -fpic >> Makefile +echo CXXFLAGS=$RPM_OPT_FLAGS -fpic >> Makefile-%{_arch} echo bundle: `ls *.o` >> Makefile echo -e "\t"g++ \$\(CXXFLAGS\) -shared -Wl,-Bsymbolic \ -o vamp-example-plugins.so \ @@ -109,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 28 2010 Michel Salim - 2.1-1 +- Update to 2.1 +- multilib fix: Makefile for examples is now arch-tagged + * Sun Jul 26 2009 Fedora Release Engineering - 2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From f017b42f72eee7a7ce98954b39608076b2237125 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:53:28 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4f35bfc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vamp-plugin-sdk -# $Id: Makefile,v 1.1 2008/01/31 04:48:43 ausil Exp $ -NAME := vamp-plugin-sdk -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12