diff options
author | Pacho Ramos <pacho@gentoo.org> | 2015-02-03 21:40:52 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2015-02-03 21:40:52 +0000 |
commit | 2cbcc24f890e71484724ef5213733aa3a85c00da (patch) | |
tree | ea9ac80d66bea3c00013b7da1288f39eb2116640 /media-plugins | |
parent | Prepare for gst-libav bump (diff) | |
download | historical-2cbcc24f890e71484724ef5213733aa3a85c00da.tar.gz historical-2cbcc24f890e71484724ef5213733aa3a85c00da.tar.bz2 historical-2cbcc24f890e71484724ef5213733aa3a85c00da.zip |
Version bump
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/gst-plugins-libav/ChangeLog | 16 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/Manifest | 19 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-coma.patch | 16 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-compat.patch | 49 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch | 121 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch | 28 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch | 120 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild | 84 | ||||
-rw-r--r-- | media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild (renamed from media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0-r1.ebuild) | 35 |
9 files changed, 26 insertions, 462 deletions
diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog index d18be3615487..6e4e43d91869 100644 --- a/media-plugins/gst-plugins-libav/ChangeLog +++ b/media-plugins/gst-plugins-libav/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for media-plugins/gst-plugins-libav -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.52 2014/10/11 13:16:29 maekke Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.53 2015/02/03 21:40:51 pacho Exp $ + +*gst-plugins-libav-1.4.5 (03 Feb 2015) + + 03 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gst-plugins-libav-1.4.5.ebuild, + -files/gst-plugins-libav-1.1.0_pre20130128-coma.patch, + -files/gst-plugins-libav-1.1.0_pre20130128-compat.patch, + -files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch, + -files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch, + -files/gst-plugins-libav-1.2.0-ffmpeg2.patch, + -gst-plugins-libav-1.1.0_pre20130128-r1.ebuild, + -gst-plugins-libav-1.2.0-r1.ebuild: + Version bump 11 Oct 2014; Markus Meier <maekke@gentoo.org> gst-plugins-libav-1.2.4.ebuild: arm stable, bug #512012 diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest index 49b43a81ae7b..dd9a1bc081ac 100644 --- a/media-plugins/gst-plugins-libav/Manifest +++ b/media-plugins/gst-plugins-libav/Manifest @@ -1,25 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gst-plugins-libav-1.1.0_pre20130128-coma.patch 517 SHA256 3f2d856668aabf8872588a9bdfb6f28296b7b7f6cf5e9a2dd77cb3ee0ecddf4f SHA512 ab89eb9642ecb66a16503d136adf41c42bd41f1021546952580f2b6e8a558916234aebb35bce6af04de5b90e2ccd8695864ef0f44f0013eed904b06ec60c1a61 WHIRLPOOL e36c3ee9a663eb284b191a8bd83e45c346c685bfdc45d96dfe14a31a7918cd1e55aa11228139cb7cb811617e0563cc2f9d0c89fd68c3a37f0641330e045b5d37 -AUX gst-plugins-libav-1.1.0_pre20130128-compat.patch 1810 SHA256 e50bf0fcf9b9c3cac9e712832438642425d3180d085d3cee5bf3427093a3d789 SHA512 1f48b05b70aef81f0c1f190ff38a68fb0d9e95c525042d213ec8a34de48d72b164491cb27064643da080c37859922a2bce1c0161d13512a42afdb8fb774f271d WHIRLPOOL c2bfc6e64b7a2fe215d8e7c02664c4b7ed4ee5657ce264a7bbc0fa021aa9cc403b4c4b3629f73aea41c97e0143226233d5fd7d442ba87bd1b4cb869aa7380a90 -AUX gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch 5250 SHA256 51c20417417c797a703710eb27dcd7b9b2cd92321ee78c6dfea10ec77024b0b6 SHA512 7261dc865729c33b4d55953167e89118f2ddf7d9eaff0436d543e30f6d24127d74ccca9b5b2eb23faff28eac38beec343b5306eee70cea80dacd897b419ab0ed WHIRLPOOL 485e538cdee9dbbe88eebe1f6596b0d3f23618d19dccc80932e0a4a33a52c2f0a0a312646f4ce1281136aa60bf109b5f32eaea84e77802113c7f4abc83f796ea -AUX gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch 1001 SHA256 120f5a118cfb71ed8eb03e015e49955ed38bf09a5dd7f9768054219a2e348e24 SHA512 7f29af719101821b88a19a46c2325021724e7f555260ff2a6448f45a87f39df303eae08aa1ef9509ccde467dc9f7e3f3cdcc2611ddd7d1b4f4cfb72f6f21364d WHIRLPOOL 987c420ea0be285c1a8c298080012f14ec8c4de31e5c653d0f312d2be40c32c935a6481e793922d969696dab70a90d9e1b45b74359775723fdceec5dcc9d19cc -AUX gst-plugins-libav-1.2.0-ffmpeg2.patch 5020 SHA256 f7d8729719ecd1dd5103f9bd23230c01fdece180d0e08ff7e8f50ba564607647 SHA512 1ae30423e434dbb158475428f98482dc479862969e3b5493876d32bc425f07d2eec582ab92b6455fd487a7ddfe4142b6dcbd5f23e0de49453082fb331eff3914 WHIRLPOOL bca67b726c41553d1f2739ff5b65fc9dfcb5a5107e320217985d089cb349a33b37d74ee0c3cbfd52ed8107626fabbe773379e4ef2c181f2e172ff4457850f65f AUX gst-plugins-libav-1.2.4-ffmpeg2.patch 5020 SHA256 f7d8729719ecd1dd5103f9bd23230c01fdece180d0e08ff7e8f50ba564607647 SHA512 1ae30423e434dbb158475428f98482dc479862969e3b5493876d32bc425f07d2eec582ab92b6455fd487a7ddfe4142b6dcbd5f23e0de49453082fb331eff3914 WHIRLPOOL bca67b726c41553d1f2739ff5b65fc9dfcb5a5107e320217985d089cb349a33b37d74ee0c3cbfd52ed8107626fabbe773379e4ef2c181f2e172ff4457850f65f AUX gst-plugins-libav-1.2.4-fix-memory-leak.patch 3064 SHA256 cbe0f73e83847fcce38ebc260e7ba6063f9f026176a231ce83012b2308cdd053 SHA512 64f54a9ee9838df5eb8dde3970a4fd8f50c4515c4b9f9ea071c54a32edb634947ff0d968065b5e0af0f6eb706d3c61adf0eff835b89ee0ec49b533dbd3733a8c WHIRLPOOL 23e8593549ab23d1298bba5eaf0089e48ca3cae75e178c94b60a41b91a323c26b9b364bb819c8b375c0d43f1ab2f6202731a67d0fa25e07973e261653ce448a6 -DIST gst-libav-1.1.0_pre20130128.tar.xz 477668 SHA256 c746d093b5ad4a6d325361217c49b35817ab0a257504d54b92ef0302820f66b4 SHA512 525d393b1fe665652798bd50859f6e5317b164c3edf7e20f4bc66a2d2c09e6345c2aacf80f8592306da0945325e7a22b0238bb868393df304fbdb4c8956cf338 WHIRLPOOL bb10a0d741997212556e88f2cec32bc93375e5a8c89b3b6ef3bc598a2c9ab8f8985b42b0585d5c2ff3ca08433276f094dca7194e1b660f8199fd276d2e531a8c -DIST gst-libav-1.2.0.tar.xz 4575972 SHA256 48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099 SHA512 2d53de52fb6f846752b0e0c90f8ca167397ade5a413755ecbad9876a25046b56850a8d8c1b2783819da0988475bdf91a3ce8709f6f8db2b3e197bc2fb0e37d7a WHIRLPOOL fcf29f4d55b7d0955750f6aef2541bf5fc94cd4b36ba44dad25035b77d642e7846ab9534ba744ad1ec79f2c67923e988b91ee2c0368b545d164f996c1e485efd DIST gst-libav-1.2.4.tar.xz 4580144 SHA256 2a69480d63fc2db93249d9e2e229ab3541bbc2db881b0f64de13d0bfc7d1f037 SHA512 64b24f0995865bc736946ad0709b37d6557ce1b91359371c7aaf48d02a0cb486f3bf90b72f483c8ccb661cd5fb637564809bc92d070ad901576bae5b17db0273 WHIRLPOOL 94948887c9ff642ab7e87695acb19b2a210946dd1938776d7d653017fc5231c9144e48c3d467f8c893513a29976d4e8b88457ed44bb0849cdb6f721e1ea576b0 -EBUILD gst-plugins-libav-1.1.0_pre20130128-r1.ebuild 2513 SHA256 0465b5de00bdf347f4eda7008cf96bcc02e33e747cb330f69a1b822d34dfae11 SHA512 228f68a34ada8fc2d8cb4a4e457a47b5cc85e7224a64548049df9982babd02ae8bfa2fa186304ad9d572b45a2f2c06535b7da9e23a69e7a555da4ce11c8620f2 WHIRLPOOL d16f725612872f45a61d38120388874903720d72fff819033515772c593d4ab2d3716a9f7bd378e8b7d549967c5d150b82fcc67fe875f5fb31e7adcc1433f347 -EBUILD gst-plugins-libav-1.2.0-r1.ebuild 2221 SHA256 a4a8a98ba0fc0d015a9759b3b5ce518c9596aee73f18c98dfd888ad0e7cdbef2 SHA512 5a8e72ee391d69ac7e944c36659f00c981e5b5b261e909a70bbb30559f6749a9a7cf4b6c9e3e6ab1c3141134bc3cdedeaeadfe091573232532683bb5bba504fb WHIRLPOOL d29f4b6fe7112ad8a0c72bd3d6f012dbd0f5609a48def028b85d144f0c7c0a8825882d5697e268b17d42e25d24aa8874a48b201d675a491ae94fef7427272d7c +DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2 EBUILD gst-plugins-libav-1.2.4.ebuild 2207 SHA256 5dd8e51ff6fbce709db841785b27822ad6aa2069bcb4519d6491f810d66dd848 SHA512 e6d83a86f37761c1164f9699b832a767f5f0cef20c05347a5a5765ec58d20abdbfc429fcef64cb380a9181ec80e221548e1b8b0234913c6efd99d4b9ab21b5b4 WHIRLPOOL 1cc677312c74acdd52ae08002a6b1adfcd1a1f64a3d31c1aa718e0f7d8e2e1d5fb84a8625a65fdab0a66ac603b28fa1e14c868b316c6affbc26e9faec5090b88 -MISC ChangeLog 8021 SHA256 d97403e97af1de7d04d37afb5543a8543a7fcb653fb9f7618690b75735bbe5f7 SHA512 b315c8e62f2ed5a11328fceaca846bafa75a244a531b173e3fa2aeded7cce7eac792997a7ea83e1c60a9be2c360d8bfe1491f5a0283ff2250f9aac88e5154010 WHIRLPOOL d1675c95b4fe6aef5044aaedb385c8e31f42b61d04c76029b8e6f286ec831eb5af43b722851ab43fc4604d0335e100cf248ec40f4be0bb10420a99799e9a1a0b +EBUILD gst-plugins-libav-1.4.5.ebuild 1546 SHA256 5704e7b2e6dc876c7e2f74e0c480d223feffad39fd27a609c925f4035fffffb2 SHA512 c333be4427e5059a9d177ba4d8ae70004b021a9439d9b8ec32a2f73ef9a1d4f5137ebb118c61594e691d6e349ac02d8aee19ba364c1f1ef0f92fed323df4be28 WHIRLPOOL 6c96178d399bfdbba1c42438c56e8f69ebc7312206385e2eeabeabb7de4f8c7cc7e381a046e50d2964340168eea1d2bfe33c739e047327900f6f0190a63d0773 +MISC ChangeLog 8529 SHA256 77de3cffe95fefb7bbe40419b4e91dd64f72e1fa7886defb68dc566d928b934a SHA512 3a0402d1735df23a7f0ef80bb52adf8e95f36682482ec7071a7a192802bb981067623c657e13fd75dea60a7414d272b710d789a0808129c460704c7fa8150037 WHIRLPOOL 4268d43683e4f0c2611e7e3c533eb9dc730fd59b302d5a20e990f9ad5d331dfc1857105a295379a3f632ff246045fd51984ad658b4ff8ca4fa06eea6d59e3f3d MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQ5La8ACgkQkKaRLQcq0GIzAgCgjmiawEWnoptWiX5GVocFUZf3 -5+IAn2PcN2AkT4aOWOIXSbvIqN/gojYH -=ePpi +iEYEAREIAAYFAlTRQGQACgkQCaWpQKGI+9TbygCfVfAlUjKzEqQhTEh+0FWoGxDn +EkgAmwUqzVeEcvxv1G5krRnk+Mi9BHSW +=6zFU -----END PGP SIGNATURE----- diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-coma.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-coma.patch deleted file mode 100644 index 4af35d2c1f4c..000000000000 --- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-coma.patch +++ /dev/null @@ -1,16 +0,0 @@ -Some muxers come with a ',' in their name, replace it by '_' as in the other -places. - -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavmux.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavmux.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavmux.c -@@ -937,7 +937,7 @@ gst_ffmpegmux_register (GstPlugin * plug - p = type_name; - - while (*p) { -- if (*p == '.') -+ if (*p == '.' || *p == ',') - *p = '_'; - p++; - } diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-compat.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-compat.patch deleted file mode 100644 index f41c875fbbba..000000000000 --- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-compat.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavcodecmap.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavcodecmap.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavcodecmap.c -@@ -27,7 +27,16 @@ - - #include <gst/gst.h> - #include <libavcodec/avcodec.h> -+#include <libavutil/avutil.h> -+#if (LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,6,0) || (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,2,0))) - #include <libavutil/channel_layout.h> -+#else -+#include <libavutil/audioconvert.h> -+#endif -+#if (LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,42,0) || (LIBAVUTIL_VERSION_MICRO > 100 && LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,74,0))) -+#define AVPixelFormat PixelFormat -+#endif -+ - - #include "gstav.h" - #include "gstavcodecmap.h" -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavutils.h -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavutils.h -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavutils.h -@@ -94,4 +94,23 @@ av_smp_format_depth(enum AVSampleFormat - GstBuffer * - new_aligned_buffer (gint size); - -+#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,7,0) || (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,8,0))) -+static inline int av_codec_is_encoder(AVCodec *codec) -+{ -+ return codec && (codec->encode || codec->encode2); -+} -+ -+static inline int av_codec_is_decoder(AVCodec *codec) -+{ -+ return codec && codec->decode; -+} -+#endif -+ -+#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,28,0) || (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,59,0))) -+static inline void avcodec_free_frame(AVFrame **frame) -+{ -+ av_free(*frame); -+} -+#endif -+ - #endif /* __GST_FFMPEG_UTILS_H__ */ diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch deleted file mode 100644 index 66b965afd833..000000000000 --- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavauddec.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavauddec.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavauddec.c -@@ -420,7 +420,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA - GstBuffer ** outbuf, GstFlowReturn * ret) - { - gint len = -1; -- gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ gint have_data = 0; - AVPacket packet; - AVFrame frame; - -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavaudenc.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavaudenc.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavaudenc.c -@@ -266,7 +266,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc - ffmpegaudenc->context->coder_type = 0; - ffmpegaudenc->context->context_model = 0; - ffmpegaudenc->context->scenechange_threshold = 0; -- ffmpegaudenc->context->inter_threshold = 0; - - /* fetch pix_fmt and so on */ - gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context); -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavcfg.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavcfg.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavcfg.c -@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void) - {FF_IDCT_INT, "JPEG reference Integer", "int"}, - {FF_IDCT_SIMPLE, "Simple", "simple"}, - {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"}, -- {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"}, - {FF_IDCT_ARM, "ARM", "arm"}, - {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"}, - {FF_IDCT_SH4, "SH4", "sh4"}, - {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"}, -- {FF_IDCT_H264, "H264", "h264"}, -- {FF_IDCT_VP3, "VP3", "vp3"}, - {FF_IDCT_IPP, "IPP", "ipp"}, - {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"}, - {0, NULL, NULL}, -@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void) - "global-headers"}, - {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", - "aic"}, -- {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"}, -- {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", -- "qp-rd"}, - {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, - {0, NULL, NULL}, - }; -@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void) - -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL); - -- pspec = g_param_spec_int ("luma-elim-threshold", -- "Luma Elimination Threshold", -- "Luma Single Coefficient Elimination Threshold", -- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -- gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL); -- -- pspec = g_param_spec_int ("chroma-elim-threshold", -- "Chroma Elimination Threshold", -- "Chroma Single Coefficient Elimination Threshold", -- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -- gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL); -- - pspec = g_param_spec_float ("lumi-masking", "Luminance Masking", - "Luminance Masking", -1.0f, 1.0f, 0.0f, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavcodecmap.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavcodecmap.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavcodecmap.c -@@ -797,13 +797,11 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec - break; - } - -- /* FIXME: context->sub_id must be filled in during decoding */ - caps = - gst_ff_vid_caps_new (context, NULL, codec_id, encode, - "video/x-pn-realvideo", "systemstream", G_TYPE_BOOLEAN, FALSE, - "rmversion", G_TYPE_INT, version, NULL); - if (context) { -- gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL); - if (context->extradata_size >= 8) { - gst_caps_set_simple (caps, - "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata), -@@ -2855,18 +2853,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod - } - break; - -- case AV_CODEC_ID_RV10: -- case AV_CODEC_ID_RV20: -- case AV_CODEC_ID_RV30: -- case AV_CODEC_ID_RV40: -- { -- gint format; -- -- if (gst_structure_get_int (str, "format", &format)) -- context->sub_id = format; -- -- break; -- } - case AV_CODEC_ID_COOK: - case AV_CODEC_ID_RA_288: - case AV_CODEC_ID_RA_144: -Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavvidenc.c -=================================================================== ---- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavvidenc.c -+++ gst-libav-1.1.0_pre20130128/ext/libav/gstavvidenc.c -@@ -332,7 +332,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc - ffmpegenc->context->coder_type = 0; - ffmpegenc->context->context_model = 0; - ffmpegenc->context->scenechange_threshold = 0; -- ffmpegenc->context->inter_threshold = 0; - - /* and last but not least the pass; CBR, 2-pass, etc */ - ffmpegenc->context->flags |= ffmpegenc->pass; diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch deleted file mode 100644 index d12554943f72..000000000000 --- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 67e11c7ad916c2e0b9af99153a01be378ea174c0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> -Date: Sat, 10 Nov 2012 16:57:06 +0100 -Subject: [PATCH] avcodecmap: Add mappings for the GBR color formats - ---- - ext/libav/gstavcodecmap.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c -index abf8f92..5d7dd23 100644 ---- a/ext/libav/gstavcodecmap.c -+++ b/ext/libav/gstavcodecmap.c -@@ -2182,6 +2182,11 @@ static const PixToFmt pixtofmttable[] = { - {GST_VIDEO_FORMAT_I420_10BE, PIX_FMT_YUV420P10BE}, - {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE}, - {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE}, -+ {GST_VIDEO_FORMAT_Y444_10LE, PIX_FMT_YUV444P10LE}, -+ {GST_VIDEO_FORMAT_Y444_10BE, PIX_FMT_YUV444P10BE}, -+ {GST_VIDEO_FORMAT_GBR, PIX_FMT_GBRP}, -+ {GST_VIDEO_FORMAT_GBR_10LE, PIX_FMT_GBRP10LE}, -+ {GST_VIDEO_FORMAT_GBR_10BE, PIX_FMT_GBRP10BE}, - }; - - GstVideoFormat --- -1.8.1.2 - diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch deleted file mode 100644 index 3deeea061512..000000000000 --- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch +++ /dev/null @@ -1,120 +0,0 @@ -Index: gst-libav-1.2.0/ext/libav/gstavauddec.c -=================================================================== ---- gst-libav-1.2.0.orig/ext/libav/gstavauddec.c -+++ gst-libav-1.2.0/ext/libav/gstavauddec.c -@@ -460,7 +460,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA - GstBuffer ** outbuf, GstFlowReturn * ret) - { - gint len = -1; -- gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ gint have_data = 0; - AVPacket packet; - AVFrame frame; - -Index: gst-libav-1.2.0/ext/libav/gstavaudenc.c -=================================================================== ---- gst-libav-1.2.0.orig/ext/libav/gstavaudenc.c -+++ gst-libav-1.2.0/ext/libav/gstavaudenc.c -@@ -289,7 +289,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc - ffmpegaudenc->context->coder_type = 0; - ffmpegaudenc->context->context_model = 0; - ffmpegaudenc->context->scenechange_threshold = 0; -- ffmpegaudenc->context->inter_threshold = 0; - - /* fetch pix_fmt and so on */ - gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context); -Index: gst-libav-1.2.0/ext/libav/gstavcfg.c -=================================================================== ---- gst-libav-1.2.0.orig/ext/libav/gstavcfg.c -+++ gst-libav-1.2.0/ext/libav/gstavcfg.c -@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void) - {FF_IDCT_INT, "JPEG reference Integer", "int"}, - {FF_IDCT_SIMPLE, "Simple", "simple"}, - {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"}, -- {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"}, - {FF_IDCT_ARM, "ARM", "arm"}, - {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"}, - {FF_IDCT_SH4, "SH4", "sh4"}, - {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"}, -- {FF_IDCT_H264, "H264", "h264"}, -- {FF_IDCT_VP3, "VP3", "vp3"}, - {FF_IDCT_IPP, "IPP", "ipp"}, - {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"}, - {0, NULL, NULL}, -@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void) - "global-headers"}, - {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", - "aic"}, -- {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"}, -- {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", -- "qp-rd"}, - {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, - {0, NULL, NULL}, - }; -@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void) - -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL); - -- pspec = g_param_spec_int ("luma-elim-threshold", -- "Luma Elimination Threshold", -- "Luma Single Coefficient Elimination Threshold", -- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -- gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL); -- -- pspec = g_param_spec_int ("chroma-elim-threshold", -- "Chroma Elimination Threshold", -- "Chroma Single Coefficient Elimination Threshold", -- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -- gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL); -- - pspec = g_param_spec_float ("lumi-masking", "Luminance Masking", - "Luminance Masking", -1.0f, 1.0f, 0.0f, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -Index: gst-libav-1.2.0/ext/libav/gstavcodecmap.c -=================================================================== ---- gst-libav-1.2.0.orig/ext/libav/gstavcodecmap.c -+++ gst-libav-1.2.0/ext/libav/gstavcodecmap.c -@@ -788,12 +788,10 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec - break; - } - -- /* FIXME: context->sub_id must be filled in during decoding */ - caps = - gst_ff_vid_caps_new (context, NULL, codec_id, encode, - "video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL); - if (context) { -- gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL); - if (context->extradata_size >= 8) { - gst_caps_set_simple (caps, - "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata), -@@ -2892,18 +2890,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod - } - break; - -- case AV_CODEC_ID_RV10: -- case AV_CODEC_ID_RV20: -- case AV_CODEC_ID_RV30: -- case AV_CODEC_ID_RV40: -- { -- gint format; -- -- if (gst_structure_get_int (str, "format", &format)) -- context->sub_id = format; -- -- break; -- } - case AV_CODEC_ID_COOK: - case AV_CODEC_ID_RA_288: - case AV_CODEC_ID_RA_144: -Index: gst-libav-1.2.0/ext/libav/gstavvidenc.c -=================================================================== ---- gst-libav-1.2.0.orig/ext/libav/gstavvidenc.c -+++ gst-libav-1.2.0/ext/libav/gstavvidenc.c -@@ -338,7 +338,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc - ffmpegenc->context->coder_type = 0; - ffmpegenc->context->context_model = 0; - ffmpegenc->context->scenechange_threshold = 0; -- ffmpegenc->context->inter_threshold = 0; - - /* and last but not least the pass; CBR, 2-pass, etc */ - ffmpegenc->context->flags |= ffmpegenc->pass; diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild deleted file mode 100644 index 4eac243cc460..000000000000 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild +++ /dev/null @@ -1,84 +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-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild,v 1.10 2013/10/22 07:21:03 ago Exp $ - -EAPI="5" - -inherit eutils flag-o-matic - -MY_PN="gst-libav" -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html" -#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz" -SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_PN}-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="1.0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="+orc" - -RDEPEND=" - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=virtual/ffmpeg-0.10 - orc? ( >=dev-lang/orc-0.4.16 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - sed -e 's/sleep 15//' -i configure.ac configure || die - - # allow building with gstreamer-1.0.x - sed -e 's/REQ=1.1.0/REQ=1.0.0/' -i configure.ac configure || die - # Disable GBR color support; it requires >=gst-plugins-base-1.1 - epatch -R "${FILESDIR}/${P}-gbr-color.patch" - # Let it be compatible with older ffmpeg/libav releases, add the compat glue - epatch "${FILESDIR}/${P}-compat.patch" - # Some muxers contains coma too. - epatch "${FILESDIR}/${P}-coma.patch" - # compatibility with recent releases - # TODO: likely apply them with libav-10 when it's out but there will - # probably be an upstream gst-libav release compatible at that time. - if has_version '>=media-video/ffmpeg-2.0' ; then - sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \ - -e 's/ CodecID/ AVCodecID/g' \ - ext/libav/*.{c,h} || die - epatch "${FILESDIR}/${P}-ffmpeg2.patch" - fi -} - -src_configure() { - GST_PLUGINS_BUILD="" - # always use system ffmpeg/libav if possible - econf \ - --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="http://www.gentoo.org" \ - --disable-fatal-warnings \ - --with-system-libav \ - $(use_enable orc) -} - -src_compile() { - # Don't build with -Werror - emake ERROR_CFLAGS= -} - -src_install() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - default - prune_libtool_files --modules -} - -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 -} diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild index 33252bbf6430..f91f8d0f4207 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0-r1.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0-r1.ebuild,v 1.2 2014/06/18 20:10:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild,v 1.1 2015/02/03 21:40:51 pacho Exp $ EAPI="5" - inherit eutils flag-o-matic multilib-minimal MY_PN="gst-libav" @@ -17,32 +16,19 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fb IUSE="+orc" RDEPEND=" - >=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}] - >=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}] + || ( =media-video/ffmpeg-2.2*[${MULTILIB_USEDEP}] =media-video/libav-10*[${MULTILIB_USEDEP}] ) orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} + app-arch/xz-utils >=dev-util/gtk-doc-am-1.12 >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " S="${WORKDIR}/${MY_PN}-${PV}" -src_prepare() { - sed -e 's/sleep 15//' -i configure.ac configure || die - - # compatibility with recent releases - # TODO: likely apply them with libav-10 when it's out but there will - # probably be an upstream gst-libav release compatible at that time. - if has_version '>=media-video/ffmpeg-2.0' ; then - sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \ - -e 's/ CodecID/ AVCodecID/g' \ - ext/libav/*.{c,h} || die - epatch "${FILESDIR}/${P}-ffmpeg2.patch" - fi -} - multilib_src_configure() { GST_PLUGINS_BUILD="" # always use system ffmpeg/libav if possible @@ -62,15 +48,6 @@ multilib_src_compile() { } multilib_src_install_all() { - DOCS="AUTHORS ChangeLog NEWS README TODO" einstalldocs prune_libtool_files --modules } - -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 -} |