[SCM] vocproc/master: Patch applied upstream.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Dec 28 09:25:44 UTC 2016


The following commit has been merged in the master branch:
commit 1618722394c277e3c22ef7b3de28306400b48170
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Dec 28 01:31:39 2016 +0100

    Patch applied upstream.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
deleted file mode 100644
index 69fd703..0000000
--- a/debian/patches/01-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Several changes to make it builds fine.
- Add DESTDIR as prefix to installation target directory.
- 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.
- Accepts and set LDFLAGS.
- .
- We may drop some of the following patches after new lv2-c++-tools migrates
- to testing.
-From: Alessio Treglia <alessio at debian.org>,
- Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Igor Brkic <igor at hyperglitch.com>
----
- Makefile |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- vocproc.orig/Makefile
-+++ vocproc/Makefile
-@@ -2,7 +2,8 @@
- # By default plugin will be installed in /usr/local/lib/lv2.
- # You can change that by changing value of INSTALL_DIR
- 
--INSTALL_DIR = /usr/local/lib/lv2
-+DESTDIR=
-+INSTALL_DIR = $(DESTDIR)/usr/lib/lv2
- 
- 
- # 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++ $(LDFLAGS) -shared -fPIC -DPIC $(DEFINES) vocproc.cpp `pkg-config --cflags --libs lv2-plugin fftw3` -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++ $(LDFLAGS) -shared -fPIC -DPIC $(DEFINES) vocproc_gui.cpp `pkg-config --cflags --libs lv2-gui` -o vocproc_gui.so
- 
- prepare:
- ifeq ($(DEFINES), -DNO_VOCODER)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d3b72df..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-makefile.patch

-- 
vocproc packaging



More information about the pkg-multimedia-commits mailing list