[patchlogo]

Debian patch tracking system

- openh323 - openh323/1.18.0.dfsg-10 - series patch pwlib_versioned_plugins

openh323 (1.18.0.dfsg-10) pwlib_versioned_plugins

Summary

 plugins/audio/G726/Makefile.in      |    7 +
 plugins/audio/GSM0610/Makefile.in   |    7 +
 plugins/audio/IMA_ADPCM/Makefile.in |    7 +
 plugins/audio/LPC_10/Makefile.in    |    7 +
 plugins/audio/Speex/Makefile.in     |    7 +
 plugins/audio/gsm-amr/Makefile.in   |    7 +
 plugins/configure                   |  141 +++++++++++++++++++++++++++++++++++-
 plugins/configure.ac                |   22 +++++
 8 files changed, 186 insertions(+), 19 deletions(-)
download this patch

Patch contents

#! /bin/sh /usr/share/dpatch/dpatch-run
## pwlib_versioned_plugin.dpatch by Kilian Krause <kilian@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix colliding files over different ABI/API versions.
## DP: Patch from Faidon Lambiotis <paravoid@debian.org>, provided in #424049.

@DPATCH@
diff -urNad openh323-1.18.0.dfsg~/plugins/audio/G726/Makefile.in openh323-1.18.0.dfsg/plugins/audio/G726/Makefile.in
--- openh323-1.18.0.dfsg~/plugins/audio/G726/Makefile.in	2004-08-22 06:20:17.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/audio/G726/Makefile.in	2007-08-11 14:19:07.000000000 +0200
@@ -37,6 +37,7 @@
 exec_prefix = ${PREFIX}
 LIBDIR=@LIBDIR@
 H323_SYSTEM_GSM=@H323_SYSTEM_GSM@
+PWLIB_VERSION=@PWLIB_VERSION@
 
 CC=@CC@
 CXX=@CXX@
@@ -74,11 +75,11 @@
 	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
-	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
+	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
+	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
 
 uninstall:
-	rm -f $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/$(PLUGIN)
+	rm -f $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/$(PLUGIN)
 
 clean:
 	rm -f $(OBJECTS) $(PLUGIN)
diff -urNad openh323-1.18.0.dfsg~/plugins/audio/GSM0610/Makefile.in openh323-1.18.0.dfsg/plugins/audio/GSM0610/Makefile.in
--- openh323-1.18.0.dfsg~/plugins/audio/GSM0610/Makefile.in	2006-02-20 09:55:03.000000000 +0100
+++ openh323-1.18.0.dfsg/plugins/audio/GSM0610/Makefile.in	2007-08-11 14:19:07.000000000 +0200
@@ -65,6 +65,7 @@
 LIBDIR=@LIBDIR@
 H323_SYSTEM_GSM=@H323_SYSTEM_GSM@
 H323_EMBEDDED_GSM=@H323_EMBEDDED_GSM@
+PWLIB_VERSION=@PWLIB_VERSION@
 
 CC=@CC@
 CFLAGS=@CFLAGS@
@@ -140,11 +141,11 @@
 endif
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
-	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
+	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
+	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
 
 uninstall:
-	rm -f $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/$(PLUGIN)
+	rm -f $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/$(PLUGIN)
 
 clean:
 	rm -f $(OBJECTS) $(PLUGIN)
diff -urNad openh323-1.18.0.dfsg~/plugins/audio/IMA_ADPCM/Makefile.in openh323-1.18.0.dfsg/plugins/audio/IMA_ADPCM/Makefile.in
--- openh323-1.18.0.dfsg~/plugins/audio/IMA_ADPCM/Makefile.in	2004-08-22 06:20:19.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/audio/IMA_ADPCM/Makefile.in	2007-08-11 14:19:07.000000000 +0200
@@ -37,6 +37,7 @@
 exec_prefix = ${PREFIX}
 LIBDIR=@LIBDIR@
 H323_SYSTEM_GSM=@H323_SYSTEM_GSM@
+PWLIB_VERSION=@PWLIB_VERSION@
 
 CC=@CC@
 CXX=@CXX@
@@ -67,11 +68,11 @@
 	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
-	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
+	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
+	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
 
 uninstall:
-	rm -f $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/$(PLUGIN)
+	rm -f $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/$(PLUGIN)
 
 clean:
 	rm -f $(OBJECTS) $(PLUGIN)
