[webrtc-audio-processing] 03/03: Apply-msse2-flag-to-the-source-objects-that-require-.patch applied upstream

[Luke Yelavich]

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch master
in repository webrtc-audio-processing.

commit 1384b85bba99032c882b0c29f99549de16a0689b
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Thu Jun 23 14:26:06 2016 +1000

    Apply-msse2-flag-to-the-source-objects-that-require-.patch applied upstream
    
    * Apply-msse2-flag-to-the-source-objects-that-require-.patch:
      - Dropped, applied upstream
---
 debian/changelog                                   |  2 +
 ...lag-to-the-source-objects-that-require-it.patch | 62 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50e4852..5542207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 webrtc-audio-processing (0.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Apply-msse2-flag-to-the-source-objects-that-require-.patch:
+    - Dropped, applied upstream
 
  -- Luke Yelavich <themuso at ubuntu.com>  Thu, 23 Jun 2016 14:22:52 +1000
 
diff --git a/debian/patches/Apply-msse2-flag-to-the-source-objects-that-require-it.patch b/debian/patches/Apply-msse2-flag-to-the-source-objects-that-require-it.patch
deleted file mode 100644
index e71c08b..0000000
--- a/debian/patches/Apply-msse2-flag-to-the-source-objects-that-require-it.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Rex Dieter <rdieter at math.unl.edu>
-Date: Mon, 6 Jun 2016 12:12:37 -0400
-Subject: Apply -msse2 flag to the source objects that require it
-
----
- webrtc/common_audio/Makefile.am             |  9 ++++++++-
- webrtc/modules/audio_processing/Makefile.am | 10 ++++++++--
- 2 files changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/webrtc/common_audio/Makefile.am b/webrtc/common_audio/Makefile.am
-index 3ff1de8..3f2c3c4 100644
---- a/webrtc/common_audio/Makefile.am
-+++ b/webrtc/common_audio/Makefile.am
-@@ -93,10 +93,17 @@ libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \
- 			     window_generator.cc
- 
- if HAVE_X86
--libcommon_audio_la_SOURCES += \
-+noinst_LTLIBRARIES += libcommon_audio_sse2.la
-+libcommon_audio_sse2_la_SOURCES = \
- 			     resampler/sinc_resampler_sse.cc \
- 			     fir_filter_sse.cc \
- 			     fir_filter_sse.h
-+
-+libcommon_audio_sse2_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) -msse2
-+libcommon_audio_sse2_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) -msse2
-+libcommon_audio_sse2_la_LDFLAGS = $(AM_LDFLAGS)
-+
-+libcommon_audio_la_LIBADD = libcommon_audio_sse2.la 
- endif
- 
- if HAVE_ARM
-diff --git a/webrtc/modules/audio_processing/Makefile.am b/webrtc/modules/audio_processing/Makefile.am
-index b685fb9..2f6bb13 100644
---- a/webrtc/modules/audio_processing/Makefile.am
-+++ b/webrtc/modules/audio_processing/Makefile.am
-@@ -147,9 +147,14 @@ libwebrtc_audio_processing_la_SOURCES += \
- endif
- 
- if HAVE_X86
--libwebrtc_audio_processing_la_SOURCES += \
-+noinst_LTLIBRARIES = libwebrtc_audio_processing_privatearch.la
-+LIBWEBRTC_PRIVATEARCH=libwebrtc_audio_processing_privatearch.la
-+libwebrtc_audio_processing_privatearch_la_SOURCES = \
- 					aec/aec_core_sse2.c \
- 					aec/aec_rdft_sse2.c
-+libwebrtc_audio_processing_privatearch_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) -msse2
-+libwebrtc_audio_processing_privatearch_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) -msse2
-+libwebrtc_audio_processing_privatearch_la_LDFLAGS = $(AM_LDFLAGS)
- endif
- 
- if HAVE_NEON
-@@ -166,7 +171,8 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \
- 				       $(top_builddir)/webrtc/base/libbase.la \
- 				       $(top_builddir)/webrtc/system_wrappers/libsystem_wrappers.la \
- 				       $(top_builddir)/webrtc/common_audio/libcommon_audio.la \
--				       $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la
-+				       $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \
-+				       $(LIBWEBRTC_PRIVATEARCH)
- libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO)
- 
- # FIXME: The MIPS optimisations need to be hooked up once we have the
diff --git a/debian/patches/series b/debian/patches/series
index 022daab..84490b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 big-endian-support.patch
-Apply-msse2-flag-to-the-source-objects-that-require-it.patch
 Add-generic-byte-order-and-pointer-size-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/webrtc-audio-processing.git