diff options
| -rw-r--r-- | media-libs/libquicktime/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/libquicktime/Manifest | 13 | ||||
| -rw-r--r-- | media-libs/libquicktime/files/libquicktime-1.1.1-libavutil50.patch | 61 | ||||
| -rw-r--r-- | media-libs/libquicktime/libquicktime-1.1.1.ebuild | 5 |
4 files changed, 77 insertions, 10 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index 7af69031159f..3a6a5acfe51e 100644 --- a/media-libs/libquicktime/ChangeLog +++ b/media-libs/libquicktime/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libquicktime -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.129 2008/12/29 22:22:06 vapier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.130 2009/04/15 05:44:38 aballier Exp $ + + 15 Apr 2009; Alexis Ballier <aballier@gentoo.org> + +files/libquicktime-1.1.1-libavutil50.patch, libquicktime-1.1.1.ebuild: + add a fix from upstream to build with ffmpeg trunk 29 Dec 2008; Mike Frysinger <vapier@gentoo.org> +files/libquicktime-1.1.1-headers.patch, libquicktime-1.1.1.ebuild: diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest index 35473cb97593..3f2b5a4e1493 100644 --- a/media-libs/libquicktime/Manifest +++ b/media-libs/libquicktime/Manifest @@ -4,18 +4,19 @@ Hash: SHA1 AUX libquicktime-1.0.3-x264-65.patch 2949 RMD160 92175c1ab94c871d024e9604288931f58b3db7af SHA1 1a70c252bdb86b8fc78ef637f8feac8962641dce SHA256 9631b1532b63b0a81247e3512429af769541a65d43d5cfd3748dcf15a9383fdf AUX libquicktime-1.0.3-x264lavc.patch 6939 RMD160 9ef1d7d5e3a47791c9939015f460b08d908f6d30 SHA1 d265c0ab4d04b7cea122d8f169650852a32fbc76 SHA256 77218bef978a3dd77ddf04f33a80d814d5a81fe55952fabbe94151280c02c997 AUX libquicktime-1.1.1-headers.patch 387 RMD160 7d3049bdd702170d7f8e1c85a7eecd641196bda3 SHA1 d76db33bde88b6e43dc4df229de0e31188d7d414 SHA256 6f34279fd585f76bbf9ab0e9c811235d3f435cd1e26399f3f671405efeb3bbea +AUX libquicktime-1.1.1-libavutil50.patch 2505 RMD160 fedb6dee50339187ab33eeb19861d286de4d16f6 SHA1 048bfc4a5ee81acbbdd0105924514a9439ace7f5 SHA256 e3db43ff7e0fbf30d3d7b3d51183f84ab472b4dfa3cb55e0ad52136061dff4f9 DIST libquicktime-1.0.3.tar.gz 1003262 RMD160 470ea049318f54d4bb7d633b33bdfa7c296469b1 SHA1 3e5e59c2620e83c6e7257befe76edb4b136c787c SHA256 72aa1c21539cecf08ced57386541fd092dd5957677c77e4c7ddc4d7c30df769a DIST libquicktime-1.1.0.tar.gz 1012906 RMD160 091b0c11b2b5d8ee707eedf7296ebf779d4eb4f6 SHA1 4e9bdbd0776a99e1bb7712a5c7cb38145c34f830 SHA256 aada7c0cb1d4e13157ad350d42b260cc4eb0ea8fc3444ba82572d0dad70450f0 DIST libquicktime-1.1.1.tar.gz 1009816 RMD160 d028b7c61d218de89103d322519421607e88cd70 SHA1 13666f7b82d8045a03e925966cf8098674814041 SHA256 90efa1a836133680669cac743b726608720ad8f3aadcdb71ff1e29e510bd0d13 EBUILD libquicktime-1.0.3.ebuild 2835 RMD160 bdc3e495edd449b9afb3d402170ee401403b5bea SHA1 d0add924dc2c9eb6af9af81041ad6fe16713a143 SHA256 c22fcbcc7cf12c5bffbf4fa17445005eb43fa1d89c3bf1623e5e1ac10a6939bc EBUILD libquicktime-1.1.0.ebuild 2758 RMD160 ab935492b90cd7215c60718b501c05dad0ae743f SHA1 e8bf331442445d786738c5b9df44ba57e6f82efc SHA256 eeef08d735f2cacc18fe32a1cb790a18c1fc5f6edea4e356276b89825762f5bd -EBUILD libquicktime-1.1.1.ebuild 2797 RMD160 eda41ec937535a0f15b683cfc15050b55b6ccb2f SHA1 917a134218361ed9cfa4da2b3b910a791b312b3e SHA256 96c88eed1e0b1f3a220dbd3bbeb9db5a8fbabe09d584e5d3bc69e351d6d1d9f8 -MISC ChangeLog 20185 RMD160 414ab8342bcd9b6481a18f275c05ad4114232dac SHA1 94cf92506cc1a96d460ab1bb4ed7293982112e86 SHA256 3e6ef3e9d2f9d8399d3cc549120f215322dedd476594bb8f9fac3b6c1bf936c4 +EBUILD libquicktime-1.1.1.ebuild 2844 RMD160 e95f67a0d899b75b130f91fe2c23ec14fa850a8d SHA1 415d21d102f91685adaed29206abe804c291754f SHA256 3b2abc37be43108e723fc1d5da44259f889fc535302a0782cba12797b796a3c9 +MISC ChangeLog 20367 RMD160 f59d32f39bae2ae1bbe42a08b01f4b37f4a46f22 SHA1 9750dba2d4f82bddc9949082fc7f24e8cad64c5b SHA256 198cc2ea5bcdceada402b2907eb59ae9fcaf0f235a5ac82bd0240495583fc23e MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAklZZwcACgkQn/5bYzqsSmGo8QCeMY4/5LgQzdbzO0EOg/erPsuJ -qpoAoLaSf6/2yMmq8qu+RhHUOBfDTGH2 -=VFlk +iEYEARECAAYFAknldEsACgkQvFcC4BYPU0p5cACbBUqrclNw7wYHAVRZOpfvtH4R +8KcAn0woerh0NTqBnr5spjnpsd/6zo/h +=8ROE -----END PGP SIGNATURE----- diff --git a/media-libs/libquicktime/files/libquicktime-1.1.1-libavutil50.patch b/media-libs/libquicktime/files/libquicktime-1.1.1-libavutil50.patch new file mode 100644 index 000000000000..5c27dc31c076 --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-1.1.1-libavutil50.patch @@ -0,0 +1,61 @@ +Fix build with libavutil 50 + + +Index: plugins/ffmpeg/video.c +=================================================================== +RCS file: /cvsroot/libquicktime/libquicktime/plugins/ffmpeg/video.c,v +retrieving revision 1.69 +retrieving revision 1.70 +diff -u -B -r1.69 -r1.70 +--- plugins/ffmpeg/video.c 11 Mar 2009 14:25:48 -0000 1.69 ++++ plugins/ffmpeg/video.c 13 Mar 2009 15:34:24 -0000 1.70 +@@ -102,7 +102,11 @@ + colormodels[] = + { + { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) ++#if LIBAVUTIL_VERSION_INT < (50<<16) + { PIX_FMT_YUV422, BC_YUV422, 1 }, ++#else ++ { PIX_FMT_YUYV422, BC_YUV422, 1 }, ++#endif + { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... + { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... + { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +@@ -112,7 +116,11 @@ + { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) + { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) + { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) ++#if LIBAVUTIL_VERSION_INT < (50<<16) + { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++#else ++ { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++#endif + { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 + { PIX_FMT_GRAY8, BC_RGB888, 0 }, + { PIX_FMT_MONOWHITE, BC_RGB888, 0 },///< 0 is white +@@ -296,7 +304,11 @@ + * Could someone please tell me, how people can make such a brain dead + * RGBA format like in ffmpeg?? + */ ++#if LIBAVUTIL_VERSION_INT < (50<<16) + if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) ++#else ++ if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) ++#endif + { + convert_image_decode_rgba(in_frame, out_frame, width, height); + return; +@@ -501,8 +513,13 @@ + + #ifdef HAVE_LIBSWSCALE + ++#if LIBAVUTIL_VERSION_INT < (50<<16) + if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && + (vtrack->stream_cmodel == BC_RGBA8888))) ++#else ++ if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && ++ (vtrack->stream_cmodel == BC_RGBA8888))) ++#endif + { + codec->swsContext = + sws_getContext(width, height, diff --git a/media-libs/libquicktime/libquicktime-1.1.1.ebuild b/media-libs/libquicktime/libquicktime-1.1.1.ebuild index 023eb01d26a2..5766cbb7bcad 100644 --- a/media-libs/libquicktime/libquicktime-1.1.1.ebuild +++ b/media-libs/libquicktime/libquicktime-1.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.1.1.ebuild,v 1.3 2008/12/29 22:22:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.1.1.ebuild,v 1.4 2009/04/15 05:44:38 aballier Exp $ inherit libtool eutils @@ -50,6 +50,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-headers.patch + epatch "${FILESDIR}"/${P}-libavutil50.patch # Needed for sane .so versionning on g/fbsd elibtoolize |