[Pkg-gstreamer-commits] [gst-fluendo-mp3] 07/08: Update debian/strip-ipp.diff

[Iain Lane]

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

laney pushed a commit to branch master
in repository gst-fluendo-mp3.

commit 4d3689e8e8fbea55e697be3ad387429c12d672d2
Author: Iain Lane <laney at debian.org>
Date:   Wed Jun 25 13:03:10 2014 +0100

    Update debian/strip-ipp.diff
---
 debian/changelog      |  1 +
 debian/strip-ipp.diff | 42 ++++++++++++++++++++----------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7faff9a..8ca47cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gst-fluendo-mp3 (0.10.28.debian-1) UNRELEASED; urgency=medium
     it easier to see the changes vs. upstream.
   * Standards-Version → 3.9.5, no changes required.
   * liboil support is removed, drop configure flag.
+  * Update debian/strip-ipp.diff.
 
  -- Iain Lane <laney at debian.org>  Wed, 25 Jun 2014 12:42:20 +0100
 
diff --git a/debian/strip-ipp.diff b/debian/strip-ipp.diff
index dc2d67d..c0d28ce 100644
--- a/debian/strip-ipp.diff
+++ b/debian/strip-ipp.diff
@@ -1,27 +1,37 @@
---- gst-fluendo-mp3-0.10.23/configure.ac	2013-09-04 09:58:09.000000000 +0200
-+++ gst-fluendo-mp3-0.10.23.debian/configure.ac	2013-09-05 20:07:38.562225912 +0200
-@@ -10,6 +10,9 @@ dnl releases only do -Wall, cvs and prer
- AC_INIT(GStreamer Fluendo MP3 Decoder, 0.10.23,,
+diff -Nurp a/gst-fluendo-mp3-0.10.28/configure.ac gst-fluendo-mp3-0.10.28/configure.ac
+--- a/gst-fluendo-mp3-0.10.28/configure.ac	2014-06-17 18:09:01.000000000 +0100
++++ gst-fluendo-mp3-0.10.28/configure.ac	2014-06-25 12:51:09.255366733 +0100
+@@ -10,6 +10,8 @@ dnl releases only do -Wall, cvs and prer
+ AC_INIT(GStreamer Fluendo MP3 Decoder, 0.10.28,,
      gst-fluendo-mp3)
  
 +AC_CONFIG_MACRO_DIR([common/m4])
-+ACLOCAL_AMFLAGS([-I common/m4])
 +
  AG_GST_INIT
  
  dnl initialize automake
-@@ -81,9 +84,6 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
+@@ -81,9 +83,6 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
    AC_MSG_ERROR(you need to have pkgconfig installed !)
  fi
  
 -dnl Setup for finding IPP libraries. Attempt to detect by default.
 -AG_NEED_IPP("ippac ipps")
 -
- HAVE_LIBOIL=false
- test_liboil=false
+ dnl Now we're ready to ask for gstreamer libs and cflags
+ dnl And we can also ask for the right version of gstreamer
+ 
+diff -Nurp a/gst-fluendo-mp3-0.10.28/Makefile.am gst-fluendo-mp3-0.10.28/Makefile.am
+--- a/gst-fluendo-mp3-0.10.28/Makefile.am	2014-06-17 18:07:27.000000000 +0100
++++ gst-fluendo-mp3-0.10.28/Makefile.am	2014-06-25 12:51:34.631367330 +0100
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I common/m4
++
+ SUBDIRS = src common util win32
  
---- gst-fluendo-mp3-0.10.23/src/Makefile.am	2013-02-11 19:25:51.000000000 +0100
-+++ gst-fluendo-mp3-0.10.23.debian/src/Makefile.am	2013-09-05 20:03:02.796858473 +0200
+ EXTRA_DIST = gst-fluendo-mp3.spec LICENSE autogen.sh
+diff -Nurp a/gst-fluendo-mp3-0.10.28/src/Makefile.am gst-fluendo-mp3-0.10.28/src/Makefile.am
+--- a/gst-fluendo-mp3-0.10.28/src/Makefile.am	2014-06-17 18:07:27.000000000 +0100
++++ gst-fluendo-mp3-0.10.28/src/Makefile.am	2014-06-25 12:34:40.599343494 +0100
 @@ -8,16 +8,6 @@ DECODER_SOURCE_FILES = \
      decode.c \
      mp3tl.c
@@ -51,15 +61,3 @@
      table-powtable.h \
      table-powtable-2.h
  
---- gst-fluendo-mp3-0.10.23/src/mp3tl-priv.h	2013-09-04 09:57:28.000000000 +0200
-+++ gst-fluendo-mp3-0.10.23.debian/src/mp3tl-priv.h	2013-09-05 20:03:13.516911651 +0200
-@@ -8,9 +8,6 @@
- #include <gst/gst.h>
- #include "mp3tl.h"
- 
--#ifdef USE_IPP
--#include "mp3-ipp.h"
--#endif
- #include "mp3-c.h"
- 
- typedef short PCM[2][SSLIMIT][SBLIMIT];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-fluendo-mp3.git