diff options
5 files changed, 72 insertions, 20 deletions
diff --git a/media-sound/karlyriceditor/ChangeLog b/media-sound/karlyriceditor/ChangeLog index 95b772ff8244..371c1481d934 100644 --- a/media-sound/karlyriceditor/ChangeLog +++ b/media-sound/karlyriceditor/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/karlyriceditor # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/karlyriceditor/ChangeLog,v 1.7 2013/02/06 08:41:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/karlyriceditor/ChangeLog,v 1.8 2013/02/07 18:45:16 aballier Exp $ + + 07 Feb 2013; Alexis Ballier <aballier@gentoo.org> karlyriceditor-1.4.ebuild, + +files/karlyriceditor-1.4-ffmpeg_compat.patch, + +files/karlyriceditor-1.4-qmin.patch: + Fix compatibility with older ffmpeg versions and fix build on amd64 while at + it. *karlyriceditor-1.4 (06 Feb 2013) diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest index 4e4ceef8b206..a3c75a3b88c3 100644 --- a/media-sound/karlyriceditor/Manifest +++ b/media-sound/karlyriceditor/Manifest @@ -2,26 +2,18 @@ Hash: SHA256 AUX karlyriceditor-1.3-libav.patch 213 SHA256 654d32e00013b4bd478fb60b4236d8780d06ae7953fbb6012c0f5557d5fbe869 SHA512 819a0f5739e3fb268a028951cdaf8a90a8dba387d2385cf4d626f351a53570b0c1913785efd0da5a4cefae28c824b9da36f16f8f1039525fcf96ba21b7ac478c WHIRLPOOL 99d2f333bb496c4bd092973a6a4998ae6a5f79cde3fe11d480e9d8285ddfc183b7c0ec1bd62c17d76576c1b06a9dcb168d7b829182a96175aa8a82cd5037a73d -DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 +AUX karlyriceditor-1.4-ffmpeg_compat.patch 1190 SHA256 35568813a22c505b1b74ef0c15d40aceba4683a3209c0d0b82331442344809ef SHA512 4d210646170b79d3d634e15b099788c5671ae1027ad8040f03366585eeed30c97d92eca537396571c77de1e2018c281a2e3638dadb5a20ad879e5a380c02a2b1 WHIRLPOOL 81ccc2890de9d0eaf8e45fa15f32e0535528b11274c2d2d381e9a423ad1557999ac585ba3cb35238c49e1cb7052053b35fe9801945b3d9a46b99e89ff4b2d13e +AUX karlyriceditor-1.4-qmin.patch 620 SHA256 5e4b3e1446d042f955e416230dbb122fa68d62d9504203c2ca1c7635bb447fb9 SHA512 b7b5bc7444bafcd9d2547e93b36667497103272e6f177849d5c44b34193aee02c87a81975c8d5c3c5d749e6cba11f8e125b3e13ad07441e811921a27dd0611cd WHIRLPOOL b268c5cd211d88cf1d4e351d81a6ad427904cb7c6e5a8784504510822210d90adf623a5ac0fb2b07de4d0d1fc89b31313a04e209ae8b17743ca0c0da24c9a242 +DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10 DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984 EBUILD karlyriceditor-1.3.ebuild 824 SHA256 02fc535e9a5c418ba5b2a10a552a97a8b07301357f8da48552ba3bae64941f5d SHA512 a780e017de2cc08b8c796f06b0689fae885059c4b9c3645de9f993c87129e63810b703c168246e7cf5e500c01021a8f029d9651214d44e020e8927a7dca298dd WHIRLPOOL cdd4f9586f8a25444ae5e1dd3097dc47bbc47f91ac79d9f469ddf3ac6bd6f8f3bccddecde1ccfdc947db38744b73e3dbd98e4711075db05ba57b70b9960d071b -EBUILD karlyriceditor-1.4.ebuild 863 SHA256 cbf2527d12d2a524258553bea22c08893f413a95f7b6c58b5677440c74c270f6 SHA512 abb866eb4dc14d5eec06fbd9dc028785def39268d794affd8ee37c30648e6a61d52afc4fdae359319f0023fa5e919eb2a0945d11baff51913b9bafc5afb7af77 WHIRLPOOL 3bfe4c3e99582b9309aa0085a2e41440390a744be64cba7b09129143fd0300722d524ed116dfbe07d234c9dddc719019c2692dcfc8c6dc6e4dd14a29dd3fdda7 -MISC ChangeLog 1295 SHA256 4bce9ce084be133e0b5a464ded3ec4cc775531a94295a3880a9e69b3f0dd64c8 SHA512 1ae7e945170aa74d5d81fc4bb35d0c7c1c006b63752f9f93b03360015ad20f4fc0d491d05f6a3736c3be75e300ef31ca722527c8c480ce884e7d5a54d1d831af WHIRLPOOL be328b7093e11e8076c296e7dd83baf234b0d268f2b1d6eec85f7a5be50f691aedde16b643a4fd231fa9a42ed545247b52c0817391163ec063513e578a75a0a2 +EBUILD karlyriceditor-1.4.ebuild 954 SHA256 d6d603773ae1cc6f417ca51251fbf8f440abac48dbacf7e923774a426c436243 SHA512 67d4ab73c9668acb3efaf712e448ce859930e61eb5e0fdd29f53a3fcbfd892d17c6c3f614dae933d017b1b17e71ae8bfb99273724db8eb274995e1b90b42e3ce WHIRLPOOL a233afdf3d4a1c927598b788f6407c0cee0e738247eaa9a55500ee23974ac5df686f102642c6900942ef5db540b9312468a6c149087fcd90304798160e183153 +MISC ChangeLog 1553 SHA256 0d639abfca5ad7e67d1fa297e8339cdf022d1ef546f7af5cc8c4d42e92beda7d SHA512 50abdc78f1b1d6aefd3c121bc40157108d1e17ca24380b76dbd0d7e8989df2353cf9d35f5f1a9226be3cd963fdd22e130193b8d3d5a8bc48d23795770a6736f2 WHIRLPOOL e72602fc080aa42fb9045df1975fa396e0334efeb36cdf4bd1323a45558222e416bd9041816b4b87dc4f9a99e7e21932ed1a537aa086e9043c92ba62f5462128 MISC metadata.xml 174 SHA256 2418e31677793769d217d7410964125cd2614638e8623dd97f6e00cb66e38930 SHA512 6ff59ffd385775c0084e3d7afc7d83858811b13b49161d7f7cc015fb8665f6c275d867887049ed219b3f81863e01196601038bb93f6e66673d62bd5e92d150b1 WHIRLPOOL 2ba7c9268b7c48e682146c2b0f9e6fdadd602f602914693f9b189d6e51aa9f71bb5282fcceb82d8a661a142afb26a4895368cf349e27fb9d1817724ff6e1aa48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJREhc0AAoJENXLsxwXqFxynYsQAK/IS+BSj3b6RXvIOmYgpQLt -kXS9cUe5hsaP6Ob7UwuT7X0yOQE8z70J/iNwKxNa6SxXnXYowXr/drNfaghld81s -0xW1h8x5t4YUOssw2/MNt8Pp34y/BDzhdVDKo31E1J0gDDSk+40Ava/u/dOn5e82 -hOUfhm2ExzsIjIA/ahvgI/RRYS063F3Uu9aW9AIO9AC6DTiLMo1+9MOhIj2ws5A9 -LQs1PFMysAYxun/HpR82Cb8mBp+FIklJPQjqxDyvrtjOZ4mV1HakgX+E7QlR2y2k -Lqe5mT8ndOSqRW5pRRjK1SoGSH0Sy/kz3Ng2T5Rwy6/g6ZTM2Mk7vIOwV0OisMX7 -cCY+ItpUw5Qk0V1d5FJIWMpYe8SxV20vn11JmD0VyLGBeY3pc6ejOodhGcJGbaAK -QAnydvDILSkl3OzI1CiKolhXciDyaRmakEH3e28L2Hf4/ntpVpNqoLzSKvgzcrNO -LqYKy0U2TDxRLo4i39dMN5Y3RAgYMVZqLBB1APaG8z0NCBoenUcw5dB+NOXsd/kX -wRV+QmUCPhGJJw+xz6Lqn4TVadxBp7VxQetTAqQukCevq9nbNDOaW5Stn+dK/M6X -KIHr6uqxkDMTwH31u17IpQvUPJI5pb9i1XtwU71SKsJpJ0LAGWUTQbnfD8pLz5or -NVvEjCsO0VIMy0G+DLcn -=mlfx +iEYEAREIAAYFAlET9j0ACgkQvFcC4BYPU0oN1gCgqhQ2dOQ5NgdnAxJ6IHPYs+Sr +qRwAnA985A7lmO6RgeGP+Jfmb8wzSBfn +=2PrS -----END PGP SIGNATURE----- diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch new file mode 100644 index 000000000000..9711f9e556f9 --- /dev/null +++ b/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch @@ -0,0 +1,37 @@ +Index: karlyriceditor-1.4/src/ffmpegvideoencoder.cpp +=================================================================== +--- karlyriceditor-1.4.orig/src/ffmpegvideoencoder.cpp ++++ karlyriceditor-1.4/src/ffmpegvideoencoder.cpp +@@ -397,6 +397,13 @@ int FFMpegVideoEncoderPriv::encodeImage( + // SWS conversion + convertImage_sws(img); + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0) ++ int out_size = avcodec_encode_video(pVideoCodecCtx,outbuf,outbuf_size,ppicture); ++ ++ if (out_size > 0) ++ { ++ av_init_packet(&pkt); ++#else + av_init_packet( &pkt ); + pkt.data = NULL; + pkt.size = 0; +@@ -408,6 +415,7 @@ int FFMpegVideoEncoderPriv::encodeImage( + + if ( got_packet ) + { ++#endif + if ( pVideoCodecCtx->coded_frame->pts != (int64_t) (0x8000000000000000LL) ) + pkt.pts= av_rescale_q(pVideoCodecCtx->coded_frame->pts, pVideoCodecCtx->time_base, pVideoStream->time_base); + +@@ -415,6 +423,10 @@ int FFMpegVideoEncoderPriv::encodeImage( + pkt.flags |= AV_PKT_FLAG_KEY; + + pkt.stream_index = pVideoStream->index; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0) ++ pkt.data = outbuf; ++ pkt.size = out_size; ++#endif + + int ret = av_interleaved_write_frame(pOutputCtx, &pkt); + diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch new file mode 100644 index 000000000000..b7835e5973ac --- /dev/null +++ b/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch @@ -0,0 +1,13 @@ +Index: karlyriceditor-1.4/src/kfn_file_parser.cpp +=================================================================== +--- karlyriceditor-1.4.orig/src/kfn_file_parser.cpp ++++ karlyriceditor-1.4/src/kfn_file_parser.cpp +@@ -311,7 +311,7 @@ QByteArray KFNFileParser::extract( const + + while ( total_in < entry.length_in ) + { +- int toRead = qMin( sizeof(buffer), (unsigned int) entry.length_in - total_in ); ++ int toRead = qMin( sizeof(buffer), (size_t) entry.length_in - total_in ); + int bytesRead = m_file.read( buffer, toRead ); + + // We might need to write less than we read since the file is rounded to 16 bytes diff --git a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild index cf4b1f338aa5..24c04fd06b1d 100644 --- a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild +++ b/media-sound/karlyriceditor/karlyriceditor-1.4.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-sound/karlyriceditor/karlyriceditor-1.4.ebuild,v 1.1 2013/02/06 08:41:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild,v 1.2 2013/02/07 18:45:16 aballier Exp $ EAPI=5 @@ -18,7 +18,7 @@ IUSE="" RDEPEND=" dev-libs/openssl:0 media-libs/libsdl - >=virtual/ffmpeg-0.11 + >=virtual/ffmpeg-0.10 x11-libs/qt-core:4 x11-libs/qt-gui:4 " @@ -26,7 +26,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -PATCHES=( "${FILESDIR}/${PN}-1.3-libav.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.3-libav.patch" + "${FILESDIR}/${PN}-1.4-ffmpeg_compat.patch" + "${FILESDIR}/${PN}-1.4-qmin.patch" + ) src_install() { dodoc Changelog |