diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-09-20 21:50:39 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-09-20 21:50:39 +0000 |
| commit | 9e6673f04f2a8178e49b49d1676640bba2149371 (patch) | |
| tree | c62b4e58e684a810c47846f1e9a173a16b0d27d1 /net | |
| parent | Returning maintainership on my multimedia ports to ports@freebsd.org (diff) | |
Move ptlib26, opal3 and ekiga3 to unversioned ports and update to:
ptlib to 2.10.10
opal to 3.10.10
ekiga to 4.0.1
Notes
Notes:
svn path=/head/; revision=327751
Diffstat (limited to 'net')
30 files changed, 366 insertions, 1199 deletions
diff --git a/net/Makefile b/net/Makefile index 504bb44f3c65..2abe471ef7ae 100644 --- a/net/Makefile +++ b/net/Makefile @@ -123,8 +123,6 @@ SUBDIR += easysoap SUBDIR += echoping SUBDIR += ecore-con - SUBDIR += ekiga - SUBDIR += ekiga3 SUBDIR += empty SUBDIR += enet SUBDIR += entitymib @@ -460,7 +458,6 @@ SUBDIR += onioncat SUBDIR += online-desktop SUBDIR += opal - SUBDIR += opal3 SUBDIR += openafs SUBDIR += openam SUBDIR += openbgpd diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile deleted file mode 100644 index 8f4b305fe193..000000000000 --- a/net/ekiga3/Makefile +++ /dev/null @@ -1,134 +0,0 @@ -# Created by: Charlie & <root@ws.ipfw.ru> -# $FreeBSD$ - -PORTNAME= ekiga3 -PORTVERSION= 3.2.6 -PORTREVISION= 10 -CATEGORIES= net -MASTER_SITES= http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/ -DISTNAME= ekiga-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= VoIP and video conferencing application - -LIB_DEPENDS= sigc-2:${PORTSDIR}/devel/libsigc++20 \ - opal-3.6.[6-9]:${PORTSDIR}/net/opal3 -BUILD_DEPENDS= intltoolize:${PORTSDIR}/textproc/intltool \ - p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ - ${LOCALBASE}/bin/scrollkeeper-config:${PORTSDIR}/textproc/rarian - -CONFLICTS= ekiga-2.* - -USE_GCC= any -USE_AUTOTOOLS= libtool -GNU_CONFIGURE= yes -USES= gettext gmake perl5 pkgconfig -USE_XORG= xv -USE_GNOME= gtk20 gnomehack -DIST_SUBDIR= gnome2 -INSTALLS_OMF= yes -INSTALLS_ICONS= yes - -MAN1= ekiga.1 - -OPTIONS_DEFINE= LDAP KDE4 H323 VIDEO NOTIFY EVOLUTION GCONF DBUS AVAHI \ - GNOMEHELP GCONFEDITOR -OPTIONS_DEFAULT=VIDEO NOTIFY GCONF AVAHI -KDE4_DESC= KDE4 support (experimental) -EVOLUTION_DESC= Evolution data server support -GNOMEHELP_DESC= Build Ekiga help files -GCONFEDITOR_DESC=Depend on gconf-editor - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MKDE4} -. if !${PORT_OPTIONS:MDBUS} -BROKEN= Please set DBUS option or remove the KDE4 option! -. endif -USE_KDE4= kdehier kdelibs -USE_QT4= # empty -CONFIGURE_ARGS+= --enable-kde -CONFIGURE_ENV+= KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \ - -I${LOCALBASE}/include" KDE_LIBS="-L${KDE4_PREFIX}/lib" -.else -CONFIGURE_ARGS+= --disable-kde -.endif - -.if ${PORT_OPTIONS:MVIDEO} -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}" -.else -CONFIGURE_ARGS+= --disable-ldap -.endif - -.if ${PORT_OPTIONS:MH323} -CONFIGURE_ARGS+= --enable-h323 -.else -CONFIGURE_ARGS+= --disable-h323 -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify -CONFIGURE_ARGS+= --enable-notify -.else -CONFIGURE_ARGS+= --disable-notify -.endif - -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus -CONFIGURE_ARGS+= --enable-dbus --enable-dbus-service -PLIST_SUB+= DBUS="" -.else -CONFIGURE_ARGS+= --disable-dbus --disable-dbus-service -PLIST_SUB+= DBUS="@comment " -.endif - -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CONFIGURE_ARGS+= --enable-gconf -GCONF_SCHEMAS= ekiga.schemas -PLIST_SUB+= NO_GCONF="@comment " -.else -CONFIGURE_ARGS+= --disable-gconf -PLIST_SUB+= NO_GCONF="" -.endif - -.if ${PORT_OPTIONS:MEVOLUTION} -USE_GNOME+= evolutiondataserver -CONFIGURE_ARGS+= --enable-eds -.else -CONFIGURE_ARGS+= --disable-eds -.endif - -.if ${PORT_OPTIONS:MAVAHI} -CONFIGURE_ARGS+= --enable-avahi -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app -.else -CONFIGURE_ARGS+= --disable-avahi -.endif - -.if ${PORT_OPTIONS:MGCONFEDITOR} -RUN_DEPENDS+= ${LOCALBASE}/bin/gconf-editor:${PORTSDIR}/sysutils/gconf-editor -.endif - -.if ${PORT_OPTIONS:MGNOMEHELP} -PLIST_SUB+= GNOMEHELP="" -USE_GNOME+= gnomedocutils -.else -CONFIGURE_ARGS+= --disable-gdu -PLIST_SUB+= GNOMEHELP="@comment " -.endif - -post-patch: - @${REINPLACE_CMD} -e 's/V4L="enabled"/V4L="disabled"/' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's?^\(KDE_CFLAGS.*\)$$?\1 -I'"${KDE4_PREFIX}/include?" ${WRKSRC}/lib/engine/components/kde/Makefile.in - -post-configure: - @${REINPLACE_CMD} -e 's?^\(CPPFLAGS\) =\(.*\)$$?\1 = '"-I${LOCALBASE}/include"' \2?' ${WRKSRC}/lib/engine/addressbook/Makefile - -.include <bsd.port.mk> diff --git a/net/ekiga3/distinfo b/net/ekiga3/distinfo deleted file mode 100644 index a7a96e901c8d..000000000000 --- a/net/ekiga3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gnome2/ekiga-3.2.6.tar.gz) = 92e91a92fa13c9634c9cc35282a6db0f0d0bd4fed999d343bb54f9c993bc873f -SIZE (gnome2/ekiga-3.2.6.tar.gz) = 9939808 diff --git a/net/ekiga3/files/patch-configure b/net/ekiga3/files/patch-configure deleted file mode 100644 index 79bfbea51ed0..000000000000 --- a/net/ekiga3/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2010-08-28 15:04:35.000000000 -0400 -+++ configure 2010-08-28 15:05:31.000000000 -0400 -@@ -17255,7 +17255,7 @@ if test -n "$PKG_CONFIG"; then - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` -+ pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -17273,7 +17273,7 @@ if test -n "$PKG_CONFIG"; then - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` -+ pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null` - else - pkg_failed=yes - fi diff --git a/net/ekiga3/files/patch-halodbus.diff b/net/ekiga3/files/patch-halodbus.diff deleted file mode 100644 index b5ce29cf143e..000000000000 --- a/net/ekiga3/files/patch-halodbus.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/engine/components/hal-dbus/Makefile.in.orig 2009-10-25 01:38:37.000000000 +0400 -+++ lib/engine/components/hal-dbus/Makefile.in 2009-10-25 01:38:58.000000000 +0400 -@@ -648,10 +648,10 @@ - - - hal-marshal.h: hal-marshal.list -- $(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $@.tmp && mv $@.tmp $@ -+ $(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header < hal-marshal.list > $@.tmp && mv $@.tmp $@ - - hal-marshal.c: hal-marshal.list -- $(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body > $@.tmp && mv $@.tmp $@ -+ $(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body < hal-marshal.list > $@.tmp && mv $@.tmp $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp deleted file mode 100644 index 5b5f5c23b63e..000000000000 --- a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/engine/components/libnotify/libnotify-main.cpp.orig 2009-09-22 16:27:35.000000000 +0200 -+++ lib/engine/components/libnotify/libnotify-main.cpp 2011-03-08 22:11:18.000000000 +0100 -@@ -38,6 +38,7 @@ - #include <map> - #include <tr1/memory> - -+#include <gtk/gtk.h> - #include <libnotify/notify.h> - - #include "services.h" -@@ -158,7 +159,7 @@ LibNotify::on_notification_added (gmref_ - - notif = notify_notification_new (notification->get_title ().c_str (), - notification->get_body ().c_str (), -- urgency, NULL); -+ urgency); - - g_signal_connect (notif, "closed", - G_CALLBACK (on_notif_closed), notification.get ()); diff --git a/net/ekiga3/files/patch-src_gui_main.cpp b/net/ekiga3/files/patch-src_gui_main.cpp deleted file mode 100644 index 3982ef64fb96..000000000000 --- a/net/ekiga3/files/patch-src_gui_main.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/gui/main.cpp.orig 2011-03-08 22:31:52.000000000 +0100 -+++ src/gui/main.cpp 2011-03-08 22:47:35.000000000 +0100 -@@ -2807,12 +2807,11 @@ ekiga_main_window_incoming_call_notify ( - - body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); - -- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); -+ notify = notify_notification_new (title, body, GM_ICON_LOGO); - notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); - notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); - notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); - notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); -- notify_notification_attach_to_status_icon (notify, statusicon); - if (!notify_notification_show (notify, NULL)) { - ekiga_main_window_incoming_call_dialog_show (mw, call); - } diff --git a/net/ekiga3/pkg-descr b/net/ekiga3/pkg-descr deleted file mode 100644 index 7ff17aa4df8b..000000000000 --- a/net/ekiga3/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Ekiga (formely known as GnomeMeeting) is an open source -VoIP and video conferencing application for GNOME/KDE. -Ekiga uses both the H.323 and SIP protocols. - -WWW: http://ekiga.org diff --git a/net/ekiga3/pkg-plist b/net/ekiga3/pkg-plist deleted file mode 100644 index 8f731ef4cd70..000000000000 --- a/net/ekiga3/pkg-plist +++ /dev/null @@ -1,539 +0,0 @@ -bin/ekiga -bin/ekiga-config-tool -%%DBUS%%bin/ekiga-helper -%%NO_GCONF%%etc/ekiga/ekiga.schemas -share/locale/am/LC_MESSAGES/ekiga.mo -share/locale/ar/LC_MESSAGES/ekiga.mo -share/locale/as/LC_MESSAGES/ekiga.mo -share/locale/az/LC_MESSAGES/ekiga.mo -share/locale/be/LC_MESSAGES/ekiga.mo -share/locale/bg/LC_MESSAGES/ekiga.mo -share/locale/bn/LC_MESSAGES/ekiga.mo -share/locale/bn_IN/LC_MESSAGES/ekiga.mo -share/locale/bs/LC_MESSAGES/ekiga.mo -share/locale/ca/LC_MESSAGES/ekiga.mo -share/locale/ca@valencia/LC_MESSAGES/ekiga.mo -share/locale/crh/LC_MESSAGES/ekiga.mo -share/locale/cs/LC_MESSAGES/ekiga.mo -share/locale/cy/LC_MESSAGES/ekiga.mo -share/locale/da/LC_MESSAGES/ekiga.mo -share/locale/de/LC_MESSAGES/ekiga.mo -share/locale/dz/LC_MESSAGES/ekiga.mo -share/locale/el/LC_MESSAGES/ekiga.mo -share/locale/en_CA/LC_MESSAGES/ekiga.mo -share/locale/en_GB/LC_MESSAGES/ekiga.mo -share/locale/eo/LC_MESSAGES/ekiga.mo -share/locale/es/LC_MESSAGES/ekiga.mo -share/locale/et/LC_MESSAGES/ekiga.mo -share/locale/eu/LC_MESSAGES/ekiga.mo -share/locale/fa/LC_MESSAGES/ekiga.mo -share/locale/fi/LC_MESSAGES/ekiga.mo -share/locale/fr/LC_MESSAGES/ekiga.mo -share/locale/ga/LC_MESSAGES/ekiga.mo -share/locale/gl/LC_MESSAGES/ekiga.mo -share/locale/gu/LC_MESSAGES/ekiga.mo -share/locale/he/LC_MESSAGES/ekiga.mo -share/locale/hi/LC_MESSAGES/ekiga.mo -share/locale/hr/LC_MESSAGES/ekiga.mo -share/locale/hu/LC_MESSAGES/ekiga.mo -share/locale/id/LC_MESSAGES/ekiga.mo -share/locale/is/LC_MESSAGES/ekiga.mo -share/locale/it/LC_MESSAGES/ekiga.mo -share/locale/ja/LC_MESSAGES/ekiga.mo -share/locale/ka/LC_MESSAGES/ekiga.mo -share/locale/kn/LC_MESSAGES/ekiga.mo -share/locale/ko/LC_MESSAGES/ekiga.mo -share/locale/ku/LC_MESSAGES/ekiga.mo -share/locale/lt/LC_MESSAGES/ekiga.mo -share/locale/lv/LC_MESSAGES/ekiga.mo -share/locale/mai/LC_MESSAGES/ekiga.mo -share/locale/mk/LC_MESSAGES/ekiga.mo -share/locale/ml/LC_MESSAGES/ekiga.mo -share/locale/mn/LC_MESSAGES/ekiga.mo -share/locale/mr/LC_MESSAGES/ekiga.mo -share/locale/ms/LC_MESSAGES/ekiga.mo -share/locale/nb/LC_MESSAGES/ekiga.mo -share/locale/ne/LC_MESSAGES/ekiga.mo -share/locale/nl/LC_MESSAGES/ekiga.mo -share/locale/nn/LC_MESSAGES/ekiga.mo -share/locale/oc/LC_MESSAGES/ekiga.mo -share/locale/or/LC_MESSAGES/ekiga.mo -share/locale/pa/LC_MESSAGES/ekiga.mo -share/locale/pl/LC_MESSAGES/ekiga.mo -share/locale/pt/LC_MESSAGES/ekiga.mo -share/locale/pt_BR/LC_MESSAGES/ekiga.mo -share/locale/ro/LC_MESSAGES/ekiga.mo -share/locale/ru/LC_MESSAGES/ekiga.mo -share/locale/rw/LC_MESSAGES/ekiga.mo -share/locale/si/LC_MESSAGES/ekiga.mo -share/locale/sk/LC_MESSAGES/ekiga.mo -share/locale/sl/LC_MESSAGES/ekiga.mo -share/locale/sq/LC_MESSAGES/ekiga.mo -share/locale/sr/LC_MESSAGES/ekiga.mo -share/locale/sr@latin/LC_MESSAGES/ekiga.mo -share/locale/sv/LC_MESSAGES/ekiga.mo -share/locale/ta/LC_MESSAGES/ekiga.mo -share/locale/te/LC_MESSAGES/ekiga.mo -share/locale/th/LC_MESSAGES/ekiga.mo -share/locale/tr/LC_MESSAGES/ekiga.mo -share/locale/uk/LC_MESSAGES/ekiga.mo -share/locale/vi/LC_MESSAGES/ekiga.mo -share/locale/wa/LC_MESSAGES/ekiga.mo -share/locale/xh/LC_MESSAGES/ekiga.mo -share/locale/zh_CN/LC_MESSAGES/ekiga.mo -share/locale/zh_HK/LC_MESSAGES/ekiga.mo -share/locale/zh_TW/LC_MESSAGES/ekiga.mo -share/applications/ekiga.desktop -%%DBUS%%share/dbus-1/services/org.ekiga.Ekiga.service -%%DBUS%%share/dbus-1/services/org.ekiga.Helper.service -%%GNOMEHELP%%share/gnome/help/ekiga/C/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/lumi.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d2.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d3.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d4.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d5.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d6.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d7.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/lumi.png -share/icons/hicolor/128x128/apps/ekiga.png -share/icons/hicolor/16x16/apps/ekiga.png -share/icons/hicolor/22x22/apps/ekiga.png -share/icons/hicolor/32x32/apps/ekiga.png -share/icons/hicolor/48x48/apps/ekiga.png -share/icons/hicolor/64x64/apps/ekiga.png -share/icons/hicolor/72x72/apps/ekiga.png -%%GNOMEHELP%%share/omf/ekiga/ekiga-C.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-bg.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-ca.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-de.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-el.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-en_GB.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-es.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-eu.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-fi.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-fr.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-oc.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-pt_BR.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-ru.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-sv.omf -%%GNOMEHELP%%share/omf/ekiga/ekiga-uk.omf -share/pixmaps/ekiga/ekiga-logo.png -share/sounds/ekiga/busytone.wav -share/sounds/ekiga/dialtone.wav -share/sounds/ekiga/newmessage.wav -share/sounds/ekiga/ring.wav -share/sounds/ekiga/voicemail.wav -@dirrm share/pixmaps/ekiga -@dirrm share/sounds/ekiga -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/wa/LC_MESSAGES -@dirrmtry share/locale/wa -@dirrmtry share/locale/vi/LC_MESSAGES -@dirrmtry share/locale/vi -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk -@dirrmtry share/locale/tr/LC_MESSAGES -@dirrmtry share/locale/tr -@dirrmtry share/locale/th/LC_MESSAGES -@dirrmtry share/locale/th -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/ta/LC_MESSAGES -@dirrmtry share/locale/ta -@dirrmtry share/locale/sv/LC_MESSAGES -@dirrmtry share/locale/sv -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/sr/LC_MESSAGES -@dirrmtry share/locale/sr -@dirrmtry share/locale/sq/LC_MESSAGES -@dirrmtry share/locale/sq -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/ru/LC_MESSAGES -@dirrmtry share/locale/ru -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro -@dirrmtry share/locale/pt_BR/LC_MESSAGES -@dirrmtry share/locale/pt_BR -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/pa/LC_MESSAGES -@dirrmtry share/locale/pa -@dirrmtry share/locale/or/LC_MESSAGES -@dirrmtry share/locale/or -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/nl/LC_MESSAGES -@dirrmtry share/locale/nl -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne -@dirrmtry share/locale/nb/LC_MESSAGES -@dirrmtry share/locale/nb -@dirrmtry share/locale/ms/LC_MESSAGES -@dirrmtry share/locale/ms -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mn/LC_MESSAGES -@dirrmtry share/locale/mn -@dirrmtry share/locale/ml/LC_MESSAGES -@dirrmtry share/locale/ml -@dirrmtry share/locale/mk/LC_MESSAGES -@dirrmtry share/locale/mk -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/lv/LC_MESSAGES -@dirrmtry share/locale/lv -@dirrmtry share/locale/lt/LC_MESSAGES -@dirrmtry share/locale/lt -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko -@dirrmtry share/locale/kn/LC_MESSAGES -@dirrmtry share/locale/kn -@dirrmtry share/locale/ka/LC_MESSAGES -@dirrmtry share/locale/ka -@dirrmtry share/locale/ja/LC_MESSAGES -@dirrmtry share/locale/ja -@dirrmtry share/locale/it/LC_MESSAGES -@dirrmtry share/locale/it -@dirrmtry share/locale/is/LC_MESSAGES -@dirrmtry share/locale/is -@dirrmtry share/locale/id/LC_MESSAGES -@dirrmtry share/locale/id -@dirrmtry share/locale/hu/LC_MESSAGES -@dirrmtry share/locale/hu -@dirrmtry share/locale/hr/LC_MESSAGES -@dirrmtry share/locale/hr -@dirrmtry share/locale/hi/LC_MESSAGES -@dirrmtry share/locale/hi -@dirrmtry share/locale/he/LC_MESSAGES -@dirrmtry share/locale/he -@dirrmtry share/locale/gu/LC_MESSAGES -@dirrmtry share/locale/gu -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/ga/LC_MESSAGES -@dirrmtry share/locale/ga -@dirrmtry share/locale/fr/LC_MESSAGES -@dirrmtry share/locale/fr -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/fa/LC_MESSAGES -@dirrmtry share/locale/fa -@dirrmtry share/locale/eu/LC_MESSAGES -@dirrmtry share/locale/eu -@dirrmtry share/locale/et/LC_MESSAGES -@dirrmtry share/locale/et -@dirrmtry share/locale/es/LC_MESSAGES -@dirrmtry share/locale/es -@dirrmtry share/locale/eo/LC_MESSAGES -@dirrmtry share/locale/eo -@dirrmtry share/locale/en_GB/LC_MESSAGES -@dirrmtry share/locale/en_GB -@dirrmtry share/locale/en_CA/LC_MESSAGES -@dirrmtry share/locale/en_CA -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/de/LC_MESSAGES -@dirrmtry share/locale/de -@dirrmtry share/locale/da/LC_MESSAGES -@dirrmtry share/locale/da -@dirrmtry share/locale/cy/LC_MESSAGES -@dirrmtry share/locale/cy -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/crh/LC_MESSAGES -@dirrmtry share/locale/crh -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca -@dirrmtry share/locale/bs/LC_MESSAGES -@dirrmtry share/locale/bs -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/bn/LC_MESSAGES -@dirrmtry share/locale/bn -@dirrmtry share/locale/bg/LC_MESSAGES -@dirrmtry share/locale/bg -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be -@dirrmtry share/locale/az/LC_MESSAGES -@dirrmtry share/locale/az -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as -@dirrmtry share/locale/ar/LC_MESSAGES -@dirrmtry share/locale/ar -@dirrmtry share/locale/am/LC_MESSAGES -@dirrmtry share/locale/am -@dirrmtry share/locale -%%GNOMEHELP%%@dirrm share/omf/ekiga -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/uk/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/uk -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sv/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sv -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ru/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ru -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/pt_BR/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/pt_BR -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/oc/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/oc -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fr/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fr -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fi/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fi -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/eu/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/eu -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/es/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/es -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/en_GB/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/en_GB -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/el/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/el -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/de/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/de -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ca/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ca -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/bg/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/bg -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/C/figures -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/C -%%GNOMEHELP%%@dirrm share/gnome/help/ekiga -@dirrmtry share/applications diff --git a/net/opal3/Makefile b/net/opal/Makefile index 58608051b3bb..c533d6ce1313 100644 --- a/net/opal3/Makefile +++ b/net/opal/Makefile @@ -1,28 +1,20 @@ # Created by: Roger Hardiman <roger@freebsd.org> # $FreeBSD$ -PORTNAME= opal3 -PORTVERSION= 3.6.6 -PORTREVISION= 17 +PORTNAME= opal +PORTVERSION= 3.10.10 CATEGORIES= net MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/${PORTNAME:S|3||g}/${PORTVERSION:R} -DISTNAME= opal-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= VoIP abstraction library LICENSE= MPL -LIB_DEPENDS= pt-2.6.[4-9]:${PORTSDIR}/devel/ptlib26 +LIB_DEPENDS= libpt.so:${PORTSDIR}/devel/ptlib -CONFLICTS= opal-2.* - -WRKSRC= ${WRKDIR}/opal-${PORTVERSION} - -USE_GCC= any -USE_BZIP2= yes -USES= pathfix gmake pkgconfig +USE_XZ= yes +USES= gmake pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -30,35 +22,42 @@ CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= ZRTP JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ - H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO AEC +OPTIONS_DEFINE= JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ + H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ + AEC DEBUG RUBY +# ZRTP +# MSRP = plist extra line vpd? +# RTPTEXT disable == build fail, so make it default? OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ RTPTEXT LID AEC +DEBUG_DESC= Install debug library ZRTP_DESC= ZRTP protocol support JAVA_DESC= Java JNI support +RUBY_DESC= Ruby support CELT_DESC= Celt codec from ports ILBC_DESC= iLBC codec from ports -GSM_DESC= GSM codec from ports +GSM_DESC= GSM 06.10 codec from ports SPEEX_DESC= SPEEX codec from ports -THEORA_DESC= Theora codec support +THEORA_DESC= Theora codec support FFMPEG_DESC= Ffmpeg codec support X264_DESC= x.264 codec support SIP_DESC= SIP protocol support H323_DESC= H.323 protocol support IAX_DESC= IAX2 protocol support H224_DESC= H.224 control protocol -H281_DESC= H.281 (Far End Camera Control) +H281_DESC= H.281 (Far End Camera Control) protocol support FAX_DESC= Fax T.38 support MSRP_DESC= MSRP protocol SIPIM_DESC= SIP-IM protocol -RTPTEXT_DESC= RFC4103 Text RTP payload +RTPTEXT_DESC= RFC4103 Text RTP payload support H450_DESC= H.450 H.323 subset H460_DESC= H.460 H.323 extension for NAT traversal H501_DESC= H.501 H323 mobility extensions -LID_DESC= LID (Light-Weight Identity) support +LID_DESC= Light-Weight Identity (incl. xJack cards and voicetronix vpb) support UVIDEO_DESC= RFC4175 uncompressed video RTP payload AEC_DESC= Accoustic echo cancellation +NO_STAGE= yes .include <bsd.port.options.mk> .ifdef OPALDIR @@ -66,28 +65,42 @@ AEC_DESC= Accoustic echo cancellation to "make". Please unset it and restart the build. .endif -PLIST_SUB+= PORTVERSION=${PORTVERSION} \ - PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g} \ - PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//} +PLIST_SUB+= VERSION=${PORTVERSION} \ + PVERSION_MAJOR=${PVERSION_MAJOR} \ + PVERSION_MINOR=${PVERSION_MINOR} -.if ${PORT_OPTIONS:MZRTP} +PVERSION_MAJOR= ${PORTVERSION:C/.[0-9]+.[0-9]+$//g} +PVERSION_MINOR= ${PORTVERSION:C/.[0-9]+$//g} + +.if ${PORT_OPTIONS:MDEBUG} +ALL_TARGET= debug opt +PLIST_SUB+= DEBUG="" +.else +ALL_TARGET= opt +PLIST_SUB+= DEBUG="@comment " +.endif + +# libzrtpcpp uses port ssl, which will conflict with this port since we use +# base ssl. +#.if ${PORT_OPTIONS:MZRTP} +.if 0 .if !defined(SAFE_ZRTP) IGNORE= please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set .endif -LIB_DEPENDS+= zrtpcpp:${PORTSDIR}/devel/libzrtpcpp +LIB_DEPENDS+= libzrtpcpp.so:${PORTSDIR}/devel/libzrtpcpp CONFIGURE_ARGS+= --enable-zrtp .else CONFIGURE_ARGS+= --disable-zrtp .endif .if ${PORT_OPTIONS:MGSM} -LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm +LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm .else CONFIGURE_ARGS+= --enable-localgsm .endif .if ${PORT_OPTIONS:MSPEEX} -LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex +LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex .else CONFIGURE_ARGS+= --enable-localspeex .endif @@ -98,8 +111,14 @@ CONFIGURE_ARGS+= --enable-java CONFIGURE_ARGS+= --disable-java .endif +.if ${PORT_OPTIONS:MRUBY} +CONFIGURE_ARGS+= --enable-ruby +.else +CONFIGURE_ARGS+= --disable-ruby +.endif + .if ${PORT_OPTIONS:MCELT} -LIB_DEPENDS+= celt0:${PORTSDIR}/audio/celt +LIB_DEPENDS+= libcelt0.so:${PORTSDIR}/audio/celt CONFIGURE_ARGS+= --enable-celt PLIST_SUB+= CELT="" .else @@ -108,14 +127,13 @@ PLIST_SUB+= CELT="@comment " .endif .if ${PORT_OPTIONS:MILBC} -LIB_DEPENDS+= ilbc:${PORTSDIR}/net/ilbc +LIB_DEPENDS+= libilbc.so:${PORTSDIR}/net/ilbc .else CONFIGURE_ARGS+= --enable-localilbc .endif .if ${PORT_OPTIONS:MTHEORA} -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora \ - ogg:${PORTSDIR}/audio/libogg +LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-theora PLIST_SUB+= THEORA="" WITH_VIDEO= yes @@ -124,26 +142,27 @@ CONFIGURE_ARGS+= --disable-theora PLIST_SUB+= THEORA="@comment " .endif -.if ${PORT_OPTIONS:MX264} -LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 -CONFIGURE_ARGS+= --enable-h264 +.if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG} +LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/x264 +CONFIGURE_ARGS+= --enable-x264 PLIST_SUB+= X264="" WITH_VIDEO= yes +# work around some weirdness in plugins/configure where it looses the +# cflags/libs of x264 +CONFIGURE_ENV+= X264_CFLAGS="`pkg-config --cflags x264`" \ + X264_LIBS="`pkg-config --libs x264`" .else -CONFIGURE_ARGS+= --disable-h264 +CONFIGURE_ARGS+= --disable-x264 PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -CONFIGURE_ARGS+= --enable-ffmpeg --enable-ffmpeg-h263 -CONFIGURE_ENV+= ac_cv_lib_avcodec_h263p_encoder=yes \ - ac_cv_lib_avcodec_h264_decoder=yes \ - ac_cv_lib_avcodec_mpeg4_encoder=yes +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+= --enable-libavcodec PLIST_SUB+= FFMPEG="" WITH_VIDEO= yes .else -CONFIGURE_ARGS+= --disable-ffmpeg --disable-ffmpeg-h263 +CONFIGURE_ARGS+= --disable-libavcodec PLIST_SUB+= FFMPEG="@comment " .endif @@ -169,9 +188,9 @@ CONFIGURE_ARGS+= --disable-h323 .endif .if ${PORT_OPTIONS:MIAX} -CONFIGURE_ARGS+= --enable-iax +CONFIGURE_ARGS+= --enable-iax2 .else -CONFIGURE_ARGS+= --disable-iax +CONFIGURE_ARGS+= --disable-iax2 .endif .if ${PORT_OPTIONS:MH224} @@ -188,8 +207,8 @@ CONFIGURE_ARGS+= --disable-h281 # keep version in lib_depend, to see the difference between spandsp-devel and normal .if ${PORT_OPTIONS:MFAX} -LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel -CONFIGURE_ARGS+= --enable-fax --enable-t38 +LIB_DEPENDS+= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38 PLIST_SUB+= FAX="" .else CONFIGURE_ARGS+= --disable-fax --disable-t38 --disable-spandsp @@ -247,29 +266,32 @@ CONFIGURE_ARGS+= --enable-rfc4175 CONFIGURE_ARGS+= --disable-rfc4175 .endif +# xxxx +.if ${PORT_OPTIONS:MXXXX} +CONFIGURE_ARGS+= --enable-rfc2435 +.else +CONFIGURE_ARGS+= --disable-rfc2435 +.endif + .if ${PORT_OPTIONS:MAEC} CONFIGURE_ARGS+= --enable-aec .else CONFIGURE_ARGS+= --disable-aec .endif +# ?? CONFIGURE_ARGS+= --disable-debug -post-patch: - @${REINPLACE_CMD} -e 's?-lopal?-lopal-${PORTVERSION:C/.[0-9]+$//g}?' ${WRKSRC}/opal.pc.in - @${REINPLACE_CMD} -e 's?^LIBS="-lilbc?LIBS="-lilbc -lm?' ${WRKSRC}/plugins/configure - @${REINPLACE_CMD} -e 's/^\(EXTRACCFLAGS.*\)/\1 -I\/usr\/local\/include/' ${WRKSRC}/plugins/*/*/Makefile.in - @${REINPLACE_CMD} -e 's?^EXTRALIBS = $(GSM_LIBS)?EXTRALIBS = $(GSM_LIBS) -L/usr/local/lib?' ${WRKSRC}/plugins/audio/GSM0610/Makefile.in - @${REINPLACE_CMD} -e 's?^EXTRALIBS = $(ILBC_LIBS)?EXTRALIBS = $(ILBC_LIBS) -L/usr/local/lib?' ${WRKSRC}/plugins/audio/iLBC/Makefile.in - @${REINPLACE_CMD} -e 's?ILBC_CFLAGS=""?ILBC_CFLAGS="-L/usr/local/lib"?' ${WRKSRC}/plugins/configure - @${REINPLACE_CMD} -e 's?^\(EXTRALIBS\)\(.*\)?\1\2 -L/usr/local/lib?' ${WRKSRC}/plugins/fax/fax_spandsp/Makefile.in - @${REINPLACE_CMD} -e 's?@@SO_VER@@?'${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}'?g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's?@@SO_MAJ@@?'${PORTVERSION:C/.[0-9]+$//g}'.so?g' ${WRKSRC}/Makefile.in -.if ! ${PORT_OPTIONS:MDEBUG} - @${REINPLACE_CMD} -e 's/^\(all:\).*/\1 optdepend opt/' ${WRKSRC}/Makefile.in -.endif +# configure flags not used +CONFIGURE_ARGS+= --disable-gsmamr \ + --disable-ruby -post-configure: - @${REINPLACE_CMD} -e 's?\$$(LIB_FILENAME_SHARED_PAT)?libopal-${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}?' ${WRKSRC}/opal_defs.mak +post-install: + ${LN} -sf libopal.so.${PORTVERSION} ${PREFIX}/lib/libopal.so.${PVERSION_MAJOR} + ${LN} -sf libopal.so.${PORTVERSION} ${PREFIX}/lib/libopal.so.${PVERSION_MINOR} +.if ${PORT_OPTIONS:MDEBUG} + ${LN} -sf libopal_d.so.${PORTVERSION} ${PREFIX}/lib/libopal_d.so.${PVERSION_MAJOR} + ${LN} -sf libopal_d.so.${PORTVERSION} ${PREFIX}/lib/libopal_d.so.${PVERSION_MINOR} +.endif .include <bsd.port.mk> diff --git a/net/opal/distinfo b/net/opal/distinfo new file mode 100644 index 000000000000..7cbf2a283067 --- /dev/null +++ b/net/opal/distinfo @@ -0,0 +1,2 @@ +SHA256 (opal-3.10.10.tar.xz) = f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864 +SIZE (opal-3.10.10.tar.xz) = 5886812 diff --git a/net/opal/files/patch-Makefile.in b/net/opal/files/patch-Makefile.in new file mode 100644 index 000000000000..98d4b537af17 --- /dev/null +++ b/net/opal/files/patch-Makefile.in @@ -0,0 +1,15 @@ +--- Makefile.in.orig 2013-07-11 10:39:04.000000000 +0200 ++++ Makefile.in 2013-07-11 10:39:56.000000000 +0200 +@@ -666,12 +666,6 @@ + + install: + mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir) +- ( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) ; then \ +- $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) ; \ +- fi ) +- ( if test -e $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_STATIC) ; then \ +- $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) ; \ +- fi ) + ( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) ; then \ + $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir) ; \ + ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(LIB_FILENAME_SHARED) ; \ diff --git a/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile b/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile new file mode 100644 index 000000000000..9bc63799b9a1 --- /dev/null +++ b/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile @@ -0,0 +1,17 @@ +--- plugins/audio/SILK/SILK_SDK/Makefile.orig 2013-09-17 11:51:45.000000000 +0200 ++++ plugins/audio/SILK/SILK_SDK/Makefile 2013-09-17 11:55:40.000000000 +0200 +@@ -16,10 +16,10 @@ + LIBSUFFIX = .a + OBJSUFFIX = .o + +-CC = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX) +-AR = $(TOOLCHAIN_PREFIX)ar +-RANLIB = $(TOOLCHAIN_PREFIX)ranlib +-CP = $(TOOLCHAIN_PREFIX)cp ++CC ?= $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX) ++AR ?= $(TOOLCHAIN_PREFIX)ar ++RANLIB ?= $(TOOLCHAIN_PREFIX)ranlib ++CP ?= $(TOOLCHAIN_PREFIX)cp + + cflags-from-defines = $(addprefix -D,$(1)) + cflags-from-includes = $(addprefix -I,$(1)) diff --git a/net/opal/files/patch-plugins_configure b/net/opal/files/patch-plugins_configure new file mode 100644 index 000000000000..d93d437ebde4 --- /dev/null +++ b/net/opal/files/patch-plugins_configure @@ -0,0 +1,189 @@ +--- plugins/configure.orig 2013-07-09 00:25:14.000000000 +0200 ++++ plugins/configure 2013-07-09 00:28:04.000000000 +0200 +@@ -6924,7 +6924,7 @@ + if test "x${HAVE_GSM0610}" = "xyes" ; then + ac_config_files="$ac_config_files audio/GSM0610/Makefile" + +- SUBDIRS+=" audio/GSM0610" ++ SUBDIRS="${SUBDIRS} audio/GSM0610" + + # Check whether --enable-localgsm was given. + if test "${enable_localgsm+set}" = set; then : +@@ -7181,7 +7181,7 @@ + if test "x${HAVE_GSMAMR}" = "xyes" ; then + ac_config_files="$ac_config_files audio/gsm-amr/Makefile" + +- SUBDIRS+=" audio/gsm-amr" ++ SUBDIRS="${SUBDIRS} audio/gsm-amr" + fi + + +@@ -7199,7 +7199,7 @@ + if test "x${HAVE_iLBC}" = "xyes" ; then + ac_config_files="$ac_config_files audio/iLBC/Makefile" + +- SUBDIRS+=" audio/iLBC" ++ SUBDIRS="${SUBDIRS} audio/iLBC" + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -8632,7 +8632,7 @@ + + ac_config_files="$ac_config_files audio/Speex/Makefile" + +- SUBDIRS+=" audio/Speex" ++ SUBDIRS="${SUBDIRS} audio/Speex" + + + old_CFLAGS="$CFLAGS" +@@ -9002,7 +9002,7 @@ + if test "x${HAVE_G722}" = "xyes" ; then + ac_config_files="$ac_config_files audio/G722/Makefile" + +- SUBDIRS+=" audio/G722" ++ SUBDIRS="${SUBDIRS} audio/G722" + fi + + +@@ -9020,7 +9020,7 @@ + if test "x${HAVE_G7221}" = "xyes" ; then + ac_config_files="$ac_config_files audio/G.722.1/Makefile" + +- SUBDIRS+=" audio/G.722.1" ++ SUBDIRS="${SUBDIRS} audio/G.722.1" + fi + + +@@ -9038,7 +9038,7 @@ + if test "x${HAVE_G7222}" = "xyes" ; then + ac_config_files="$ac_config_files audio/G.722.2/Makefile" + +- SUBDIRS+=" audio/G.722.2" ++ SUBDIRS="${SUBDIRS} audio/G.722.2" + fi + + +@@ -9056,7 +9056,7 @@ + if test "x${HAVE_G726}" = "xyes" ; then + ac_config_files="$ac_config_files audio/G726/Makefile" + +- SUBDIRS+=" audio/G726" ++ SUBDIRS="${SUBDIRS} audio/G726" + fi + + +@@ -9074,7 +9074,7 @@ + if test "x${HAVE_LPC10}" = "xyes" ; then + ac_config_files="$ac_config_files audio/LPC_10/Makefile" + +- SUBDIRS+=" audio/LPC_10" ++ SUBDIRS="${SUBDIRS} audio/LPC_10" + fi + + +@@ -9092,7 +9092,7 @@ + if test "x${HAVE_IMA_ADPCM}" = "xyes" ; then + ac_config_files="$ac_config_files audio/IMA_ADPCM/Makefile" + +- SUBDIRS+=" audio/IMA_ADPCM" ++ SUBDIRS="${SUBDIRS} audio/IMA_ADPCM" + fi + + +@@ -9155,7 +9155,7 @@ + if test "x${HAVE_SBC}" = "xyes" ; then + ac_config_files="$ac_config_files audio/SBC/Makefile" + +- SUBDIRS+=" audio/SBC" ++ SUBDIRS="${SUBDIRS} audio/SBC" + fi + + +@@ -9251,7 +9251,7 @@ + sed -e "s/\./*10000+/" -e "s/\./*100+/"`\"" + ac_config_files="$ac_config_files audio/celt/Makefile" + +- SUBDIRS+=" audio/celt" ++ SUBDIRS="${SUBDIRS} audio/celt" + fi + + +@@ -9269,7 +9269,7 @@ + if test "x${HAVE_SILK}" = "xyes" ; then + ac_config_files="$ac_config_files audio/SILK/Makefile" + +- SUBDIRS+=" audio/SILK" ++ SUBDIRS="${SUBDIRS} audio/SILK" + fi + + +@@ -9288,7 +9288,7 @@ + if test "x${HAVE_H261}" = "xyes" ; then + ac_config_files="$ac_config_files video/H.261-vic/Makefile" + +- SUBDIRS+=" video/H.261-vic" ++ SUBDIRS="${SUBDIRS} video/H.261-vic" + fi + + +@@ -9717,13 +9717,13 @@ + if test "x${HAVE_LIBAVCODEC}" = "xyes"; then + ac_config_files="$ac_config_files video/H.263-1998/Makefile" + +- SUBDIRS+=" video/H.263-1998" ++ SUBDIRS="${SUBDIRS} video/H.263-1998" + fi + + if test "x${HAVE_LIBAVCODEC}" = "xyes"; then + ac_config_files="$ac_config_files video/MPEG4-ffmpeg/Makefile" + +- SUBDIRS+=" video/MPEG4-ffmpeg" ++ SUBDIRS="${SUBDIRS} video/MPEG4-ffmpeg" + fi + + +@@ -9875,7 +9875,7 @@ + fi + + +- SUBDIRS+=" video/H.264" ++ SUBDIRS="${SUBDIRS} video/H.264" + ac_config_files="$ac_config_files video/H.264/Makefile" + + ac_config_files="$ac_config_files video/H.264/gpl/Makefile" +@@ -9973,7 +9973,7 @@ + if test "x$HAVE_THEORA" = "xyes" ; then + ac_config_files="$ac_config_files video/THEORA/Makefile" + +- SUBDIRS+=" video/THEORA" ++ SUBDIRS="${SUBDIRS} video/THEORA" + fi + + +@@ -10054,7 +10054,7 @@ + if test "x$HAVE_IXJ" = "xyes" ; then + ac_config_files="$ac_config_files LID/IxJ/Makefile" + +- SUBDIRS+=" LID/IxJ" ++ SUBDIRS="${SUBDIRS} LID/IxJ" + fi + + if test -d LID/VPB ; then +@@ -10101,7 +10101,7 @@ + if test "x$HAVE_VPB" = "xyes" ; then + ac_config_files="$ac_config_files LID/VPB/Makefile" + +- SUBDIRS+=" LID/VPB" ++ SUBDIRS="${SUBDIRS} LID/VPB" + fi + + +@@ -10284,7 +10284,7 @@ + if test "x$HAVE_SPANDSP" = "xyes" ; then + ac_config_files="$ac_config_files fax/fax_spandsp/Makefile" + +- SUBDIRS+=" fax/fax_spandsp" ++ SUBDIRS="${SUBDIRS} fax/fax_spandsp" + fi + + diff --git a/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx b/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx new file mode 100644 index 000000000000..6c693b4d2dfd --- /dev/null +++ b/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx @@ -0,0 +1,11 @@ +--- plugins/video/H.263-1998/rfc2190.cxx.orig 2013-02-20 03:18:03.000000000 +0100 ++++ plugins/video/H.263-1998/rfc2190.cxx 2013-07-09 00:32:54.000000000 +0200 +@@ -25,7 +25,7 @@ + + #include <iostream> + #include <string.h> +-#include <malloc.h> ++#include <stdlib.h> + + + const unsigned char PSC[3] = { 0x00, 0x00, 0x80 }; diff --git a/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h b/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h new file mode 100644 index 000000000000..099d0631cbab --- /dev/null +++ b/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h @@ -0,0 +1,11 @@ +--- plugins/video/H.264/shared/x264wrap.h.orig 2013-07-09 00:34:36.000000000 +0200 ++++ plugins/video/H.264/shared/x264wrap.h 2013-07-09 00:38:14.000000000 +0200 +@@ -126,7 +126,7 @@ + char m_ulName[100]; + int m_pipeToProcess; + int m_pipeFromProcess; +- pid_t m_pid; ++ int m_pid; + #endif // WIN32 + + bool m_startNewFrame; diff --git a/net/opal3/pkg-descr b/net/opal/pkg-descr index b337a0341444..b337a0341444 100644 --- a/net/opal3/pkg-descr +++ b/net/opal/pkg-descr diff --git a/net/opal3/pkg-plist b/net/opal/pkg-plist index a0dd1570c433..ecce9e67f385 100644 --- a/net/opal3/pkg-plist +++ b/net/opal/pkg-plist @@ -26,6 +26,7 @@ include/opal/codec/opalplugin.h include/opal/codec/opalpluginmgr.h include/opal/codec/opalwavfile.h include/opal/codec/ratectl.h +include/opal/codec/rfc2435.h include/opal/codec/rfc2833.h include/opal/codec/rfc4175.h include/opal/codec/silencedetect.h @@ -64,7 +65,6 @@ include/opal/iax2/frame.h include/opal/iax2/iax2.h include/opal/iax2/iax2con.h include/opal/iax2/iax2ep.h -include/opal/iax2/iax2jitter.h include/opal/iax2/iax2medstrm.h include/opal/iax2/iedata.h include/opal/iax2/ies.h @@ -83,15 +83,16 @@ include/opal/im/msrp.h include/opal/im/rfc4103.h include/opal/im/sipim.h include/opal/im/t140.h +include/opal/lids/capi_ep.h include/opal/lids/lid.h include/opal/lids/lidep.h include/opal/lids/lidplugin.h include/opal/lids/lidpluginmgr.h include/opal/opal.h -include/opal/opal/audiorecord.h include/opal/opal/buildopts.h include/opal/opal/call.h include/opal/opal/connection.h +include/opal/opal/console_mgr.h include/opal/opal/endpoint.h include/opal/opal/guid.h include/opal/opal/ivr.h @@ -105,11 +106,15 @@ include/opal/opal/opalmixer.h include/opal/opal/opalvxml.h include/opal/opal/patch.h include/opal/opal/pcss.h +include/opal/opal/pres_ent.h +include/opal/opal/recording.h include/opal/opal/rtpconn.h include/opal/opal/rtpep.h include/opal/opal/transcoders.h include/opal/opal/transports.h include/opal/rtp/jitter.h +include/opal/rtp/metrics.h +include/opal/rtp/pcapfile.h include/opal/rtp/rtp.h include/opal/rtp/srtp.h include/opal/rtp/zrtpudp.h @@ -119,6 +124,7 @@ include/opal/sip/sip.h include/opal/sip/sipcon.h include/opal/sip/sipep.h include/opal/sip/sippdu.h +include/opal/sip/sippres.h include/opal/t120/h323t120.h include/opal/t120/t120proto.h include/opal/t120/x224.h @@ -127,34 +133,39 @@ include/opal/t38/sipt38.h include/opal/t38/t38proto.h include/opal/zrtp/opalzrtp.h include/opal/zrtp/zrtpeventproc.h -lib/libopal-%%PVERSION_MAJOR%%.so -lib/libopal-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%% lib/libopal.so -lib/libopal_s.a -%%CELT%%lib/opal-%%PORTVERSION%%/codecs/audio/celtcodec_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/g722_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/g726_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/gsm0610_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/gsmamrcodec_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/ilbc_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/ima_adpcm_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/lpc10_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/audio/speex_audio_pwplugin.so -lib/opal-%%PORTVERSION%%/codecs/video/h261-vic_video_pwplugin.so -%%FFMPEG%%lib/opal-%%PORTVERSION%%/codecs/video/h263-1998_video_pwplugin.so -%%X264%%lib/opal-%%PORTVERSION%%/codecs/video/h264_video_pwplugin.so -%%X264%%lib/opal-%%PORTVERSION%%/codecs/video/h264_video_pwplugin_helper -%%FFMPEG%%lib/opal-%%PORTVERSION%%/codecs/video/mpeg4-ffmpeg_video_pwplugin.so -%%THEORA%%lib/opal-%%PORTVERSION%%/codecs/video/theora_video_pwplugin.so -%%FAX%%lib/opal-%%PORTVERSION%%/fax/spandsp_fax_pwplugin.so -%%LID%%lib/opal-%%PORTVERSION%%/lid/vpb_lid_pwplugin.so +lib/libopal.so.%%PVERSION_MAJOR%% +lib/libopal.so.%%PVERSION_MINOR%% +lib/libopal.so.%%VERSION%% +%%DEBUG%%lib/libopal_d.so +%%DEBUG%%lib/libopal_d.so.%%PVERSION_MAJOR%% +%%DEBUG%%lib/libopal_d.so.%%PVERSION_MINOR%% +%%DEBUG%%lib/libopal_d.so.%%VERSION%% +%%CELT%%lib/opal-%%VERSION%%/codecs/audio/celt_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/g7221_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/g7222_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/g722_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/g726_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/gsm0610_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/iLBC_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/ima_adpcm_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/lpc10_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/silk_ptplugin.so +lib/opal-%%VERSION%%/codecs/audio/speex_ptplugin.so +lib/opal-%%VERSION%%/codecs/video/h261_vic_ptplugin.so +lib/opal-%%VERSION%%/codecs/video/h263_ffmpeg_ptplugin.so +lib/opal-%%VERSION%%/codecs/video/h264_video_pwplugin_helper +lib/opal-%%VERSION%%/codecs/video/h264_x264_ptplugin.so +lib/opal-%%VERSION%%/codecs/video/mpeg4_ffmpeg_ptplugin.so +%%THEORA%%lib/opal-%%VERSION%%/codecs/video/theora_ptplugin.so +%%FAX%%lib/opal-%%VERSION%%/fax/spandsp_ptplugin.so +%%LID%%lib/opal-%%VERSION%%/lid/vpb_ptplugin.so libdata/pkgconfig/opal.pc -%%LID%%@dirrm lib/opal-%%PORTVERSION%%/lid -%%FAX%%@dirrm lib/opal-%%PORTVERSION%%/fax -%%VIDEO%%@dirrm lib/opal-%%PORTVERSION%%/codecs/video -@dirrm lib/opal-%%PORTVERSION%%/codecs/audio -@dirrm lib/opal-%%PORTVERSION%%/codecs -@dirrm lib/opal-%%PORTVERSION%% +%%FAX%%@dirrm lib/opal-%%VERSION%%/fax +%%VIDEO%%@dirrm lib/opal-%%VERSION%%/codecs/video +@dirrm lib/opal-%%VERSION%%/codecs/audio +@dirrm lib/opal-%%VERSION%%/codecs +@dirrm lib/opal-%%VERSION%% @dirrm include/opal/zrtp @dirrm include/opal/t38 @dirrm include/opal/t120 diff --git a/net/opal3/distinfo b/net/opal3/distinfo deleted file mode 100644 index e78965d9b2cb..000000000000 --- a/net/opal3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (opal-3.6.6.tar.bz2) = 60c9d75703bedfeca7140cb76b23fae7179ce1f86e7e8b0026b72d66acd75c82 -SIZE (opal-3.6.6.tar.bz2) = 7062422 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> |