[SCM] swh-plugins/master: Patch refreshed.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue May 31 13:04:17 UTC 2016


The following commit has been merged in the master branch:
commit c0ef7241e4fddf4708dccd20f276548bf528a943
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue May 31 15:04:08 2016 +0200

    Patch refreshed.

diff --git a/debian/patches/01-dont-use-march.diff b/debian/patches/01-dont-use-march.diff
index 77f7a8c..cd8bf23 100644
--- a/debian/patches/01-dont-use-march.diff
+++ b/debian/patches/01-dont-use-march.diff
@@ -4,29 +4,25 @@
  configure.in |   13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)
 
---- swh-plugins.orig/configure.in
-+++ swh-plugins/configure.in
-@@ -96,20 +96,13 @@ CFLAGS=$lrintf_save_CFLAGS -I at top_srcdir
+Index: swh-plugins/configure.ac
+===================================================================
+--- swh-plugins.orig/configure.ac
++++ swh-plugins/configure.ac
+@@ -100,15 +100,9 @@ CFLAGS="$lrintf_save_CFLAGS -I at top_srcdi
  if [ echo ${CFLAGS} | grep "\-march=" ]; then
    AC_MSG_WARN([CFLAGS appears to allready contain architecture specifaction, using exiting one])
  else
--  AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
+-  AC_MSG_WARN([Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type])
 -  AC_MSG_WARN([May result in non-portable code])
 -  dnl For gcc use:
 -  MACHINE="-march=${build_cpu}"
 -  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
 -  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
 -  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
--
--  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
 +  AC_MSG_WARN([Can't find architecture specifaction in CFLAGS])
  
+-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
 +  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${USE_SSE} ${DARWIN_CFLAGS}"
+ 
    dnl For Intel's C compiler use:
    dnl CC="icc"
-   dnl CFLAGS="$CFLAGS -O2 -rcd -tpp6 -xiMK -KPIC -DPIC"
--  
-+
-   dnl For debugging use:
-   dnl CFLAGS="$CFLAGS -Wall -g -ffast-math -fPIC -DPIC"
- fi
diff --git a/debian/patches/series b/debian/patches/series
index c1d5ab8..e51104c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 01-dont-use-march.diff
 02-fix-spelling-add-de.po.diff
-03-uptodate-ltmain.diff
-04-nosetlocale.diff
-05-mbeq_crash_fix.diff
+#03-uptodate-ltmain.diff
+#04-nosetlocale.diff
+#05-mbeq_crash_fix.diff
 06-build_reproducible.patch

-- 
swh-plugins packaging



More information about the pkg-multimedia-commits mailing list