We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 29
kodi-noX-raspberry-pi.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de
4
+
5
+- kodi.cximage.gcc6.patch
6
+
7
+-------------------------------------------------------------------
8
Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com
9
10
- Version update to Kodi 16.1 Jarvis:
11
kodi-noX-raspberry-pi2.changes
Changed
11
1
2
-------------------------------------------------------------------
3
+Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de
4
+
5
+- kodi.cximage.gcc6.patch
6
+
7
+-------------------------------------------------------------------
8
Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com
9
10
- Version update to Kodi 16.1 Jarvis:
11
kodi-noX.changes
Changed
11
1
2
-------------------------------------------------------------------
3
+Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de
4
+
5
+- kodi.cximage.gcc6.patch
6
+
7
+-------------------------------------------------------------------
8
Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com
9
10
- Version update to Kodi 16.1 Jarvis:
11
kodi.changes
Changed
11
1
2
-------------------------------------------------------------------
3
+Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de
4
+
5
+- kodi.cximage.gcc6.patch
6
+
7
+-------------------------------------------------------------------
8
Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com
9
10
- Version update to Kodi 16.1 Jarvis:
11
kodi-noX-raspberry-pi.spec
Changed
17
1
2
Patch2: kodi-texturepacker.patch
3
Patch3: crossguid_build64.patch
4
Patch4: add_rpi2_support.patch
5
+Patch6: kodi.cximage.gcc6.patch
6
BuildRequires: avahi-devel
7
BuildRequires: boost-devel
8
BuildRequires: byacc
9
10
%patch2
11
%patch3
12
%patch4 -p0
13
+%patch6 -p1
14
15
16
# Remove build time references so build-compare can do its work
17
kodi-noX-raspberry-pi2.spec
Changed
17
1
2
Patch2: kodi-texturepacker.patch
3
Patch3: crossguid_build64.patch
4
Patch4: add_rpi2_support.patch
5
+Patch6: kodi.cximage.gcc6.patch
6
BuildRequires: avahi-devel
7
BuildRequires: boost-devel
8
BuildRequires: byacc
9
10
%patch2
11
%patch3
12
%patch4 -p0
13
+%patch6 -p1
14
15
16
# Remove build time references so build-compare can do its work
17
kodi-noX.spec
Changed
17
1
2
Patch2: kodi-texturepacker.patch
3
Patch3: crossguid_build64.patch
4
Patch4: add_rpi2_support.patch
5
+Patch6: kodi.cximage.gcc6.patch
6
BuildRequires: avahi-devel
7
BuildRequires: boost-devel
8
BuildRequires: byacc
9
10
%patch2
11
%patch3
12
%patch4 -p0
13
+%patch6 -p1
14
15
16
# Remove build time references so build-compare can do its work
17
kodi.spec
Changed
17
1
2
Patch2: kodi-texturepacker.patch
3
Patch3: crossguid_build64.patch
4
Patch4: add_rpi2_support.patch
5
+Patch6: kodi.cximage.gcc6.patch
6
BuildRequires: avahi-devel
7
BuildRequires: boost-devel
8
BuildRequires: byacc
9
10
%patch2
11
%patch3
12
%patch4 -p0
13
+%patch6 -p1
14
15
16
# Remove build time references so build-compare can do its work
17
kodi.cximage.gcc6.patch
Added
201
1
2
+https://github.com/xbmc/xbmc/pull/9703
3
+---
4
+ lib/cximage-6.0/CxImage/ximabmp.cpp | 6 -
5
+ lib/cximage-6.0/CxImage/ximadef.h | 8 -
6
+ lib/cximage-6.0/CxImage/ximadsp.cpp | 182 +++++++++++++++++------------------
7
+ lib/cximage-6.0/CxImage/ximage.cpp | 4
8
+ lib/cximage-6.0/CxImage/ximagif.cpp | 6 -
9
+ lib/cximage-6.0/CxImage/ximahist.cpp | 12 +-
10
+ lib/cximage-6.0/CxImage/ximaint.cpp | 8 -
11
+ lib/cximage-6.0/CxImage/ximaiter.h | 4
12
+ lib/cximage-6.0/CxImage/ximajpg.cpp | 2
13
+ lib/cximage-6.0/CxImage/ximapal.cpp | 14 +-
14
+ lib/cximage-6.0/CxImage/ximapng.cpp | 12 +-
15
+ lib/cximage-6.0/CxImage/ximaraw.cpp | 4
16
+ lib/cximage-6.0/CxImage/ximasel.cpp | 54 +++++-----
17
+ lib/cximage-6.0/CxImage/ximath.cpp | 8 -
18
+ lib/cximage-6.0/CxImage/ximatif.cpp | 6 -
19
+ lib/cximage-6.0/CxImage/ximatran.cpp | 138 +++++++++++++-------------
20
+ lib/cximage-6.0/CxImage/ximawnd.cpp | 16 +--
21
+ 17 files changed, 238 insertions(+), 246 deletions(-)
22
+
23
+--- a/lib/cximage-6.0/CxImage/ximabmp.cpp
24
++++ b/lib/cximage-6.0/CxImage/ximabmp.cpp
25
+@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
26
+ bihtoh(&infohdr);
27
+
28
+ // Write the file header
29
+- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
30
++ hFile->Write(&hdr,cmin(14,sizeof(BITMAPFILEHEADER)),1);
31
+ hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1);
32
+ //and DIB+ALPHA interlaced
33
+ BYTE *srcalpha = AlphaGetPointer();
34
+@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
35
+ #endif //CXIMAGE_SUPPORT_ALPHA
36
+ {
37
+ // Write the file header
38
+- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
39
++ hFile->Write(&hdr,cmin(14,sizeof(BITMAPFILEHEADER)),1);
40
+ //copy attributes
41
+ memcpy(pDib,&head,sizeof(BITMAPINFOHEADER));
42
+ bihtoh((BITMAPINFOHEADER*)pDib);
43
+@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile)
44
+ BITMAPFILEHEADER bf;
45
+ DWORD off = hFile->Tell(); //<CSC>
46
+ cx_try {
47
+- if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
48
++ if (hFile->Read(&bf,cmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
49
+
50
+ bf.bfSize = my_ntohl(bf.bfSize);
51
+ bf.bfOffBits = my_ntohl(bf.bfOffBits);
52
+--- a/lib/cximage-6.0/CxImage/ximadef.h
53
++++ b/lib/cximage-6.0/CxImage/ximadef.h
54
+@@ -53,12 +53,8 @@
55
+ #define CXIMAGE_SUPPORT_WINDOWS 0
56
+ #endif
57
+
58
+-#ifndef min
59
+-#define min(a,b) (((a)<(b))?(a):(b))
60
+-#endif
61
+-#ifndef max
62
+-#define max(a,b) (((a)>(b))?(a):(b))
63
+-#endif
64
++#define cmin(a,b) (((a)<(b))?(a):(b))
65
++#define cmax(a,b) (((a)>(b))?(a):(b))
66
+
67
+ #ifndef PI
68
+ #define PI 3.141592653589793f
69
+--- a/lib/cximage-6.0/CxImage/ximadsp.cpp
70
++++ b/lib/cximage-6.0/CxImage/ximadsp.cpp
71
+@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBCo
72
+ G = lRGBColor.rgbGreen;
73
+ B = lRGBColor.rgbBlue;
74
+
75
+- cMax = max( max(R,G), B); /* calculate lightness */
76
+- cMin = min( min(R,G), B);
77
++ cMax = cmax( cmax(R,G), B); /* calculate lightness */
78
++ cMin = cmin( cmin(R,G), B);
79
+ L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX));
80
+
81
+ if (cMax==cMin){ /* r=g=b --> achromatic case */
82
+@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVCo
83
+ G = (int)( Y - 0.344f * U - 0.714f * V);
84
+ B = (int)( Y + 1.770f * U);
85
+
86
+- R= min(255,max(0,R));
87
+- G= min(255,max(0,G));
88
+- B= min(255,max(0,B));
89
++ R= cmin(255,cmax(0,R));
90
++ G= cmin(255,cmax(0,G));
91
++ B= cmin(255,cmax(0,B));
92
+ RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
93
+ return rgb;
94
+ }
95
+@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBCo
96
+ U = (int)((B-Y) * 0.565f + 128);
97
+ V = (int)((R-Y) * 0.713f + 128);
98
+
99
+- Y= min(255,max(0,Y));
100
+- U= min(255,max(0,U));
101
+- V= min(255,max(0,V));
102
++ Y= cmin(255,cmax(0,Y));
103
++ U= cmin(255,cmax(0,U));
104
++ V= cmin(255,cmax(0,V));
105
+ RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0};
106
+ return yuv;
107
+ }
108
+@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQCo
109
+ G = (int)( Y - 0.273f * I - 0.647f * Q);
110
+ B = (int)( Y - 1.104f * I + 1.701f * Q);
111
+
112
+- R= min(255,max(0,R));
113
+- G= min(255,max(0,G));
114
+- B= min(255,max(0,B));
115
++ R= cmin(255,cmax(0,R));
116
++ G= cmin(255,cmax(0,G));
117
++ B= cmin(255,cmax(0,B));
118
+ RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
119
+ return rgb;
120
+ }
121
+@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBCo
122
+ I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128);
123
+ Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128);
124
+
125
+- Y= min(255,max(0,Y));
126
+- I= min(255,max(0,I));
127
+- Q= min(255,max(0,Q));
128
++ Y= cmin(255,cmax(0,Y));
129
++ I= cmin(255,cmax(0,I));
130
++ Q= cmin(255,cmax(0,Q));
131
+ RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0};
132
+ return yiq;
133
+ }
134
+@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZCo
135
+ G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k);
136
+ B = (int)( 0.055648f * X - 0.204043f * Y + 1.057311f * Z * k);
137
+
138
+- R= min(255,max(0,R));
139
+- G= min(255,max(0,G));
140
+- B= min(255,max(0,B));
141
++ R= cmin(255,cmax(0,R));
142
++ G= cmin(255,cmax(0,G));
143
++ B= cmin(255,cmax(0,B));
144
+ RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
145
+ return rgb;
146
+ }
147
+@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBCo
148
+ Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B);
149
+ Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f);
150
+
151
+- //X= min(255,max(0,X));
152
+- //Y= min(255,max(0,Y));
153
+- //Z= min(255,max(0,Z));
154
++ //X= cmin(255,cmax(0,X));
155
++ //Y= cmin(255,cmax(0,Y));
156
++ //Z= cmin(255,cmax(0,Z));
157
+ RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0};
158
+ return xyz;
159
+ }
160
+@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, lon
161
+
162
+ BYTE cTable[256]; //<nipper>
163
+ for (int i=0;i<256;i++) {
164
+- cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f)));
165
++ cTable[i] = (BYTE)cmax(0,cmin(255,(int)((i-128)*c + brightness + 0.5f)));
166
+ }
167
+
168
+ return Lut(cTable);
169
+@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long
170
+ }
171
+ }
172
+ if (Kfactor==0 || ksumcur==0){
173
+- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b + Koffset)));
174
++ cPtr2[iY1] = (BYTE)cmin(255, cmax(0,(int)(b + Koffset)));
175
+ } else if (ksumtot == ksumcur) {
176
+- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
177
++ cPtr2[iY1] = (BYTE)cmin(255, cmax(0,(int)(b/Kfactor + Koffset)));
178
+ } else {
179
+- cPtr2[iY1] = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
180
++ cPtr2[iY1] = (BYTE)cmin(255, cmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
181
+ }
182
+ }
183
+ }
184
+@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long
185
+ }
186
+ }
187
+ if (Kfactor==0 || ksumcur==0){
188
+- c.rgbRed = (BYTE)min(255, max(0,(int)(r + Koffset)));
189
+- c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset)));
190
+- c.rgbBlue = (BYTE)min(255, max(0,(int)(b + Koffset)));
191
++ c.rgbRed = (BYTE)cmin(255, cmax(0,(int)(r + Koffset)));
192
++ c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(g + Koffset)));
193
++ c.rgbBlue = (BYTE)cmin(255, cmax(0,(int)(b + Koffset)));
194
+ } else if (ksumtot == ksumcur) {
195
+- c.rgbRed = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset)));
196
+- c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset)));
197
+- c.rgbBlue = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
198
++ c.rgbRed = (BYTE)cmin(255, cmax(0,(int)(r/Kfactor + Koffset)));
199
++ c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(g/Kfactor + Koffset)));
200
++ c.rgbBlue = (BYTE)cmin(255, cmax(0,(int)(b/Kfactor + Koffset)));
201