From 329c07fbac612889ca2c464f29f98407a6e69639 Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Thu, 19 Oct 2023 19:20:53 +0200
Subject: [PATCH] opal - update to version 3.16.2
---
components/library/opal/Makefile | 61 ++++------
components/library/opal/manifests/sample-manifest.p5m | 106 ++++++++++-------
/dev/null | 20 ---
components/library/opal/pkg5 | 2
components/library/opal/libopal.p5m | 113 ++++++++++--------
5 files changed, 149 insertions(+), 153 deletions(-)
diff --git a/components/library/opal/Makefile b/components/library/opal/Makefile
index 1ae41d4..c7752b6 100644
--- a/components/library/opal/Makefile
+++ b/components/library/opal/Makefile
@@ -11,68 +11,55 @@
#
# Copyright 2014 Alexander Pyhalov. All rights reserved.
+# Copyright 2023 Friedrich Kink. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= opal
-COMPONENT_VERSION= 3.10.10
-COMPONENT_REVISION= 2
+COMPONENT_VERSION= 3.16.2
COMPONENT_SUMMARY= OPAL - Open Phone Abstraction Library
COMPONENT_PROJECT_URL = http://www.gnome.org
COMPONENT_FMRI= library/libopal
COMPONENT_CLASSIFICATION=Desktop (GNOME)/Libraries
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864
+ sha256:9225e881e7a450d39f739be7db97d0b1f845c754afdc2f26d8ebdbd5799dd3ed
COMPONENT_ARCHIVE_URL= \
- https://download.gnome.org/sources/$(COMPONENT_NAME)/3.10/$(COMPONENT_ARCHIVE)
+ https://sourceforge.net/projects/opalvoip/files/V3.16%20Procyon/Stable%202/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE= MPLv1.0
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/common.mk
-OPAL_FFMPEG_PATCH =\
-sed -e 's/CODEC_ID/AV_&/' \
- -e 's/PIX_FMT_/AV_&/' \
- -i plugins/video/H.263-1998/h263-1998.cxx \
- plugins/video/common/dyna.cxx \
- plugins/video/H.264/h264-x264.cxx \
- plugins/video/MPEG4-ffmpeg/mpeg4.cxx \
-&& \
-sed -e '/<< mime.PrintContents/ s/mime/(const std::string\&)&/' \
- -i src/im/msrp.cxx
+PATH= $(PATH.gnu)
+COMPONENT_BUILD_ARGS += VERBOSE=1
-COMPONENT_PREP_ACTION=( cd $(@D)/plugins && aclocal && autoconf &&\
- cd $(@D)&& aclocal && autoconf && $(OPAL_FFMPEG_PATCH) )
+OPAL_FFMPEG_PATCH = \
+ $(GSED) -e '/<< mime.PrintContents/ s/mime/(const std::string\&)&/' \
+ -i src/im/msrp.cxx
+
+COMPONENT_PREP_ACTION=( cd $(@D)/plugins && aclocal && autoconf && \
+ cd $(@D) && aclocal && autoconf && $(OPAL_FFMPEG_PATCH) )
# Missing files in build dir for configure without this.
-COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+COMPONENT_PRE_CONFIGURE_ACTION = ( CLONEY_MODE=copy $(CLONEY) $(SOURCE_DIR) $(@D) )
+
+COMPONENT_POST_CONFIGURE_ACTION = ( \
+ echo "install: ; @\$$(MAKE) --file=$(SOURCE_DIR)/Makefile \$$(MAKECMDGOALS)" >> $(@D)/Makefile )
CONFIGURE_OPTIONS += --sysconfdir=/etc
-CONFIGURE_OPTIONS += --disable-iax
-CONFIGURE_OPTIONS += --enable-localgsm
-CONFIGURE_OPTIONS += --disable-x264
-CONFIGURE_OPTIONS += --disable-libavcodec
+CONFIGURE_OPTIONS += --disable-srtp
+CONFIGURE_OPTIONS += --disable-spandsp
+CONFIGURE_OPTIONS += --disable-libavutil
+CONFIGURE_OPTIONS += --enable-localsrtp
+CONFIGURE_OPTIONS += PKG_CONFIG_PATH=/usr/lib/$(MACH64)/pkgconfig
# opal comes with SILK SDK, which has own build system
COMPONENT_BUILD_ENV += SILK_CC="$(CC)"
COMPONENT_BUILD_ENV += SILK_CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ENV += SILK_LDFLAGS="$(LDFLAGS)"
-
-COMPONENT_POST_INSTALL_ACTION= \
- (cd $(PROTOUSRDIR) ; \
- $(MV) include/opal/opal/buildopts.h include/opal/opal/buildopts-$(BITS).h )
-
-
-build: $(BUILD_32_and_64)
-
-install: $(INSTALL_32_and_64)
-
-test: $(NO_TESTS)
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
@@ -80,6 +67,8 @@
REQUIRED_PACKAGES += codec/libtheora
REQUIRED_PACKAGES += codec/speex
REQUIRED_PACKAGES += library/desktop/ptlib
+REQUIRED_PACKAGES += library/opus
REQUIRED_PACKAGES += library/speexdsp
+REQUIRED_PACKAGES += library/video/libvpx
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
diff --git a/components/library/opal/libopal.p5m b/components/library/opal/libopal.p5m
index 53926d4..5a68ea4 100644
--- a/components/library/opal/libopal.p5m
+++ b/components/library/opal/libopal.p5m
@@ -11,9 +11,11 @@
#
# Copyright 2016 Aurelien Larcher. All rights reserved.
+# Copyright 2023 Friedrich Kink. All rights reserved.
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,7 +24,8 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file files/buildopts.h path=usr/include/opal/opal/buildopts.h
+# remove static libraries
+<transform file path=.*/lib/.+.a$ -> drop>
file path=usr/include/opal/asn/gcc.h
file path=usr/include/opal/asn/h225.h
@@ -48,6 +51,7 @@
file path=usr/include/opal/codec/echocancel.h
file path=usr/include/opal/codec/g711a1_plc.h
file path=usr/include/opal/codec/g711codec.h
+file path=usr/include/opal/codec/known.h
file path=usr/include/opal/codec/opalplugin.h
file path=usr/include/opal/codec/opalpluginmgr.h
file path=usr/include/opal/codec/opalwavfile.h
@@ -57,11 +61,25 @@
file path=usr/include/opal/codec/rfc4175.h
file path=usr/include/opal/codec/silencedetect.h
file path=usr/include/opal/codec/vidcodec.h
+file path=usr/include/opal/ep/GstEndPoint.h
+file path=usr/include/opal/ep/ivr.h
+file path=usr/include/opal/ep/localep.h
+file path=usr/include/opal/ep/opalmixer.h
+file path=usr/include/opal/ep/opalvxml.h
+file path=usr/include/opal/ep/pcss.h
+file path=usr/include/opal/ep/skinnyep.h
+file path=usr/include/opal/h224/h224.h
+file path=usr/include/opal/h224/h224handler.h
+file path=usr/include/opal/h224/h281.h
+file path=usr/include/opal/h224/h281handler.h
+file path=usr/include/opal/h224/h323h224.h
+file path=usr/include/opal/h224/q922.h
file path=usr/include/opal/h323/channels.h
file path=usr/include/opal/h323/gkclient.h
file path=usr/include/opal/h323/gkserver.h
file path=usr/include/opal/h323/h225ras.h
file path=usr/include/opal/h323/h235auth.h
+file path=usr/include/opal/h323/h235dh.h
file path=usr/include/opal/h323/h323.h
file path=usr/include/opal/h323/h323annexg.h
file path=usr/include/opal/h323/h323caps.h
@@ -81,7 +99,12 @@
file path=usr/include/opal/h460/h4601.h
file path=usr/include/opal/h460/h46018.h
file path=usr/include/opal/h460/h46019.h
+file path=usr/include/opal/h460/h46024b.h
file path=usr/include/opal/h460/h4609.h
+file path=usr/include/opal/h460/h460_std18.h
+file path=usr/include/opal/h460/h460_std19.h
+file path=usr/include/opal/h460/h460_std23.h
+file path=usr/include/opal/h460/h460_std24.h
file path=usr/include/opal/h460/h460p.h
file path=usr/include/opal/h460/h460pres.h
file path=usr/include/opal/h460/h460tm.h
@@ -105,48 +128,54 @@
file path=usr/include/opal/iax2/transmit.h
file path=usr/include/opal/iax2/version.h
file path=usr/include/opal/im/im.h
+file path=usr/include/opal/im/im_ep.h
file path=usr/include/opal/im/msrp.h
file path=usr/include/opal/im/rfc4103.h
file path=usr/include/opal/im/sipim.h
file path=usr/include/opal/im/t140.h
file path=usr/include/opal/lids/capi_ep.h
+file path=usr/include/opal/lids/dahdi_ep.h
file path=usr/include/opal/lids/lid.h
file path=usr/include/opal/lids/lidep.h
file path=usr/include/opal/lids/lidplugin.h
file path=usr/include/opal/lids/lidpluginmgr.h
file path=usr/include/opal/opal.h
-file path=usr/include/opal/opal/buildopts-32.h
-file path=usr/include/opal/opal/buildopts-64.h
file path=usr/include/opal/opal/call.h
file path=usr/include/opal/opal/connection.h
file path=usr/include/opal/opal/console_mgr.h
file path=usr/include/opal/opal/endpoint.h
file path=usr/include/opal/opal/guid.h
-file path=usr/include/opal/opal/ivr.h
-file path=usr/include/opal/opal/localep.h
file path=usr/include/opal/opal/manager.h
file path=usr/include/opal/opal/mediacmd.h
file path=usr/include/opal/opal/mediafmt.h
+file path=usr/include/opal/opal/mediasession.h
file path=usr/include/opal/opal/mediastrm.h
file path=usr/include/opal/opal/mediatype.h
-file path=usr/include/opal/opal/opalmixer.h
-file path=usr/include/opal/opal/opalvxml.h
file path=usr/include/opal/opal/patch.h
-file path=usr/include/opal/opal/pcss.h
file path=usr/include/opal/opal/pres_ent.h
file path=usr/include/opal/opal/recording.h
-file path=usr/include/opal/opal/rtpconn.h
-file path=usr/include/opal/opal/rtpep.h
file path=usr/include/opal/opal/transcoders.h
file path=usr/include/opal/opal/transports.h
+file path=usr/include/opal/opal_config.h
+file path=usr/include/opal/rtp/dtls_srtp_session.h
+file path=usr/include/opal/rtp/h235_session.h
file path=usr/include/opal/rtp/jitter.h
file path=usr/include/opal/rtp/metrics.h
+file path=usr/include/opal/rtp/opalzrtp.h
file path=usr/include/opal/rtp/pcapfile.h
file path=usr/include/opal/rtp/rtp.h
-file path=usr/include/opal/rtp/srtp.h
+file path=usr/include/opal/rtp/rtp_session.h
+file path=usr/include/opal/rtp/rtp_stream.h
+file path=usr/include/opal/rtp/rtpconn.h
+file path=usr/include/opal/rtp/rtpep.h
+file path=usr/include/opal/rtp/srtp_session.h
+file path=usr/include/opal/rtp/zrtpeventproc.h
file path=usr/include/opal/rtp/zrtpudp.h
+file path=usr/include/opal/sdp/ice.h
+file path=usr/include/opal/sdp/sdp.h
+file path=usr/include/opal/sdp/sdpep.h
+file path=usr/include/opal/sdp/sdphttpep.h
file path=usr/include/opal/sip/handlers.h
-file path=usr/include/opal/sip/sdp.h
file path=usr/include/opal/sip/sip.h
file path=usr/include/opal/sip/sipcon.h
file path=usr/include/opal/sip/sipep.h
@@ -158,44 +187,26 @@
file path=usr/include/opal/t38/h323t38.h
file path=usr/include/opal/t38/sipt38.h
file path=usr/include/opal/t38/t38proto.h
-file path=usr/include/opal/zrtp/opalzrtp.h
-file path=usr/include/opal/zrtp/zrtpeventproc.h
-link path=usr/lib/$(MACH64)/libopal.so target=libopal.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/libopal.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libopal.so target=libopal.so.$(HUMAN_VERSION)
+file path=usr/lib/$(MACH64)/libopal.so.$(HUMAN_VERSION)
+file path=usr/lib/$(MACH64)/libopal.so.$(HUMAN_VERSION).debug
file path=usr/lib/$(MACH64)/libopal_s.a
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g7221_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g7222_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g722_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g726_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/gsm0610_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/gsmamrcodec_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/iLBC_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/ima_adpcm_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/lpc10_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/silk_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/speex_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/video/h261_vic_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/video/theora_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/g7222_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/g722_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/g726_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/gsm0610_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/gsmamrcodec_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/iLBC_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/iSAC_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/ima_adpcm_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/lpc10_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/opus_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/silk_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/speex_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/video/h261_vic_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/video/theora_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/video/vp8_webm_ptplugin.so
file path=usr/lib/$(MACH64)/pkgconfig/opal.pc
-link path=usr/lib/libopal.so target=libopal.so.$(COMPONENT_VERSION)
-file path=usr/lib/libopal.so.$(COMPONENT_VERSION)
-file path=usr/lib/libopal_s.a
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g7221_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g7222_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g722_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g726_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/gsm0610_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/gsmamrcodec_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/iLBC_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/ima_adpcm_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/lpc10_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/silk_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/speex_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/h261_vic_ptplugin.so
-# Disabled due to dependency to encumbered
-#file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/h263_ffmpeg_ptplugin.so
-#file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/h264_video_pwplugin_helper
-#file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/h264_x264_ptplugin.so
-#file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/mpeg4_ffmpeg_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/theora_ptplugin.so
-file path=usr/lib/pkgconfig/opal.pc
+file path=usr/share/opal/make/opal.mak
+file path=usr/share/opal/make/opal_config.mak
+file path=usr/share/opal/make/toplevel.mak
diff --git a/components/library/opal/manifests/sample-manifest.p5m b/components/library/opal/manifests/sample-manifest.p5m
index 17de6f9..850c337 100644
--- a/components/library/opal/manifests/sample-manifest.p5m
+++ b/components/library/opal/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2017 <contributor>
+# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -46,6 +47,7 @@
file path=usr/include/opal/codec/echocancel.h
file path=usr/include/opal/codec/g711a1_plc.h
file path=usr/include/opal/codec/g711codec.h
+file path=usr/include/opal/codec/known.h
file path=usr/include/opal/codec/opalplugin.h
file path=usr/include/opal/codec/opalpluginmgr.h
file path=usr/include/opal/codec/opalwavfile.h
@@ -55,11 +57,25 @@
file path=usr/include/opal/codec/rfc4175.h
file path=usr/include/opal/codec/silencedetect.h
file path=usr/include/opal/codec/vidcodec.h
+file path=usr/include/opal/ep/GstEndPoint.h
+file path=usr/include/opal/ep/ivr.h
+file path=usr/include/opal/ep/localep.h
+file path=usr/include/opal/ep/opalmixer.h
+file path=usr/include/opal/ep/opalvxml.h
+file path=usr/include/opal/ep/pcss.h
+file path=usr/include/opal/ep/skinnyep.h
+file path=usr/include/opal/h224/h224.h
+file path=usr/include/opal/h224/h224handler.h
+file path=usr/include/opal/h224/h281.h
+file path=usr/include/opal/h224/h281handler.h
+file path=usr/include/opal/h224/h323h224.h
+file path=usr/include/opal/h224/q922.h
file path=usr/include/opal/h323/channels.h
file path=usr/include/opal/h323/gkclient.h
file path=usr/include/opal/h323/gkserver.h
file path=usr/include/opal/h323/h225ras.h
file path=usr/include/opal/h323/h235auth.h
+file path=usr/include/opal/h323/h235dh.h
file path=usr/include/opal/h323/h323.h
file path=usr/include/opal/h323/h323annexg.h
file path=usr/include/opal/h323/h323caps.h
@@ -79,7 +95,12 @@
file path=usr/include/opal/h460/h4601.h
file path=usr/include/opal/h460/h46018.h
file path=usr/include/opal/h460/h46019.h
+file path=usr/include/opal/h460/h46024b.h
file path=usr/include/opal/h460/h4609.h
+file path=usr/include/opal/h460/h460_std18.h
+file path=usr/include/opal/h460/h460_std19.h
+file path=usr/include/opal/h460/h460_std23.h
+file path=usr/include/opal/h460/h460_std24.h
file path=usr/include/opal/h460/h460p.h
file path=usr/include/opal/h460/h460pres.h
file path=usr/include/opal/h460/h460tm.h
@@ -103,48 +124,54 @@
file path=usr/include/opal/iax2/transmit.h
file path=usr/include/opal/iax2/version.h
file path=usr/include/opal/im/im.h
+file path=usr/include/opal/im/im_ep.h
file path=usr/include/opal/im/msrp.h
file path=usr/include/opal/im/rfc4103.h
file path=usr/include/opal/im/sipim.h
file path=usr/include/opal/im/t140.h
file path=usr/include/opal/lids/capi_ep.h
+file path=usr/include/opal/lids/dahdi_ep.h
file path=usr/include/opal/lids/lid.h
file path=usr/include/opal/lids/lidep.h
file path=usr/include/opal/lids/lidplugin.h
file path=usr/include/opal/lids/lidpluginmgr.h
file path=usr/include/opal/opal.h
-file path=usr/include/opal/opal/buildopts-32.h
-file path=usr/include/opal/opal/buildopts-64.h
file path=usr/include/opal/opal/call.h
file path=usr/include/opal/opal/connection.h
file path=usr/include/opal/opal/console_mgr.h
file path=usr/include/opal/opal/endpoint.h
file path=usr/include/opal/opal/guid.h
-file path=usr/include/opal/opal/ivr.h
-file path=usr/include/opal/opal/localep.h
file path=usr/include/opal/opal/manager.h
file path=usr/include/opal/opal/mediacmd.h
file path=usr/include/opal/opal/mediafmt.h
+file path=usr/include/opal/opal/mediasession.h
file path=usr/include/opal/opal/mediastrm.h
file path=usr/include/opal/opal/mediatype.h
-file path=usr/include/opal/opal/opalmixer.h
-file path=usr/include/opal/opal/opalvxml.h
file path=usr/include/opal/opal/patch.h
-file path=usr/include/opal/opal/pcss.h
file path=usr/include/opal/opal/pres_ent.h
file path=usr/include/opal/opal/recording.h
-file path=usr/include/opal/opal/rtpconn.h
-file path=usr/include/opal/opal/rtpep.h
file path=usr/include/opal/opal/transcoders.h
file path=usr/include/opal/opal/transports.h
+file path=usr/include/opal/opal_config.h
+file path=usr/include/opal/rtp/dtls_srtp_session.h
+file path=usr/include/opal/rtp/h235_session.h
file path=usr/include/opal/rtp/jitter.h
file path=usr/include/opal/rtp/metrics.h
+file path=usr/include/opal/rtp/opalzrtp.h
file path=usr/include/opal/rtp/pcapfile.h
file path=usr/include/opal/rtp/rtp.h
-file path=usr/include/opal/rtp/srtp.h
+file path=usr/include/opal/rtp/rtp_session.h
+file path=usr/include/opal/rtp/rtp_stream.h
+file path=usr/include/opal/rtp/rtpconn.h
+file path=usr/include/opal/rtp/rtpep.h
+file path=usr/include/opal/rtp/srtp_session.h
+file path=usr/include/opal/rtp/zrtpeventproc.h
file path=usr/include/opal/rtp/zrtpudp.h
+file path=usr/include/opal/sdp/ice.h
+file path=usr/include/opal/sdp/sdp.h
+file path=usr/include/opal/sdp/sdpep.h
+file path=usr/include/opal/sdp/sdphttpep.h
file path=usr/include/opal/sip/handlers.h
-file path=usr/include/opal/sip/sdp.h
file path=usr/include/opal/sip/sip.h
file path=usr/include/opal/sip/sipcon.h
file path=usr/include/opal/sip/sipep.h
@@ -156,39 +183,26 @@
file path=usr/include/opal/t38/h323t38.h
file path=usr/include/opal/t38/sipt38.h
file path=usr/include/opal/t38/t38proto.h
-file path=usr/include/opal/zrtp/opalzrtp.h
-file path=usr/include/opal/zrtp/zrtpeventproc.h
-link path=usr/lib/$(MACH64)/libopal.so target=libopal.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/libopal.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libopal.so target=libopal.so.$(HUMAN_VERSION)
+file path=usr/lib/$(MACH64)/libopal.so.$(HUMAN_VERSION)
+file path=usr/lib/$(MACH64)/libopal.so.$(HUMAN_VERSION).debug
file path=usr/lib/$(MACH64)/libopal_s.a
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g7221_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g7222_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g722_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/g726_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/gsm0610_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/gsmamrcodec_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/iLBC_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/ima_adpcm_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/lpc10_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/silk_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/audio/speex_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/video/h261_vic_ptplugin.so
-file path=usr/lib/$(MACH64)/opal-$(COMPONENT_VERSION)/codecs/video/theora_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/g7222_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/g722_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/g726_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/gsm0610_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/gsmamrcodec_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/iLBC_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/iSAC_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/ima_adpcm_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/lpc10_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/opus_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/silk_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/audio/speex_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/video/h261_vic_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/video/theora_ptplugin.so
+file path=usr/lib/$(MACH64)/opal-$(HUMAN_VERSION)/codecs/video/vp8_webm_ptplugin.so
file path=usr/lib/$(MACH64)/pkgconfig/opal.pc
-link path=usr/lib/libopal.so target=libopal.so.$(COMPONENT_VERSION)
-file path=usr/lib/libopal.so.$(COMPONENT_VERSION)
-file path=usr/lib/libopal_s.a
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g7221_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g7222_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g722_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/g726_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/gsm0610_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/gsmamrcodec_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/iLBC_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/ima_adpcm_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/lpc10_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/silk_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/audio/speex_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/h261_vic_ptplugin.so
-file path=usr/lib/opal-$(COMPONENT_VERSION)/codecs/video/theora_ptplugin.so
-file path=usr/lib/pkgconfig/opal.pc
+file path=usr/share/opal/make/opal.mak
+file path=usr/share/opal/make/opal_config.mak
+file path=usr/share/opal/make/toplevel.mak
diff --git a/components/library/opal/patches/opal-01-ptlibs.patch b/components/library/opal/patches/opal-01-ptlibs.patch
deleted file mode 100644
index de57c08..0000000
--- a/components/library/opal/patches/opal-01-ptlibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opal-3.10.10/configure.ac.orig 2016-07-31 03:54:30.197989095 +0200
-+++ opal-3.10.10/configure.ac 2016-07-31 03:54:39.969795127 +0200
-@@ -139,7 +139,7 @@
- CFLAGS="$CFLAGS $PTLIB_CFLAGS"
- LDFLAGS="$LDFLAGS $PTLIB_CFLAGS"
- CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS"
--#LIBS="$LIBS $PTLIB_LIBS"
-+LIBS="$LIBS $PTLIB_LIBS"
-
-
- dnl ########################################################################
diff --git a/components/library/opal/patches/opal-02-ffmpeg2-1.patch b/components/library/opal/patches/opal-02-ffmpeg2-1.patch
deleted file mode 100644
index 6b58ac2..0000000
--- a/components/library/opal/patches/opal-02-ffmpeg2-1.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Submitted By: Igor ��ivkovi�� <contact@igor-zivkovic.from.hr>
-Date: 2013-10-08
-Initial Package Version: 3.10.10
-Upstream Status: Unknown
-Origin: Gentoo
-Description: Fixes building against FFmpeg version >= 2.0.0
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
---- opal-3.10.10.orig/plugins/video/common/dyna.cxx 2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.cxx 2013-10-08 12:57:25.058873513 +0200
-@@ -210,7 +210,7 @@
- #endif
-
-
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
- {
- m_codec = codec;
- if (m_codec==CODEC_ID_H264)
-@@ -348,12 +348,12 @@
- return true;
- }
-
--AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
- {
- return Favcodec_find_encoder(id);
- }
-
--AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
- {
- WaitAndSignal m(processLock);
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
---- opal-3.10.10.orig/plugins/video/common/dyna.h 2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.h 2013-10-08 12:57:25.058873513 +0200
-@@ -88,13 +88,13 @@
- class FFMPEGLibrary
- {
- public:
-- FFMPEGLibrary(CodecID codec);
-+ FFMPEGLibrary(AVCodecID codec);
- ~FFMPEGLibrary();
-
- bool Load();
-
-- AVCodec *AvcodecFindEncoder(enum CodecID id);
-- AVCodec *AvcodecFindDecoder(enum CodecID id);
-+ AVCodec *AvcodecFindEncoder(enum AVCodecID id);
-+ AVCodec *AvcodecFindDecoder(enum AVCodecID id);
- AVCodecContext *AvcodecAllocContext(void);
- AVFrame *AvcodecAllocFrame(void);
- int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@
- DynaLink m_libAvcodec;
- DynaLink m_libAvutil;
-
-- CodecID m_codec;
-+ AVCodecID m_codec;
- char m_codecString[32];
-
- void (*Favcodec_init)(void);
- void (*Fav_init_packet)(AVPacket *pkt);
-
- void (*Favcodec_register_all)(void);
-- AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
-- AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
-+ AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
-+ AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
- AVCodecContext *(*Favcodec_alloc_context)(void);
- AVFrame *(*Favcodec_alloc_frame)(void);
- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
-diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
---- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 03:18:04.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-10-08 12:57:25.060873488 +0200
-@@ -101,7 +101,7 @@
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- */
--enum CodecID {
-+enum AVCodecID {
- CODEC_ID_NONE,
-
- /* video codecs */
-@@ -1390,7 +1390,7 @@
-
- char codec_name[32];
- enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-- enum CodecID codec_id; /* see CODEC_ID_xxx */
-+ enum AVCodecID codec_id; /* see CODEC_ID_xxx */
-
- /**
- * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-@@ -2843,7 +2843,7 @@
- */
- const char *name;
- enum AVMediaType type;
-- enum CodecID id;
-+ enum AVCodecID id;
- int priv_data_size;
- int (*init)(AVCodecContext *);
- int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-@@ -2898,7 +2898,7 @@
- *
- * See CODEC_ID_xxx
- */
-- enum CodecID id;
-+ enum AVCodecID id;
-
- /**
- * Supported pixel format.
-@@ -3402,10 +3402,10 @@
- /**
- * Find a registered encoder with a matching codec ID.
- *
-- * @param id CodecID of the requested encoder
-+ * @param id AVCodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
--AVCodec *avcodec_find_encoder(enum CodecID id);
-+AVCodec *avcodec_find_encoder(enum AVCodecID id);
-
- /**
- * Find a registered encoder with the specified name.
-@@ -3418,10 +3418,10 @@
- /**
- * Find a registered decoder with a matching codec ID.
- *
-- * @param id CodecID of the requested decoder
-+ * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
--AVCodec *avcodec_find_decoder(enum CodecID id);
-+AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
- /**
- * Find a registered decoder with the specified name.
-@@ -3822,7 +3822,7 @@
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
--int av_get_bits_per_sample(enum CodecID codec_id);
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
-
- #if FF_API_OLD_SAMPLE_FMT
- /**
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx 2013-10-08 12:57:25.061873475 +0200
-@@ -48,6 +48,10 @@
- #endif
-
- #include "h263-1998.h"
-+extern "C"
-+{
-+#include <libavutil/opt.h>
-+}
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -203,7 +207,7 @@
- PTRACE(4, m_prefix, "Encoder closed");
- }
-
--bool H263_Base_EncoderContext::Init(CodecID codecId)
-+bool H263_Base_EncoderContext::Init(AVCodecID codecId)
- {
- PTRACE(5, m_prefix, "Opening encoder");
-
-@@ -317,9 +321,9 @@
- // Level 2+
- // works with eyeBeam, signaled via non-standard "D"
- if (atoi(value) == 1)
-- m_context->flags |= CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_context->priv_data, "umv", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
- return;
- }
-
-@@ -328,9 +332,9 @@
- // Annex F: Advanced Prediction Mode
- // does not work with eyeBeam
- if (atoi(value) == 1)
-- m_context->flags |= CODEC_FLAG_OBMC;
-+ av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_OBMC;
-+ av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
- return;
- }
- #endif
-@@ -360,9 +364,9 @@
- // Annex K: Slice Structure
- // does not work with eyeBeam
- if (atoi(value) != 0)
-- m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- return;
- }
-
-@@ -370,9 +374,9 @@
- // Annex S: Alternative INTER VLC mode
- // does not work with eyeBeam
- if (atoi(value) == 1)
-- m_context->flags |= CODEC_FLAG_H263P_AIV;
-+ av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
- else
-- m_context->flags &= ~CODEC_FLAG_H263P_AIV;
-+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
- return;
- }
-
-@@ -450,15 +454,6 @@
- PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
- PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
-
-- #define CODEC_TRACER_FLAG(tracer, flag) \
-- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
-- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
- return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
-
-@@ -521,7 +516,7 @@
-
- // Need to copy to local buffer to guarantee 16 byte alignment
- memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
-- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
-
- /*
- m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +598,13 @@
- m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
- m_context->opaque = this; // used to separate out packets from different encode threads
-
-- m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
- m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
- m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
-- m_context->flags &= ~CODEC_FLAG_H263P_AIV;
-- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-
- return true;
- }
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h 2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h 2013-10-08 12:57:25.062873463 +0200
-@@ -115,7 +115,7 @@
- virtual ~H263_Base_EncoderContext();
-
- virtual bool Init() = 0;
-- virtual bool Init(CodecID codecId);
-+ virtual bool Init(AVCodecID codecId);
-
- virtual bool SetOptions(const char * const * options);
- virtual void SetOption(const char * option, const char * value);
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
---- opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in 2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in 2013-10-08 12:57:25.062873463 +0200
-@@ -35,7 +35,7 @@
- $(COMMONDIR)/dyna.cxx
-
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS += @DL_LIBS@
-+LIBS += @DL_LIBS@ @LIBAVUTIL_LIBS@
-
- HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
- ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx 2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx 2013-10-08 12:57:25.062873463 +0200
-@@ -27,6 +27,7 @@
- #include <fstream>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#include <unistd.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx 2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx 2013-10-08 12:57:25.063873450 +0200
-@@ -40,6 +40,9 @@
- #include "plugin-config.h"
- #endif
-
-+#define FF_IDCT_H264 11
-+#define CODEC_FLAG2_SKIP_RD 0x00004000
-+
- #include <codec/opalplugin.hpp>
-
- #include "../common/ffmpeg.h"
-@@ -1071,13 +1074,10 @@
- return false;
-
- m_context->workaround_bugs = FF_BUG_AUTODETECT;
-- m_context->error_recognition = FF_ER_AGGRESSIVE;
- m_context->idct_algo = FF_IDCT_H264;
- m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
- m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
-- m_context->flags2 = CODEC_FLAG2_BRDO |
-- CODEC_FLAG2_MEMC_ONLY |
-- CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
- CODEC_FLAG2_SKIP_RD |
- CODEC_FLAG2_CHUNKS;
-
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx 2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx 2013-10-08 12:57:25.064873438 +0200
-@@ -33,6 +33,7 @@
-
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-02-20 03:18:07.000000000 +0100
-+++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-10-08 12:57:25.064873438 +0200
-@@ -31,7 +31,7 @@
- SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx
-
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS += @DL_LIBS@
-+LIBS += @DL_LIBS@ @LIBAVUTIL_LIBS@
-
- # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
- # Also add libavutil, so ffmpeg headers can #include "log.h".
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-02-20 03:18:07.000000000 +0100
-+++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-10-08 12:57:25.065873425 +0200
-@@ -103,6 +103,7 @@
-
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
-
-@@ -589,17 +590,17 @@
- m_avpicture->quality = m_videoQMin;
-
- #ifdef USE_ORIG
-- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning
-+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
- m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors
- #else
- m_avcontext->max_b_frames=0; /*don't use b frames*/
- m_avcontext->flags|=CODEC_FLAG_AC_PRED;
-- m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+ av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
- /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
- m_avcontext->flags|=CODEC_FLAG_4MV;
- m_avcontext->flags|=CODEC_FLAG_GMC;
- m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
-- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
- m_avcontext->opaque = this; // for use in RTP callback
- }
-@@ -804,7 +805,7 @@
- // Should the next frame be an I-Frame?
- if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
- {
-- m_avpicture->pict_type = FF_I_TYPE;
-+ m_avpicture->pict_type = AV_PICTURE_TYPE_I;
- }
- else // No IFrame requested, let avcodec decide what to do
- {
-@@ -1325,7 +1326,7 @@
-
- void MPEG4DecoderContext::SetStaticDecodingParams() {
- m_avcontext->flags |= CODEC_FLAG_4MV;
-- m_avcontext->flags |= CODEC_FLAG_PART;
-+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
- m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
-
diff --git a/components/library/opal/patches/opal-03-solaris-gcc.patch b/components/library/opal/patches/opal-03-solaris-gcc.patch
deleted file mode 100644
index 02239a9..0000000
--- a/components/library/opal/patches/opal-03-solaris-gcc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- opal-3.6.8/configure.ac.~1~ 2014-02-18 11:02:25.949308528 +0400
-+++ opal-3.6.8/configure.ac 2014-02-18 11:07:29.025522547 +0400
-@@ -193,10 +193,15 @@
- case "$target_os" in
- solaris*)
- SHAREDLIBEXT=so
-- SHARED_CFLAGS="-KPIC -D__inline=inline"
-+ if test "$GXX"="yes"; then
-+ SHARED_CFLAGS="-fPIC";
-+ LDSOOPTS="-shared -Wl,-soname,\$(LIB_FILENAME_SHARED_PAT)"
-+ else
-+ SHARED_CFLAGS="-KPIC -D__inline=inline"
-+ LDSOOPTS="-Bdynamic -G -h \$(LIB_FILENAME_SHARED_PAT)"
-+ fi
- OPAL_DETERMINE_LIBNAMES(DEBUG)
- OPAL_DETERMINE_LIBNAMES(RELEASE)
-- LDSOOPTS="-Bdynamic -G -h \$(LIB_FILENAME_SHARED_PAT)"
-
- DEBUG_CFLAGS="-D_DEBUG"
- HAVE_RANLIB=no
---- opal-3.10.10/plugins/configure.ac.orig 2016-07-31 04:26:47.184409269 +0200
-+++ opal-3.10.10/plugins/configure.ac 2016-07-31 04:27:53.972333891 +0200
-@@ -72,8 +72,14 @@
- LDSO=
- case "$target_os" in
- solaris*)
-- CFLAGS="$CFLAGS -KPIC"
-- LDSO='-Bdynamic -G -h $@'
-+ if test "$GXX"="yes"; then
-+ STDCCFLAGS="$STDCCFLAGS -fPIC"
-+ LDSO='-shared -h $@'
-+ else
-+ STDCCFLAGS="$STDCCFLAGS -KPIC"
-+ LDSO="-Bdynamic -G -h $@"
-+ fi
-+
- PLUGINEXT=so
- AC_CHECK_HEADERS([sys/time.h sys/file.h netinet/in.h])
- AC_FUNC_FORK()
diff --git a/components/library/opal/patches/opal-04-plugins-pic.patch b/components/library/opal/patches/opal-04-plugins-pic.patch
deleted file mode 100644
index 5b002cd..0000000
--- a/components/library/opal/patches/opal-04-plugins-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opal-3.10.10/plugins/plugin-inc.mak.in.orig 2016-07-31 15:42:10.608990027 +0200
-+++ opal-3.10.10/plugins/plugin-inc.mak.in 2016-07-31 15:44:02.151612438 +0200
-@@ -30,7 +30,7 @@
-
- CC := @CC@
- CXX := @CXX@
--CFLAGS += @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
-+CFLAGS += @CFLAGS@ -fPIC -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
- LDFLAGS += @LDFLAGS@ @LDSO@
- PLUGINEXT :=@PLUGINEXT@
-
diff --git a/components/library/opal/patches/opal-05-cxx-fixes.patch b/components/library/opal/patches/opal-05-cxx-fixes.patch
deleted file mode 100644
index 10cc6e8..0000000
--- a/components/library/opal/patches/opal-05-cxx-fixes.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nurb opal-3.10.10.orig/include/h323/h323ep.h opal-3.10.10/include/h323/h323ep.h
---- opal-3.10.10.orig/include/h323/h323ep.h 2013-02-20 03:18:14.000000000 +0100
-+++ opal-3.10.10/include/h323/h323ep.h 2016-07-31 15:45:34.758319854 +0200
-@@ -145,7 +145,7 @@
- OpalCall & call, ///< Owner of connection
- const PString & party, ///< Remote party to call
- void * userData = NULL, ///< Arbitrary data to pass to connection
-- unsigned int options = NULL, ///< options to pass to conneciton
-+ unsigned int options = 0, ///< options to pass to conneciton
- OpalConnection::StringOptions * stringOptions = NULL
- );
- //@}
-diff -Nurb opal-3.10.10.orig/include/opal/manager.h opal-3.10.10/include/opal/manager.h
---- opal-3.10.10.orig/include/opal/manager.h 2013-02-20 03:18:20.000000000 +0100
-+++ opal-3.10.10/include/opal/manager.h 2016-07-31 15:45:34.760096740 +0200
-@@ -1527,7 +1527,7 @@
- PString defaultDisplayName;
-
- BYTE m_defaultMediaTypeOfService;
-- map<OpalMediaType, BYTE> m_mediaTypeOfService;
-+ std::map<OpalMediaType, BYTE> m_mediaTypeOfService;
-
- PINDEX rtpPayloadSizeMax;
- PINDEX rtpPacketSizeMax;
-diff -Nurb opal-3.10.10.orig/include/opal/opalmixer.h opal-3.10.10/include/opal/opalmixer.h
---- opal-3.10.10.orig/include/opal/opalmixer.h 2013-02-20 03:18:20.000000000 +0100
-+++ opal-3.10.10/include/opal/opalmixer.h 2016-07-31 15:45:34.759809722 +0200
-@@ -153,7 +153,7 @@
- struct Stream {
- virtual ~Stream() { }
- virtual void QueuePacket(const RTP_DataFrame & rtp) = 0;
-- queue<RTP_DataFrame> m_queue;
-+ std::queue<RTP_DataFrame> m_queue;
- };
- typedef std::map<Key_T, Stream *> StreamMap_T;
-
-diff -Nurb opal-3.10.10.orig/include/sip/handlers.h opal-3.10.10/include/sip/handlers.h
---- opal-3.10.10.orig/include/sip/handlers.h 2013-02-20 03:18:21.000000000 +0100
-+++ opal-3.10.10/include/sip/handlers.h 2016-07-31 15:45:34.760416421 +0200
-@@ -164,7 +164,7 @@
- int m_originalExpireTime;
- int m_offlineExpireTime;
- State m_state;
-- queue<State> m_stateQueue;
-+ std::queue<State> m_stateQueue;
- bool m_receivedResponse;
- PTimer m_expireTimer;
- SIPURL m_proxy;
-diff -Nurb opal-3.10.10.orig/include/sip/sipcon.h opal-3.10.10/include/sip/sipcon.h
---- opal-3.10.10.orig/include/sip/sipcon.h 2013-02-20 03:18:21.000000000 +0100
-+++ opal-3.10.10/include/sip/sipcon.h 2016-07-31 15:45:34.760509989 +0200
-@@ -738,7 +738,7 @@
- PRACKMode m_prackMode;
- bool m_prackEnabled;
- unsigned m_prackSequenceNumber;
-- queue<SIP_PDU> m_responsePackets;
-+ std::queue<SIP_PDU> m_responsePackets;
- PTimer m_responseFailTimer;
- PTimer m_responseRetryTimer;
- unsigned m_responseRetryCount;
-diff -Nurb opal-3.10.10.orig/plugins/video/common/mpi.cxx opal-3.10.10/plugins/video/common/mpi.cxx
---- opal-3.10.10.orig/plugins/video/common/mpi.cxx 2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/mpi.cxx 2016-07-31 15:45:34.865970421 +0200
-@@ -132,8 +132,8 @@
- // to the desired one or matches it
- for (i=0; i < MPIs.size(); i++) {
- // we square the value in order to get absolute distances
-- distance = ( abs(MPIs[i].width - desiredWidth ) *
-- abs(MPIs[i].height - desiredHeight) );
-+ distance = ( abs(int(MPIs[i].width - desiredWidth)) *
-+ abs(int(MPIs[i].height - desiredHeight)));
-
- if (distance < minDistance) {
- minDistance = distance;
-diff -Nurb opal-3.10.10.orig/src/opal/manager.cxx opal-3.10.10/src/opal/manager.cxx
---- opal-3.10.10.orig/src/opal/manager.cxx 2013-02-20 03:18:31.000000000 +0100
-+++ opal-3.10.10/src/opal/manager.cxx 2016-07-31 15:45:34.774398967 +0200
-@@ -1666,7 +1666,7 @@
-
- BYTE OpalManager::GetMediaTypeOfService(const OpalMediaType & type) const
- {
-- map<OpalMediaType, BYTE>::const_iterator it = m_mediaTypeOfService.find(type);
-+ std::map<OpalMediaType, BYTE>::const_iterator it = m_mediaTypeOfService.find(type);
- return it != m_mediaTypeOfService.end() ? it->second : m_defaultMediaTypeOfService;
- }
-
diff --git a/components/library/opal/patches/opal-06-alloca.patch b/components/library/opal/patches/opal-06-alloca.patch
deleted file mode 100644
index cc9ccfb..0000000
--- a/components/library/opal/patches/opal-06-alloca.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nurb opal-3.10.10.orig/src/codec/opalpluginmgr.cxx opal-3.10.10/src/codec/opalpluginmgr.cxx
---- opal-3.10.10.orig/src/codec/opalpluginmgr.cxx 2013-02-20 03:18:46.000000000 +0100
-+++ opal-3.10.10/src/codec/opalpluginmgr.cxx 2016-07-31 15:45:34.810717429 +0200
-@@ -53,6 +53,8 @@
- #include <codec/vidcodec.h>
- #endif
-
-+#include <alloca.h>
-+
-
- PFACTORY_CREATE_SINGLETON(PFactory<PPluginModuleManager>, OpalPluginCodecManager);
-
-diff -Nurb opal-3.10.10.orig/src/codec/opalwavfile.cxx opal-3.10.10/src/codec/opalwavfile.cxx
---- opal-3.10.10.orig/src/codec/opalwavfile.cxx 2013-02-20 03:18:46.000000000 +0100
-+++ opal-3.10.10/src/codec/opalwavfile.cxx 2016-07-31 15:45:34.811283666 +0200
-@@ -36,6 +36,7 @@
-
- #include <codec/g711codec.h>
-
-+#include <alloca.h>
-
-
- #define new PNEW
-diff -Nurb opal-3.10.10.orig/src/opal/opalmixer.cxx opal-3.10.10/src/opal/opalmixer.cxx
---- opal-3.10.10.orig/src/opal/opalmixer.cxx 2013-02-20 03:18:31.000000000 +0100
-+++ opal-3.10.10/src/opal/opalmixer.cxx 2016-07-31 15:45:34.774532717 +0200
-@@ -41,6 +41,7 @@
- #include <ptlib/vconvert.h>
- #include <ptclib/pwavfile.h>
-
-+#include <alloca.h>
-
- #define DETAIL_LOG_LEVEL 6
-
diff --git a/components/library/opal/patches/opal-07-silk-sdk-flags.patch b/components/library/opal/patches/opal-07-silk-sdk-flags.patch
deleted file mode 100644
index aba9348..0000000
--- a/components/library/opal/patches/opal-07-silk-sdk-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- opal-3.10.10/plugins/audio/SILK/SILK_SDK/Makefile.1 2018-04-05 12:18:27.175755208 +0000
-+++ opal-3.10.10/plugins/audio/SILK/SILK_SDK/Makefile 2018-04-05 12:20:59.804849252 +0000
-@@ -16,7 +16,7 @@
- LIBSUFFIX = .a
- OBJSUFFIX = .o
-
--CC = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
-+CC = $(SILK_CC)
- AR = $(TOOLCHAIN_PREFIX)ar
- RANLIB = $(TOOLCHAIN_PREFIX)ranlib
- CP = $(TOOLCHAIN_PREFIX)cp
-@@ -27,6 +27,8 @@
- ldlibs-from-libs = $(addprefix -l,$(1))
-
- CFLAGS += -Wall -enable-threads -O3 -fPIC
-+CFLAGS += $(SILK_CFLAGS)
-+LDFLAGS += $(SILK_LDFLAGS)
-
- CFLAGS += $(call cflags-from-defines,$(CDEFINES))
- CFLAGS += $(call cflags-from-defines,$(ADDED_DEFINES))
diff --git a/components/library/opal/pkg5 b/components/library/opal/pkg5
index 29e5a5e..903845f 100644
--- a/components/library/opal/pkg5
+++ b/components/library/opal/pkg5
@@ -3,7 +3,9 @@
"codec/libtheora",
"codec/speex",
"library/desktop/ptlib",
+ "library/opus",
"library/speexdsp",
+ "library/video/libvpx",
"system/library",
"system/library/g++-10-runtime",
"system/library/gcc-10-runtime",
--
Gitblit v1.9.3