libquicktime: add a fix from upstream to build with ffmpeg trunk (thanks to gentoo)

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@461 18ef50b8-d735-4ccd-97c1-689132df3dd9

3 files changed, 97 insertions, 3 deletions

diff --git a/media/libs/libquicktime/Manifest b/media/libs/libquicktime/Manifest
index 9c15a73..e05513e 100644
--- a/media/libs/libquicktime/Manifest
+++ b/media/libs/libquicktime/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libquicktime-1.1.1.tar.gz 1009816 MD5 88df838a450b6c6768819d45bacc0926 RMD160 d028b7c61d218de89103d322519421607e88cd70 SHA1 13666f7b82d8045a03e925966cf8098674814041 SHA256 90efa1a836133680669cac743b726608720ad8f3aadcdb71ff1e29e510bd0d13 SHA512 6358af15c7fd93cab06c963f5a239ca210b973c3f9748f4810a655220940cb47d847ed2ee6aca4cd3ff28a0c052d75209a66f0158f1c7cb8d152baca9443d5aa
-MKBUILD libquicktime.mkbuild 2932 MD5 0aca78209b412de8b722049cd644d726 RMD160 dcc76b66de012f9862417aba95f811cc9a36cde6 SHA1 69bf63bbf669ecd279001c9f5183e2cc7142a2a4 SHA256 b3dcf4192bba27a136183c7a4bff45defdd2683834b756497b130c93bca84b7f SHA512 32f1910b1195688b75a56c0066355f39a2bcae159e279154422db723bfe1a3bddf4d3bc08c65f924bc1af6f3d01a8ffc40a0d31d166ff4857369e5f7261d1ff3
+MKBUILD libquicktime.mkbuild 2952 MD5 f7f77217d068644ac917b86f9a9e920a RMD160 a1a1fc8f3c161339a7efaf8789181a2869563551 SHA1 1b78ad7e44e48be344497e872e98866280883252 SHA256 024d0292e4feb2970de126dd41cf4609e67d9c725b284d39bd1cbd636585b787 SHA512 e9f318a5122fff858cb36dd7b08404140e71716e7348f184b70547a229eff07403863c1b8fcee94c276b5d4296d69dfd19f79401e05651d1996ec015ebb21b65
 PATCH libquicktime-0.9.10.diff 1759 MD5 8770acadd1c0d35a55d7e6d62534ba0f RMD160 1e319d133115a4653ed0e86dc0738e0df4b8e529 SHA1 e0037c6950595ebd4a5f7c2be5a91b282c58e216 SHA256 2de7b233a70439206bb5a464df7275875bba5a0885fc0a5dd0eedc3b9eb51e01 SHA512 18007bed2d05a71e400f4153842096e4a2d7cad0918a8ee1d27fc7da8280d6c325f625d0989f2bdf76204e5ee2fff6f31ec86ab92de0a69b17a708f58f667d7b
+PATCH libquicktime-1.1.1.diff 2383 MD5 4e67d7da5a7293899c2d845e8e208612 RMD160 f11a1d77673158cccfbc296727c6b9c8eb7cf017 SHA1 ad6f1a0a1b56f4978ab5e4f98d7fef5a3604e8c6 SHA256 26f79de062e3ebae8f641112d6416df576f64a80964cc5d46eb83dbae8bd6b64 SHA512 55f0adf42c02a41573579507dc448fbf47770101181465de56076a9976456050671f143a58a50c62182b32d2fcbb1a904b9d967af70e8b595f8605b252f68637
 SLACK-REQUIRED slack-required 84 MD5 68ac4b8b2d410b368135bffcac189d57 RMD160 6eeb6640b37b4beb999f823aa4444098ff252a9e SHA1 dfb45dfc23a4297d27724ad46f9f212ce62cd8e3 SHA256 820e7fac5fcdf1beef1d6199bcf2a280d463d354207220aaeaa884e30a694bc6 SHA512 30a3b87ceeebf12e1e9537d4d514380c71b6739425ede1b6168e51935720d1feb2471f90e534cd94caaca9923ef677988687e1cb370f5bb1b214ade0c18c5feb