diff -urNad openh323-1.18.0.dfsg~/plugins/audio/LPC_10/Makefile.in openh323-1.18.0.dfsg/plugins/audio/LPC_10/Makefile.in
--- openh323-1.18.0.dfsg~/plugins/audio/LPC_10/Makefile.in	2004-08-22 06:20:19.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/audio/LPC_10/Makefile.in	2007-08-11 14:19:07.000000000 +0200
@@ -36,6 +36,7 @@
 PREFIX=@INSTALLPREFIX@
 exec_prefix = ${PREFIX}
 LIBDIR=@LIBDIR@
+PWLIB_VERSION=@PWLIB_VERSION@
 
 CC=@CC@
 CXX=@CXX@
@@ -103,11 +104,11 @@
 	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
-	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
+	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
+	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
 
 uninstall:
-	rm -f $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/$(PLUGIN)
+	rm -f $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/$(PLUGIN)
 
 clean:
 	rm -f $(OBJECTS) $(PLUGIN)
diff -urNad openh323-1.18.0.dfsg~/plugins/audio/Speex/Makefile.in openh323-1.18.0.dfsg/plugins/audio/Speex/Makefile.in
--- openh323-1.18.0.dfsg~/plugins/audio/Speex/Makefile.in	2004-09-09 02:25:34.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/audio/Speex/Makefile.in	2007-08-11 14:19:07.000000000 +0200
@@ -55,6 +55,7 @@
 exec_prefix = ${PREFIX}
 LIBDIR=@LIBDIR@
 H323_SYSTEM_SPEEX=@H323_SYSTEM_SPEEX@
+PWLIB_VERSION=@PWLIB_VERSION@
 
 CC=@CC@
 CXX=@CXX@
@@ -104,11 +105,11 @@
 	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
-	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
+	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
+	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
 
 uninstall:
-	rm -f $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/$(PLUGIN)
+	rm -f $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/$(PLUGIN)
 
 clean:
 	rm -f $(OBJECTS) $(PLUGIN)
diff -urNad openh323-1.18.0.dfsg~/plugins/audio/gsm-amr/Makefile.in openh323-1.18.0.dfsg/plugins/audio/gsm-amr/Makefile.in
--- openh323-1.18.0.dfsg~/plugins/audio/gsm-amr/Makefile.in	2005-06-07 05:22:23.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/audio/gsm-amr/Makefile.in	2007-08-11 14:19:07.000000000 +0200
@@ -9,6 +9,7 @@
 exec_prefix = ${PREFIX}
 LIBDIR=@LIBDIR@
 H323_GSMAMR_NB_FLOAT=@H323_GSMAMR_NB_FLOAT@
+PWLIB_VERSION=@PWLIB_VERSION@
 
 CC=@CC@
 CXX=@CXX@
@@ -49,11 +50,11 @@
 	$(CC) $(LDSO)$(SONAME) -o $@ $^
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
-	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
+	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
+	cp $(PLUGIN) $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/
 
 uninstall:
-	rm -f $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/$(PLUGIN)
+	rm -f $(DESTDIR)$(LIBDIR)/pwlib/$(PWLIB_VERSION)/codecs/audio/$(PLUGIN)
 else
 install:
 uninstall:
diff -urNad openh323-1.18.0.dfsg~/plugins/configure openh323-1.18.0.dfsg/plugins/configure
--- openh323-1.18.0.dfsg~/plugins/configure	2006-10-22 13:15:06.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/configure	2007-08-11 14:19:07.000000000 +0200
@@ -272,7 +272,7 @@
 PACKAGE_BUGREPORT=
 
 ac_unique_file="configure.ac"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP EGREP INSTALLPREFIX LIBDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LDSO H323_GSMAMR_NB_FLOAT H323_EMBEDDED_GSM H323_SYSTEM_SPEEX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP EGREP INSTALLPREFIX LIBDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LDSO PTLIB_CONFIG PWLIB_VERSION H323_GSMAMR_NB_FLOAT H323_EMBEDDED_GSM H323_SYSTEM_SPEEX LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3102,6 +3102,143 @@
 
 
 
