[SCM] gwc/master: Patches applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Jul 18 14:23:27 UTC 2017
The following commit has been merged in the master branch:
commit 438227488b8fd9cd3ebbe8f7c5129e9d291f430e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Jul 18 15:55:09 2017 +0200
Patches applied upstream.
diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
deleted file mode 100644
index 209f715..0000000
--- a/debian/patches/0001-buildsystem.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Subject: Small improvements to the buildsystem.
- Add -g to CFLAGS.
-Origin: Debian
-Reviewed-by: Alessio Treglia <alessio at debian.org>
-Last-Update: 2011-03-04
-Forwarded: Jeffrey J. Welty <jeff at redhawk.org>
----
- Makefile.in | 20 ++++++++------------
- configure | 2 +-
- configure.in | 2 +-
- meschach/makefile.in | 2 +-
- 4 files changed, 11 insertions(+), 15 deletions(-)
-
---- gwc.orig/Makefile.in
-+++ gwc/Makefile.in
-@@ -1,16 +1,15 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
--BINDIR = @bindir@
--DATADIR = @datadir@
--DATAROOTDIR = @datarootdir@
--LIBDIR = @libdir@
--SYSCONFDIR = @sysconfdir@
-+BINDIR = $(DESTDIR)/@bindir@
-+DATADIR = $(DESTDIR)/@datadir@
-+DATAROOTDIR = $(DESTDIR)/@datarootdir@
-+LIBDIR = $(DESTDIR)/@libdir@
- APPNAME = gnome_wave_cleaner
- GNOME = @GNOME_BASE@
-
- pixmapdir = $(DATADIR)/pixmaps
--HELPDIR = ${prefix}/$(GNOME)/share/gnome/help/$(APPNAME)
-+HELPDIR = $(DESTDIR)/$(GNOME)/share/gnome/help/$(APPNAME)
- HELPDIRC = $(HELPDIR)/C
- DOCDIR = $(DATADIR)/doc/gwc
-
-@@ -23,7 +22,7 @@ DOCDIR = $(DATADIR)/doc/gwc
- CONFIGDIR = /$(APPNAME)/config/
-
- DEFS = -DDATADIR=\"$(DATADIR)\" -DLIBDIR=\"$(LIBDIR)\" -DAPPNAME=\"$(APPNAME)\" @ALSADEF@ @PAHDR@ @FFTWHDR@ @FFTWPREC@ @OGGHDR@ @MP3HDR@
--CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -O6 @GNOMEUI_CFLAGS@ @SNDFILE_CFLAGS@
-+CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -O6 @GNOMEUI_CFLAGS@ @SNDFILE_CFLAGS@
-
- LIBS= meschach.a @GNOMEUI_LIBS@ @SNDFILE_LIBS@ @ALSALIB@ @PALIB@ @FFTWLIB@ @OGGLIB@ @MP3LIB@ -lm
-
-@@ -47,7 +46,7 @@ EFENCE =
- all : gwc
-
- gwc : $(OBJS) meschach.a
-- $(CC) $(OBJS) $(EFENCE) $(LFLAGS) $(LIBS) -o gwc
-+ $(CC) $(LDFLAGS) $(OBJS) $(EFENCE) $(LFLAGS) $(LIBS) -o gwc
-
- audio_device.o : audio_device.c audio_alsa.c audio_oss.c audio_osx.c audio_pa.c Makefile
- $(COMPILE) -c audio_device.c
-@@ -60,7 +59,7 @@ install : gwc
- install -d $(DOCDIR)
- install -d $(pixmapdir)
- install -d $(HELPDIRC)
-- install -p -s $(BINFILES) $(BINDIR)
-+ install -p $(BINFILES) $(BINDIR)/$(APPNAME)
- install -p -m 0644 $(DOCFILES) $(DOCDIR)
- for hf in $(HELPFILES) ; do install -p -m 0644 $(HELPFILESSRCD)/$$hf $(HELPDIRC) ; done
- install -p -m 0644 $(pixmap_DATA) $(pixmapdir)
-@@ -78,9 +77,6 @@ meschach.a : meschach/meschach.a
- meschach/meschach.a :
- (cd meschach ; ./configure --with-sparse ; make part1 ; make part2 ; make part3 ; cp machine.h ..)
-
--test : test.c
-- $(CC) test.c $(LFLAGS) -g -lrfftw -lfftw -lm -o test
--
- clean :
- rm -f gwc *.o core meschach.a meschach/meschach.a
- (cd meschach ; make realclean)
---- gwc.orig/configure
-+++ gwc/configure
-@@ -3169,7 +3169,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- UNAME_MACHINE=`uname -m`
--#GNOME_BASE=`gnome-config --prefix`
-+GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
-
-
-
---- gwc.orig/configure.in
-+++ gwc/configure.in
-@@ -27,7 +27,7 @@ AC_SUBST(UNAME_MACHINE)
- AC_SUBST(GNOME_BASE)
-
- UNAME_MACHINE=`uname -m`
--#GNOME_BASE=`gnome-config --prefix`
-+GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
-
- dnl Checks for libraries.
-
---- gwc.orig/meschach/makefile.in
-+++ gwc/meschach/makefile.in
-@@ -16,7 +16,7 @@ LIBS = @LIBS@
- RANLIB = @RANLIB@
-
-
--CFLAGS = -O6
-+CFLAGS = -g -O6
-
-
- .c.o:
diff --git a/debian/patches/0002-fix-function-declaration.patch b/debian/patches/0002-fix-function-declaration.patch
deleted file mode 100644
index d98054a..0000000
--- a/debian/patches/0002-fix-function-declaration.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Subject: Fix build with clang
- Thanks to Arthur Marble <arthur at info9.net>
-Reviewed-by: Jaromír Mikeš <mira.mikes at seznam.cz>
-Last-Update: 2014-08-10
-Forwarded: Jeffrey J. Welty <jeff at redhawk.org>
-
-Index: gwc/gwc.c
-===================================================================
---- gwc.orig/gwc.c
-+++ gwc/gwc.c
-@@ -2657,28 +2657,28 @@ long time_to_sample(char *time, struct s
- return position;
- }
-
-+long batch_atol(char *time)
-+{
-+ if( strcmp(time,"end") == 0 )
-+ return prefs.n_samples;
-+ else
-+ return atol(time);
-+}
-+
-+long batch_time_to_sample(char *time, struct sound_prefs *p)
-+{
-+ if( strcmp(time,"end") == 0 )
-+ return p->n_samples;
-+ else
-+ return time_to_sample(time, p);
-+}
-+
- /* bj Sep 2003 re-write batch declick, add batch denoise, batch truncate */
- void batch(int argc, char **argv)
- {
- #define BYTIME 0
- #define BYSAMPLE 1
-
-- long batch_atol(char *time)
-- {
-- if( strcmp(time,"end") == 0 )
-- return prefs.n_samples;
-- else
-- return atol(time);
-- }
--
-- long batch_time_to_sample(char *time, struct sound_prefs *p)
-- {
-- if( strcmp(time,"end") == 0 )
-- return p->n_samples;
-- else
-- return time_to_sample(time, p);
-- }
--
- int type = BYTIME ;
-
- batch_mode = 1 ;
diff --git a/debian/patches/0003-fix_typos.patch b/debian/patches/0003-fix_typos.patch
deleted file mode 100644
index f424504..0000000
--- a/debian/patches/0003-fix_typos.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Subject: Fix typos.
-Reviewed-by: Jaromír Mikeš <mira.mikes at seznam.cz>
-Last-Update: 2014-08-10
-Forwarded: Jeffrey J. Welty <jeff at redhawk.org>
-
-Index: gwc/biquad.c
-===================================================================
---- gwc.orig/biquad.c
-+++ gwc/biquad.c
-@@ -567,7 +567,7 @@ smp_type srate, smp_type bandwidth)
- b->a4 = a2 /a0;
-
- #ifdef HARDWIRE
-- /* hardwire BPF at 10 Khz, srate = 44.1 Khz */
-+ /* hardwire BPF at 10 kHz, srate = 44.1 kHz */
- b->a0 = 1.0 ;
- b->a1 = 0.0 ;
- b->a2 = -1.0 ;
-Index: gwc/encode.c
-===================================================================
---- gwc.orig/encode.c
-+++ gwc/encode.c
-@@ -123,7 +123,7 @@ int build_options(int fmt, char *newfile
- break;
- default:
- warning
-- ("Please resample audio file to standard 8/11.025/12/16/22.05/24/32/44.1/48 Khz\n");
-+ ("Please resample audio file to standard 8/11.025/12/16/22.05/24/32/44.1/48 kHz\n");
- return (1);
- break;
- }
-@@ -241,7 +241,7 @@ int build_options(int fmt, char *newfile
- break;
- default:
- warning
-- ("Please resample audio file to standard 8/11.025/12/16/22.05/24/32/44.1/48 Khz\n");
-+ ("Please resample audio file to standard 8/11.025/12/16/22.05/24/32/44.1/48 kHz\n");
- return (1);
- break;
- }
-Index: gwc/preferences.c
-===================================================================
---- gwc.orig/preferences.c
-+++ gwc/preferences.c
-@@ -196,7 +196,7 @@ void set_ogg_encoding_preferences(GtkWid
- add_number_entry_with_label_int(atoi
- (encoding_prefs.
- ogg_lowpass_frequency),
-- "Adv Low Pass (Khz)", dialog_table,
-+ "Adv Low Pass (kHz)", dialog_table,
- row++);
- gtk_entry_set_max_length(GTK_ENTRY(Advlowpass_entry), 5); /* 5 digits */
- AdvBitrateAvgWindow_entry =
-@@ -605,7 +605,7 @@ void set_mp3_encoding_preferences(GtkWid
-
- bitrate_entry =
- add_number_entry_with_label_int(atoi(encoding_prefs.mp3_bitrate),
-- "MP3 Encoding Bitrate (Kbps)",
-+ "MP3 Encoding Bitrate (kbps)",
- dialog_table, row++);
- gtk_entry_set_max_length(GTK_ENTRY(bitrate_entry), 5); /* 5 digits */
- quality_entry =
-@@ -617,13 +617,13 @@ void set_mp3_encoding_preferences(GtkWid
-
- lowpassfreq_entry =
- add_number_entry_with_label(encoding_prefs.mp3_lowpass_freq,
-- "Lowpass Filter (Khz)", dialog_table,
-+ "Lowpass Filter (kHz)", dialog_table,
- row++);
- gtk_entry_set_max_length(GTK_ENTRY(lowpassfreq_entry), 5); /* 5 digits */
-
- highpassfreq_entry =
- add_number_entry_with_label(encoding_prefs.mp3_highpass_freq,
-- "Highpass Filter (Khz)", dialog_table,
-+ "Highpass Filter (kHz)", dialog_table,
- row++);
- gtk_entry_set_max_length(GTK_ENTRY(highpassfreq_entry), 5); /* 5 digits */
-
diff --git a/debian/patches/0004-pointer-truncation.patch b/debian/patches/0004-pointer-truncation.patch
deleted file mode 100644
index 9472f70..0000000
--- a/debian/patches/0004-pointer-truncation.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Fix pointer truncation issues in 2 _get_type functions
- On 64-bit architectures the pointers returned by these functions were being
- truncated to 32-bits causing segfaults.
-Author: James Cowgill <jcowgill at debian.org>
-Bug-Debian: https://bugs.debian.org/852082
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/gtkgamma.c
-+++ b/gtkgamma.c
-@@ -202,10 +202,10 @@ static char *xpm[][27] =
- }
- };
-
--guint
-+GtkType
- gtk_gamma_curve_get_type (void)
- {
-- static guint gamma_curve_type = 0;
-+ static GtkType gamma_curve_type = 0;
-
- if (!gamma_curve_type)
- {
---- a/gtkgamma.h
-+++ b/gtkgamma.h
-@@ -68,7 +68,7 @@ struct _GtkGammaCurveClass
- };
-
-
--guint gtk_gamma_curve_get_type (void);
-+GtkType gtk_gamma_curve_get_type (void);
- GtkWidget* gtk_gamma_curve_new (void);
-
-
---- a/gtkledbar.c
-+++ b/gtkledbar.c
-@@ -28,10 +28,10 @@
- static void led_bar_class_init (LedBarClass *klass);
- static void led_bar_init (LedBar *led_bar);
-
--guint
-+GtkType
- led_bar_get_type ()
- {
-- static guint led_bar_type = 0;
-+ static GtkType led_bar_type = 0;
-
- if (!led_bar_type)
- {
---- a/gtkledbar.h
-+++ b/gtkledbar.h
-@@ -57,7 +57,7 @@ struct _LedBarClass
- GtkVBoxClass parent_class;
- };
-
--guint led_bar_get_type (void);
-+GtkType led_bar_get_type (void);
- GtkWidget* led_bar_new (gint segments,
- gint orientation);
- gint led_bar_get_num_segments (GtkWidget *bar);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 606964e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-buildsystem.patch
-0002-fix-function-declaration.patch
-0003-fix_typos.patch
-0004-pointer-truncation.patch
--
gwc packaging
More information about the pkg-multimedia-commits
mailing list