-SLACKBUILD libquicktime.SlackBuild 6136 MD5 3a6463a7c03c54794e42ac1743c8bddd RMD160 2a1cc93d6d0a6384d8cd8064055efc8ae7c30963 SHA1 43b589625d1ffc7422eb70e31c1a6681d670ee5c SHA256 875c774410812bc1aec67113eef9ff4e935de2040ee58833fa64afeed959124b SHA512 97f4580ab08349f01ec200059edb0647167836c1069ecc438863d6afb1e313e1ccdd16c6c6679db3377be48918570ecf9ecb721c07b30f6de37bcdb0cf279793
+SLACKBUILD libquicktime.SlackBuild 8286 MD5 76fd3fa48fda6b59b47f992801d6403f RMD160 3fd9b2fbf2af4b4a10e6c3ae47c740021b8457cd SHA1 740b27b3173bfbc3d049fa9e95b7d070f69e57c3 SHA256 f2cd58bccb0e1963ae30937080760604496245f4219cb1b5384bd2c39e8281c0 SHA512 79fdcbdd873efd1d7580a59371887e4bccdff9b884153dbbbe62c67029cf0364b62c0388cb36b9e008c3cf4f6b738e6dd661e7864329f39fd9378166364459ad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/vSdAAoJEEHL93ESzgei3FUQAJjmd9OyT5wN5zt47KDn2Bhy
+lE1novlX9tfSQdWvFdJHi/zUjLMBO8yUbdiKvsS5n2R2KK0PRCAF0HfGHOwDy38/
+kJaAtNONShUFUhaHYAYyqkC3MOQEiQAQS57YWiYrCESm+ab5aqL3/N70sTHTWNKt
+K6SEnUgfP4busDOmhL2C3x5b7bj2kUfmuat/y4vie8MGz3zd2LTHHaItlyUPPQWy
+nbywOylXwBi3FtoKiBUouOsp1pMDF1eg8zebRB5Ub8nY8U0wRwP4F2Q92aCdvjbg
+J4RfP/wlnaX/bKWR2LscMZyPGwyKpwbQSWR8Gr/DSDpU5cqJE0G0LMB+hR44TlrJ
+HPSYczUz85BkRjW8ONgpBkdkgNIFNsv7bh2xFaz9pyRBLPP9vCen8Nq3/Pbe9tj/
+2IYZmasq0rcLT9+jtRgDD8gkF6UgwnBTU5uHH6ENPWGl6JPjuTN2GaAgxibHy7rN
+UkFnFJsuAQZhhgtiHhHd+gPU4pTHbeg9dDA724B9nPqheFcnC2E+zE5zQC+rfryd
+wM7VZXWKJ5OMH6c3kc8EcqIOV4QaqgxcPgd8cFkRedX4beNliSKESXsTurx0C4su
+caGEICaKMZ2h9pe8dkKCiANoyabRbLfaF4ayg1Np90m8N/yrLPfZzOcy+bKTAyRB
+65jPRenQU5Lb2LR7lfLu
+=dYns
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libquicktime/libquicktime-1.1.1.diff b/media/libs/libquicktime/libquicktime-1.1.1.diff
new file mode 100644
index 0000000..fb25e6a
--- /dev/null
+++ b/media/libs/libquicktime/libquicktime-1.1.1.diff
@@ -0,0 +1,53 @@
+diff -Naur libquicktime-1.1.1.orig/plugins/ffmpeg/video.c libquicktime-1.1.1/plugins/ffmpeg/video.c
+--- libquicktime-1.1.1.orig/plugins/ffmpeg/video.c	2008-12-01 17:45:29.000000000 -0200
++++ libquicktime-1.1.1/plugins/ffmpeg/video.c	2009-05-04 10:56:11.000000000 -0300
+@@ -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;
+@@ -537,8 +549,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/video/ffmpeg/Manifest b/media/video/ffmpeg/Manifest
index 132af43..c7a5201 100644
--- a/media/video/ffmpeg/Manifest
+++ b/media/video/ffmpeg/Manifest
@@ -1,3 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MKBUILD ffmpeg.mkbuild 3750 MD5 034cf705fa7295caaaead716949b8e00 RMD160 a22a5387cf5287915964b4ead2dbf11f48b5c626 SHA1 53bba99a9298c00ab1f4acf293831fc47c135648 SHA256 1d408f5f07ea9826373949789b12ef96510a6f7ffc88329a13fd894476e28fdb SHA512 c145180bdce5288827135e7134251592e2cd207846b50ba24fe1b953f092567381aa50391d446764ca324ae922961dc71580b094ba63893239cc446d1a4d76f4
 SLACK-REQUIRED slack-required 106 MD5 b7c18a5ca91581acda9bb7bf750d6b3b RMD160 292eb967eaf437dc0a29004fc0cd22af3fcdc019 SHA1 4d75e5e5dcbe70bc44ab134cade77d57c88a5399 SHA256 6df14409e362af22858d675914390f400ee4991f972785633d185fbece3fba80 SHA512 38a768c04892c33d228db617089faa26537e9cf712b6db195bb039cbca6ff43f6a5dfd3e2e806a8a337b35da9f94aaa45cf718f19c82b55d4add936e936e86a4