+echo "$as_me:$LINENO: checking for /usr/local/include/ptlib.h" >&5
+echo $ECHO_N "checking for /usr/local/include/ptlib.h... $ECHO_C" >&6
+if test "${ac_cv_file__usr_local_include_ptlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "/usr/local/include/ptlib.h"; then
+  ac_cv_file__usr_local_include_ptlib_h=yes
+else
+  ac_cv_file__usr_local_include_ptlib_h=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_ptlib_h" >&5
+echo "${ECHO_T}$ac_cv_file__usr_local_include_ptlib_h" >&6
+if test $ac_cv_file__usr_local_include_ptlib_h = yes; then
+  HAS_PTLIB=1
+fi
+
+if test "${HAS_PTLIB:-unset}" != "unset" ; then
+  # Extract the first word of "ptlib-config", so it can be a program name with args.
+set dummy ptlib-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PTLIB_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /usr/local/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG
+
+if test -n "$PTLIB_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5
+echo "${ECHO_T}$PTLIB_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+else
+  echo "$as_me:$LINENO: checking for /usr/include/ptlib.h" >&5
+echo $ECHO_N "checking for /usr/include/ptlib.h... $ECHO_C" >&6
+if test "${ac_cv_file__usr_include_ptlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "/usr/include/ptlib.h"; then
+  ac_cv_file__usr_include_ptlib_h=yes
+else
+  ac_cv_file__usr_include_ptlib_h=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_ptlib_h" >&5
+echo "${ECHO_T}$ac_cv_file__usr_include_ptlib_h" >&6
+if test $ac_cv_file__usr_include_ptlib_h = yes; then
+  HAS_PTLIB=1
+fi
+
+  if test "${HAS_PTLIB:-unset}" != "unset" ; then
+    # Extract the first word of "ptlib-config", so it can be a program name with args.
+set dummy ptlib-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PTLIB_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /usr/share/pwlib/make/
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG
+
+if test -n "$PTLIB_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5
+echo "${ECHO_T}$PTLIB_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+fi
+if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+  echo "Cannot find ptlib-config - please install and try again"
+  exit
+fi
+PWLIB_VERSION=`$PTLIB_CONFIG --version`
+
+echo "PWLib version is ${PWLIB_VERSION}"
+
+PWLIB_VERSION=$PWLIB_VERSION
+
+
+
 H323_GSMAMR_NB_FLOAT=0
 if test -r "./audio/gsm-amr/src/c-code/interf_dec.h" ; then
   { echo "$as_me:$LINENO: Enabling GSM-AMR plugin" >&5
@@ -3985,6 +4122,8 @@
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
 s,@LDSO@,$LDSO,;t t
+s,@PTLIB_CONFIG@,$PTLIB_CONFIG,;t t
+s,@PWLIB_VERSION@,$PWLIB_VERSION,;t t
 s,@H323_GSMAMR_NB_FLOAT@,$H323_GSMAMR_NB_FLOAT,;t t
 s,@H323_EMBEDDED_GSM@,$H323_EMBEDDED_GSM,;t t
 s,@H323_SYSTEM_SPEEX@,$H323_SYSTEM_SPEEX,;t t
diff -urNad openh323-1.18.0.dfsg~/plugins/configure.ac openh323-1.18.0.dfsg/plugins/configure.ac
--- openh323-1.18.0.dfsg~/plugins/configure.ac	2006-10-22 13:15:06.000000000 +0200
+++ openh323-1.18.0.dfsg/plugins/configure.ac	2007-08-11 14:19:07.000000000 +0200
@@ -31,6 +31,28 @@
 AC_SUBST(LDSO, ${LDSO})
 
 dnl ########################################################################
+dnl look for pwlib plugin path
+
+AC_CHECK_FILE(/usr/local/include/ptlib.h, HAS_PTLIB=1)
+if test "${HAS_PTLIB:-unset}" != "unset" ; then
+  AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
+else
+  AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PTLIB=1)
+  if test "${HAS_PTLIB:-unset}" != "unset" ; then
+    AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make/)
+  fi
+fi
+if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+  echo "Cannot find ptlib-config - please install and try again"
+  exit
+fi
+PWLIB_VERSION=`$PTLIB_CONFIG --version`
+
+echo "PWLib version is ${PWLIB_VERSION}"
+
+AC_SUBST(PWLIB_VERSION, $PWLIB_VERSION)
+
+dnl ########################################################################
 dnl look for amr-nb_float
 
 H323_GSMAMR_NB_FLOAT=0
page code/design/content is copyright (c) 2008 sean finney <seanius@debian.org>.
patches viewed/retrieved through this system are copyrighted by their respective authors.
browse git repo - clone git repo