From 0d05c0ffa0bd9a7ecbd982f4eef6a448c487d966 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 30 Jun 2011 10:02:35 +0000 Subject: [PATCH] missed in previous --- audio/soundtouch/patches/patch-Makefile_am | 16 ++++++++++++++++ audio/soundtouch/patches/patch-Makefile_in | 16 ---------------- .../patches/patch-source_SoundTouch_Makefile_am | 12 ++++++++++++ .../patches/patch-source_SoundTouch_Makefile_in | 12 ------------ ...patch-source_example_SoundStretch_Makefile_am | 12 ++++++++++++ ...patch-source_example_SoundStretch_Makefile_in | 12 ------------ .../patches/patch-source_example_bpm_Makefile_am | 12 ++++++++++++ .../patches/patch-source_example_bpm_Makefile_in | 12 ------------ 8 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 audio/soundtouch/patches/patch-Makefile_am delete mode 100644 audio/soundtouch/patches/patch-Makefile_in create mode 100644 audio/soundtouch/patches/patch-source_SoundTouch_Makefile_am delete mode 100644 audio/soundtouch/patches/patch-source_SoundTouch_Makefile_in create mode 100644 audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_am delete mode 100644 audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_in create mode 100644 audio/soundtouch/patches/patch-source_example_bpm_Makefile_am delete mode 100644 audio/soundtouch/patches/patch-source_example_bpm_Makefile_in diff --git a/audio/soundtouch/patches/patch-Makefile_am b/audio/soundtouch/patches/patch-Makefile_am new file mode 100644 index 00000000000..76f67506ab0 --- /dev/null +++ b/audio/soundtouch/patches/patch-Makefile_am @@ -0,0 +1,16 @@ +$OpenBSD: patch-Makefile_am,v 1.3 2011/06/30 10:02:35 jasper Exp $ +--- Makefile.am.orig Sat Nov 24 14:56:18 2007 ++++ Makefile.am Sat Nov 24 14:59:39 2007 +@@ -28,10 +28,11 @@ SUBDIRS=include source + + + # list files that are documentation to be packaged in a release tarball and installed +-pkgdoc_DATA=COPYING.TXT README.html ++pkgdoc_DATA=README.html + + # extra data files that are to be pacakged in a release tarball and installed into the data directory + #pkgdata_DATA= ++pkgdocdir=$(datadir)/doc/soundtouch + + # sets up for soundtouch.m4 to be installed + m4datadir=$(datadir)/aclocal diff --git a/audio/soundtouch/patches/patch-Makefile_in b/audio/soundtouch/patches/patch-Makefile_in deleted file mode 100644 index 842817353a3..00000000000 --- a/audio/soundtouch/patches/patch-Makefile_in +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $ ---- Makefile.in.orig Wed Jun 29 13:21:02 2011 -+++ Makefile.in Wed Jun 29 13:21:25 2011 -@@ -188,10 +188,11 @@ pkgdocdir = $(prefix)/doc/@PACKAGE@ - SUBDIRS = include source - - # list files that are documentation to be packaged in a release tarball and installed --pkgdoc_DATA = COPYING.TXT README.html -+pkgdoc_DATA = README.html - - # extra data files that are to be pacakged in a release tarball and installed into the data directory - #pkgdata_DATA= -+pkgdocdir=$(datadir)/doc/soundtouch - - # sets up for soundtouch.m4 to be installed - m4datadir = $(datadir)/aclocal diff --git a/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_am b/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_am new file mode 100644 index 00000000000..ebb9b4f30bf --- /dev/null +++ b/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_am @@ -0,0 +1,12 @@ +$OpenBSD: patch-source_SoundTouch_Makefile_am,v 1.3 2011/06/30 10:02:35 jasper Exp $ +--- source/SoundTouch/Makefile.am.orig Sat Nov 24 13:45:29 2007 ++++ source/SoundTouch/Makefile.am Sat Nov 24 13:45:36 2007 +@@ -35,7 +35,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FI + + # ??? test for -fcheck-new in configure.ac + # other compiler flags to add +-AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include ++AM_CXXFLAGS=-fcheck-new -I../../include + + # other linking flags to add + #libSoundTouch_la_LIBADD= diff --git a/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_in b/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_in deleted file mode 100644 index bdb64cae840..00000000000 --- a/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-source_SoundTouch_Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $ ---- source/SoundTouch/Makefile.in.orig Wed Jun 29 13:21:43 2011 -+++ source/SoundTouch/Makefile.in Wed Jun 29 13:22:01 2011 -@@ -191,7 +191,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp - - # ??? test for -fcheck-new in configure.ac - # other compiler flags to add --AM_CXXFLAGS = -O3 -msse -fcheck-new -I../../include -+AM_CXXFLAGS = -msse -fcheck-new -I../../include - all: all-am - - .SUFFIXES: diff --git a/audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_am b/audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_am new file mode 100644 index 00000000000..2b4070c8914 --- /dev/null +++ b/audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_am @@ -0,0 +1,12 @@ +$OpenBSD: patch-source_example_SoundStretch_Makefile_am,v 1.3 2011/06/30 10:02:35 jasper Exp $ +--- source/example/SoundStretch/Makefile.am.orig Sat Nov 24 13:45:12 2007 ++++ source/example/SoundStretch/Makefile.am Sat Nov 24 13:45:57 2007 +@@ -47,7 +47,7 @@ soundstretch_LDADD=../../SoundTouch/libSoundTouch.la . + soundstretch_LDFLAGS=-s + + ## additional compiler flags +-soundstretch_CXXFLAGS=-O3 -I../bpm ++soundstretch_CXXFLAGS=-I../bpm + + #clean-local: + # -rm -f additional-files-to-remove-on-make-clean diff --git a/audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_in b/audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_in deleted file mode 100644 index ef1f8411d10..00000000000 --- a/audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-source_example_SoundStretch_Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $ ---- source/example/SoundStretch/Makefile.in.orig Wed Jun 29 13:22:35 2011 -+++ source/example/SoundStretch/Makefile.in Wed Jun 29 13:22:42 2011 -@@ -183,7 +183,7 @@ EXTRA_DIST = soundstretch.dsp soundstretch.dsw - soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp - soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm - soundstretch_LDFLAGS = -s --soundstretch_CXXFLAGS = -O3 -I../bpm -+soundstretch_CXXFLAGS = -I../bpm - all: all-am - - .SUFFIXES: diff --git a/audio/soundtouch/patches/patch-source_example_bpm_Makefile_am b/audio/soundtouch/patches/patch-source_example_bpm_Makefile_am new file mode 100644 index 00000000000..865f5977289 --- /dev/null +++ b/audio/soundtouch/patches/patch-source_example_bpm_Makefile_am @@ -0,0 +1,12 @@ +$OpenBSD: patch-source_example_bpm_Makefile_am,v 1.3 2011/06/30 10:02:35 jasper Exp $ +--- source/example/bpm/Makefile.am.orig Sat Nov 24 13:45:06 2007 ++++ source/example/bpm/Makefile.am Sat Nov 24 13:45:50 2007 +@@ -33,7 +33,7 @@ libBPM_la_SOURCES=BPMDetect.cpp PeakFinder.cpp + + + # other compiler flags to add +-AM_CXXFLAGS=-O3 -I../../../include ++AM_CXXFLAGS=-I../../../include + + # other linking flags to add + #libBPM_la_LIBADD= diff --git a/audio/soundtouch/patches/patch-source_example_bpm_Makefile_in b/audio/soundtouch/patches/patch-source_example_bpm_Makefile_in deleted file mode 100644 index c14b43d174b..00000000000 --- a/audio/soundtouch/patches/patch-source_example_bpm_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-source_example_bpm_Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $ ---- source/example/bpm/Makefile.in.orig Wed Jun 29 13:22:49 2011 -+++ source/example/bpm/Makefile.in Wed Jun 29 13:22:54 2011 -@@ -186,7 +186,7 @@ lib_LTLIBRARIES = libBPM.la - libBPM_la_SOURCES = BPMDetect.cpp PeakFinder.cpp - - # other compiler flags to add --AM_CXXFLAGS = -O3 -I../../../include -+AM_CXXFLAGS = -I../../../include - all: all-am - - .SUFFIXES: