[SCM] pd-flext/master: Synced patches with upstream.

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 605665535cdd6ab17a7663199beff2b9239838c1
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Nov 3 21:57:06 2016 +0100

    Synced patches with upstream.

diff --git a/debian/patches/DEBIAN_doxygen.patch b/debian/patches/DEBIAN_doxygen.patch
index 27327d2..a1325a9 100644
--- a/debian/patches/DEBIAN_doxygen.patch
+++ b/debian/patches/DEBIAN_doxygen.patch
@@ -5,8 +5,8 @@ Origin: Debian
 Last-Update: 2016-11-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- flext-master.orig/Doxyfile
-+++ flext-master/Doxyfile
+--- pd-flext.orig/Doxyfile
++++ pd-flext/Doxyfile
 @@ -4,7 +4,7 @@
  # Project related configuration options
  #---------------------------------------------------------------------------
diff --git a/debian/patches/autotools-fixes.patch b/debian/patches/autotools-fixes.patch
index 2279e16..1b951a3 100644
--- a/debian/patches/autotools-fixes.patch
+++ b/debian/patches/autotools-fixes.patch
@@ -4,6 +4,7 @@ Description: mark autotools project as 'foreign'
  also fixed a variable-name typo.
 Author: IOhannes m zmölnig
 Bug: https://github.com/grrrr/flext/pull/24
+Applied-Upstream: yes
 Last-Update: 2016-11-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@@ -27,25 +28,39 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	]
  )
  
-@@ -145,7 +145,7 @@
+@@ -147,6 +147,7 @@
  
- # set compilation flags
- 
--OPT_FLAGS="$C_FLAGS -O2"
-+OPT_FLAGS="$C_FLAGS -DNDEBUG -O2"
+ OPT_FLAGS="$C_FLAGS -O2"
  DBG_FLAGS="$C_FLAGS -DFLEXT_DEBUG -g"
++FLEXT_EXT_CFLAGS=""
  
  AC_ARG_ENABLE(optimize, 
-@@ -171,6 +171,9 @@
+ 	AC_HELP_STRING(--enable-optimize,[enables optimized architecture specific builds for pentium4, pentium3, G4, G5, etc.]),
+@@ -171,6 +172,11 @@
  		esac
  	]
  )
 +AC_ARG_ENABLE([cmem],
 +	AC_HELP_STRING(--enable-cmem,[enables C-style memory allocation (as opposed to overloading 'new' and 'delete')]),
-+        AS_CASE([$enableval], [yes], [AC_DEFINE(FLEXT_USE_CMEM)]))
++        AS_CASE([$enableval], [yes], [
++		AC_DEFINE(FLEXT_USE_CMEM)
++		FLEXT_EXT_CFLAGS="$FLEXT_EXT_CFLAGS -DFLEXT_USE_CMEM"]))
  
  
  AC_SUBST(SYSTEM)
+@@ -184,10 +190,12 @@
+ AC_SUBST(stkdir)
+ AC_SUBST(sndobjdir)
+ AC_SUBST(FRAMEWORKS)
++AC_SUBST(FLEXT_EXT_CFLAGS)
+ 
+ AC_OUTPUT([
+ 			Makefile
+ 			source/Makefile
++			tutorial/simple1/Makefile
+ 			$SYSTEM-flext.pc
+ ])
+ 
 --- pd-flext.orig/source/Makefile.am
 +++ pd-flext/source/Makefile.am
 @@ -73,10 +73,10 @@
@@ -72,3 +87,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  libflext_ at SYSTEM@_la_LDFLAGS  = @LD_FLAGS@ $(patsubst %,-L%, at LIBDIRS@) $(patsubst %,-l%, at libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %, at FRAMEWORKS@)
  libflext_ at SYSTEM@_d_la_LDFLAGS  = @LD_FLAGS@ $(patsubst %,-L%, at LIBDIRS@) $(patsubst %,-l%, at libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %, at FRAMEWORKS@) 
+--- pd-flext.orig/pd-flext.pc.in
++++ pd-flext/pd-flext.pc.in
+@@ -6,7 +6,7 @@
+ Name: pd-flext
+ Description: C++ glue layer for Pure Data and Max
+ Version: @VERSION@
+-Cflags: -I${includedir} -DPD -DFLEXT_SYS=2 -DFLEXT_SHARED
++Cflags: -I${includedir} -DPD -DFLEXT_SYS=2 -DFLEXT_SHARED @FLEXT_EXT_CFLAGS@
+ Libs: -L${libdir} -lflext-pd
+ 
+ ## sections below ought to be factored out into standalone .pc files

-- 
pd-flext packaging