diff options
author | Sukneet Basuta | 2012-07-11 15:36:59 -0400 |
---|---|---|
committer | Sukneet Basuta | 2012-07-11 15:36:59 -0400 |
commit | ecadf7c445c8ca8621629bd8985522768f1a4fdf (patch) | |
tree | 157d1f0dc5b4f2a69b8026993bdb8e5e2015ecae /chat-libs | |
parent | ee94046709c0973433b00e7c308d39d033cfff06 (diff) |
opal: => 3.10.5
Fixed SOURCE_URL[0]
fixed SCM info and switched to prepare_select_branch
updated License, WEB_SITE, SHORT, and description
* PREPARE: switch to prepare_select_branch
* PRE_BUILD: added to apply patch
* opal-ffmpeg.patch: added, fix ffmpeg codecs. From Arch Linux
Diffstat (limited to 'chat-libs')
-rwxr-xr-x | chat-libs/opal/DETAILS | 37 | ||||
-rw-r--r-- | chat-libs/opal/HISTORY | 9 | ||||
-rwxr-xr-x | chat-libs/opal/PREPARE | 3 | ||||
-rwxr-xr-x | chat-libs/opal/PRE_BUILD | 6 | ||||
-rw-r--r-- | chat-libs/opal/opal-3.10.1.tar.bz2.sig | bin | 287 -> 0 bytes | |||
-rw-r--r-- | chat-libs/opal/opal-3.10.5.tar.bz2.sig | bin | 0 -> 287 bytes | |||
-rw-r--r-- | chat-libs/opal/opal-ffmpeg.patch | 193 |
7 files changed, 231 insertions, 17 deletions
diff --git a/chat-libs/opal/DETAILS b/chat-libs/opal/DETAILS index 5b9e836b3c..693fe75e3b 100755 --- a/chat-libs/opal/DETAILS +++ b/chat-libs/opal/DETAILS @@ -1,28 +1,33 @@ SPELL=opal -if [ "$CVS" == "y" ]; then - VERSION=cvs - SOURCE=${SPELL}-${VERSION}.tar.bz2 - SOURCE_URL[0]=http://snapshots.seconix.com/cvs/$SOURCE - FORCE_DOWNLOAD=1 +if [[ $OPAL_BRANCH == scm ]]; then + if [[ $OPAL_AUTOUPDATE == y ]]; then + VERSION=$(date +%Y%m%d) + else + VERSION=scm + fi + SOURCE=${SPELL}-scm.tar.bz2 + SOURCE_URL[0]=svn_https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk:opalvoip + FORCE_DOWNLOAD=on SOURCE_IGNORE=volatile -SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL} +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm else - VERSION=3.10.1 + VERSION=3.10.5 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=${SPELL}-${VERSION}.tar.bz2 - SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE + SOURCE_URL[0]=$SOURCEFORGE_URL/opalvoip/$SOURCE SOURCE_GPG="gurus.gpg:${SOURCE}.sig" SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} fi - LICENSE[0]=GPL - MAKE_NJOBS=1 - WEB_SITE=http://www.gnomemeeting.org + LICENSE[0]=MPL + WEB_SITE=http://www.opalvoip.org/ ENTERED=20060106 KEYWORDS="chat libs" - SHORT="A Portable Text and GUI C/C++ Class Libarary." + SHORT="The OPAL VoIP library." cat << EOF -PWLib is a moderately large class library that has its genesis many years ago -as a method to product applications to run on both Microsoft Windows and Unix -X-Windows systems. It also was to have a Macintosh port as well but this never -eventuated. +OPAL implements the commonly used protocols used to send voice, video and fax +data over IP networks. + +Originally part of the OpenH323 project, OpalVoip has grown to include SIP +and IAX2. OPAL is released under the Mozilla Public License 1.0 Open Source +license. EOF diff --git a/chat-libs/opal/HISTORY b/chat-libs/opal/HISTORY index f7be3505ea..74ef7f7823 100644 --- a/chat-libs/opal/HISTORY +++ b/chat-libs/opal/HISTORY @@ -1,3 +1,12 @@ +2012-07-10 Sukneet Basuta <sukneet@sourcemage.org> + * DETAILS: updated spell to 3.10.5 + Fixed SOURCE_URL[0] + fixed SCM info and switched to prepare_select_branch + updated License, WEB_SITE, SHORT, and description + * PREPARE: switch to prepare_select_branch + * PRE_BUILD: added to apply patch + * opal-ffmpeg.patch: added, fix ffmpeg codecs. From Arch Linux + 2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DEPENDS: changed dependency on g++ to dependency on gcc with sub-depends on CXX (scripted) diff --git a/chat-libs/opal/PREPARE b/chat-libs/opal/PREPARE index 8064306141..98d27e41ff 100755 --- a/chat-libs/opal/PREPARE +++ b/chat-libs/opal/PREPARE @@ -1 +1,2 @@ -config_query CVS "Would you like to build the latest cvs version?" n +. ${GRIMOIRE}/FUNCTIONS && +prepare_select_branch stable scm diff --git a/chat-libs/opal/PRE_BUILD b/chat-libs/opal/PRE_BUILD new file mode 100755 index 0000000000..c3f6c84fdb --- /dev/null +++ b/chat-libs/opal/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && + +if [[ $OPAL_BRANCH != scm ]]; then + patch -p1 < $SPELL_DIRECTORY/opal-ffmpeg.patch +fi diff --git a/chat-libs/opal/opal-3.10.1.tar.bz2.sig b/chat-libs/opal/opal-3.10.1.tar.bz2.sig Binary files differdeleted file mode 100644 index a873671d30..0000000000 --- a/chat-libs/opal/opal-3.10.1.tar.bz2.sig +++ /dev/null diff --git a/chat-libs/opal/opal-3.10.5.tar.bz2.sig b/chat-libs/opal/opal-3.10.5.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..7c5944b15a --- /dev/null +++ b/chat-libs/opal/opal-3.10.5.tar.bz2.sig diff --git a/chat-libs/opal/opal-ffmpeg.patch b/chat-libs/opal/opal-ffmpeg.patch new file mode 100644 index 0000000000..743a608545 --- /dev/null +++ b/chat-libs/opal/opal-ffmpeg.patch @@ -0,0 +1,193 @@ +diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx +--- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26 06:56:01.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10 16:39:35.447021150 +0200 +@@ -51,6 +51,7 @@ + #endif + + #include "h263-1998.h" ++#include <libavutil/opt.h> + #include <limits> + #include <iomanip> + #include <stdio.h> +@@ -324,9 +325,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; + } + +@@ -335,9 +336,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 +@@ -367,9 +368,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; + } + +@@ -377,9 +378,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; + } + } +@@ -445,15 +446,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; + } + +@@ -516,7 +508,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; +@@ -598,13 +590,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 -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx +--- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26 06:56:00.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-06-10 16:49:11.210568639 +0200 +@@ -25,6 +25,7 @@ + #include <fstream> + #include <stdlib.h> + #include <sys/stat.h> ++#include <unistd.h> + + + #ifndef PLUGINCODEC_TRACING +diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx +--- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26 06:56:00.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10 17:04:19.695646950 +0200 +@@ -1035,13 +1035,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 -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx +--- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26 06:56:00.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-06-10 17:04:46.012171051 +0200 +@@ -33,6 +33,7 @@ + + #include <codec/opalplugin.hpp> + #include <stdio.h> ++#include <unistd.h> + + + #if defined(X264_LICENSED) || defined(GPL_HELPER_APP) +diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +--- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26 06:56:02.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10 16:46:33.498089705 +0200 +@@ -101,8 +101,10 @@ + #include <libavutil/bswap.h> + #include <libavcodec/mpegvideo.h> + ++ + #else /* LIBAVCODEC_HAVE_SOURCE_DIR */ + #include LIBAVCODEC_HEADER ++#include <libavutil/opt.h> + #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */ + } + +@@ -589,17 +591,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 +806,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 +1327,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 + } |