[SCM] vocproc/master: Revert a portion of the patch, now could link against static libraries provided by lv2-c++-tools.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Mar 26 09:34:20 UTC 2011


The following commit has been merged in the master branch:
commit 185462a8915947782f7c34d08a29e9a1d3d2388b
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Mar 26 10:20:39 2011 +0100

    Revert a portion of the patch, now could link against static libraries provided by lv2-c++-tools.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index af9052c..4a25fbd 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,6 +1,5 @@
 Description: Several changes to make it builds fine.
  Add DESTDIR as prefix to installation target directory.
- Rely on libpaq-dev's pkg-config information provided by paq.pc.
  Due to a bug of lv2-c++-tools package currently in testing, we need to
  rely on gtkmm-2.4 pkg-config .pc file explicitely.
  .
@@ -10,8 +9,8 @@ From: Alessio Treglia <alessio at debian.org>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 ---
- Makefile |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 --- vocproc.orig/Makefile
 +++ vocproc/Makefile
@@ -25,16 +24,3 @@ Forwarded: no
  
  
  # By default (because of the built in vocoder functionality) VocProc has two inputs and
-@@ -30,10 +31,10 @@ $(BUNDLE): manifest.ttl vocproc.ttl vocp
- 	cp $^ $(BUNDLE)
- 
- vocproc.so: vocproc.cpp vocproc.peg
--	g++ -shared -fPIC -DPIC $(DEFINES) vocproc.cpp `pkg-config --cflags --libs lv2-plugin fftw3` -lm -o vocproc.so
-+	g++ -shared -fPIC -DPIC $(DEFINES) vocproc.cpp `pkg-config --cflags --libs fftw3 paq gtkmm-2.4` -lm -o vocproc.so
- 
- vocproc_gui.so: vocproc_gui.cpp vocproc.peg
--	g++ -shared -fPIC -DPIC $(DEFINES) vocproc_gui.cpp `pkg-config --cflags --libs lv2-gui` -o vocproc_gui.so
-+	g++ -shared -fPIC -DPIC $(DEFINES) vocproc_gui.cpp `pkg-config --cflags --libs paq gtkmm-2.4` -o vocproc_gui.so
- 
- prepare:
- ifeq ($(DEFINES), -DNO_VOCODER)

-- 
vocproc packaging



More information about the pkg-multimedia-commits mailing list