diff options
Diffstat (limited to 'media-libs/libgroove')
| -rw-r--r-- | media-libs/libgroove/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch | 47 | ||||
| -rw-r--r-- | media-libs/libgroove/libgroove-4.3.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-libs/libgroove/metadata.xml | 3 |
4 files changed, 54 insertions, 4 deletions
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest index 6679c43a6606..037fc1536a49 100644 --- a/media-libs/libgroove/Manifest +++ b/media-libs/libgroove/Manifest @@ -1,6 +1,7 @@ AUX libgroove-4.3.0_GNUInstallDirs.patch 4199 BLAKE2B bd9e58dad55660c24fd272af50b41bed8b427d3b6901e882dc2348e1b507b60369c8122e424d3e7ba982833807fc403fbf8ee9321016bd43b170a332306b0233 SHA512 e7e2458cfc10f41afe163fda4f54fd1c9a3305c0cbe351b2954c64b066eb8fe529e83a4c333c4eb54ebc24edb39fcda4127c7f60011cbcfa2926f55f29725dea AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e5b79c772c93f8a7eeeeb91d9c892586434811ee9b675ec60970569a0318c9b4811b82b4d62b75dfd4753a5e2f9d98c SHA512 d0ab678d4bf0bac17493fbf7de51273bc918ef141a9951f6bae94362e8e142131e6098b68a2955b22e73b4c159940cd94630d5a6e6b6ae82e84bb18648770cc1 +AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705 -EBUILD libgroove-4.3.0-r1.ebuild 1143 BLAKE2B 9e67a84f260ecefc8fdceb4091096a5c31331546c3a1f144de7b6bec87f511a8f45bd4e401830d7045f02012b7e4e080a3a572f16a2bcbf4442a269851919936 SHA512 5e233c525b3edc2d3eddfce680117a669d3a5352c4d633503a70c91012f8eaa15b4df6c0ce91e4d248a3d3b8ba99e246d5c87f3d8031fd1a8c7a0ffb3ebea349 -MISC metadata.xml 1135 BLAKE2B 9dd3c2b193626f4962c2e42016971ce4957c8a870fa0a1452fb153d8de5ff4fe5c1cc131a6f277cbcf78cd89367a7ffb9ee41a1f47d689b8c8e3ce39b619cf98 SHA512 bcc655913cb4929aa53f82a1296e86f43138407cee6a17af58e9c7869d498fa94029c7402f981d0b3301bf935f6940fd515a443f4ef5e97bc5f0ef15e8ad4a78 +EBUILD libgroove-4.3.0-r1.ebuild 1177 BLAKE2B 65a597cf4f2564f0fb9fb3800d90e82e6fd789e683e95a63fdc0de13b50dad1a7d71b6cdabfc3b79253bb962d4d07435d051b44e04a83675db355201d48dde12 SHA512 b254cab5750412e33291c7c129f8215533bdfc8a44c575d33302d66dd5c8bda55f4bcb5fac83f75e87db99dba3ca3d5cec5cc5cfb8a44dd44a350bc9c3e24618 +MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3 diff --git a/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch new file mode 100644 index 000000000000..eadc4d98a913 --- /dev/null +++ b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch @@ -0,0 +1,47 @@ +Description: Fix FTBFS with FFmpeg 4.0 +Author: James Cowgill <jcowgill@debian.org> +Bug-Debian: https://bugs.debian.org/888376 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/groove/encoder.c ++++ b/groove/encoder.c +@@ -616,7 +616,7 @@ int groove_encoder_attach(struct GrooveE + + e->sink->audio_format = encoder->actual_audio_format; + e->sink->buffer_size = encoder->sink_buffer_size; +- e->sink->buffer_sample_count = (codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ? ++ e->sink->buffer_sample_count = (codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ? + 0 : e->stream->codec->frame_size; + e->sink->gain = encoder->gain; + +--- a/groove/playlist.c ++++ b/groove/playlist.c +@@ -186,7 +186,7 @@ static int audio_decode_frame(struct Gro + + if (!got_frame) { + // stop sending empty packets if the decoder is finished +- if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) ++ if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY) + return 0; + continue; + } +@@ -571,7 +571,7 @@ static int decode_one_frame(struct Groov + pthread_mutex_unlock(&f->seek_mutex); + + if (f->eof) { +- if (f->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) { ++ if (f->audio_st->codec->codec->capabilities & AV_CODEC_CAP_DELAY) { + av_init_packet(pkt); + pkt->data = NULL; + pkt->size = 0; +--- a/groove/file.c ++++ b/groove/file.c +@@ -281,7 +281,7 @@ int groove_file_save(struct GrooveFile * + ocodec->rc_buffer_size = icodec->rc_buffer_size; + ocodec->field_order = icodec->field_order; + +- uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; ++ uint64_t extra_size = (uint64_t)icodec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE; + if (extra_size > INT_MAX) { + cleanup_save(file); + av_log(NULL, AV_LOG_ERROR, "codec extra size too big\n"); diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild index 2cfafff6daef..9aac876f1dea 100644 --- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild +++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}_cflags.patch" "${FILESDIR}/${P}_sdl2_include_dir.patch" + "${FILESDIR}/${P}_ffmpeg4.patch" "${FILESDIR}/${P}_GNUInstallDirs.patch" ) src_configure() { diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml index 2d8c712dd3d1..b3286a1df8d5 100644 --- a/media-libs/libgroove/metadata.xml +++ b/media-libs/libgroove/metadata.xml @@ -18,10 +18,11 @@ <flag name="sound">Enable audio playing.</flag> </use> <upstream> - <maintainer status="active"> + <maintainer status="inactive"> <email>superjoe30@gmail.com</email> <name>Andrew Kelley</name> </maintainer> <remote-id type="github">andrewrk/libgroove</remote-id> + <bugs-to>https://github.com/andrewrk/libgroove/issues</bugs-to> </upstream> </pkgmetadata> |