[Pkg-voip-commits] r9334 - in /openh323/trunk/debian: changelog patches/02_configure.ac.patch patches/fix_autoconf patches/printon_with_notrace.patch patches/ptlib-pkgconfig patches/series rules
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Tue Oct 18 17:04:16 UTC 2011
Author: tzafrir
Date: Tue Oct 18 17:04:16 2011
New Revision: 9334
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9334
Log:
Somewhat closer to building openh323
* Patch fix_autoconf: fix broken syntax, allow autoreconf
* Patch ptlib-pkgconfig: also helps there, I believe
* Properly use dh-autoreconf in debian/rules
Added:
openh323/trunk/debian/patches/fix_autoconf
openh323/trunk/debian/patches/ptlib-pkgconfig
Removed:
openh323/trunk/debian/patches/02_configure.ac.patch
Modified:
openh323/trunk/debian/changelog
openh323/trunk/debian/patches/printon_with_notrace.patch
openh323/trunk/debian/patches/series
openh323/trunk/debian/rules
Modified: openh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/changelog?rev=9334&op=diff
==============================================================================
--- openh323/trunk/debian/changelog (original)
+++ openh323/trunk/debian/changelog Tue Oct 18 17:04:16 2011
@@ -1,14 +1,20 @@
h323plus (1.23.0~dfsg-1) UNRELEASED; urgency=low
+ [ Kilian Krause ]
* New upstream release: 1.23.0
+ debian/rules: fix get-orig-source target
+ + Patch 02_configure.ac.patch removed: applied upstream.
* Install h323plus_changes.txt as upstream changelog
* Add configure.ac patch from upstream to find installed ptlib, too.
(Requires dh-autoreconf for now)
* Remove unneccessary ptlibdir hack from debian/rules
* Include symbols-check as default now
- -- Kilian Krause <kilian at debian.org> Fri, 26 Aug 2011 10:50:40 +0200
+ [ Tzafrir Cohen ]
+ * Patch fix_autoconf: fix broken syntax, allow autoreconf
+ * Patch ptlib-pkgconfig: Fixes building with ptlib, I believe
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Tue, 18 Oct 2011 18:58:55 +0200
h323plus (1.22.0~dfsg-1) experimental; urgency=low
Added: openh323/trunk/debian/patches/fix_autoconf
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/fix_autoconf?rev=9334&op=file
==============================================================================
--- openh323/trunk/debian/patches/fix_autoconf (added)
+++ openh323/trunk/debian/patches/fix_autoconf Tue Oct 18 17:04:16 2011
@@ -1,0 +1,228 @@
+Author: Tzafrir Cohen <tzafrir at debian.org>
+Description: minor fixes to fix newer versions of autoconf
+--- a/plugins/configure.ac
++++ b/plugins/configure.ac
+@@ -474,7 +474,7 @@ AC_COMPILE_IFELSE([
+ )
+ ],
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_POSIX_MEMALIGN, 1),
++ AC_DEFINE(HAVE_POSIX_MEMALIGN, 1, [POSIX memalign() support]),
+ AC_MSG_RESULT(no)
+ )
+ AC_LANG_POP([C++])
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,10 +56,10 @@ AC_SUBST(BUILD_NUMBER, $BUILD_NUMBER)
+
+ echo "OpenH323 version is ${OPENH323_VERSION}"
+
+-AC_DEFINE_UNQUOTED(OPENH323_MAJOR, ${MAJOR_VERSION})
+-AC_DEFINE_UNQUOTED(OPENH323_MINOR, ${MINOR_VERSION})
+-AC_DEFINE_UNQUOTED(OPENH323_BUILD, ${BUILD_NUMBER})
+-AC_DEFINE_UNQUOTED(OPENH323_VERSION, "$OPENH323_VERSION")
++AC_DEFINE_UNQUOTED(OPENH323_MAJOR, ${MAJOR_VERSION}, [Major version])
++AC_DEFINE_UNQUOTED(OPENH323_MINOR, ${MINOR_VERSION}, [Minor version])
++AC_DEFINE_UNQUOTED(OPENH323_BUILD, ${BUILD_NUMBER}, [Build number])
++AC_DEFINE_UNQUOTED(OPENH323_VERSION, "$OPENH323_VERSION", [Full version number])
+
+ dnl ########################################################################
+ dnl look for ptlib, use a preference order of explicit PTLIBDIR, directory
+@@ -241,7 +241,7 @@ if test "$enable_audio" = "no" ; then
+ AC_MSG_NOTICE(Disabling audio functions)
+ AC_SUBST(NOAUDIOCODECS, 1)
+ else
+- AC_DEFINE(H323_AUDIO_CODECS, 1)
++ AC_DEFINE(H323_AUDIO_CODECS, 1, [Include audio codecs])
+
+ AC_ARG_ENABLE(embeddedgsm,
+ [ --enable-embeddedgsm embed GSM codec via static linking],
+@@ -254,7 +254,7 @@ else
+ if test "x$GSM" != "x"; then
+ ENDLDLIBS="$ENDLDLIBS -lgsm"
+ fi
+- AC_DEFINE(H323_EMBEDDED_GSM)
++ AC_DEFINE(H323_EMBEDDED_GSM, , [Use embdedded GSM codec])
+ fi
+ fi
+
+@@ -275,7 +275,7 @@ if test "$enable_video" = "no" ; then
+ AC_MSG_NOTICE(Disabling video functions)
+ AC_SUBST(NOVIDEO, 1)
+ else
+- AC_DEFINE(H323_VIDEO, 1)
++ AC_DEFINE(H323_VIDEO, 1, [Enable H.323 video support])
+ fi
+
+ dnl ########################################################################
+@@ -291,7 +291,7 @@ if test "${enable_h224}x" = "x" ; then
+ fi
+ if test "$enable_h224" = "yes" ; then
+ H323_H224=1
+- AC_DEFINE(H323_H224, 1)
++ AC_DEFINE(H323_H224, 1, [Enable H.244 support])
+ else
+ H323_H224=
+ AC_MSG_NOTICE(Disabling H.224)
+@@ -311,7 +311,7 @@ if test "${enable_h230}x" = "x" ; then
+ fi
+ if test "$enable_h230" = "yes" ; then
+ H323_H230=1
+- AC_DEFINE(H323_H230, 1)
++ AC_DEFINE(H323_H230, 1, [Enable H.230 support])
+ else
+ H323_H230=
+ AC_MSG_NOTICE(Disabling H.230)
+@@ -331,7 +331,7 @@ if test "${enable_h239}x" = "x" ; then
+ fi
+ if test "$enable_h239" = "yes" ; then
+ H323_H239=1
+- AC_DEFINE(H323_H239, 1)
++ AC_DEFINE(H323_H239, 1, [Enable H.239 support])
+ else
+ H323_H239=
+ AC_MSG_NOTICE(Disabling H.239)
+@@ -351,7 +351,7 @@ if test "${enable_h248}x" = "x" ; then
+ fi
+ if test "$enable_h248" = "yes" ; then
+ H323_H248=1
+- AC_DEFINE(H323_H248, 1)
++ AC_DEFINE(H323_H248, 1, [Enable H.248 support])
+ else
+ H323_H248=
+ AC_MSG_NOTICE(Disabling H.248)
+@@ -371,7 +371,7 @@ if test "${enable_h249}x" = "x" ; then
+ fi
+ if test "$enable_h249" = "yes" ; then
+ H323_H249=1
+- AC_DEFINE(H323_H249, 1)
++ AC_DEFINE(H323_H249, 1, [Enable H.249 support])
+ else
+ H323_H249=
+ AC_MSG_NOTICE(Disabling H.249)
+@@ -391,7 +391,7 @@ if test "${enable_h341}x" = "x" ; then
+ fi
+ if test "$enable_h341" = "yes" ; then
+ H323_H341=1
+- AC_DEFINE(H323_H341, 1)
++ AC_DEFINE(H323_H341, 1, [Enable H.341 support])
+ else
+ H323_H341=
+ AC_MSG_NOTICE(Disabling H.341)
+@@ -411,7 +411,7 @@ if test "${enable_h350}x" = "x" ; then
+ fi
+ if test "$enable_h350" = "yes" ; then
+ H323_H350=1
+- AC_DEFINE(H323_H350, 1)
++ AC_DEFINE(H323_H350, 1, [Enable H.350 support])
+ else
+ H323_H350=
+ AC_MSG_NOTICE(Disabling H.350)
+@@ -431,7 +431,7 @@ if test "${enable_h450}x" = "x" ; then
+ fi
+ if test "$enable_h450" = "yes" ; then
+ H323_H450=1
+- AC_DEFINE(H323_H450, 1)
++ AC_DEFINE(H323_H450, 1, [Enable H.450 support])
+ else
+ H323_H450=
+ AC_MSG_NOTICE(Disabling H.450)
+@@ -451,7 +451,7 @@ if test "${enable_h460}x" = "x" ; then
+ fi
+ if test "$enable_h460" = "yes" ; then
+ H323_H460=1
+- AC_DEFINE(H323_H460, 1)
++ AC_DEFINE(H323_H460, 1, [Enable H.460 support])
+ else
+ H323_H460=
+ AC_MSG_NOTICE(Disabling H.460)
+@@ -471,7 +471,7 @@ if test "${enable_h4609}x" = "x" ; then
+ fi
+ if test "$enable_h4609" = "yes" ; then
+ H323_h4609=1
+- AC_DEFINE(H323_H4609, 1)
++ AC_DEFINE(H323_h4609, 1, [Enable H.490 support])
+ else
+ H323_h4609=
+ AC_MSG_NOTICE(Disabling H.460.9)
+@@ -491,7 +491,7 @@ if test "${enable_h46018}x" = "x" ; then
+ fi
+ if test "$enable_h46018" = "yes" ; then
+ H323_H46018=1
+- AC_DEFINE(H323_H46018, 1)
++ AC_DEFINE(H323_H46018, 1, [Enable H.460.18/.19 support])
+ else
+ H323_H46018=
+ AC_MSG_NOTICE(Disabling H.460.18/.19)
+@@ -511,7 +511,7 @@ if test "${enable_h46023}x" = "x" ; then
+ fi
+ if test "$enable_h46023" = "yes" ; then
+ H323_H46023=1
+- AC_DEFINE(H323_H46023, 1)
++ AC_DEFINE(H323_H46023, 1, [Enable H.460.23 support])
+ else
+ H323_H46023=
+ AC_MSG_NOTICE(Disabling H.460.23/.24)
+@@ -531,7 +531,7 @@ if test "${enable_h460p}x" = "x" ; then
+ fi
+ if test "$enable_h460p" = "yes" ; then
+ H323_H460P=1
+- AC_DEFINE(H323_H460P, 1)
++ AC_DEFINE(H323_H460P, 1, [Enable H.460P support])
+ else
+ H323_H460P=
+ AC_MSG_NOTICE(Disabling H.460 Presence)
+@@ -551,7 +551,7 @@ if test "${enable_h501}x" = "x" ; then
+ fi
+ if test "$enable_h501" = "yes" ; then
+ H323_H501=1
+- AC_DEFINE(H323_H501, 1)
++ AC_DEFINE(H323_H501, 1, [Enable H.501 support])
+ else
+ H323_H501=
+ AC_MSG_NOTICE(Disabling H.501)
+@@ -572,7 +572,7 @@ fi
+ if test "$enable_t38" = "yes" ; then
+ AC_MSG_NOTICE(Enabling T.38)
+ H323_T38=1
+- AC_DEFINE(H323_T38, 1)
++ AC_DEFINE(H323_T38, 1, [Enable T.38 support])
+ else
+ H323_T38=
+ AC_MSG_NOTICE(Disabling T.38)
+@@ -595,7 +595,7 @@ if test "$enable_t120" = "no" ; then
+ AC_MSG_NOTICE(Disabling T.120)
+ else
+ H323_T20=1
+- AC_DEFINE(H323_T120, 1)
++ AC_DEFINE(H323_T120, 1, [Enable T.120 support])
+ fi
+ AC_SUBST(H323_T120)
+
+@@ -612,7 +612,7 @@ if test "${enable_gnugk}x" = "x" ; then
+ fi
+ if test "$enable_gnugk" = "yes" ; then
+ H323_GNUGK=1
+- AC_DEFINE(H323_GNUGK, 1)
++ AC_DEFINE(H323_GNUGK, 1, [Enable GNU GateKeeper NAT support])
+ else
+ H323_GNUGK=
+ AC_MSG_NOTICE(Disabling GnuGk NAT)
+@@ -632,7 +632,7 @@ if test "${enable_file}x" = "x" ; then
+ fi
+ if test "$enable_file" = "yes" ; then
+ H323_FILE=1
+- AC_DEFINE(H323_FILE, 1)
++ AC_DEFINE(H323_FILE, 1, [Enable H323 file support])
+ else
+ H323_FILE=
+ AC_MSG_NOTICE(Disabling File Transfer)
+@@ -675,7 +675,7 @@ if test "${OSTYPE:-unknown}" = "solaris"
+ [upad128_t upad; upad._q = 0.0;], has_upad128_t=y)
+ if test ${has_upad128_t} == "y"; then
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(P_HAS_UPAD128_T)
++ AC_DEFINE(P_HAS_UPAD128_T, ,[type upad128_t available])
+ else
+ AC_MSG_RESULT(no)
+ fi
Modified: openh323/trunk/debian/patches/printon_with_notrace.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/printon_with_notrace.patch?rev=9334&op=diff
==============================================================================
--- openh323/trunk/debian/patches/printon_with_notrace.patch (original)
+++ openh323/trunk/debian/patches/printon_with_notrace.patch Tue Oct 18 17:04:16 2011
@@ -10,4 +10,4 @@
+STDCCFLAGS += -DPASN_LEANANDMEAN
OH323_SUFFIX = n
else
- STDCCFLAGS += -DPTRACING
+ ifeq (,$(findstring PTRACING,$(STDCCFLAGS)))
Added: openh323/trunk/debian/patches/ptlib-pkgconfig
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/ptlib-pkgconfig?rev=9334&op=file
==============================================================================
--- openh323/trunk/debian/patches/ptlib-pkgconfig (added)
+++ openh323/trunk/debian/patches/ptlib-pkgconfig Tue Oct 18 17:04:16 2011
@@ -1,0 +1,33 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,7 @@ if test "${PTLIBDIR:-unset}" != "unset"
+ AC_CHECK_FILE(${PTLIBDIR}/version.h, HAS_PTLIB=1)
+ fi
+
++set -x
+ if test "${HAS_PTLIB:-unset}" = "unset" ; then
+ AC_CHECK_FILE(${OPENH323DIR}/../ptlib/version.h, HAS_PTLIB=1)
+ if test "${HAS_PTLIB:-unset}" != "unset" ; then
+@@ -79,19 +80,13 @@ if test "${HAS_PTLIB:-unset}" = "unset"
+ PTLIBDIR="${HOME}/ptlib"
+ else
+ if test "${HAS_PTLIB:-unset}" = "unset" ; then
+- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
+- else
+- if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
+- else
+- if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
+- fi
+- fi
++ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, ,
++ $PATH:/usr/share/ptlib/make)
+ fi
+ fi
+ fi
+ fi
++set +x
+ if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
+ PTLIBDIR=`$PTLIB_CONFIG --prefix`
+ HAS_PTLIB=1
Modified: openh323/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/series?rev=9334&op=diff
==============================================================================
--- openh323/trunk/debian/patches/series (original)
+++ openh323/trunk/debian/patches/series Tue Oct 18 17:04:16 2011
@@ -1,7 +1,8 @@
01_libname.patch
-02_configure.ac.patch
03_Makefile.in.patch
10_openh323u.mak.patch
notrace.patch
printon_with_notrace.patch
ixjuser.h.patch
+fix_autoconf
+ptlib-pkgconfig
Modified: openh323/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/rules?rev=9334&op=diff
==============================================================================
--- openh323/trunk/debian/rules (original)
+++ openh323/trunk/debian/rules Tue Oct 18 17:04:16 2011
@@ -12,8 +12,7 @@
URL := http://www.h323plus.org/source/download/h323plus-v$(URLVERSION).tar.gz
%:
- dh $@ --parallel --with autotools_dev --with=pkgkde-symbolshelper \
- --with-dh-autoreconf
+ dh $@ --parallel --with=pkgkde-symbolshelper --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- --enable-plugins
More information about the Pkg-voip-commits
mailing list