-SLACKBUILD ffmpeg.SlackBuild 8803 MD5 8944e3c4e9f351c4c836305d805e2174 RMD160 11b576824938d6780480f1cf8b3e97bb2fc30676 SHA1 a808153ee570d71cf796486adfad90aa314e5fdf SHA256 2a1194adea09ed8b04d90af58e6a05e5ca8cd73f15a889b95f249d50820182b9 SHA512 c767a1a97e4a6305922e5aa15d6b473fd44675551f2d5f4c1f0e0caeeb6008b759f273182f3b9659a7c3b8947949ec87e0e21e5d51cb405afff69c3596a319a3
+SLACKBUILD ffmpeg.SlackBuild 8887 MD5 b29bf557844050996b53be68d1eeae96 RMD160 e56affde334dcefdc2e35a1d653b4651e98cc543 SHA1 04b1383733bcd988737e6965b8d69cef4bbe2a85 SHA256 1fbd7d259f71a3472c0d7a6253702c653b5f4c745eccd568437031c5e196b907 SHA512 ab27e7ba5f7b23172a3bcaa1145429bd7309558dafb4112933e1531d3db96d04e8335f7fc47d437e12e26662550eff5ee35b4453158d827f3602f43c579c6188
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/hLnAAoJEEHL93ESzgeiNh8P/1JgL3/Q4QUVMeuKw/vplqk7
+kMN8BvwUqR9pctkrFZw6re2YhZu/eCtANl7sX8TyNRbEY95razTaLqBAY3omNLhT
+sNaRFKuNRyHbC9FWinKjl8Ce+0hvFx1yWqvNk9J40X6pO3rSMn6n6hYgQ88bv9ra
+R7IvxTXRChcv9NPsf9JMtyqquLeZ2ru+6X1oJHtVX+klvkEw4V8iBIireoCACjJx
++F7tgWBYiWARw4SHD7MRBILzeSz1CbHqQmBW5osWoL6s+W/fJ63axyULx45SBoUC
+9NZpVuPloXtCMPMzUCsUAa9SDnLpYJbe8bDr7Mf1e+VqQ91PpiuF8LZJt/whuiSn
+DSUz+DpQAoVQbSNH58sBurQDx3vVSTZd2JwpuSo+xykuA+i/koSI2jhWq2Pdmz7Z
+ueqOSPMrRgtN107kxWvG1okBxiJayBmfzaqElyGoEPJcR4YK48gyT0cpBfoZ4ks1
+oMatiqHrlyAaor0LM4Z7jSJFQEgw9JhTcJOL2zoN+NOSFR4ineJrhTuMCYNbPwMe
+4TdtFqaIIbwno09+PEdsuU8I6vwjeYH8ODPDEL0pj2ztO7SnexxhHo9lsltO9BMe
+cBBZjvOUScUZhDaIXDhvAKj6ij+Datwh9NkoNLag6zv2WcIhT3dkHhnexkrlXHP+
+3LH2uTLBhQy5ZG6P7ABV
+=txrH
+-----END PGP SIGNATURE-----