diff options
author | Mounir Lamouri <volkmar@gentoo.org> | 2009-07-03 10:09:58 +0000 |
---|---|---|
committer | Mounir Lamouri <volkmar@gentoo.org> | 2009-07-03 10:09:58 +0000 |
commit | ff47da7d4f755e9a9711343915dce3c1cc44a9d4 (patch) | |
tree | 56b0bf110f72685b39a06978d03a9bd1a29397cb /net-libs/opal/files | |
parent | Automated update of use.local.desc (diff) | |
download | gentoo-2-ff47da7d4f755e9a9711343915dce3c1cc44a9d4.tar.gz gentoo-2-ff47da7d4f755e9a9711343915dce3c1cc44a9d4.tar.bz2 gentoo-2-ff47da7d4f755e9a9711343915dce3c1cc44a9d4.zip |
version bump to 3.6.2, bug 238610
(Portage version: 13756-svn/cvs/Linux i686)
Diffstat (limited to 'net-libs/opal/files')
-rw-r--r-- | net-libs/opal/files/opal-3.6.2-as-needed.patch | 164 | ||||
-rw-r--r-- | net-libs/opal/files/opal-3.6.2-jdkroot.patch | 15 | ||||
-rw-r--r-- | net-libs/opal/files/opal-3.6.2-sbc.patch | 11 | ||||
-rw-r--r-- | net-libs/opal/files/opal-3.6.2-system-ilbc.patch | 117 |
4 files changed, 307 insertions, 0 deletions
diff --git a/net-libs/opal/files/opal-3.6.2-as-needed.patch b/net-libs/opal/files/opal-3.6.2-as-needed.patch new file mode 100644 index 000000000000..64ae516c0804 --- /dev/null +++ b/net-libs/opal/files/opal-3.6.2-as-needed.patch @@ -0,0 +1,164 @@ +--- opal.m4.old 2009-05-22 12:44:22.000000000 +0200 ++++ opal.m4 2009-05-22 13:43:58.000000000 +0200 +@@ -363,13 +363,13 @@ + AC_DEFUN([OPAL_CHECK_PTLIB], + [ + old_CXXFLAGS="$CXXFLAGS" +- old_LDFLAGS="$LDFLAGS" ++ old_LIBS="$LIBS" + + CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" + if test "x${DEBUG_BUILD}" = xyes; then +- LDFLAGS="$LDFLAGS $DEBUG_LIBS" ++ LIBS="$LIBS $DEBUG_LIBS" + else +- LDFLAGS="$LDFLAGS $RELEASE_LIBS" ++ LIBS="$LIBS $RELEASE_LIBS" + fi + + AC_LANG(C++) +@@ -387,34 +387,69 @@ + [opal_ptlib_option=no]) + + CXXFLAGS="$old_CXXFLAGS" +- LDFLAGS="$old_LDFLAGS" ++ LIBS="$old_LIBS" + + OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option]) +- if test "x$4" = "x" ; then +- if test "x$opal_ptlib_option" = "xno" ; then ++ $4="$opal_ptlib_option" ++ AC_SUBST($4) ++ if test "x$opal_ptlib_option" = "xyes" ; then ++ AC_DEFINE([$4], [1], [$1]) ++ fi ++ ++ ]) ++ ++dnl OPAL_CHECK_PTLIB_MANDATORY ++dnl Check if ptlib was compiled with a specific mandatory feature ++dnl Arguments: $1 Name of feature ++dnl $2 ptlib/pasn.h Header file to include ++dnl $3 Code to test the feature ++AC_DEFUN([OPAL_CHECK_PTLIB_MANDATORY], ++ [ ++ old_CXXFLAGS="$CXXFLAGS" ++ old_LIBS="$LIBS" ++ ++ CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" ++ if test "x${DEBUG_BUILD}" = xyes; then ++ LIBS="$LIBS $DEBUG_LIBS" ++ else ++ LIBS="$LIBS $RELEASE_LIBS" ++ fi ++ ++ AC_LANG(C++) ++ AC_LINK_IFELSE([ ++ #include <ptbuildopts.h> ++ #include <ptlib.h> ++ #include <$2> ++ ++ int main() ++ { ++ $3 ++ } ++ ], ++ [opal_ptlib_option=yes], ++ [opal_ptlib_option=no]) ++ ++ CXXFLAGS="$old_CXXFLAGS" ++ LIBS="$old_LIBS" ++ ++ OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option]) ++ if test "x$opal_ptlib_option" = "xno" ; then + echo " ERROR: compulsory feature from PTLib disabled."; + exit 1; +- fi +- else +- $4="$opal_ptlib_option" +- AC_SUBST($4) +- if test "x$opal_ptlib_option" = "xyes" ; then +- AC_DEFINE([$4], [1], [$1]) +- fi + fi +- +- ]) ++ ++ ]) + + AC_DEFUN([OPAL_CHECK_PTLIB_EXISTS], + [ + old_CXXFLAGS="$CXXFLAGS" +- old_LDFLAGS="$LDFLAGS" ++ old_LIBS="$LIBS" + + CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" + if test "x${DEBUG_BUILD}" = xyes; then +- LDFLAGS="$LDFLAGS $DEBUG_LIBS" ++ LIBS="$LIBS $DEBUG_LIBS" + else +- LDFLAGS="$LDFLAGS $RELEASE_LIBS" ++ LIBS="$LIBS $RELEASE_LIBS" + fi + + AC_LANG(C++) +@@ -424,7 +459,7 @@ + [opal_ptlib_exists=no]) + + CXXFLAGS="$old_CXXFLAGS" +- LDFLAGS="$old_LDFLAGS" ++ LIBS="$old_LIBS" + + + if test "x$opal_ptlib_exists" != "xyes" ; then +--- configure.ac.old 2009-05-22 12:03:06.000000000 +0200 ++++ configure.ac 2009-05-22 13:45:18.000000000 +0200 +@@ -291,8 +291,8 @@ + OPAL_MSG_CHECK([ptlib version], [$PTLIB_VERSION]) + + OPAL_CHECK_PTLIB_EXISTS() +-OPAL_CHECK_PTLIB([URL], [ptclib/url.h], [PURL url;], []) +-OPAL_CHECK_PTLIB([STUN], [ptclib/pstun.h],[PSTUNClient client;], []) ++OPAL_CHECK_PTLIB_MANDATORY([URL], [ptclib/url.h], [PURL url;]) ++OPAL_CHECK_PTLIB_MANDATORY([STUN], [ptclib/pstun.h],[PSTUNClient client;]) + OPAL_CHECK_PTLIB([SSL], [ptclib/pssl.h], [PSSLContext ctx;], [OPAL_PTLIB_SSL]) + OPAL_CHECK_PTLIB([ASN.1], [ptclib/pasn.h], [PASNInteger asnint(5);], [OPAL_PTLIB_ASN]) + OPAL_CHECK_PTLIB([expat], [ptclib/pxml.h], [PXMLParser parser;], [OPAL_PTLIB_EXPAT]) +@@ -439,7 +439,7 @@ + OPAL_SIMPLE_OPTION([h323],[OPAL_H323], [whether to enable H.323 protocol support]) + + if test "x$OPAL_H323" = "xyes" ; then +- OPAL_CHECK_PTLIB([ASN], [ptclib/asner.h], [PPER_Stream per;], []) ++ OPAL_CHECK_PTLIB_MANDATORY([ASN], [ptclib/asner.h], [PPER_Stream per;]) + fi + + dnl MSWIN_DISPLAY iax2,IAX2 support +--- plugins/configure.ac.old 2009-05-24 15:24:01.000000000 +0200 ++++ plugins/configure.ac 2009-05-24 15:29:52.000000000 +0200 +@@ -230,6 +230,7 @@ + AC_SUBST(LIBAVCODEC_CFLAGS) + AC_SUBST(LIBAVCODEC_LIBS) + AC_DEFINE([HAVE_LIBAVCODEC], [1], [ffmpeg]) ++ AC_SUBST(LIBAVCODEC_LIB_NAME) + HAVE_LIBAVCODEC=yes + OPAL_LIBAVCODEC_HACK + case "$target_os" in +@@ -240,15 +241,13 @@ + HAVE_H264_DECODER=yes + ;; + * ) +- OPAL_GET_LIBNAME([LIBAVCODEC], [libavcodec], [$LIBAVCODEC_LIBS]) +- OPAL_CHECK_LIBAVCODEC([h263p_encoder], [HAVE_H263P=yes], [HAVE_H263P=no]) +- OPAL_CHECK_LIBAVCODEC([mpeg4_encoder], [HAVE_MPEG4=yes], [HAVE_MPEG4=no]) +- OPAL_CHECK_LIBAVCODEC([h264_decoder], [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no]) ++ AC_CHECK_LIB(avcodec, h263p_encoder, [HAVE_H263P=yes], [HAVE_H263P=no]) ++ AC_CHECK_LIB(avcodec, mpeg4_encoder, [HAVE_MPEG4=yes], [HAVE_MPEG4=no]) ++ AC_CHECK_LIB(avcodec, h264_decoder, [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no]) + ;; + esac + AC_SUBST(HAVE_H263P) + AC_SUBST(HAVE_MPEG4) +- AC_SUBST(LIBAVCODEC_LIB_NAME) + OPAL_LIBAVCODEC_HEADER + ], + [ diff --git a/net-libs/opal/files/opal-3.6.2-jdkroot.patch b/net-libs/opal/files/opal-3.6.2-jdkroot.patch new file mode 100644 index 000000000000..480a0eefb162 --- /dev/null +++ b/net-libs/opal/files/opal-3.6.2-jdkroot.patch @@ -0,0 +1,15 @@ +Index: opal.m4 +=================================================================== +--- opal.m4 (revision 22933) ++++ opal.m4 (working copy) +@@ -996,6 +996,10 @@ + AC_CHECK_HEADERS([jni.h], [opal_java=yes]) + + if test "x$opal_java" = "xno" ; then ++ if test "x${JDK_ROOT}" = "x" ; then ++ JDK_ROOT=${JDK_HOME} ++ fi ++ + if test "x${JDK_ROOT}" != "x" ; then + AC_CHECK_FILE([${JDK_ROOT}/include/jni.h], + [ diff --git a/net-libs/opal/files/opal-3.6.2-sbc.patch b/net-libs/opal/files/opal-3.6.2-sbc.patch new file mode 100644 index 000000000000..d4e7e4ec26ca --- /dev/null +++ b/net-libs/opal/files/opal-3.6.2-sbc.patch @@ -0,0 +1,11 @@ +--- plugins/audio/SBC/Makefile.in.old 2009-05-24 13:15:46.000000000 +0200 ++++ plugins/audio/SBC/Makefile.in 2009-05-24 13:16:18.000000000 +0200 +@@ -30,7 +30,7 @@ + SRCDIR = . + PLUGINDIR=../.. + SONAME = sbccodec +-SAMPLERATELIB = -Lsamplerate ++SAMPLERATE_LIB = -lsamplerate + + CC =@CC@ + CFLAGS =@CFLAGS@ diff --git a/net-libs/opal/files/opal-3.6.2-system-ilbc.patch b/net-libs/opal/files/opal-3.6.2-system-ilbc.patch new file mode 100644 index 000000000000..8ee423203128 --- /dev/null +++ b/net-libs/opal/files/opal-3.6.2-system-ilbc.patch @@ -0,0 +1,117 @@ +--- opal.m4.old 2009-05-22 19:42:30.000000000 +0200 ++++ opal.m4 2009-05-22 20:07:45.000000000 +0200 +@@ -1007,3 +1007,41 @@ + fi + AS_IF([test AS_VAR_GET([opal_java]) = yes], [$1], [$2])[] + ]) ++ ++dnl OPAL_DETERMINE_ILBC ++dnl Determine whether to use the system or internal iLBC (can be forced) ++dnl Arguments: none ++dnl Return: $ILBC_SYSTEM whether system or internal iLBC shall be used ++dnl $ILBC_CFLAGS system iLBC CFLAGS if using system iLBC ++dnl $ILBC_LIBS system iLBC LIBS if using system iLBC ++AC_DEFUN([OPAL_DETERMINE_ILBC], ++ [AC_ARG_ENABLE([localilbc], ++ [AC_HELP_STRING([--enable-localilbc],[Force use local version of iLBC library rather than system version])], ++ [localilbc=$enableval], ++ [localilbc=]) ++ ++ if test "x${localilbc}" = "xyes" ; then ++ AC_MSG_NOTICE(forcing use of local iLBC sources) ++ ILBC_SYSTEM=no ++ else ++ AC_MSG_NOTICE(checking if iLBC is installed) ++ ++ saved_LIBS="$LIBS" ++ LIBS="$LIBS -lilbc" ++ AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [has_ilbc=no]) ++ LIBS=$saved_LIBS ++ ++ if test "x${has_ilbc}" = "xyes"; then ++ AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no]) ++ fi ++ ++ if test "x${has_ilbc}" = "xyes"; then ++ ILBC_CFLAGS="" ++ ILBC_LIBS="-lilbc" ++ ILBC_SYSTEM=yes ++ else ++ ILBC_SYSTEM=no ++ fi ++ OPAL_MSG_CHECK([System iLBC], [$has_ilbc]) ++ fi ++ ]) +--- plugins/audio/iLBC/Makefile.in.old 2009-05-22 19:25:06.000000000 +0200 ++++ plugins/audio/iLBC/Makefile.in 2009-05-22 20:10:11.000000000 +0200 +@@ -78,13 +78,26 @@ + LDFLAGS =@LDFLAGS@ + EXTRACFLAGS =-I$(PLUGINDIR) + +-SRCS = ilbccodec.c $(SRCDIR)/anaFilter.c $(SRCDIR)/constants.c $(SRCDIR)/createCB.c $(SRCDIR)/doCPLC.c \ ++ILBC_CFLAGS=@ILBC_CFLAGS@ ++ILBC_LIBS=@ILBC_LIBS@ ++ILBC_SYSTEM=@ILBC_SYSTEM@ ++ ++SRCS = ilbccodec.c ++ ++ifeq ($(ILBC_SYSTEM),no) ++SRCS += $(SRCDIR)/anaFilter.c $(SRCDIR)/constants.c $(SRCDIR)/createCB.c $(SRCDIR)/doCPLC.c \ + $(SRCDIR)/enhancer.c $(SRCDIR)/filter.c $(SRCDIR)/FrameClassify.c $(SRCDIR)/gainquant.c \ + $(SRCDIR)/getCBvec.c $(SRCDIR)/helpfun.c $(SRCDIR)/hpInput.c $(SRCDIR)/hpOutput.c \ + $(SRCDIR)/iCBConstruct.c $(SRCDIR)/iCBSearch.c $(SRCDIR)/iLBC_decode.c $(SRCDIR)/iLBC_encode.c \ + $(SRCDIR)/LPCdecode.c $(SRCDIR)/LPCencode.c $(SRCDIR)/lsf.c $(SRCDIR)/packing.c \ + $(SRCDIR)/StateConstructW.c $(SRCDIR)/StateSearchW.c $(SRCDIR)/syntFilter.c + ++EXTRALIBS = ++else ++EXTRACFLAGS += $(IBLC_CFLAGS) ++EXTRALIBS = $(ILBC_LIBS) ++endif ++ + OBJDIR = ./obj + + vpath %.o $(OBJDIR) +@@ -100,9 +113,9 @@ + + $(PLUGIN): $(OBJECTS) + ifeq (solaris,$(findstring solaris,$(target_os))) +- $(CC) $(LDSO) $@ -o $@ $^ ++ $(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS) + else +- $(CC) $(LDSO) -o $@ $^ ++ $(CC) $(LDSO) -o $@ $^ $(EXTRALIBS) + endif + + install: +--- plugins/configure.ac.old 2009-05-22 19:39:05.000000000 +0200 ++++ plugins/configure.ac 2009-05-22 19:41:25.000000000 +0200 +@@ -181,6 +181,14 @@ + AC_SUBST(SPEEX_CFLAGS) + AC_SUBST(SPEEX_LIBS) + ++dnl ######################## ++dnl iLBC (system/local) ++dnl ######################## ++OPAL_DETERMINE_ILBC() ++AC_SUBST(ILBC_SYSTEM) ++AC_SUBST(ILBC_CFLAGS) ++AC_SUBST(ILBC_LIBS) ++ + dnl ######################################################################## + dnl sbc,Bluetooth SBC for telephony with CD quality + +@@ -516,7 +524,12 @@ + fi + + echo " gsm-amr : yes" +-echo " iLBC : yes" ++if test "x${ILBC_SYSTEM}" = "xyes" ; then ++echo " iLBC : yes (system)" ++else ++echo " iLBC : yes (internal)" ++fi ++ + if test "x${SPEEX_SYSTEM}" = "xyes" ; then + echo " Speex : yes (system, version $SPEEX_SYSTEM_VERSION)" + else |