From 87f9f41a064e00a750aae39fbdbea44a868bfe43 Mon Sep 17 00:00:00 2001 From: piernov Date: Mon, 25 Jul 2011 00:29:01 +0200 Subject: opal 3.10.1-1 correction port --- opal/.footprint.i686 | 55 ++++++------ opal/.footprint.x86_64 | 178 +++++++++++++++++++++++++++++++++++++++ opal/.md5sum.i686 | 2 + opal/.md5sum.x86_64 | 2 + opal/Pkgfile | 13 ++- opal/opal-3.10.1-ffmpeg0.8.patch | 41 +++++++++ opal/opal-3.10.1-fix-link.patch | 39 +++++++++ 7 files changed, 299 insertions(+), 31 deletions(-) create mode 100644 opal/.footprint.x86_64 create mode 100644 opal/opal-3.10.1-ffmpeg0.8.patch create mode 100644 opal/opal-3.10.1-fix-link.patch diff --git a/opal/.footprint.i686 b/opal/.footprint.i686 index 3b66d79..47d4770 100644 --- a/opal/.footprint.i686 +++ b/opal/.footprint.i686 @@ -31,6 +31,7 @@ drwxr-xr-x root/root usr/include/opal/codec/ -rw-r--r-- root/root usr/include/opal/codec/opalpluginmgr.h -rw-r--r-- root/root usr/include/opal/codec/opalwavfile.h -rw-r--r-- root/root usr/include/opal/codec/ratectl.h +-rw-r--r-- root/root usr/include/opal/codec/rfc2435.h -rw-r--r-- root/root usr/include/opal/codec/rfc2833.h -rw-r--r-- root/root usr/include/opal/codec/rfc4175.h -rw-r--r-- root/root usr/include/opal/codec/silencedetect.h @@ -72,7 +73,6 @@ drwxr-xr-x root/root usr/include/opal/iax2/ -rw-r--r-- root/root usr/include/opal/iax2/iax2.h -rw-r--r-- root/root usr/include/opal/iax2/iax2con.h -rw-r--r-- root/root usr/include/opal/iax2/iax2ep.h --rw-r--r-- root/root usr/include/opal/iax2/iax2jitter.h -rw-r--r-- root/root usr/include/opal/iax2/iax2medstrm.h -rw-r--r-- root/root usr/include/opal/iax2/iedata.h -rw-r--r-- root/root usr/include/opal/iax2/ies.h @@ -93,16 +93,17 @@ drwxr-xr-x root/root usr/include/opal/im/ -rw-r--r-- root/root usr/include/opal/im/sipim.h -rw-r--r-- root/root usr/include/opal/im/t140.h drwxr-xr-x root/root usr/include/opal/lids/ +-rw-r--r-- root/root usr/include/opal/lids/capi_ep.h -rw-r--r-- root/root usr/include/opal/lids/lid.h -rw-r--r-- root/root usr/include/opal/lids/lidep.h -rw-r--r-- root/root usr/include/opal/lids/lidplugin.h -rw-r--r-- root/root usr/include/opal/lids/lidpluginmgr.h -rw-r--r-- root/root usr/include/opal/opal.h drwxr-xr-x root/root usr/include/opal/opal/ --rw-r--r-- root/root usr/include/opal/opal/audiorecord.h -rw-r--r-- root/root usr/include/opal/opal/buildopts.h -rw-r--r-- root/root usr/include/opal/opal/call.h -rw-r--r-- root/root usr/include/opal/opal/connection.h +-rw-r--r-- root/root usr/include/opal/opal/console_mgr.h -rw-r--r-- root/root usr/include/opal/opal/endpoint.h -rw-r--r-- root/root usr/include/opal/opal/guid.h -rw-r--r-- root/root usr/include/opal/opal/ivr.h @@ -116,12 +117,16 @@ drwxr-xr-x root/root usr/include/opal/opal/ -rw-r--r-- root/root usr/include/opal/opal/opalvxml.h -rw-r--r-- root/root usr/include/opal/opal/patch.h -rw-r--r-- root/root usr/include/opal/opal/pcss.h +-rw-r--r-- root/root usr/include/opal/opal/pres_ent.h +-rw-r--r-- root/root usr/include/opal/opal/recording.h -rw-r--r-- root/root usr/include/opal/opal/rtpconn.h -rw-r--r-- root/root usr/include/opal/opal/rtpep.h -rw-r--r-- root/root usr/include/opal/opal/transcoders.h -rw-r--r-- root/root usr/include/opal/opal/transports.h drwxr-xr-x root/root usr/include/opal/rtp/ -rw-r--r-- root/root usr/include/opal/rtp/jitter.h +-rw-r--r-- root/root usr/include/opal/rtp/metrics.h +-rw-r--r-- root/root usr/include/opal/rtp/pcapfile.h -rw-r--r-- root/root usr/include/opal/rtp/rtp.h -rw-r--r-- root/root usr/include/opal/rtp/srtp.h -rw-r--r-- root/root usr/include/opal/rtp/zrtpudp.h @@ -132,6 +137,7 @@ drwxr-xr-x root/root usr/include/opal/sip/ -rw-r--r-- root/root usr/include/opal/sip/sipcon.h -rw-r--r-- root/root usr/include/opal/sip/sipep.h -rw-r--r-- root/root usr/include/opal/sip/sippdu.h +-rw-r--r-- root/root usr/include/opal/sip/sippres.h drwxr-xr-x root/root usr/include/opal/t120/ -rw-r--r-- root/root usr/include/opal/t120/h323t120.h -rw-r--r-- root/root usr/include/opal/t120/t120proto.h @@ -144,28 +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.6.8 --rwxr-xr-x root/root usr/lib/libopal.so.3.6.8 +lrwxrwxrwx root/root usr/lib/libopal.so -> libopal.so.3.10.1 +-rwxr-xr-x root/root usr/lib/libopal.so.3.10.1 -rwxr-xr-x root/root usr/lib/libopal_s.a -drwxr-xr-x root/root usr/lib/opal-3.6.8/ -drwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/ -drwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/ --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/g722_audio_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/g726_audio_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/gsm0610_audio_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/gsmamrcodec_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/ilbc_audio_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/ima_adpcm_audio_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/lpc10_audio_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/audio/speex_audio_pwplugin.so -drwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/ --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/h261-vic_video_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/h263-1998_video_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/h264_video_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/h264_video_pwplugin_helper --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/mpeg4-ffmpeg_video_pwplugin.so --rwxr-xr-x root/root usr/lib/opal-3.6.8/codecs/video/theora_video_pwplugin.so -drwxr-xr-x root/root usr/lib/opal-3.6.8/lid/ --rwxr-xr-x root/root usr/lib/opal-3.6.8/lid/vpb_lid_pwplugin.so +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/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/opal.pc diff --git a/opal/.footprint.x86_64 b/opal/.footprint.x86_64 new file mode 100644 index 0000000..47d4770 --- /dev/null +++ b/opal/.footprint.x86_64 @@ -0,0 +1,178 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/opal/ +drwxr-xr-x root/root usr/include/opal/asn/ +-rw-r--r-- root/root usr/include/opal/asn/gcc.h +-rw-r--r-- root/root usr/include/opal/asn/h225.h +-rw-r--r-- root/root usr/include/opal/asn/h235.h +-rw-r--r-- root/root usr/include/opal/asn/h235_srtp.h +-rw-r--r-- root/root usr/include/opal/asn/h245.h +-rw-r--r-- root/root usr/include/opal/asn/h248.h +-rw-r--r-- root/root usr/include/opal/asn/h4501.h +-rw-r--r-- root/root usr/include/opal/asn/h45010.h +-rw-r--r-- root/root usr/include/opal/asn/h45011.h +-rw-r--r-- root/root usr/include/opal/asn/h4502.h +-rw-r--r-- root/root usr/include/opal/asn/h4503.h +-rw-r--r-- root/root usr/include/opal/asn/h4504.h +-rw-r--r-- root/root usr/include/opal/asn/h4505.h +-rw-r--r-- root/root usr/include/opal/asn/h4506.h +-rw-r--r-- root/root usr/include/opal/asn/h4507.h +-rw-r--r-- root/root usr/include/opal/asn/h4508.h +-rw-r--r-- root/root usr/include/opal/asn/h4509.h +-rw-r--r-- root/root usr/include/opal/asn/h501.h +-rw-r--r-- root/root usr/include/opal/asn/mcs.h +-rw-r--r-- root/root usr/include/opal/asn/t38.h +-rw-r--r-- root/root usr/include/opal/asn/x880.h +drwxr-xr-x root/root usr/include/opal/codec/ +-rw-r--r-- root/root usr/include/opal/codec/echocancel.h +-rw-r--r-- root/root usr/include/opal/codec/g711a1_plc.h +-rw-r--r-- root/root usr/include/opal/codec/g711codec.h +-rw-r--r-- root/root usr/include/opal/codec/opalplugin.h +-rw-r--r-- root/root usr/include/opal/codec/opalpluginmgr.h +-rw-r--r-- root/root usr/include/opal/codec/opalwavfile.h +-rw-r--r-- root/root usr/include/opal/codec/ratectl.h +-rw-r--r-- root/root usr/include/opal/codec/rfc2435.h +-rw-r--r-- root/root usr/include/opal/codec/rfc2833.h +-rw-r--r-- root/root usr/include/opal/codec/rfc4175.h +-rw-r--r-- root/root usr/include/opal/codec/silencedetect.h +-rw-r--r-- root/root usr/include/opal/codec/vidcodec.h +drwxr-xr-x root/root usr/include/opal/h323/ +-rw-r--r-- root/root usr/include/opal/h323/channels.h +-rw-r--r-- root/root usr/include/opal/h323/gkclient.h +-rw-r--r-- root/root usr/include/opal/h323/gkserver.h +-rw-r--r-- root/root usr/include/opal/h323/h225ras.h +-rw-r--r-- root/root usr/include/opal/h323/h235auth.h +-rw-r--r-- root/root usr/include/opal/h323/h323.h +-rw-r--r-- root/root usr/include/opal/h323/h323annexg.h +-rw-r--r-- root/root usr/include/opal/h323/h323caps.h +-rw-r--r-- root/root usr/include/opal/h323/h323con.h +-rw-r--r-- root/root usr/include/opal/h323/h323ep.h +-rw-r--r-- root/root usr/include/opal/h323/h323neg.h +-rw-r--r-- root/root usr/include/opal/h323/h323pdu.h +-rw-r--r-- root/root usr/include/opal/h323/h323rtp.h +-rw-r--r-- root/root usr/include/opal/h323/h323trans.h +-rw-r--r-- root/root usr/include/opal/h323/h450pdu.h +-rw-r--r-- root/root usr/include/opal/h323/h501pdu.h +-rw-r--r-- root/root usr/include/opal/h323/peclient.h +-rw-r--r-- root/root usr/include/opal/h323/q931.h +-rw-r--r-- root/root usr/include/opal/h323/svcctrl.h +-rw-r--r-- root/root usr/include/opal/h323/transaddr.h +drwxr-xr-x root/root usr/include/opal/h460/ +-rw-r--r-- root/root usr/include/opal/h460/h460.h +-rw-r--r-- root/root usr/include/opal/h460/h4601.h +-rw-r--r-- root/root usr/include/opal/h460/h46018.h +-rw-r--r-- root/root usr/include/opal/h460/h46019.h +-rw-r--r-- root/root usr/include/opal/h460/h4609.h +-rw-r--r-- root/root usr/include/opal/h460/h460p.h +-rw-r--r-- root/root usr/include/opal/h460/h460pres.h +-rw-r--r-- root/root usr/include/opal/h460/h460tm.h +drwxr-xr-x root/root usr/include/opal/iax2/ +-rw-r--r-- root/root usr/include/opal/iax2/callprocessor.h +-rw-r--r-- root/root usr/include/opal/iax2/causecode.h +-rw-r--r-- root/root usr/include/opal/iax2/frame.h +-rw-r--r-- root/root usr/include/opal/iax2/iax2.h +-rw-r--r-- root/root usr/include/opal/iax2/iax2con.h +-rw-r--r-- root/root usr/include/opal/iax2/iax2ep.h +-rw-r--r-- root/root usr/include/opal/iax2/iax2medstrm.h +-rw-r--r-- root/root usr/include/opal/iax2/iedata.h +-rw-r--r-- root/root usr/include/opal/iax2/ies.h +-rw-r--r-- root/root usr/include/opal/iax2/overview.h +-rw-r--r-- root/root usr/include/opal/iax2/processor.h +-rw-r--r-- root/root usr/include/opal/iax2/receiver.h +-rw-r--r-- root/root usr/include/opal/iax2/regprocessor.h +-rw-r--r-- root/root usr/include/opal/iax2/remote.h +-rw-r--r-- root/root usr/include/opal/iax2/safestrings.h +-rw-r--r-- root/root usr/include/opal/iax2/sound.h +-rw-r--r-- root/root usr/include/opal/iax2/specialprocessor.h +-rw-r--r-- root/root usr/include/opal/iax2/transmit.h +-rw-r--r-- root/root usr/include/opal/iax2/version.h +drwxr-xr-x root/root usr/include/opal/im/ +-rw-r--r-- root/root usr/include/opal/im/im.h +-rw-r--r-- root/root usr/include/opal/im/msrp.h +-rw-r--r-- root/root usr/include/opal/im/rfc4103.h +-rw-r--r-- root/root usr/include/opal/im/sipim.h +-rw-r--r-- root/root usr/include/opal/im/t140.h +drwxr-xr-x root/root usr/include/opal/lids/ +-rw-r--r-- root/root usr/include/opal/lids/capi_ep.h +-rw-r--r-- root/root usr/include/opal/lids/lid.h +-rw-r--r-- root/root usr/include/opal/lids/lidep.h +-rw-r--r-- root/root usr/include/opal/lids/lidplugin.h +-rw-r--r-- root/root usr/include/opal/lids/lidpluginmgr.h +-rw-r--r-- root/root usr/include/opal/opal.h +drwxr-xr-x root/root usr/include/opal/opal/ +-rw-r--r-- root/root usr/include/opal/opal/buildopts.h +-rw-r--r-- root/root usr/include/opal/opal/call.h +-rw-r--r-- root/root usr/include/opal/opal/connection.h +-rw-r--r-- root/root usr/include/opal/opal/console_mgr.h +-rw-r--r-- root/root usr/include/opal/opal/endpoint.h +-rw-r--r-- root/root usr/include/opal/opal/guid.h +-rw-r--r-- root/root usr/include/opal/opal/ivr.h +-rw-r--r-- root/root usr/include/opal/opal/localep.h +-rw-r--r-- root/root usr/include/opal/opal/manager.h +-rw-r--r-- root/root usr/include/opal/opal/mediacmd.h +-rw-r--r-- root/root usr/include/opal/opal/mediafmt.h +-rw-r--r-- root/root usr/include/opal/opal/mediastrm.h +-rw-r--r-- root/root usr/include/opal/opal/mediatype.h +-rw-r--r-- root/root usr/include/opal/opal/opalmixer.h +-rw-r--r-- root/root usr/include/opal/opal/opalvxml.h +-rw-r--r-- root/root usr/include/opal/opal/patch.h +-rw-r--r-- root/root usr/include/opal/opal/pcss.h +-rw-r--r-- root/root usr/include/opal/opal/pres_ent.h +-rw-r--r-- root/root usr/include/opal/opal/recording.h +-rw-r--r-- root/root usr/include/opal/opal/rtpconn.h +-rw-r--r-- root/root usr/include/opal/opal/rtpep.h +-rw-r--r-- root/root usr/include/opal/opal/transcoders.h +-rw-r--r-- root/root usr/include/opal/opal/transports.h +drwxr-xr-x root/root usr/include/opal/rtp/ +-rw-r--r-- root/root usr/include/opal/rtp/jitter.h +-rw-r--r-- root/root usr/include/opal/rtp/metrics.h +-rw-r--r-- root/root usr/include/opal/rtp/pcapfile.h +-rw-r--r-- root/root usr/include/opal/rtp/rtp.h +-rw-r--r-- root/root usr/include/opal/rtp/srtp.h +-rw-r--r-- root/root usr/include/opal/rtp/zrtpudp.h +drwxr-xr-x root/root usr/include/opal/sip/ +-rw-r--r-- root/root usr/include/opal/sip/handlers.h +-rw-r--r-- root/root usr/include/opal/sip/sdp.h +-rw-r--r-- root/root usr/include/opal/sip/sip.h +-rw-r--r-- root/root usr/include/opal/sip/sipcon.h +-rw-r--r-- root/root usr/include/opal/sip/sipep.h +-rw-r--r-- root/root usr/include/opal/sip/sippdu.h +-rw-r--r-- root/root usr/include/opal/sip/sippres.h +drwxr-xr-x root/root usr/include/opal/t120/ +-rw-r--r-- root/root usr/include/opal/t120/h323t120.h +-rw-r--r-- root/root usr/include/opal/t120/t120proto.h +-rw-r--r-- root/root usr/include/opal/t120/x224.h +drwxr-xr-x root/root usr/include/opal/t38/ +-rw-r--r-- root/root usr/include/opal/t38/h323t38.h +-rw-r--r-- root/root usr/include/opal/t38/sipt38.h +-rw-r--r-- root/root usr/include/opal/t38/t38proto.h +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 +-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/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/opal.pc diff --git a/opal/.md5sum.i686 b/opal/.md5sum.i686 index adc4aa9..7020a93 100644 --- a/opal/.md5sum.i686 +++ b/opal/.md5sum.i686 @@ -1 +1,3 @@ +fa167595f603691f528c361e6a37f37d opal-3.10.1-ffmpeg0.8.patch +f05bf143d38a8fddad44379ba6f70f65 opal-3.10.1-fix-link.patch 9c870ca90a433f2fb0efed2fd68a019d opal-3.10.1.tar.xz diff --git a/opal/.md5sum.x86_64 b/opal/.md5sum.x86_64 index adc4aa9..7020a93 100644 --- a/opal/.md5sum.x86_64 +++ b/opal/.md5sum.x86_64 @@ -1 +1,3 @@ +fa167595f603691f528c361e6a37f37d opal-3.10.1-ffmpeg0.8.patch +f05bf143d38a8fddad44379ba6f70f65 opal-3.10.1-fix-link.patch 9c870ca90a433f2fb0efed2fd68a019d opal-3.10.1.tar.xz diff --git a/opal/Pkgfile b/opal/Pkgfile index 3e7761c..697adb5 100644 --- a/opal/Pkgfile +++ b/opal/Pkgfile @@ -8,20 +8,19 @@ name=opal version=3.10.1 release=1 -source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz) +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) build() { cd $name-$version + patch -p0 < ../opal-3.10.1-ffmpeg0.8.patch + patch -p0 < ../opal-3.10.1-fix-link.patch CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" \ ./configure --prefix=/usr\ --sysconfdir=/etc \ --localstatedir=/var/lib \ - --mandir=/usr/share/man \ - --disable-silk \ - --disable-libavcodec - - # there's a linking error in this release, SILK should be reactivated in the next release - # opal 3.10.1 isn't compatible with ffmpeg 0.8, libavcodec maybe reactivated in the next release + --mandir=/usr/share/man make make DESTDIR=$PKG install diff --git a/opal/opal-3.10.1-ffmpeg0.8.patch b/opal/opal-3.10.1-ffmpeg0.8.patch new file mode 100644 index 0000000..c675d8a --- /dev/null +++ b/opal/opal-3.10.1-ffmpeg0.8.patch @@ -0,0 +1,41 @@ +--- 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 @@ + } + else // No IFrame requested, let avcodec decide what to do + { +- m_avpicture->pict_type = 0; ++ m_avpicture->pict_type = (AVPictureType)0; + } + + // Encode a frame diff --git a/opal/opal-3.10.1-fix-link.patch b/opal/opal-3.10.1-fix-link.patch new file mode 100644 index 0000000..621f893 --- /dev/null +++ b/opal/opal-3.10.1-fix-link.patch @@ -0,0 +1,39 @@ +--- plugins/audio/SILK/SILK_SDK/Makefile.link 2011-06-14 10:38:53.000000000 +0200 ++++ plugins/audio/SILK/SILK_SDK/Makefile 2011-07-20 20:09:48.000000000 +0200 +@@ -35,7 +35,7 @@ + LDLIBS += $(call ldlibs-from-libs,$(LIBS)) + + COMPILE.c.cmdline = $(CC) -c $(CFLAGS) -o $@ $< +-LINK.o.cmdline = $(LINK.o) -lm $^ $(LDLIBS) -o $@$(EXESUFFIX) ++LINK.o.cmdline = $(LINK.o) $^ $(LDLIBS) -o $@$(EXESUFFIX) -lm + ARCHIVE.cmdline = $(AR) $(ARFLAGS) $@ $^ && $(RANLIB) $@ + + %$(OBJSUFFIX):%.c +@@ -83,13 +83,13 @@ + $(TARGET): $(OBJS) + $(ARCHIVE.cmdline) + +-encoder$(EXESUFFIX): $(ENCODER_OBJS) ++encoder$(EXESUFFIX): $(ENCODER_OBJS) $(TARGET) + $(LINK.o.cmdline) + +-decoder$(EXESUFFIX): $(DECODER_OBJS) ++decoder$(EXESUFFIX): $(DECODER_OBJS) $(TARGET) + $(LINK.o.cmdline) + +-signalcompare$(EXESUFFIX): $(SIGNALCMP_OBJS) ++signalcompare$(EXESUFFIX): $(SIGNALCMP_OBJS) $(TARGET) + $(LINK.o.cmdline) + + clean: +--- plugins/plugin-inc.mak.in.link 2011-07-20 21:39:44.000000000 +0200 ++++ plugins/plugin-inc.mak.in 2011-07-20 21:39:52.000000000 +0200 +@@ -69,7 +69,7 @@ + OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS)))))) + + $(PLUGIN_PATH): $(SUBDIRS) $(OBJECTS) +- $(Q_LD)$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) ++ $(Q_LD)$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) -lpthread -ldl + + ifneq ($(SUBDIRS),) + .PHONY: $(SUBDIRS) -- cgit v1.2.3-70-g09d2