[SCM] gxtuner/master: Droped patches - applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sat Aug 10 15:14:39 UTC 2013
The following commit has been merged in the master branch:
commit 9b29749a4f2e0e666b025882586f8c518298e065
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sat Aug 10 17:12:19 2013 +0200
Droped patches - applied upstream.
diff --git a/debian/patches/0001-new_resampler_api.patch b/debian/patches/0001-new_resampler_api.patch
deleted file mode 100644
index 0487873..0000000
--- a/debian/patches/0001-new_resampler_api.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Adapt to zita-resampler's new API.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: yes
----
- pitchtracker.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gxtuner.orig/pitchtracker.h
-+++ gxtuner/pitchtracker.h
-@@ -35,7 +35,7 @@
- #include <cmath>
- #include <cstdlib>
-
--#include <zita-resampler.h>
-+#include <zita-resampler/resampler.h>
-
- /* ------------- Pitch Tracker ------------- */
-
diff --git a/debian/patches/0002-undefined_reference.patch b/debian/patches/0002-undefined_reference.patch
deleted file mode 100644
index 5b6a7e7..0000000
--- a/debian/patches/0002-undefined_reference.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: add explicitly x11 to LD flags.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-Index: gxtuner/Makefile
-===================================================================
---- gxtuner.orig/Makefile 2013-08-05 02:03:21.494584719 +0200
-+++ gxtuner/Makefile 2013-08-05 02:19:23.234560426 +0200
-@@ -9,7 +9,7 @@
- DESKAPPS_DIR = $(SHARE_DIR)/applications
- PIXMAPS_DIR = $(SHARE_DIR)/pixmaps
- VER = 2.0
-- LIBS = `pkg-config --libs jack gtk+-2.0 gthread-2.0 fftw3f` -lzita-resampler
-+ LIBS = `pkg-config --libs jack gtk+-2.0 gthread-2.0 fftw3f x11` -lzita-resampler
- CFLAGS += -Wall -ffast-math `pkg-config --cflags jack gtk+-2.0 gthread-2.0 fftw3f`
- OBJS = jacktuner.o gxtuner.o cmdparser.o pitchtracker.o gtkknob.o \
- paintbox.o tuner.o deskpager.o main.o
diff --git a/debian/patches/0003-spelling_fix.patch b/debian/patches/0003-spelling_fix.patch
deleted file mode 100644
index bf9afaa..0000000
--- a/debian/patches/0003-spelling_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix spelling.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-Index: gxtuner/cmdparser.cpp
-===================================================================
---- gxtuner.orig/cmdparser.cpp 2013-08-05 02:03:21.494584719 +0200
-+++ gxtuner/cmdparser.cpp 2013-08-05 02:57:44.178502302 +0200
-@@ -33,7 +33,7 @@
- infostring = "\n version ";
- infostring += VERSION;
- infostring += "\n A simple (linux) guitar and bass tuner for jack\n";
-- infostring += " with full jack session managment support";
-+ infostring += " with full jack session management support";
- opt_context = g_option_context_new(infostring.c_str());
- jack_uuid = NULL;
- jack_input = NULL;
diff --git a/debian/patches/0004-fix_hardening.patch b/debian/patches/0004-fix_hardening.patch
deleted file mode 100644
index 0d937a6..0000000
--- a/debian/patches/0004-fix_hardening.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Pass CPPFLAGS.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-Index: gxtuner/Makefile
-===================================================================
---- gxtuner.orig/Makefile 2013-08-05 16:33:25.317197598 +0200
-+++ gxtuner/Makefile 2013-08-05 16:35:34.925840296 +0200
-@@ -34,7 +34,7 @@
- link : $(OBJS)
- @rm -rf gxtuner
- @echo $(BROWN)
-- - $(CXX) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LIBS) -o gxtuner
-+ - $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJS) $(LIBS) -o gxtuner
-
- #@check if build have worked
- check : link
-@@ -77,39 +77,39 @@
- #@build object files
- jacktuner.o : jacktuner.cpp jacktuner.h config.h
- @rm -rf jacktuner.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c jacktuner.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c jacktuner.cpp
-
- gxtuner.o : gxtuner.cpp gxtuner.h
- @rm -rf gxtuner.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c gxtuner.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gxtuner.cpp
-
- cmdparser.o : cmdparser.cpp cmdparser.h config.h
- @rm -rf cmdparser.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c cmdparser.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c cmdparser.cpp
-
- pitchtracker.o : pitchtracker.cpp pitchtracker.h
- @rm -rf pitchtracker.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c pitchtracker.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c pitchtracker.cpp
-
- gtkknob.o : gtkknob.cc gtkknob.h
- @rm -rf gtkknob.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c gtkknob.cc
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gtkknob.cc
-
- tuner.o :tuner.cpp tuner.h config.h paintbox.h gtkknob.h gxtuner.h deskpager.h
- @rm -rf tuner.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c tuner.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c tuner.cpp
-
- paintbox.o : paintbox.cpp paintbox.h frame.h
- @rm -rf paintbox.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c paintbox.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c paintbox.cpp
-
- deskpager.o : deskpager.cpp deskpager.h
- @rm -rf deskpager.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c deskpager.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c deskpager.cpp
-
- main.o : main.cpp jacktuner.h gxtuner.h cmdparser.h pitchtracker.h tuner.h deskpager.h
- @rm -rf main.o
-- -$(CXX) $(LDFLAGS) $(CFLAGS) -c main.cpp
-+ -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c main.cpp
-
- #@install all
- install :
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b15489f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-new_resampler_api.patch
-0002-undefined_reference.patch
-0003-spelling_fix.patch
-0004-fix_hardening.patch
--
gxtuner packaging
More information about the pkg-multimedia-commits
mailing list