diff options
| -rw-r--r-- | media-video/gpac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gpac/Manifest | 21 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch | 28 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.5.0.ebuild | 5 |
4 files changed, 42 insertions, 18 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index 0129967087b9..1b8c730c8bc9 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gpac # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.105 2013/06/22 16:28:36 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.106 2013/08/07 02:09:38 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild, + +files/gpac-0.5.0-ffmpeg2.patch: + fix build with ffmpeg2 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/gpac-0.5.0-libav9.patch, gpac-0.5.0.ebuild: diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index a6e2479042c0..1bf09683c3d1 100644 --- a/media-video/gpac/Manifest +++ b/media-video/gpac/Manifest @@ -5,6 +5,7 @@ AUX 110_all_implicitdecls.patch 1048 SHA256 6607d53e88dbecfa7185ba97f8f4ac13b266 AUX 160_all_externalamr.patch 1117 SHA256 8ef7f54bcbec758c944797594e92accdc726573480e1d2e9c442cfc38621f594 SHA512 b59b243daf64c9f764f569ec72ac43689d22ca58f9d717f5a066de867fd8455a667927875fd614b3de31f84ec16e65b5a36a0578fd93da99ecb247fba977916b WHIRLPOOL a3b5ab344ac372f01da824a969fbb1509146375758d899ea6c8c6f0b2fc75410594a95738a8ee159f9ebe66f270b3ec5007a6e9213f38f08663bc1264b54284d AUX 210_all_system_libogg.patch 647 SHA256 8c29c8b3688b5662bbcb40ea231fd3e78a722884cacda944c0ccf9c374077e64 SHA512 ea88df06002107cfc8d5700180152d9391456530fa83928cafa13ab184122f444168201447365d7b16d68357a7bb6d45ea1765791f143ecee463b7898cb4145c WHIRLPOOL 184d9124e680324f0229d2ed73a667fea0e2f34d7570b56fbd80e508348aece9d7975f5dece221754c6e1bdea253ca42a255f5106258c7c211c7402f3b9ec6da AUX gpac-0.5.0-build-fixes.patch 4268 SHA256 95dfd33cd485b9d46d50dd589a518a6728b46af03e6e02a653327c0b76f6ec6f SHA512 fd2283e3cf7a8370b467bbc7f96bd8a41873a05e3205e887525bf0655490929b8961b55b4d773d045ef9a3637fa258a348f85b98362495c6695d633b1b054b7f WHIRLPOOL 618c4ac99e6efbdaf907c28580fee428b2098dfa3543193cea2a603de5196fbfbddf771a607fb8cc8543a72e9a6707148631cb4df4145268570b00e9d0925523 +AUX gpac-0.5.0-ffmpeg2.patch 1108 SHA256 ddd684b479c67b44cea1f9ecd248f7a0caf82ea39c9046aadfb46f6a9dc2e839 SHA512 5c52cf618553792b067a15ebef358a2218f4d728709b441118ecdb8e1c1b71c446293d2f7d67e51dd98b02acba82b38196d7d56c848b14f73192ccfdcd2d3703 WHIRLPOOL 04ea5160bf886f2218ff90d1c1a777a7abf78b7e188db70078e4f1b7f21c987cb6f71bd9490488abfe6a3e20e656ac6b1cae849bb38c9fa11f019b8c1eceed61 AUX gpac-0.5.0-libav9.patch 4064 SHA256 00ee9900081066d7fe05415aa8d50e1fd6cdd931735fa7e95bf8c4a193aa808d SHA512 4a2cb03db46559f93beb80b9bdffe37d9450ef180164958acd1c98a76ef96303602a84e93d5474e18b336167f5a0b96454db1e9bf50ad92f2996e28e4da76cba WHIRLPOOL 08b3d1d5d02cfe418188b85a57ad152e1d1ea87ee172b347b811d6b080814a5e1ba9cd6b72a66b58b9e007525bcda56a51e6e05b72b88b4178dc8b563716d973 DIST gpac-0.4.5-patches-8.tar.bz2 7263 SHA256 ed2b1bda99cd4a3dda49473876f36983ac3b7310e87f7f04cd2757de86515e57 SHA512 85806871c223722227d5b80bf8e45a25ffecdb842e1edc5586b50bfc2fb6c6fe0dfc3a414f90ffa9a64f02bcf3792be2ceea19784d27cf042e41b12be66dbde0 WHIRLPOOL 69a21a725277ace08c447e20307a955c99e7f2a9629731f0ed9b6ce5d1c7e4881cebee418415481148a82fcc7868bdb2e47174de8b7c6f7d00816fbbf2b0abfc DIST gpac-0.4.5-patches-9.tar.bz2 7370 SHA256 aee2cbdcc6256b320d4b9fd59ec82746f1bba797f3e604f2e5022cbef3cf89d5 SHA512 a40f0619680d5a022fd1a101555be599c834e983a432c1bb407b764a41128738298fac72ab1ae77d5a34afeced77e8099556d3c342da6980fccd01aec754102b WHIRLPOOL 9f88d3f7e3be5802d0210e184bbf8941cfa70c60e4fc4fe81d9d0764a2a934d4fb7f5bb61cdda8195b15f7e96d520ad6c71fb82324ce9b24e2cf91db7124e0c2 @@ -12,23 +13,13 @@ DIST gpac-0.4.5.tar.gz 4269054 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd0 DIST gpac-0.5.0.tar.gz 7861057 SHA256 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278 WHIRLPOOL 1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271 EBUILD gpac-0.4.5-r4.ebuild 4043 SHA256 69707121dc8df5ab7626d119e245860dde8531f06453bfdabc01eb85466f2964 SHA512 3e3e83ec3b85cc68ee02c6aae333dd5744f695644a9ba2059d52985c53d28ef34a46b12e20e8d64c44abc0b53646bd25afb5f98705251debf27d29c8973134ec WHIRLPOOL dfdb53525c535db7690ad946d359b7c96f3917ac42a8333fcfed14f6a0266f0ae1fbea0b5485e6e498ebdac7a66c50d8a76e2290d0ae80b2b11a17c7a5955acd EBUILD gpac-0.4.5-r5.ebuild 3925 SHA256 87648fbff68242aab58c11923d7789d9eab0f3148425fb035b73db2338b1bc92 SHA512 abb935789d504001b7727c7ca0ce44f86c0726d37812b1562f98e0df888c09c95c907049f7578ba76a5ac0016fdd16a795263851e8a9aac3b74fa3cb6a4587ab WHIRLPOOL 22d33b1056c127ec918031884bae543e7fdb9b1286d8586fab3ab7f99abcaf9097c08d960f0ef6ab31eca4c589c9b97e9dbdc4f7419ebe2ad27571a842527ac9 -EBUILD gpac-0.5.0.ebuild 4005 SHA256 e722a8f00e4b361a283ff8ff639b537e08b9298e8c55db95e42e73b3f2cc68cb SHA512 2d6861dfe5a4bc2fe535ecf18158e9be11e151d8ac532db89cdbcf6eafce5ee64681cac014806c2d502addfb1e20b99b8274bd372dec247ba87d0bebef9a036d WHIRLPOOL e97fe4ae8bc4f00fca9f3924153021526e7c5ef9bb3fdd1c16bbd9108de59bd53bb3d7768586eae1f8ac28f69f94d4b64e4d877c600054cd06a55daeb28643cc -MISC ChangeLog 15627 SHA256 66d90a05564a8b4315f8b0675740baebe3933ff0881c9019450fed03cb215859 SHA512 b4513a2aa6d00958eab35c5a6136a654a8feb209d84d5af1c318b0a4db6e7b4e7a4c9b0272cdf98982a31246d8ca7c6e0079a0126d4f1dd7b5459c51cbbecf74 WHIRLPOOL 49c74801e2235483705ac3603a4f6e36f7d2b6792a44a17f7ea24840d2e8c509a5aa89d63d26a2acb5557823ef3357819a318a67c7e86fc724aa39d1cb22a391 +EBUILD gpac-0.5.0.ebuild 4041 SHA256 6d4d98192337adcbe5fb11e821af2e4d4a4683486b879a789482d86e489cd4ee SHA512 3cd89a079c607d57a47e095d1d86c6dfeaa79c6c4c2c4d2b3fabc6fe4915b24fa37d6435f4b0e9e5283f707c42ee992c17cf0cfa577cc15e395670283cec4680 WHIRLPOOL 572cebbc71d3dab1bcdf5c104daabd88cf08ec668d0a27259b7fd12659066de715604893569f665f338a202e49ce29551a91502b9ab2ea2b1ef643451a9594e7 +MISC ChangeLog 15758 SHA256 a74a82bafd80e0e9692c521c52c91e219c050e30924237ba9df24dc2a8ac01d5 SHA512 4554a6b98f7b11fb2465256c558d03ccfd4633d5ff1f3927509bfa16eccc7b924bc99eeae7562970ac2fa58b5adb350a92821d75d0113ed962dc5997fa94daad WHIRLPOOL e64ba0b52c9cd9f9af81cd298f6bdc066d00ab6a25ecb6b1dcea448f5801046700460e74793172140eba10b969a1cef0601150244cdd7e5ef0d0cb6a1e796700 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQIcBAEBCAAGBQJRxdCpAAoJEOSiRoyO7jvoB8wQAJUswDoJ4wvhpd7oKgNgrkLY -RUwemHhi6+WvifsHQaN+zIbUNNXrs4e/uZqnGC7o83ESUYdiq9KrbcL5NGR82/Er -MDQh+tT8CiP++o347Xc+Mkb+AhSPBXTe+pRfvF5j9A0eEBnxJ5ZPAx1ZfPKRpCwf -KXNeHGWUaDy0+JDRWOA4YEFSDhwqK/EZofLfwDIwdzRKbTJh2vUvnt0u/WVTpWyZ -TMoZL2ibE5TunJ2u4C00GvDDUUU0bwY651x6kuJ0gMwYD1Sf5eZ2eWt2qBgPX+ZU -T8pfawFcx6L7t0vbSwqdtKOmYTZFVwSdPJY4HwyhKd4cyoV4TRtdIznPEXbSynU/ -hpV9TXILQVN4pXNssqnN4D7zfrfqctpisnfWX461AXOcZunwpnYO4/Hgws4oHp4a -aGA6uJMvClhYYwyTb5TpqWFLI40E9I3nefz9kFChjcgynkBLqtUoT48sCTg8lcTw -N/f8PIY1xKN1fvqeo1Ku/IxIuYYjUA40wtTcgXzapH3icZdNgE5Zf0I9GBy0snkH -sMzZjL1/JDRWctSV8JHBHmf4sc8r//LHt1Ikvbbz6TgdIggEqmDZs0YcQto5lw0p -69Jnte1M13X4OwkjrKs/XLR2f4x+cp45lazLKO5C4ukt2vBqtDVYMQ978g6juTNq -lCDwvCcDigXIE2vjFts6 -=yrnP +iEYEAREIAAYFAlIBrGQACgkQvFcC4BYPU0pMyACfSUV9w4uIpXlDiNVaqmETrR4o +aaIAoJxK5lDwmf3v4k1+bS03FaToTQqV +=0mlx -----END PGP SIGNATURE----- diff --git a/media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch b/media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch new file mode 100644 index 000000000000..f9dd4ba340a7 --- /dev/null +++ b/media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch @@ -0,0 +1,28 @@ +Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c +=================================================================== +--- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c ++++ gpac/modules/ffmpeg_in/ffmpeg_demux.c +@@ -614,7 +614,7 @@ static GF_Err FFD_ConnectService(GF_Inpu + } + /*setup downloader*/ + av_in->flags |= AVFMT_NOFILE; +-#if (LIBAVFORMAT_VERSION_MAJOR < 55) /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/ ++#if (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,4,0)) /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/ + res = avformat_open_input(&ffd->ctx, szName, av_in, NULL); + #else + res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL); +Index: gpac/modules/ffmpeg_in/ffmpeg_in.h +=================================================================== +--- gpac.orig/modules/ffmpeg_in/ffmpeg_in.h ++++ gpac/modules/ffmpeg_in/ffmpeg_in.h +@@ -96,6 +96,10 @@ void gf_av_vlog(void* avcl, int level, c + #endif + + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + + + /*FFMPEG decoder module */ diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild index dbc1c2d26a17..ebff59c6d210 100644 --- a/media-video/gpac/gpac-0.5.0.ebuild +++ b/media-video/gpac/gpac-0.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.4 2013/06/22 16:28:36 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.5 2013/08/07 02:09:38 aballier Exp $ EAPI=4 @@ -60,7 +60,8 @@ src_prepare() { "${FILESDIR}"/160_all_externalamr.patch \ "${FILESDIR}"/210_all_system_libogg.patch \ "${FILESDIR}"/${P}-build-fixes.patch \ - "${FILESDIR}"/${P}-libav9.patch + "${FILESDIR}"/${P}-libav9.patch \ + "${FILESDIR}"/${P}-ffmpeg2.patch # remove last of internal ogg sed -i \ |