[SCM] pd-flext/master: Properly build shared library

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Nov 2 15:46:49 UTC 2016


The following commit has been merged in the master branch:
commit 30ec3810171fb256176939523be7b7e26ce48a61
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Nov 2 16:30:12 2016 +0100

    Properly build shared library
    
    needs FLEXT_EXPORTS and FLEXT_USE_CMEM

diff --git a/debian/patches/autotools-fixes.patch b/debian/patches/autotools-fixes.patch
index 87dc4c1..2279e16 100644
--- a/debian/patches/autotools-fixes.patch
+++ b/debian/patches/autotools-fixes.patch
@@ -7,8 +7,8 @@ Bug: https://github.com/grrrr/flext/pull/24
 Last-Update: 2016-11-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- flext-master.orig/configure.ac
-+++ flext-master/configure.ac
+--- pd-flext.orig/configure.ac
++++ pd-flext/configure.ac
 @@ -7,7 +7,7 @@
  # API_VERSION=0:0:0
  
@@ -27,8 +27,27 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	]
  )
  
---- flext-master.orig/source/Makefile.am
-+++ flext-master/source/Makefile.am
+@@ -145,7 +145,7 @@
+ 
+ # set compilation flags
+ 
+-OPT_FLAGS="$C_FLAGS -O2"
++OPT_FLAGS="$C_FLAGS -DNDEBUG -O2"
+ DBG_FLAGS="$C_FLAGS -DFLEXT_DEBUG -g"
+ 
+ AC_ARG_ENABLE(optimize, 
+@@ -171,6 +171,9 @@
+ 		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)]))
+ 
+ 
+ AC_SUBST(SYSTEM)
+--- pd-flext.orig/source/Makefile.am
++++ pd-flext/source/Makefile.am
 @@ -73,10 +73,10 @@
  
  # handling for stk / sndobj
@@ -42,3 +61,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  if SNDOBJ
  SRCS_FLEXT         += $(SRCS_SNDOBJ)
+@@ -101,8 +101,8 @@
+ libflext_ at SYSTEM@_sd_la_CXXFLAGS  = @DBG_FLAGS@ -static $(patsubst %,-I%, at INCLUDEDIRS@)
+ libflext_ at SYSTEM@_t_la_CXXFLAGS  = @OPT_FLAGS@ -static $(patsubst %,-I%, at INCLUDEDIRS@) -DFLEXT_THREADS 
+ libflext_ at SYSTEM@_td_la_CXXFLAGS = @DBG_FLAGS@ -static $(patsubst %,-I%, at INCLUDEDIRS@) -DFLEXT_THREADS 
+-libflext_ at SYSTEM@_la_CXXFLAGS    = @OPT_FLAGS@ $(patsubst %,-I%, at INCLUDEDIRS@) -DFLEXT_SHARED
+-libflext_ at SYSTEM@_d_la_CXXFLAGS  = @DBG_FLAGS@ $(patsubst %,-I%, at INCLUDEDIRS@) -DFLEXT_SHARED
++libflext_ at SYSTEM@_la_CXXFLAGS    = @OPT_FLAGS@ $(patsubst %,-I%, at INCLUDEDIRS@) -DFLEXT_SHARED -DFLEXT_EXPORTS
++libflext_ at SYSTEM@_d_la_CXXFLAGS  = @DBG_FLAGS@ $(patsubst %,-I%, at INCLUDEDIRS@) -DFLEXT_SHARED -DFLEXT_EXPORTS
+ 
+ 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 packaging



More information about the pkg-multimedia-commits mailing list