[SCM] ir.lv2/master: Remove patches applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sun Dec 18 15:58:30 UTC 2016
The following commit has been merged in the master branch:
commit 16b8ef041fe381aa68802c5125c75763ebb73f52
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sun Dec 18 16:33:57 2016 +0100
Remove patches applied upstream.
diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
deleted file mode 100644
index e42f8f9..0000000
--- a/debian/patches/01-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Prepend DESTDIR to INSTALL_DIR and set it to /usr/lib/lv2.
- Pass LDFLAGS to the linker.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: tomszilagyi at gmail.com
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- ir.lv2.orig/Makefile
-+++ ir.lv2/Makefile
-@@ -5,7 +5,7 @@
- # (for local use, not installed by make install)
-
- PREFIX = /usr
--INSTDIR = $(PREFIX)/lib/lv2/ir.lv2
-+INSTDIR = $(DESTDIR)$(PREFIX)/lib/lv2/ir.lv2
-
- INST_FILES = ir.so ir_gui.so ir.ttl manifest.ttl
-
-@@ -51,7 +51,7 @@ ir_gui.so: ir_gui.o ir_utils.o ir_meter.
- g++ $(LDFLAGS) ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o $(LIBS) -shared -z nodelete -o ir_gui.so
-
- convert4chan: convert4chan.c
-- gcc $(C4CFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
-+ gcc $(C4CFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
-
- install: all
- mkdir -p $(INSTDIR)
diff --git a/debian/patches/02-lv2_headers.patch b/debian/patches/02-lv2_headers.patch
deleted file mode 100644
index b9fd61f..0000000
--- a/debian/patches/02-lv2_headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix #include statements to find LV2 system wide-headers.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: tomszilagyi at gmail.com
----
- ir_gui.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- ir.lv2.orig/ir_gui.cc
-+++ ir.lv2/ir_gui.cc
-@@ -27,8 +27,8 @@
- #include <gtk/gtk.h>
-
- #include <lv2.h>
--#include "lv2_ui.h"
--#include "instance-access.h"
-+#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
-+#include "lv2/lv2plug.in/ns/ext/instance-access/instance-access.h"
-
- #include "ir.h"
- #include "ir_utils.h"
diff --git a/debian/patches/03-fix_covert4chan_hardening.patch b/debian/patches/03-fix_covert4chan_hardening.patch
deleted file mode 100644
index 52824e2..0000000
--- a/debian/patches/03-fix_covert4chan_hardening.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix hardening for conver4chan binary
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: tomszilagyi at gmail.com
-
-Index: ir.lv2/Makefile
-===================================================================
---- ir.lv2.orig/Makefile
-+++ ir.lv2/Makefile
-@@ -51,7 +51,7 @@ ir_gui.so: ir_gui.o ir_utils.o ir_meter.
- g++ $(LDFLAGS) ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o $(LIBS) -shared -z nodelete -o ir_gui.so
-
- convert4chan: convert4chan.c
-- gcc $(C4CFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
-+ gcc $(C4CFLAGS) $(CPPFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
-
- install: all
- mkdir -p $(INSTDIR)
diff --git a/debian/patches/series b/debian/patches/series
index 613da93..fb1f973 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01-makefile.patch
-02-lv2_headers.patch
-03-fix_covert4chan_hardening.patch
04-allow_debbug.patch
--
ir.lv2 packaging
More information about the pkg-multimedia-commits
mailing list