diff options
| -rw-r--r-- | opal/.footprint.i686 | 46 | ||||
| -rw-r--r-- | opal/.footprint.x86_64 | 46 | ||||
| -rw-r--r-- | opal/.md5sum.i686 | 4 | ||||
| -rw-r--r-- | opal/.md5sum.x86_64 | 4 | ||||
| -rw-r--r-- | opal/Pkgfile | 6 | ||||
| -rw-r--r-- | opal/opal-3.10.1-ffmpeg0.8.patch | 33 |
6 files changed, 55 insertions, 84 deletions
diff --git a/opal/.footprint.i686 b/opal/.footprint.i686 index 47d4770..fcffcb2 100644 --- a/opal/.footprint.i686 +++ b/opal/.footprint.i686 @@ -150,29 +150,29 @@ drwxr-xr-x root/root usr/include/opal/zrtp/ -rw-r--r-- root/root usr/include/opal/zrtp/opalzrtp.h -rw-r--r-- root/root usr/include/opal/zrtp/zrtpeventproc.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libopal.so -> libopal.so.3.10.1 --rwxr-xr-x root/root usr/lib/libopal.so.3.10.1 +lrwxrwxrwx root/root usr/lib/libopal.so -> libopal.so.3.10.2 +-rwxr-xr-x root/root usr/lib/libopal.so.3.10.2 -rwxr-xr-x root/root usr/lib/libopal_s.a -drwxr-xr-x root/root usr/lib/opal-3.10.1/ -drwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/ -drwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/ --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g7221_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g7222_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g722_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g726_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/gsm0610_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/gsmamrcodec_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/iLBC_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/ima_adpcm_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/lpc10_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/silk_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/speex_ptplugin.so -drwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/ --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h261_vic_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h263_ffmpeg_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h264_video_pwplugin_helper --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h264_x264_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/mpeg4_ffmpeg_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/theora_ptplugin.so +drwxr-xr-x root/root usr/lib/opal-3.10.2/ +drwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/ +drwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/ +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g7221_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g7222_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g722_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g726_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/gsm0610_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/gsmamrcodec_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/iLBC_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/ima_adpcm_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/lpc10_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/silk_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/speex_ptplugin.so +drwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/ +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h261_vic_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h263_ffmpeg_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h264_video_pwplugin_helper +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h264_x264_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/mpeg4_ffmpeg_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/theora_ptplugin.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/opal.pc diff --git a/opal/.footprint.x86_64 b/opal/.footprint.x86_64 index 47d4770..fcffcb2 100644 --- a/opal/.footprint.x86_64 +++ b/opal/.footprint.x86_64 @@ -150,29 +150,29 @@ drwxr-xr-x root/root usr/include/opal/zrtp/ -rw-r--r-- root/root usr/include/opal/zrtp/opalzrtp.h -rw-r--r-- root/root usr/include/opal/zrtp/zrtpeventproc.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libopal.so -> libopal.so.3.10.1 --rwxr-xr-x root/root usr/lib/libopal.so.3.10.1 +lrwxrwxrwx root/root usr/lib/libopal.so -> libopal.so.3.10.2 +-rwxr-xr-x root/root usr/lib/libopal.so.3.10.2 -rwxr-xr-x root/root usr/lib/libopal_s.a -drwxr-xr-x root/root usr/lib/opal-3.10.1/ -drwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/ -drwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/ --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g7221_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g7222_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g722_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/g726_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/gsm0610_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/gsmamrcodec_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/iLBC_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/ima_adpcm_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/lpc10_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/silk_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/audio/speex_ptplugin.so -drwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/ --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h261_vic_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h263_ffmpeg_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h264_video_pwplugin_helper --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/h264_x264_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/mpeg4_ffmpeg_ptplugin.so --rwxr-xr-x root/root usr/lib/opal-3.10.1/codecs/video/theora_ptplugin.so +drwxr-xr-x root/root usr/lib/opal-3.10.2/ +drwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/ +drwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/ +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g7221_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g7222_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g722_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/g726_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/gsm0610_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/gsmamrcodec_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/iLBC_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/ima_adpcm_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/lpc10_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/silk_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/audio/speex_ptplugin.so +drwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/ +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h261_vic_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h263_ffmpeg_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h264_video_pwplugin_helper +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/h264_x264_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/mpeg4_ffmpeg_ptplugin.so +-rwxr-xr-x root/root usr/lib/opal-3.10.2/codecs/video/theora_ptplugin.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/opal.pc diff --git a/opal/.md5sum.i686 b/opal/.md5sum.i686 index 7020a93..7134f4d 100644 --- a/opal/.md5sum.i686 +++ b/opal/.md5sum.i686 @@ -1,3 +1,3 @@ -fa167595f603691f528c361e6a37f37d opal-3.10.1-ffmpeg0.8.patch +755f9bab85f0fdd104277a845caa830a opal-3.10.1-ffmpeg0.8.patch f05bf143d38a8fddad44379ba6f70f65 opal-3.10.1-fix-link.patch -9c870ca90a433f2fb0efed2fd68a019d opal-3.10.1.tar.xz +11263275c51e3ea77de202bf5ca87e0b opal-3.10.2.tar.xz diff --git a/opal/.md5sum.x86_64 b/opal/.md5sum.x86_64 index 7020a93..7134f4d 100644 --- a/opal/.md5sum.x86_64 +++ b/opal/.md5sum.x86_64 @@ -1,3 +1,3 @@ -fa167595f603691f528c361e6a37f37d opal-3.10.1-ffmpeg0.8.patch +755f9bab85f0fdd104277a845caa830a opal-3.10.1-ffmpeg0.8.patch f05bf143d38a8fddad44379ba6f70f65 opal-3.10.1-fix-link.patch -9c870ca90a433f2fb0efed2fd68a019d opal-3.10.1.tar.xz +11263275c51e3ea77de202bf5ca87e0b opal-3.10.2.tar.xz diff --git a/opal/Pkgfile b/opal/Pkgfile index 697adb5..80bbffa 100644 --- a/opal/Pkgfile +++ b/opal/Pkgfile @@ -6,11 +6,11 @@ # Run on: libtheora,x264,ffmpeg,ptlib name=opal -version=3.10.1 +version=3.10.2 release=1 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz - opal-3.10.1-ffmpeg0.8.patch - opal-3.10.1-fix-link.patch) + opal-3.10.1-fix-link.patch + opal-3.10.1-ffmpeg0.8.patch) build() { cd $name-$version diff --git a/opal/opal-3.10.1-ffmpeg0.8.patch b/opal/opal-3.10.1-ffmpeg0.8.patch index c675d8a..f351885 100644 --- a/opal/opal-3.10.1-ffmpeg0.8.patch +++ b/opal/opal-3.10.1-ffmpeg0.8.patch @@ -1,36 +1,6 @@ ---- plugins/video/H.263-1998/h263-1998.cxx.ffmpeg 2011-07-20 21:44:12.000000000 +0200 -+++ plugins/video/H.263-1998/h263-1998.cxx 2011-07-20 22:17:36.000000000 +0200 -@@ -334,9 +334,6 @@ - _context->qmax = round ( (31.0 - H263P_MIN_QUANT) / 31.0 * tsto + H263P_MIN_QUANT); - _context->qmax = std::min( _context->qmax, 31); - -- _context->mb_qmin = _context->qmin; -- _context->mb_qmax = _context->qmax; -- - // Lagrange multipliers - this is how the context defaults do it: - _context->lmin = _context->qmin * FF_QP2LAMBDA; - _context->lmax = _context->qmax * FF_QP2LAMBDA; -@@ -660,7 +657,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 = (AVPictureType)((flags && forceIFrame) ? FF_I_TYPE : 0); - - currentMb = 0; - currentBytes = 0; -@@ -863,7 +860,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 = (AVPictureType)((flags && forceIFrame) ? FF_I_TYPE : 0); - - _txH263PFrame->BeginNewFrame(); - _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp()); --- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.ffmpeg 2011-07-20 22:24:03.000000000 +0200 +++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2011-07-20 22:24:35.000000000 +0200 -@@ -808,7 +808,7 @@ +@@ -806,7 +806,7 @@ } else // No IFrame requested, let avcodec decide what to do { @@ -39,3 +9,4 @@ } // Encode a frame + |