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.in14
-rw-r--r--net/opal3/files/patch-configure11
-rw-r--r--net/opal3/files/patch-configure-spandsp56
-rw-r--r--net/opal3/files/patch-include_h323_h323ep.h10
-rw-r--r--net/opal3/files/patch-includes_video_rfc2190.cxx11
-rw-r--r--net/opal3/files/patch-plugins-audio-celt-celtcodec.c56
-rw-r--r--net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx14
-rw-r--r--net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx20
-rw-r--r--net/opal3/files/patch-plugins_configure144
-rw-r--r--net/opal3/files/patch-spandsp_fax.cpp10
-rw-r--r--net/opal3/files/patch-spandsp_if.cpp10
11 files changed, 0 insertions, 356 deletions
diff --git a/net/opal3/files/patch-Makefile.in b/net/opal3/files/patch-Makefile.in
deleted file mode 100644
index 1d52232f1d6c..000000000000
--- a/net/opal3/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig 2013-03-21 10:43:22.000000000 +0100
-+++ Makefile.in 2013-03-21 10:44:48.000000000 +0100
-@@ -549,8 +549,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)$(prefix)/libdata/pkgconfig ; chmod 755 $(DESTDIR)$(prefix)/libdata/pkgconfig
- $(INSTALL) -m 644 opal.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
-
diff --git a/net/opal3/files/patch-configure b/net/opal3/files/patch-configure
deleted file mode 100644
index 0686bafad330..000000000000
--- a/net/opal3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2012-01-26 02:29:34.000000000 -0600
-+++ configure 2012-01-26 02:30:16.000000000 -0600
-@@ -4636,7 +4636,7 @@
- MACHTYPE=
- case "$target_cpu" in
- x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86; ;;
-- x86_64) MACHTYPE=x86_64; ;;
-+ amd64 | x86_64) MACHTYPE=x86_64; ;;
- alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) MACHTYPE=alpha; ;;
- hppa ) MACHTYPE=hppa; ;;
- hppa64 ) MACHTYPE=hppa64; ;;
diff --git a/net/opal3/files/patch-configure-spandsp b/net/opal3/files/patch-configure-spandsp
deleted file mode 100644
index 88424a0b7e54..000000000000
--- a/net/opal3/files/patch-configure-spandsp
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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-include_h323_h323ep.h b/net/opal3/files/patch-include_h323_h323ep.h
deleted file mode 100644
index 4bcb555138fc..000000000000
--- a/net/opal3/files/patch-include_h323_h323ep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/h323/h323ep.h.orig 2010-06-29 22:41:03.000000000 +0400
-+++ include/h323/h323ep.h 2010-06-29 22:41:17.000000000 +0400
-@@ -49,6 +49,7 @@
- #include <h323/h323con.h>
- #include <h323/h323caps.h>
- #include <h323/h235auth.h>
-+#include <asn/h225.h>
-
- #if OPAL_H460
- #include <h460/h4601.h>
diff --git a/net/opal3/files/patch-includes_video_rfc2190.cxx b/net/opal3/files/patch-includes_video_rfc2190.cxx
deleted file mode 100644
index 02b026280223..000000000000
--- a/net/opal3/files/patch-includes_video_rfc2190.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-plugins-audio-celt-celtcodec.c b/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
deleted file mode 100644
index 823bca9cfb3c..000000000000
--- a/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./plugins/audio/celt/celtcodec.c.orig 2009-09-22 02:57:45.000000000 +0200
-+++ ./plugins/audio/celt/celtcodec.c 2011-04-12 12:26:00.485668577 +0200
-@@ -52,12 +52,12 @@
- {
- int error = 0;
-
-- celt->mode = celt_mode_create(codec->sampleRate, 1, codec->parm.audio.samplesPerFrame, &error);
-+ celt->mode = celt_mode_create(codec->sampleRate, codec->parm.audio.samplesPerFrame, &error);
- if (celt->mode == NULL) {
- return FALSE;
- }
-
-- celt_mode_info(celt->mode, CELT_GET_FRAME_SIZE, &celt->frame_size);
-+ celt->frame_size = 960; /* default from tools/celtenc.c */
- celt->bytes_per_packet = (codec->bitsPerSec * celt->frame_size/codec->sampleRate + 4) / 8;
-
- return TRUE;
-@@ -74,7 +74,7 @@
- return NULL;
- }
-
-- celt->encoder_state = celt_encoder_create(celt->mode);
-+ celt->encoder_state = celt_encoder_create(celt->mode, 1, NULL);
- if (celt->encoder_state == NULL ) {
- celt_mode_destroy(celt->mode);
- free(celt);
-@@ -96,7 +96,7 @@
- return NULL;
- }
-
-- celt->decoder_state = celt_decoder_create(celt->mode);
-+ celt->decoder_state = celt_decoder_create(celt->mode, 1, NULL);
- if (celt->decoder_state == NULL ) {
- celt_mode_destroy(celt->mode);
- free(celt);
-@@ -143,9 +143,9 @@
- return FALSE;
-
- #ifdef HAVE_CELT_0_5_0_OR_LATER
-- byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, NULL, (char *)toPtr, celt->bytes_per_packet);
-+ byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, celt->frame_size, (char *)toPtr, celt->bytes_per_packet);
- #else
-- byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, (char *)toPtr, celt->bytes_per_packet);
-+ byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, (char *)toPtr, celt->bytes_per_packet);
- #endif
- if (byteCount < 0) {
- return 0;
-@@ -173,7 +173,7 @@
- if (*fromLen == 0)
- return FALSE;
-
-- if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr) < 0) {
-+ if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr, celt->frame_size) < 0) {
- return 0;
- }
-
diff --git a/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx b/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
deleted file mode 100644
index b7a500489cb2..000000000000
--- a/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig 2011-06-25 11:31:14.153034898 +0200
-+++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2011-06-25 11:32:04.791577475 +0200
-@@ -830,10 +830,10 @@
- {
- _avpicture->pict_type = FF_I_TYPE;
- }
- else // No IFrame requested, let avcodec decide what to do
- {
-- _avpicture->pict_type = 0;
-+ _avpicture->pict_type = AV_PICTURE_TYPE_NONE;
- }
-
- // Encode a frame
- int total = FFMPEGLibraryInstance.AvcodecEncodeVideo
diff --git a/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx b/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
deleted file mode 100644
index 9a75cf7c4962..000000000000
--- a/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/video/H.263-1998/h263-1998.cxx.orig 2009-09-22 02:57:52.000000000 +0200
-+++ plugins/video/H.263-1998/h263-1998.cxx 2011-06-25 11:37:56.719449353 +0200
-@@ -688,7 +688,7 @@
-
- _inputFrame->data[1] = _inputFrame->data[0] + size;
- _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
-- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
-+ _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-
- currentMb = 0;
- currentBytes = 0;
-@@ -885,7 +886,7 @@
- _inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
- _inputFrame->data[1] = _inputFrame->data[0] + size;
- _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
-- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
-+ _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-
- _txH263PFrame->BeginNewFrame();
- _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());
diff --git a/net/opal3/files/patch-plugins_configure b/net/opal3/files/patch-plugins_configure
deleted file mode 100644
index e81bd1893ba1..000000000000
--- a/net/opal3/files/patch-plugins_configure
+++ /dev/null
@@ -1,144 +0,0 @@
---- 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_fax.cpp b/net/opal3/files/patch-spandsp_fax.cpp
deleted file mode 100644
index a5652224f0a5..000000000000
--- a/net/opal3/files/patch-spandsp_fax.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/fax/fax_spandsp/spandsp_fax.cpp.orig 2011-12-26 21:02:09.000000000 +0000
-+++ plugins/fax/fax_spandsp/spandsp_fax.cpp 2011-12-26 21:01:38.000000000 +0000
-@@ -42,6 +42,7 @@
- *
- */
-
-+#define __STDC_LIMIT_MACROS
- #include <codec/opalplugin.h>
-
- extern "C" {
diff --git a/net/opal3/files/patch-spandsp_if.cpp b/net/opal3/files/patch-spandsp_if.cpp
deleted file mode 100644
index a130da05758f..000000000000
--- a/net/opal3/files/patch-spandsp_if.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp.orig 2011-12-26 21:04:48.000000000 +0000
-+++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp 2011-12-26 21:05:21.000000000 +0000
-@@ -23,6 +23,7 @@
- * $Id: spandsp_if.cpp,v 1.7 2007/07/24 04:39:44 csoutheren Exp $
- */
-
-+#define __STDC_LIMIT_MACROS
- #include "spandsp_if.h"
-
- #include <iostream>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 13:26:17 +0000