summaryrefslogtreecommitdiff
path: root/net/opal3/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/opal3/files')
-rw-r--r--net/opal3/files/patch-Makefile.in25
-rw-r--r--net/opal3/files/patch-configure-spandsp56
-rw-r--r--net/opal3/files/patch-includes_video_rfc2190.cxx11
-rw-r--r--net/opal3/files/patch-libspeex13
-rw-r--r--net/opal3/files/patch-opal_inc.mak.in11
-rw-r--r--net/opal3/files/patch-plugins_configure144
-rw-r--r--net/opal3/files/patch-spandsp_if.h14
7 files changed, 238 insertions, 36 deletions
diff --git a/net/opal3/files/patch-Makefile.in b/net/opal3/files/patch-Makefile.in
index 43ac050eaf72..6082481257b3 100644
--- a/net/opal3/files/patch-Makefile.in
+++ b/net/opal3/files/patch-Makefile.in
@@ -1,13 +1,14 @@
---- Makefile.in.orig Sat Apr 22 16:06:54 2006
-+++ Makefile.in Thu Jun 22 09:39:04 2006
-@@ -427,10 +427,6 @@
- SOURCES += $(OPAL_SRCDIR)/lids/vpblid.cxx
- endif
+--- Makefile.in.orig 2009-09-11 02:47:07.000000000 +0400
++++ Makefile.in 2009-09-11 03:06:15.000000000 +0400
+@@ -541,8 +541,9 @@
+ install:
+ mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)
+ $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir)
+- $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)
+- ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(LIB_FILENAME_SHARED)
++ $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME)-@@SO_VER@@
++ ln -snf $(RELEASE_LIB_NAME)-@@SO_VER@@ $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME)-@@SO_MAJ@@
++ ln -snf $(RELEASE_LIB_NAME)-@@SO_VER@@ $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME).so
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig ; chmod 755 $(DESTDIR)$(libdir)/pkgconfig
+ $(INSTALL) -m 644 opal.pc $(DESTDIR)$(libdir)/pkgconfig
--ifdef HAS_SANGOMA
--SOURCES += $(OPAL_SRCDIR)/lids/sangomalid.cxx
--endif
--
-
- ##################
- # Software codecs
diff --git a/net/opal3/files/patch-configure-spandsp b/net/opal3/files/patch-configure-spandsp
new file mode 100644
index 000000000000..88424a0b7e54
--- /dev/null
+++ b/net/opal3/files/patch-configure-spandsp
@@ -0,0 +1,56 @@
+--- plugins/configure.orig 2009-08-29 23:23:02.000000000 +0400
++++ plugins/configure 2009-08-29 23:23:29.000000000 +0400
+@@ -11549,9 +11549,9 @@
+
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS -lspandsp"
+- { echo "$as_me:$LINENO: checking for t38_indicator in -lspandsp" >&5
+-echo $ECHO_N "checking for t38_indicator in -lspandsp... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_spandsp_t38_indicator+set}" = set; then
++ { echo "$as_me:$LINENO: checking for t38_core_init in -lspandsp" >&5
++echo $ECHO_N "checking for t38_core_init in -lspandsp... $ECHO_C" >&6; }
++if test "${ac_cv_lib_spandsp_t38_core_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11569,11 +11569,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char t38_indicator ();
++char t38_core_init ();
+ int
+ main ()
+ {
+-return t38_indicator ();
++return t38_core_init ();
+ ;
+ return 0;
+ }
+@@ -11596,21 +11596,21 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+- ac_cv_lib_spandsp_t38_indicator=yes
++ ac_cv_lib_spandsp_t38_core_init=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_lib_spandsp_t38_indicator=no
++ ac_cv_lib_spandsp_t38_core_init=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_spandsp_t38_indicator" >&5
+-echo "${ECHO_T}$ac_cv_lib_spandsp_t38_indicator" >&6; }
+-if test $ac_cv_lib_spandsp_t38_indicator = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_spandsp_t38_core_init" >&5
++echo "${ECHO_T}$ac_cv_lib_spandsp_t38_core_init" >&6; }
++if test $ac_cv_lib_spandsp_t38_core_init = yes; then
+ opal_spandsp=yes
+ else
+ opal_spandsp=no
diff --git a/net/opal3/files/patch-includes_video_rfc2190.cxx b/net/opal3/files/patch-includes_video_rfc2190.cxx
new file mode 100644
index 000000000000..02b026280223
--- /dev/null
+++ b/net/opal3/files/patch-includes_video_rfc2190.cxx
@@ -0,0 +1,11 @@
+--- plugins/video/H.263-1998/rfc2190.cxx.orig 2009-08-30 02:08:09.000000000 +0400
++++ plugins/video/H.263-1998/rfc2190.cxx 2009-08-30 02:08:11.000000000 +0400
+@@ -21,7 +21,7 @@
+
+ #include <iostream>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ using namespace std;
+
+ #include "rfc2190.h"
diff --git a/net/opal3/files/patch-libspeex b/net/opal3/files/patch-libspeex
deleted file mode 100644
index 5e452da8fc77..000000000000
--- a/net/opal3/files/patch-libspeex
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/codec/speex/libspeex/kiss_fft.h.orig Thu Jun 22 09:56:34 2006
-+++ src/codec/speex/libspeex/kiss_fft.h Thu Jun 22 09:56:53 2006
-@@ -6,10 +6,6 @@
- #include <math.h>
- #include <memory.h>
-
--#if !(defined(P_MACOSX) || defined(P_FREEBSD))
--#include <malloc.h> // RMF
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/net/opal3/files/patch-opal_inc.mak.in b/net/opal3/files/patch-opal_inc.mak.in
deleted file mode 100644
index 1b879aae2153..000000000000
--- a/net/opal3/files/patch-opal_inc.mak.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- opal_inc.mak.in.orig Fri Apr 7 08:12:16 2006
-+++ opal_inc.mak.in Fri Apr 7 08:13:55 2006
-@@ -103,7 +103,7 @@
- endif
-
-
--OPAL_BASE = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
-+OPAL_BASE = opal_$(OPAL_SUFFIX)
- OPAL_FILE = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-
- LDFLAGS += -L$(OPAL_LIBDIR)
diff --git a/net/opal3/files/patch-plugins_configure b/net/opal3/files/patch-plugins_configure
new file mode 100644
index 000000000000..e81bd1893ba1
--- /dev/null
+++ b/net/opal3/files/patch-plugins_configure
@@ -0,0 +1,144 @@
+--- plugins/configure.ac.orig 2009-09-22 04:57:56.000000000 +0400
++++ plugins/configure.ac 2009-09-26 21:36:48.000000000 +0400
+@@ -219,6 +219,11 @@
+ dnl ########################
+ dnl libavcodec (ffmpeg)
+ dnl ########################
++AC_ARG_ENABLE([ffmpeg],
++ [AC_HELP_STRING([--enable-ffmpeg],[enable libavcodec codec support])],
++ [HAVE_LIBAVCODEC=$enableval])
++
++if test "x${HAVE_LIBAVCODEC}" = "xyes" ; then
+ PKG_CHECK_MODULES([LIBAVCODEC],
+ [libavcodec >= 52.20.0],
+ [
+@@ -249,6 +254,8 @@
+ HAVE_LIBAVCODEC=no
+ ]
+ )
++fi
++
+ AC_SUBST(HAVE_LIBAVCODEC)
+
+ OPAL_LIBAVCODEC_SOURCE()
+@@ -290,6 +297,11 @@
+ dnl ########################
+ dnl theora
+ dnl ########################
++AC_ARG_ENABLE([theora],
++ [AC_HELP_STRING([--enable-theora],[enable theora codec support])],
++ [HAVE_THEORA=$enableval])
++
++if test "x${HAVE_THEORA}" = "xyes" ; then
+ PKG_CHECK_MODULES([THEORA],
+ [theora],
+ [
+@@ -301,11 +313,18 @@
+ [
+ HAVE_THEORA=no
+ ])
++fi
++
+ AC_SUBST(HAVE_THEORA)
+
+ dnl ########################
+ dnl celt
+ dnl ########################
++AC_ARG_ENABLE([celt],
++ [AC_HELP_STRING([--enable-celt],[enable CELT codec support])],
++ [HAVE_CELT=$enableval])
++
++if test "x${HAVE_CELT}" = "xyes" ; then
+ PKG_CHECK_MODULES([CELT],
+ [celt],
+ [
+@@ -321,6 +340,8 @@
+ [
+ HAVE_CELT=no
+ ])
++fi
++
+ AC_SUBST(HAVE_CELT)
+
+ dnl ########################
+--- plugins/configure.orig 2009-09-26 16:50:06.000000000 +0400
++++ plugins/configure 2009-09-26 21:44:26.000000000 +0400
+@@ -1340,11 +1340,14 @@
+ --enable-sbc enable use of Bluetooth SBC for CD quality telephony
+ --enable-default-to-full-capabilties
+ default to full capabilities at empty fmtp lines
++ --enable-ffmpeg enable libavcodec codec support
+ --enable-libavcodec-stackalign-hack
+ Stack alignment hack for libavcodec library
+ --enable-x264-link-static
+ Statically link x264 to the plugin. Default for
+ win32.
++ --enable-theora enable theora codec support
++ --enable-celt enable CELT codec support
+ --enable-h264 enable H.264 support
+ --enable-ixj enable xJack cards
+ --enable-vpb enable voicetronix vpb
+@@ -9543,6 +9546,13 @@
+ fi
+
+
++# Check whether --enable-ffmpeg was given.
++if test "${enable_ffmpeg+set}" = set; then
++ enableval=$enable_ffmpeg; HAVE_LIBAVCODEC=$enableval
++fi
++
++
++if test "x${HAVE_LIBAVCODEC}" = "xyes" ; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for LIBAVCODEC" >&5
+@@ -10144,6 +10154,8 @@
+
+
+ fi
++fi
++
+
+
+
+@@ -10350,6 +10362,13 @@
+
+
+
++# Check whether --enable-theora was given.
++if test "${enable_theora+set}" = set; then
++ enableval=$enable_theora; HAVE_THEORA=$enableval
++fi
++
++
++if test "x${HAVE_THEORA}" = "xyes" ; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for THEORA" >&5
+@@ -10430,8 +10449,17 @@
+ HAVE_THEORA=yes
+
+ fi
++fi
++
+
+
++# Check whether --enable-celt was given.
++if test "${enable_celt+set}" = set; then
++ enableval=$enable_celt; HAVE_CELT=$enableval
++fi
++
++
++if test "x${HAVE_CELT}" = "xyes" ; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for CELT" >&5
+@@ -10526,6 +10554,8 @@
+ fi
+
+ fi
++fi
++
+
+
+
diff --git a/net/opal3/files/patch-spandsp_if.h b/net/opal3/files/patch-spandsp_if.h
new file mode 100644
index 000000000000..70a10347440e
--- /dev/null
+++ b/net/opal3/files/patch-spandsp_if.h
@@ -0,0 +1,14 @@
+--- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h.orig 2009-08-30 02:52:53.000000000 +0400
++++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h 2009-08-30 02:53:00.000000000 +0400
+@@ -24,6 +24,11 @@
+ */
+
+ extern "C" {
++#undef __cplusplus
++#undef _MACHINE__STDINT_H_
++#include <machine/_stdint.h>
++#define __cplusplus
++
+ #include "spandsp.h"
+ };
+