diff options
author | 2013-07-02 12:40:07 +0000 | |
---|---|---|
committer | 2013-07-02 12:40:07 +0000 | |
commit | fdc8b90193c199b5a45c221664b1055d5dce78a5 (patch) | |
tree | 9f18a65daede3c7e401299499a007f47f7e6b976 /media-plugins/gst-plugins-ffmpeg | |
parent | remove old (diff) | |
download | historical-fdc8b90193c199b5a45c221664b1055d5dce78a5.tar.gz historical-fdc8b90193c199b5a45c221664b1055d5dce78a5.tar.bz2 historical-fdc8b90193c199b5a45c221664b1055d5dce78a5.zip |
remove old
Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-plugins/gst-plugins-ffmpeg')
10 files changed, 14 insertions, 598 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog index d19686ead127..45d2dd0e6a7d 100644 --- a/media-plugins/gst-plugins-ffmpeg/ChangeLog +++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-plugins/gst-plugins-ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.164 2013/06/29 18:21:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.165 2013/07/02 12:40:00 aballier Exp $ + + 02 Jul 2013; Alexis Ballier <aballier@gentoo.org> + -gst-plugins-ffmpeg-0.10.11-r1.ebuild, -gst-plugins-ffmpeg-0.10.13-r1.ebuild, + -gst-plugins-ffmpeg-0.10.13-r2.ebuild, -files/0.10.13-gcc-4.7.patch, + -files/0.10.5/lavc.patch, -files/0.10.5/offset.patch, + -files/0.10.5/system-ffmpeg-warning.patch, + -files/0.10.6/system-ffmpeg-warning.patch: + remove old 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> gst-plugins-ffmpeg-0.10.13_p201211.ebuild: diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest index 8d1d0c39c77d..9bf51beba105 100644 --- a/media-plugins/gst-plugins-ffmpeg/Manifest +++ b/media-plugins/gst-plugins-ffmpeg/Manifest @@ -1,39 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX 0.10.13-gcc-4.7.patch 1982 SHA256 25b4072e5269e019d4a10b8ecbe77987f63be29a9424863c7ed3342103ad25fa SHA512 bee06c1bc96f10e0feebe311f39f0c691dedf36c453d1d8613ec70c75a8d985a08dfc99eb984719e8e35fd631b9d1a89c6e5911dbe66110dfbee8f6043fd16da WHIRLPOOL 12e11b886c3944c963a41eb063a2484d4b164b5a29a587b8e19661ef93c1225356eae748d9672ab822115b7cf9615a62435f12692a40af09519e810d38081b33 AUX 0.10.13_p201211-channel_layout.patch 1028 SHA256 7650f22a13d36c2d6b5e6a386c36663e7a0b68c7b0a3608dccf9d250ab661910 SHA512 b49c139cc28954de5727da2bed6e998785e51d10a7a47f83dd6389af6a3ef30902ca8e39c0498eea4361a2b797da043726d6d0d7cb07652e5e3bc9b2af62e2ce WHIRLPOOL aa4d34454478f94ee96f80bd3902a4ac9f422099593415de7866604bdb76a8a842f9ed75f6d7f4bfa83cf20ff02be5d5a85d6cc7a8fed11b98bf9ca3ca721e60 AUX 0.10.13_p201211-coma.patch 529 SHA256 cbd596623bd4aadd4f8d403e9ffbbdcaabb6a4a8a83e8d23aab379d0be154ec6 SHA512 186f0260e210326c1ce70a140b8f9c08bedb3ca723e7d02d539d845cdfca1a6028612d624817ad360712b41dcf0308ce703301ce0a739cce7a481ba732d36fa3 WHIRLPOOL 73391355a90538bb5a4519362bece3aae2245b2920e9bd89a0c0d41cb3f0a42ab2cfb2d396975de130b63c4afe83b116c9594c4ec6cfe64bc1e7dbdef1da1dbe AUX 0.10.13_p201211-gstffmpegpipe_redef.patch 599 SHA256 25921c2c33077a5da1374ba0ea1055c7c321f9280526e313b17c5b432825f1f1 SHA512 8086616eb8ed6bb993f10cc2c7d5fff35fbaadd8a14e4d2339909176b5aedcc840cfe7807887b2fd6884e2e53a6e5bd579dfdb0cd1bde79b34a7fedd33b7602c WHIRLPOOL 60425db1b803f53e7f85e639b645b3782162bc1676a29d2dabbf9e809680392dba1153a47a675c554e839518258ff59d2dd6493288e66138f342fb8534a1a2ce AUX 0.10.13_p201211-iscodec.patch 857 SHA256 36e5a9ecce08ce92c99bb6fca8e1989de535a135685c66631e21d83d1d901b1d SHA512 40d051dcb2ec9b27986ba3424dc22e4cfd0f905b8e743d4fe47bf366ef9b06ace756c7d65658157f2333055bb4a7f2e7f6d0e9d8d3ef8017db34f15bf2a01bca WHIRLPOOL a64e4077141ace9f3d526b8baa36c37f57ae45eb2ee8060928088dd35a79b932e897107f8db699f6719292cc4a7a8b219542a94efc9f393cc5330a7d214e9f4f -AUX 0.10.5/lavc.patch 8765 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad SHA512 6936bdcef2f72d0d51edef262c0197f1d8efb781913abe750e35ea13958dfe0c4c0d2ec758163b1b44b4b0b33a24d0b1b94fd4f204b4a6cdb12fd39a96fbc272 WHIRLPOOL a514482d61691eea95425911458bf58d1d1370bb5be57bed02d23196e71ec2e737798eaf1e88036b0107a18c9b14e392ef91950eadc8d203845a636e1c6e2565 -AUX 0.10.5/offset.patch 525 SHA256 dd5ccdb6cc16d72f7dd94e89f549c32fe09a483b503369fa06e3b673d89d6d33 SHA512 f659a29c1fc97f157ab9de3c2a959a3c348dbc6d4a8ead6e27ea1748e63bc162c7ef2e050f04f008b110c6817b53eb4d24f8604e17f22501ceab544d3facd1cb WHIRLPOOL b48624958cbb429d1e4f11ec5dd9d92bb223d1327c6a99ca1a6e0f40a4ef899100253652c3c8dbb0208e17dd5877733ad070fe0e00f811f92d73fe9c49e0678e -AUX 0.10.5/system-ffmpeg-warning.patch 3567 SHA256 73c9cfa1006c6bca43d677a60ca8b2e30bca3b17c9855d11812afffa35542568 SHA512 59d711430c23c7db8b95aa4447d2763f38955f86a8f55992ba0f8a3fd3557f4bb461055e55f76d1b36414bd4f0be6c6fa5b0b956a9ee26e3ef5548979efd88aa WHIRLPOOL fd047c50c504ebf02a3accf9f1d1e04d52361d1b61c42e84816c1be1467e7d3e652e0d162585528b0f0aa05eed59593fd2a0f21a9ad67edb08c15dbb13ce7cfe -AUX 0.10.6/system-ffmpeg-warning.patch 3547 SHA256 fccf0f672fc34fd03d156ba4d9498511858563ea2e9fbe3c217adc6a4f9abd6c SHA512 fb88d631cedad36958f89d6012d7f04e6f957577c10d9a1ae05040d5f9fd9482f1c871de1fc2c5d803989e92fdf219dfe14ccd84250343e0d7ecf5a1d84d371c WHIRLPOOL 9b22491b42442d1c66869c1bbdd475eb55d47a80ee9ed89a7d7f97b3e58e91fe6952fec5737ccb0a1c296b57fb384e284d0b92b68e58dbf0e6ca3a6a0825f659 -DIST gst-ffmpeg-0.10.11.tar.bz2 4250699 SHA256 ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e SHA512 2fc624ecdf1256aecf081eec9822a057e3b00c54483d2c3bf1d6ccaed67c440f602f30df8df24ec685c0330f88b7c076b707d26b3f658df71c986d69e9083eff WHIRLPOOL 8a7b093fed751ad680f53a995453f0f6f6547353edace36f9f6d36f02d20c5b21d8718e28af02b09a4c48e38715ca1442bdfe5804b3bc4d314be13ae153cf3d4 -DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 SHA256 76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62 SHA512 f1141fc73b4bf1d774053ce53c4a67d5e600d6f0118ee7824cd2ff4fc8af8ba1dfbd5cf82d9e15872f3e6f8730112ddfc520a7d8df3cf605a9725e959f37e6ed WHIRLPOOL 62a018357bbb44b2cb762b7bcfb2f1a62b15b69c7a882c4a25655c0afc93e624460cc72984089dff392fc5ae852be0e6a66243c227a5ec0960d4defe8403aca7 DIST gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz 14076 SHA256 5afa627ccbbedc1c80bfd419cb497c746aea0f27e0165a49c41947eba31774ee SHA512 cd12490600c0e56a85ec7436ec6152be8962c0e949ee9925ad64c114c60d7a72958f7c5ac98a3bdc6988bce707a2c40060e3a20b899ef2a95a30b4166bfb8145 WHIRLPOOL a7f17fd32112ba9df89ef80717946a50cc81e02e608c7cc15066987cd0e3556a1971ef5360ac50089d7c883aae5eb9d36ed3d7834fb7a075a816ceb16fa2b960 DIST gst-ffmpeg-0.10.13_p201211.tar.xz 4285300 SHA256 cc15841b9972d1b60c9aaa3ffae14f3dbf44c0b08c14bb9319fb8956c89864c6 SHA512 9067aa92ef7613b08a51957d35d1de80897c28cb959522d9b523de6f482635dac3fe421015febb88ece624b7baee0216dd4b72e770bf92c05d8994f186d2f396 WHIRLPOOL 88ba2ce647ca821ef8f7aa22d64cf39397e30d8f34eadec475e6b627472c4baf6c7de6c60d4ca86527a67c710193dc00eb6534fe8bc92f73cc26db1f8e404a49 -EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1153 SHA256 2dd65f12f7d5c6d346fc85b1feb57368933d3665a056c0563bed155c0b8835f6 SHA512 ebea81241dfea1ce1fdcbca209fc1c897d787036f0c8eb9ae5691c7c5c3a97352ec908319e59a612ee3612e65d13a9cb8bc5f6f6cce811723766fedf3b5cada2 WHIRLPOOL 1875ecff2d564f6a580af70de116a70d63f4fb76ee67d1932c261d4c1706a5e68a237808e63376a8536576b6af759e6530f5680816672cb09e8436d0d4e24c50 -EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1252 SHA256 ba3b58b3b57694f50ddcc307efd17db0cfb1e625d16b5e61a51778a1cc9e6ae0 SHA512 ff0af7a595028cfd5e60bd479be4ef80a52de190fb56a13afe2c22d6e9f2fcdfebfd8338d313697c4d0effa19dbeb907f64d0ac7e52dc6aedf1628114bcbb88a WHIRLPOOL fb173a20cbddff4891a33bb45a15be1dd49ca19bd1a2b215454952662fc4b6109e57c664952c2a49b1400a3071af3e5e5da29a3eeab453acd06724e1895088d2 -EBUILD gst-plugins-ffmpeg-0.10.13-r2.ebuild 1398 SHA256 fcc94ad5293d0285d8687b6af23c78c073e1144048cc3ff677d5570c62c66935 SHA512 6a4e738e35d94c334badb89980f234538e4f6c0640e736970338d9c575819da0b40bf543187ca10179c919bd3944c77a1de4d2e5ea41a8d6a98d7989e911d1ae WHIRLPOOL 3f16310025b6be4c6c8261a207e2216a57e1ca017e330434372b37baac743de700a83820e112f60dc5bd3606b20ed2bc0ac3c8466a5f59abca61e37f1d84888d EBUILD gst-plugins-ffmpeg-0.10.13_p201211.ebuild 2080 SHA256 7f7aa0fecfc71df1aaf3b508b1c37a86a37baf6d331859a46be21da0d98f2357 SHA512 01e39944be3b382d4c3a85d0606df56d384a487155937ccd9c497105def7a286e732c9df68b7bbb2ba828e0ba99c8c87f5cd29656795244f452e6ee729a97cd5 WHIRLPOOL 93bc2ac54becb36d998c44fa99d00db05edeb0bc7f15019592473618e6bfca1dd7e76cfd0cf7c2cb134286fe929c0ee81859f92c5675a73b86f3a0c663d50a03 -MISC ChangeLog 25329 SHA256 b18aa4033c7830596096519ee7a765393ac998fc6faa8bbdb8d5549bdf73272c SHA512 d47741decc3c9511dd989aded675d2d2fba73f82031ff2f8792b65a371b46061ca8b4907d02cc60a557d5d6a985793506a58cbd5e4ca527782c0926951a83595 WHIRLPOOL 42171b528340a5d0b03e5277337032ac738f20b8fb6012be9dea1f652de0da1f27301cdb941fd935e07d8c1e595d85c6e0d0540dd7e0cc55a845acf1adc462af +MISC ChangeLog 25697 SHA256 44395d69b889a242cd4e756560943244d63246fe8aacba0db03ce35e31fb138b SHA512 14c89b7bad8dbb1a134b0f2041fb91b6d0ddb9b0fd51d5775f6e0682ecd7000fe704b279ba1703c7ab2d536d6a4ac3615f6bb31ae33d3cece66db092a86f1671 WHIRLPOOL 78a1051f527cbe301deb4cb46ea55c08f5d1203b4796cc70fc3d9bcec464d98c113b4e15af1c4a0f036f0610a45980a883cf15180c8e6e8de6155c94bd59abce MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQIcBAEBCgAGBQJRzyTvAAoJELp701BxlEWfZtMP/0rE/zN5nR+jvOxnSZDRiMxO -v3hSTENZz2uEI/B2wwjw0AbVgAiS7ElTIVcgc3pW2XjARkzCFSCkJM3JaiIXcSaD -dvEJJrm4RMaj2dnwrKuMe2o8vD9pkTrPspCdBxneEwVIIdW4D4UOIDzg4WeiLv6l -IdX24zxQ1YhC3GpNSD27SkCj2SbgMbWC3VTJcKamwGbWpwdmXomxSMRHquDQFn9w -nwHb07/GEnxZ0L9iHf8iTz0ifahwsDPR8cCwTRhHCKC4kLYbeEtkaVJX+5MB0e7G -yJkaO2PfEGz/XbEoxNFXbl5WBvQqsZtvdsb6aoYsdA3mhytA0/sZznpsdoUE4qZS -dxGVw/4RU82j7wD8Ho9qr+L1c15AUT9hP/pyIuYa0Uy6FPJtVuNUPJuOO53c2Ld0 -elFI7GZIQCoUB2PDylXev4lmFFTQF4lESEl2yHUMox6MIAbzWi1tE9s52B+ZNomb -4cy4i2THMmZpZ1ZjuE08/797GHk4oYbi94CMQlDJtWAh0nWKSfTomxpeJRz0167+ -mzCvMEXhM64iBX0fnY0OTZn+cOGfvyu/QbQ1u/ZLaOLyIMRCxMp4JIpqcoSXpLwo -DlR5xwPwsoACCq3Apc4qbJl0rgK50OiyggWu/ifzmOP1GTk5rxPSic8yeAp/2qA8 -C0zu/LeE1zayVEjOoQ+Y -=0xU9 +iEYEAREIAAYFAlHSyiIACgkQvFcC4BYPU0oGbwCgkHcjRciyFfhxWr6p6a0tUFq8 +gJYAn3YurX046ZzFp8iS+BBP+rS+fh7Q +=R6b9 -----END PGP SIGNATURE----- diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch deleted file mode 100644 index 794495b01d2a..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ./gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -+++ ./gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -@@ -398,7 +398,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst, - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ static av_always_inline void OPNAME ## h264_qpel8or16_hv1_lowpass_ ## MMX(int16_ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst, - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ static av_always_inline void put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp, u - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" --- -1.7.9 - - diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch deleted file mode 100644 index 9729ac9f37ac..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch +++ /dev/null @@ -1,233 +0,0 @@ -Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcfg.c -=================================================================== ---- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegcfg.c -+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcfg.c -@@ -272,7 +272,9 @@ gst_ffmpeg_flags_get_type (void) - {CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"}, - {CODEC_FLAG_NORMALIZE_AQP, - "Normalize Adaptive Quantization (masking, etc)", "aqp"}, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - {CODEC_FLAG_TRELLIS_QUANT, "Trellis Quantization", "trellis"}, -+#endif - {CODEC_FLAG_GLOBAL_HEADER, - "Global headers in extradata instead of every keyframe", - "global-headers"}, -@@ -669,6 +671,11 @@ gst_ffmpeg_cfg_init () - "Prediction Method", - GST_TYPE_FFMPEG_PRED_METHOD, FF_PRED_LEFT, G_PARAM_READWRITE); - gst_ffmpeg_add_pspec (pspec, config.prediction_method, FALSE, huffyuv, NULL); -+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0) -+ pspec = g_param_spec_int ("trellis", "Trellis Quantization", -+ "Trellis RD quantization", 0, 1, 1, G_PARAM_READWRITE); -+ gst_ffmpeg_add_pspec (pspec, config.trellis, FALSE, mpeg, NULL); -+#endif - } - - /* ==== END CONFIGURATION SECTION ==== */ -Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c -=================================================================== ---- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegcodecmap.c -+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c -@@ -332,7 +332,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "depth", G_TYPE_INT, context->bits_per_sample, NULL); -+#else -+ "depth", G_TYPE_INT, context->bits_per_coded_sample, NULL); -+#endif - } - break; - -@@ -511,7 +515,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - caps = gst_ff_vid_caps_new (context, codec_id, "video/x-huffyuv", NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "bpp", G_TYPE_INT, context->bits_per_sample, NULL); -+#else -+ "bpp", G_TYPE_INT, context->bits_per_coded_sample, NULL); -+#endif - } - break; - -@@ -627,7 +635,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - "layout", G_TYPE_STRING, "microsoft", NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL); -+#else -+ "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL); -+#endif - } else { - gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL); - } -@@ -638,7 +650,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - "layout", G_TYPE_STRING, "quicktime", NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL); -+#else -+ "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL); -+#endif - } else { - gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL); - } -@@ -688,7 +704,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - caps = gst_ff_vid_caps_new (context, codec_id, "video/x-camtasia", NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL); -+#else -+ "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL); -+#endif - } else { - gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 8, 32, NULL); - } -@@ -1026,7 +1046,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-alac", NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "samplesize", G_TYPE_INT, context->bits_per_sample, NULL); -+#else -+ "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL); -+#endif - } - break; - -@@ -1049,7 +1073,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID - caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-tta", NULL); - if (context) { - gst_caps_set_simple (caps, -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - "samplesize", G_TYPE_INT, context->bits_per_sample, NULL); -+#else -+ "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL); -+#endif - } - break; - case CODEC_ID_VORBIS: -@@ -1416,7 +1444,11 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps - - gst_structure_get_int (structure, "width", &context->width); - gst_structure_get_int (structure, "height", &context->height); -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - gst_structure_get_int (structure, "bpp", &context->bits_per_sample); -+#else -+ gst_structure_get_int (structure, "bpp", &context->bits_per_coded_sample); -+#endif - - fps = gst_structure_get_value (structure, "framerate"); - if (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)) { -@@ -1647,7 +1679,11 @@ gst_ffmpeg_caps_with_codecid (enum Codec - gint depth; - - if (gst_structure_get_int (str, "depth", &depth)) { -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - context->bits_per_sample = depth; -+#else -+ context->bits_per_coded_sample = depth; -+#endif - } else { - GST_WARNING ("No depth field in caps %" GST_PTR_FORMAT, caps); - } -@@ -1680,7 +1716,11 @@ gst_ffmpeg_caps_with_codecid (enum Codec - context->bit_rate = bitrate; - } - case CODEC_ID_ALAC: -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - gst_structure_get_int (str, "samplesize", &context->bits_per_sample); -+#else -+ gst_structure_get_int (str, "samplesize", &context->bits_per_coded_sample); -+#endif - break; - - case CODEC_ID_DVVIDEO: -Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c -=================================================================== ---- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegdec.c -+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c -@@ -696,7 +696,11 @@ gst_ffmpegdec_setcaps (GstPad * pad, Gst - - /* workaround encoder bugs */ - ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT; -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - ffmpegdec->context->error_resilience = 1; -+#else -+ ffmpegdec->context->error_recognition = 1; -+#endif - - /* for slow cpus */ - ffmpegdec->context->lowres = ffmpegdec->lowres; -@@ -2423,7 +2427,7 @@ gst_ffmpegdec_register (GstPlugin * plug - AVCodec *in_plugin; - gint rank; - -- in_plugin = first_avcodec; -+ in_plugin = av_codec_next(NULL); - - GST_LOG ("Registering decoders"); - -@@ -2545,7 +2549,7 @@ gst_ffmpegdec_register (GstPlugin * plug - gst_caps_unref (sinkcaps); - if (srccaps) - gst_caps_unref (srccaps); -- in_plugin = in_plugin->next; -+ in_plugin = av_codec_next(in_plugin); - } - - GST_LOG ("Finished Registering decoders"); -Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegenc.c -=================================================================== ---- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegenc.c -+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegenc.c -@@ -306,8 +306,8 @@ gst_ffmpegenc_getcaps (GstPad * pad) - /* set some default properties */ - ctx->width = DEFAULT_WIDTH; - ctx->height = DEFAULT_HEIGHT; -- ctx->time_base.num = DEFAULT_FRAME_RATE_BASE; -- ctx->time_base.den = 25 * DEFAULT_FRAME_RATE_BASE; -+ ctx->time_base.num = 1; -+ ctx->time_base.den = 25; - ctx->bit_rate = DEFAULT_VIDEO_BITRATE; - /* makes it silent */ - ctx->strict_std_compliance = -1; -@@ -391,7 +391,9 @@ gst_ffmpegenc_setcaps (GstPad * pad, Gst - - /* RTP payload used for GOB production (for Asterisk) */ - if (ffmpegenc->rtp_payload_size) { -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - ffmpegenc->context->rtp_mode = 1; -+#endif - ffmpegenc->context->rtp_payload_size = ffmpegenc->rtp_payload_size; - } - -@@ -944,13 +946,13 @@ gst_ffmpegenc_register (GstPlugin * plug - GType type; - AVCodec *in_plugin; - -- in_plugin = first_avcodec; - - GST_LOG ("Registering encoders"); - - /* build global ffmpeg param/property info */ - gst_ffmpeg_cfg_init (); - -+ in_plugin = av_codec_next(NULL); - while (in_plugin) { - gchar *type_name; - GstCaps *srccaps = NULL, *sinkcaps = NULL; -@@ -1027,7 +1029,7 @@ gst_ffmpegenc_register (GstPlugin * plug - gst_caps_unref (sinkcaps); - if (srccaps) - gst_caps_unref (srccaps); -- in_plugin = in_plugin->next; -+ in_plugin = av_codec_next(in_plugin); - } - - GST_LOG ("Finished registering encoders"); diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch deleted file mode 100644 index 63b8c2271bf8..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegprotocol.c -=================================================================== ---- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegprotocol.c -+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegprotocol.c -@@ -175,8 +175,8 @@ gst_ffmpegdata_write (URLContext * h, un - return size; - } - --static offset_t --gst_ffmpegdata_seek (URLContext * h, offset_t pos, int whence) -+static int64_t -+gst_ffmpegdata_seek (URLContext * h, int64_t pos, int whence) - { - GstProtocolInfo *info; - guint64 newpos; diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch deleted file mode 100644 index e44173737d73..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -NrU5 gst-ffmpeg-0.10.5.orig/configure gst-ffmpeg-0.10.5/configure ---- gst-ffmpeg-0.10.5.orig/configure 2008-10-14 15:37:05.000000000 +0200 -+++ gst-ffmpeg-0.10.5/configure 2008-10-14 15:38:00.000000000 +0200 -@@ -17231,68 +17231,10 @@ - _ACEOF - - HAVE_FFMPEG_UNINSTALLED=0 - { $as_echo "$as_me:$LINENO: Using system-installed FFMpeg code" >&5 - $as_echo "$as_me: Using system-installed FFMpeg code" >&6;} -- { $as_echo "$as_me:$LINENO: WARNING: -- ====================================================================== -- WARNING: you have chosen to build gst-ffmpeg against a random -- external version of ffmpeg instead of building it against the tested -- internal ffmpeg snapshot that is included with gst-ffmpeg. -- -- This is a very bad idea. So bad in fact that words cannot express -- just how bad it is. Suffice to say that it is BAD. -- -- The GStreamer developers cannot and will not support a gst-ffmpeg -- built this way. Any bug reports that indicate there is an external -- version of ffmpeg involved will be closed immediately without further -- investigation. -- -- The reason such a setup can't be supported is that the ffmpeg API -- and ABI is in constant flux, yet there aren't any official releases -- of the ffmpeg library to develop against. This makes it impossible -- to guarantee that gst-ffmpeg will work reliably, or even compile, -- with a randomly picked version ffmpeg. Even if gst-ffmpeg compiles -- and superficially appears to work fine against your chosen external -- ffmpeg version, that might just not be the case on other systems, or -- even the same system at a later time, or when using decoders, -- encoders, demuxers or muxers that have not been tested. -- -- Please do not create or distribute binary packages of gst-ffmpeg -- that link against an external ffmpeg. Thank you! -- ====================================================================== -- " >&5 --$as_echo "$as_me: WARNING: -- ====================================================================== -- WARNING: you have chosen to build gst-ffmpeg against a random -- external version of ffmpeg instead of building it against the tested -- internal ffmpeg snapshot that is included with gst-ffmpeg. -- -- This is a very bad idea. So bad in fact that words cannot express -- just how bad it is. Suffice to say that it is BAD. -- -- The GStreamer developers cannot and will not support a gst-ffmpeg -- built this way. Any bug reports that indicate there is an external -- version of ffmpeg involved will be closed immediately without further -- investigation. -- -- The reason such a setup can't be supported is that the ffmpeg API -- and ABI is in constant flux, yet there aren't any official releases -- of the ffmpeg library to develop against. This makes it impossible -- to guarantee that gst-ffmpeg will work reliably, or even compile, -- with a randomly picked version ffmpeg. Even if gst-ffmpeg compiles -- and superficially appears to work fine against your chosen external -- ffmpeg version, that might just not be the case on other systems, or -- even the same system at a later time, or when using decoders, -- encoders, demuxers or muxers that have not been tested. -- -- Please do not create or distribute binary packages of gst-ffmpeg -- that link against an external ffmpeg. Thank you! -- ====================================================================== -- " >&2;} -- -- sleep 15 - else - - source "$srcdir/ffmpegrev" - - { $as_echo "$as_me:$LINENO: Using ffmpeg revision $FFMPEG_REVISION" >&5 diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.6/system-ffmpeg-warning.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.6/system-ffmpeg-warning.patch deleted file mode 100644 index 6be9bb26ad3d..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/files/0.10.6/system-ffmpeg-warning.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -NrU5 gst-ffmpeg-0.10.6.orig/configure gst-ffmpeg-0.10.6/configure ---- gst-ffmpeg-0.10.6.orig/configure 2008-12-05 23:57:18.000000000 +0100 -+++ gst-ffmpeg-0.10.6/configure 2008-12-06 00:02:04.000000000 +0100 -@@ -17130,68 +17130,10 @@ - _ACEOF - - HAVE_FFMPEG_UNINSTALLED=0 - { echo "$as_me:$LINENO: Using system-installed FFMpeg code" >&5 - echo "$as_me: Using system-installed FFMpeg code" >&6;} -- { echo "$as_me:$LINENO: WARNING: -- ====================================================================== -- WARNING: you have chosen to build gst-ffmpeg against a random -- external version of ffmpeg instead of building it against the tested -- internal ffmpeg snapshot that is included with gst-ffmpeg. -- -- This is a very bad idea. So bad in fact that words cannot express -- just how bad it is. Suffice to say that it is BAD. -- -- The GStreamer developers cannot and will not support a gst-ffmpeg -- built this way. Any bug reports that indicate there is an external -- version of ffmpeg involved will be closed immediately without further -- investigation. -- -- The reason such a setup can't be supported is that the ffmpeg API -- and ABI is in constant flux, yet there aren't any official releases -- of the ffmpeg library to develop against. This makes it impossible -- to guarantee that gst-ffmpeg will work reliably, or even compile, -- with a randomly picked version ffmpeg. Even if gst-ffmpeg compiles -- and superficially appears to work fine against your chosen external -- ffmpeg version, that might just not be the case on other systems, or -- even the same system at a later time, or when using decoders, -- encoders, demuxers or muxers that have not been tested. -- -- Please do not create or distribute binary packages of gst-ffmpeg -- that link against an external ffmpeg. Thank you! -- ====================================================================== -- " >&5 --echo "$as_me: WARNING: -- ====================================================================== -- WARNING: you have chosen to build gst-ffmpeg against a random -- external version of ffmpeg instead of building it against the tested -- internal ffmpeg snapshot that is included with gst-ffmpeg. -- -- This is a very bad idea. So bad in fact that words cannot express -- just how bad it is. Suffice to say that it is BAD. -- -- The GStreamer developers cannot and will not support a gst-ffmpeg -- built this way. Any bug reports that indicate there is an external -- version of ffmpeg involved will be closed immediately without further -- investigation. -- -- The reason such a setup can't be supported is that the ffmpeg API -- and ABI is in constant flux, yet there aren't any official releases -- of the ffmpeg library to develop against. This makes it impossible -- to guarantee that gst-ffmpeg will work reliably, or even compile, -- with a randomly picked version ffmpeg. Even if gst-ffmpeg compiles -- and superficially appears to work fine against your chosen external -- ffmpeg version, that might just not be the case on other systems, or -- even the same system at a later time, or when using decoders, -- encoders, demuxers or muxers that have not been tested. -- -- Please do not create or distribute binary packages of gst-ffmpeg -- that link against an external ffmpeg. Thank you! -- ====================================================================== -- " >&2;} -- -- sleep 15 - else - - source "$srcdir/ffmpegrev" - - { echo "$as_me:$LINENO: Using ffmpeg revision $FFMPEG_REVISION" >&5 diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild deleted file mode 100644 index 2a8238771868..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild,v 1.10 2012/12/02 16:12:06 eva Exp $ - -EAPI=1 - -inherit flag-o-matic eutils base - -PD=${FILESDIR}/${PV} -MY_PN=${PN/-plugins} -MY_P=${MY_PN}-${PV} - -# Create a major/minor combo for SLOT -PVP=(${PV//[-\._]/ }) -SLOT=${PVP[0]}.${PVP[1]} -#SLOT=0.10 - -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html" -SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+orc" - -S=${WORKDIR}/${MY_P} - -RDEPEND=">=media-libs/gstreamer-0.10.25:0.10 - >=media-libs/gst-plugins-base-0.10.25:0.10 - orc? ( >=dev-lang/orc-0.4.5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_compile() { - append-flags -fno-strict-aliasing - - econf $(use_enable orc) - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild deleted file mode 100644 index e7239139b444..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.7 2012/12/02 23:08:35 eva Exp $ - -EAPI=4 - -inherit base eutils flag-o-matic - -PD=${FILESDIR}/${PV} -MY_PN=${PN/-plugins} -MY_P=${MY_PN}-${PV} - -# Create a major/minor combo for SLOT -PVP=(${PV//[-\._]/ }) -SLOT=${PVP[0]}.${PVP[1]} -#SLOT=0.10 - -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html" -SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="+orc hardened" - -S=${WORKDIR}/${MY_P} - -RDEPEND=">=media-libs/gstreamer-0.10.31 - >=media-libs/gst-plugins-base-0.10.31 - orc? ( >=dev-lang/orc-0.4.6 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PV}-gcc-4.7.patch ) - -src_configure() { - append-flags -fno-strict-aliasing - - if ! use hardened; then - econf $(use_enable orc) - else - # On hardened, we need to disable mmx and mmx2 to avoid TEXTRELs - econf $(use_enable orc) \ - --with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2' - fi -} diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild deleted file mode 100644 index 9ecf7bd27e1c..000000000000 --- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild,v 1.14 2013/06/26 12:53:27 tetromino Exp $ - -EAPI=4 - -inherit base eutils flag-o-matic - -MY_PN=${PN/-plugins} -MY_P=${MY_PN}-${PV} - -# Create a major/minor combo for SLOT -PVP=(${PV//[-\._]/ }) -SLOT=${PVP[0]}.${PVP[1]} - -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html" -SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+orc" - -S=${WORKDIR}/${MY_P} - -# the libpostproc dep should be cleaned in future -RDEPEND=">=media-libs/gstreamer-0.10.31:0.10 - >=media-libs/gst-plugins-base-0.10.31:0.10 - =virtual/ffmpeg-0.10* - || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) - orc? ( >=dev-lang/orc-0.4.6 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - # always use system ffmpeg if possible - econf \ - --with-system-ffmpeg \ - $(use_enable orc) -} - -pkg_postinst() { - if has_version "media-video/ffmpeg"; then - elog "Please note that upstream uses media-video/libav" - elog "rather than media-video/ffmpeg. If you encounter any" - elog "issues try to move from ffmpeg to libav." - fi -} |