Permalink
Browse files

Updated the xbmc pvr ebuild (old patches were not valid anymore + new

 dependency)
  • Loading branch information...
gbin committed Aug 9, 2012
1 parent 63fd19b commit ad7c462157bea2d5f0951516644083168ada355b
@@ -1,4 +1 @@
-AUX xbmc-pvr-9999-headers.patch 450 RMD160 52f5b4974c2e593c3d6518638c81946a9dc325f2 SHA1 e1987cea85f3156b0f00c61d6411e678416df5f3 SHA256 28765af28836502ce2df92c00b0df27733137111f7fbb11a5cd0b5b7c47b0713
-AUX xbmc-pvr-9999-libpng-1.5-fix-plt-trn-get.patch 1659 RMD160 94404f801cc50f0f83f6d9716b572568981cc238 SHA1 761e00902f9979180966928719ea2ba311ab590b SHA256 fed3ba39de959c46bc43431b229347c187690848ccd3bdc823bb7291bc425e84
-AUX xbmc-pvr-9999-libpng-1.5.patch 18687 RMD160 806918123b89ba86dd548cbd42fe26f9784ca6b9 SHA1 44d8c0f96445db48293f356909cff303b050e279 SHA256 359cc4893cc6922b86269770c11c5e80fd5b33e711ebf1645b232e4f3fc91c28
-EBUILD xbmc-pvr-9999.ebuild 6555 RMD160 52e9a0c0d63db6d15d88e729111bd35a3ec4952c SHA1 b86d4c3c71832e4b7d99076119baea80bf394b85 SHA256 2f79ffc465686d7f393b6f1ed5c1da5962aa483adb00dcd05f20eb284367abf4
+EBUILD xbmc-pvr-9999.ebuild 6204 SHA256 c905b1ea2cb099908e60aefc3abf75bc4acdb91ca5c0194bd6a04364fb5071f0 SHA512 f7f3f1ba77d11bc1366eedfdb84507dd11a21ef3c940db2461b61ed3b2293d91761850ee9c3a16f998743c0a1cc50b87e59f25d17772a85e06328a809701d730 WHIRLPOOL fc14706528935d2882a14ed6d2946a899cfd7efb8306e54c747e843575499a93915306e9fc2f8bc2b96a910459ccfa24b0ab94df462a7c79692a6c7c973b9197
@@ -1,12 +0,0 @@
-diff --git a/tools/TexturePacker/XBTFWriter.cpp b/tools/TexturePacker/XBTFWriter.cpp
-index 78b47fe..2e75d96 100644
---- a/tools/TexturePacker/XBTFWriter.cpp
-+++ b/tools/TexturePacker/XBTFWriter.cpp
-@@ -22,6 +22,7 @@
- #include "XBTFWriter.h"
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
-+#include <unistd.h> /* for unlink() prototype */
- #include "guilib/XBTF.h"
- #include "utils/EndianSwap.h"
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
@@ -1,51 +0,0 @@
-
-Update libpng 1.5 patch: check return values of png_get_PLTE() and
-png_get_tRNS() before using the values to avoid using uninitialized values.
-
---- a/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -178,12 +178,14 @@ bool CxImagePNG::Decode(CxFile *hFile)
- int _num_palette;
- png_colorp _palette;
- #if PNG_LIBPNG_VER > 10399
-- png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+ png_uint_32 _palette_ret;
-+ _palette_ret = png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+ if (_palette_ret && _num_palette>0){
- #else
- _num_palette=info_ptr->num_palette;
- _palette=info_ptr->palette;
--#endif
- if (_num_palette>0){
-+#endif
- SetPalette((rgb_color*)_palette,_num_palette);
- SetClrImportant(_num_palette);
- } else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-@@ -199,11 +201,13 @@ bool CxImagePNG::Decode(CxFile *hFile)
- int _num_trans;
- png_color_16p _trans_color;
- #if PNG_LIBPNG_VER > 10399
-- png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+ png_uint_32 _trans_ret;
-+ _trans_ret = png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+ if (_trans_ret && _num_trans!=0){ //palette transparency
- #else
- _num_trans=info_ptr->num_trans;
--#endif
- if (_num_trans!=0){ //palette transparency
-+#endif
- if (_num_trans==1){
- if (_color_type == PNG_COLOR_TYPE_PALETTE){
- #if PNG_LIBPNG_VER > 10399
-@@ -219,7 +223,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- #endif
- }
- }
-+#if PNG_LIBPNG_VER > 10399
-+ if (_num_trans>1 && _trans_alpha!=NULL){
-+#else
- if (_num_trans>1){
-+#endif
- RGBQUAD* pal=GetPalette();
- if (pal){
- DWORD ip;
Oops, something went wrong.

0 comments on commit ad7c462

Please sign in to comment.