rpms/xtables-addons-kmod/F-16 xtables-addons-kmod.spec,1.37,1.38
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13953
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.41-1.12
- rebuild for updated kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-16/xtables-addons-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xtables-addons-kmod.spec 21 Mar 2012 11:06:51 -0000 1.37
+++ xtables-addons-kmod.spec 30 Mar 2012 09:36:40 -0000 1.38
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 1.41
-Release: 1%{?dist}.11
+Release: 1%{?dist}.12
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.41-1.12
+- rebuild for updated kernel
+
* Wed Mar 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.41-1.11
- rebuild for updated kernel
12 years, 7 months
rpms/west-chamber-kmod/F-16 west-chamber-kmod.spec,1.32,1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13829
Modified Files:
west-chamber-kmod.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.28
- rebuild for updated kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-16/west-chamber-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- west-chamber-kmod.spec 21 Mar 2012 11:06:40 -0000 1.32
+++ west-chamber-kmod.spec 30 Mar 2012 09:36:30 -0000 1.33
@@ -11,7 +11,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}.27
+Release: 7.%{?svndate}svn%{?dist}.28
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -82,6 +82,9 @@
rm -rf %{buildroot}
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.28
+- rebuild for updated kernel
+
* Wed Mar 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.27
- rebuild for updated kernel
12 years, 7 months
rpms/VirtualBox-OSE-kmod/F-16 VirtualBox-OSE-kmod.spec,1.83,1.84
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13705
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.10-1.2
- rebuild for updated kernel
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-16/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- VirtualBox-OSE-kmod.spec 23 Mar 2012 16:53:22 -0000 1.83
+++ VirtualBox-OSE-kmod.spec 30 Mar 2012 09:36:20 -0000 1.84
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels akmod
+%define buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -18,7 +18,7 @@
Name: VirtualBox-OSE-kmod
Version: 4.1.10
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -100,6 +100,9 @@
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.10-1.2
+- rebuild for updated kernel
+
* Fri Mar 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.10-1.1
- New release.
12 years, 7 months
rpms/staging-kmod/F-16 staging-kmod.spec,1.44,1.45
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13298
Modified Files:
staging-kmod.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.2
- rebuild for updated kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-16/staging-kmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- staging-kmod.spec 22 Mar 2012 20:25:26 -0000 1.44
+++ staging-kmod.spec 30 Mar 2012 09:36:09 -0000 1.45
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -127,6 +127,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.2
+- rebuild for updated kernel
+
* Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
- update to 3.3
- disable the HV driver, as HYPERV is not set in Fedora
12 years, 7 months
rpms/openafs-kmod/F-16 openafs-kmod.spec,1.37,1.38
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13160
Modified Files:
openafs-kmod.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-0.pre4.4
- rebuild for updated kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-16/openafs-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- openafs-kmod.spec 21 Mar 2012 11:06:05 -0000 1.37
+++ openafs-kmod.spec 30 Mar 2012 09:35:58 -0000 1.38
@@ -23,7 +23,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 0.%{pre}%{?dist}.3
+Release: 0.%{pre}%{?dist}.4
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -96,6 +96,9 @@
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-0.pre4.4
+- rebuild for updated kernel
+
* Wed Mar 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-0.pre4.3
- rebuild for updated kernel
12 years, 7 months
rpms/ndiswrapper-kmod/F-16 ndiswrapper-kmod.spec,1.75,1.76
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13033
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.15
- rebuild for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-16/ndiswrapper-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ndiswrapper-kmod.spec 21 Mar 2012 11:05:53 -0000 1.75
+++ ndiswrapper-kmod.spec 30 Mar 2012 09:35:47 -0000 1.76
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 1%{?_rc}%{?dist}.14
+Release: 1%{?_rc}%{?dist}.15
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.15
+- rebuild for updated kernel
+
* Wed Mar 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.14
- rebuild for updated kernel
12 years, 7 months
rpms/buildsys-build-rpmfusion/F-16 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.47, 1.48 buildsys-build-rpmfusion.spec, 1.58, 1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1755
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-31
- rebuild for kernel 3.3.0-8.fc16
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- buildsys-build-rpmfusion-kerneldevpkgs-current 21 Mar 2012 10:31:38 -0000 1.47
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 30 Mar 2012 07:52:42 -0000 1.48
@@ -1,3 +1,3 @@
-3.3.0-4.fc16
-3.3.0-4.fc16smp
-3.3.0-4.fc16PAE
+3.3.0-8.fc16
+3.3.0-8.fc16smp
+3.3.0-8.fc16PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- buildsys-build-rpmfusion.spec 21 Mar 2012 10:31:38 -0000 1.58
+++ buildsys-build-rpmfusion.spec 30 Mar 2012 07:52:42 -0000 1.59
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 16
-Release: 30
+Release: 31
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-31
+- rebuild for kernel 3.3.0-8.fc16
+
* Wed Mar 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-30
- rebuild for kernel 3.3.0-4.fc16
12 years, 7 months
rpms/xbmc/F-16 xbmc-10.1-libpng-1.5.patch,NONE,1.1
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7441
Added Files:
xbmc-10.1-libpng-1.5.patch
Log Message:
Missed a file.
xbmc-10.1-libpng-1.5.patch:
ximapng.cpp | 294 ++++++++++++++++++++++++++++++++++++++++++++++++------------
ximapng.h | 5 +
2 files changed, 241 insertions(+), 58 deletions(-)
--- NEW FILE xbmc-10.1-libpng-1.5.patch ---
fix building with newer libpng. patch by Ian Stakenvicius.
https://bugs.gentoo.org/380127
--- a/xbmc/lib/cximage-6.0/CxImage/ximapng.h
+++ b/xbmc/lib/cximage-6.0/CxImage/ximapng.h
@@ -69,8 +69,13 @@
static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
{
+#if PNG_LIBPNG_VER > 10399
+ strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
strncpy((char*)png_ptr->error_ptr,error_msg,255);
longjmp(png_ptr->jmpbuf, 1);
+#endif
}
};
--- a/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
+++ b/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
@@ -15,7 +15,11 @@
void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
{
strcpy(info.szLastError,message);
+#if PNG_LIBPNG_VER > 10399
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
longjmp(png_ptr->jmpbuf, 1);
+#endif
}
////////////////////////////////////////////////////////////////////////////////
#if CXIMAGE_SUPPORT_DECODE
@@ -62,7 +66,11 @@
/* Set error handling if you are using the setjmp/longjmp method (this is
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier. */
+#if PNG_LIBPNG_VER > 10399
+ if (setjmp(png_jmpbuf(png_ptr))) {
+#else
if (setjmp(png_ptr->jmpbuf)) {
+#endif
/* Free all of the memory associated with the png_ptr and info_ptr */
delete [] row_pointers;
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
@@ -70,16 +78,35 @@
/* read the file information */
png_read_info(png_ptr, info_ptr);
+ png_uint_32 _width,_height;
+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
+#if PNG_LIBPNG_VER > 10399
+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,
+ &_interlace_type,&_compression_type,&_filter_type);
+#else
+ _width=info_ptr->width;
+ _height=info_ptr->height;
+ _bit_depth=info_ptr->bit_depth;
+ _color_type=info_ptr->color_type;
+ _interlace_type=info_ptr->interlace_type;
+ _compression_type=info_ptr->compression_type;
+ _filter_type=info_ptr->filter_type;
+#endif
+
if (info.nEscape == -1){
- head.biWidth = info_ptr->width;
- head.biHeight= info_ptr->height;
+ head.biWidth = _width;
+ head.biHeight= _height;
info.dwType = CXIMAGE_FORMAT_PNG;
+#if PNG_LIBPNG_VER > 10399
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
longjmp(png_ptr->jmpbuf, 1);
+#endif
}
/* calculate new number of channels */
int channels=0;
- switch(info_ptr->color_type){
+ switch(_color_type){
case PNG_COLOR_TYPE_GRAY:
case PNG_COLOR_TYPE_PALETTE:
channels = 1;
@@ -101,71 +128,108 @@
break;
default:
strcpy(info.szLastError,"unknown PNG color type");
+#if PNG_LIBPNG_VER > 10399
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
longjmp(png_ptr->jmpbuf, 1);
+#endif
}
//find the right pixel depth used for cximage
+#if PNG_LIBPNG_VER > 10399
+ int pixel_depth = _bit_depth * png_get_channels(png_ptr,info_ptr);
+#else
int pixel_depth = info_ptr->pixel_depth;
+#endif
if (channels == 1 && pixel_depth>8) pixel_depth=8;
if (channels == 2) pixel_depth=8;
if (channels >= 3) pixel_depth=24;
- if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+ if (!Create(_width, _height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+#if PNG_LIBPNG_VER > 10399
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
longjmp(png_ptr->jmpbuf, 1);
+#endif
}
/* get metrics */
- switch (info_ptr->phys_unit_type)
+ png_uint_32 _x_pixels_per_unit,_y_pixels_per_unit;
+ int _phys_unit_type;
+#if PNG_LIBPNG_VER > 10399
+ png_get_pHYs(png_ptr,info_ptr,&_x_pixels_per_unit,&_y_pixels_per_unit,&_phys_unit_type);
+#else
+ _x_pixels_per_unit=info_ptr->x_pixels_per_unit;
+ _y_pixels_per_unit=info_ptr->y_pixels_per_unit;
+ _phys_unit_type=info_ptr->phys_unit_type;
+#endif
+ switch (_phys_unit_type)
{
case PNG_RESOLUTION_UNKNOWN:
- SetXDPI(info_ptr->x_pixels_per_unit);
- SetYDPI(info_ptr->y_pixels_per_unit);
+ SetXDPI(_x_pixels_per_unit);
+ SetYDPI(_y_pixels_per_unit);
break;
case PNG_RESOLUTION_METER:
- SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
- SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
+ SetXDPI((long)floor(_x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
+ SetYDPI((long)floor(_y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
break;
}
- if (info_ptr->num_palette>0){
- SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
- SetClrImportant(info_ptr->num_palette);
- } else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
+ int _num_palette;
+ png_colorp _palette;
+#if PNG_LIBPNG_VER > 10399
+ png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
+#else
+ _num_palette=info_ptr->num_palette;
+ _palette=info_ptr->palette;
+#endif
+ if (_num_palette>0){
+ SetPalette((rgb_color*)_palette,_num_palette);
+ SetClrImportant(_num_palette);
+ } else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
SetPaletteColor(0,0,0,0);
SetPaletteColor(1,85,85,85);
SetPaletteColor(2,170,170,170);
SetPaletteColor(3,255,255,255);
} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
+ int nshift = max(0,(_bit_depth>>3)-1)<<3;
- if (info_ptr->num_trans!=0){ //palette transparency
- if (info_ptr->num_trans==1){
- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+ png_bytep _trans_alpha;
+ 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);
+#else
+ _num_trans=info_ptr->num_trans;
+#endif
+ if (_num_trans!=0){ //palette transparency
+ if (_num_trans==1){
+ if (_color_type == PNG_COLOR_TYPE_PALETTE){
#if PNG_LIBPNG_VER > 10399
- info.nBkgndIndex = info_ptr->trans_color.index;
+ info.nBkgndIndex = _trans_color->index;
#else
info.nBkgndIndex = info_ptr->trans_values.index;
#endif
} else{
#if PNG_LIBPNG_VER > 10399
- info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+ info.nBkgndIndex = _trans_color->gray>>nshift;
#else
info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
#endif
}
}
- if (info_ptr->num_trans>1){
+ if (_num_trans>1){
RGBQUAD* pal=GetPalette();
if (pal){
DWORD ip;
- for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+ for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
#if PNG_LIBPNG_VER > 10399
- pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+ pal[ip].rgbReserved=_trans_alpha[ip];
#else
pal[ip].rgbReserved=info_ptr->trans[ip];
#endif
- for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
+ for (ip=_num_trans;ip<head.biClrUsed;ip++){
pal[ip].rgbReserved=255;
}
info.bAlphaPaletteEnabled=true;
@@ -174,14 +238,12 @@
}
if (channels == 3){ //check RGB binary transparency
- png_bytep trans;
- int num_trans;
- png_color_16 *image_background;
- if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
-#if PNG_LIBPNG_VER > 10399
- info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_color.red>>nshift);
- info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
- info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_color.blue>>nshift);
+ /* seems unnecessary to call again, but the conditional must be important so... */
+ if (png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color)){
+#if PNG_LIBPNG_VER > 10399
+ info.nBkgndColor.rgbRed = (BYTE)(_trans_color->red>>nshift);
+ info.nBkgndColor.rgbGreen = (BYTE)(_trans_color->green>>nshift);
+ info.nBkgndColor.rgbBlue = (BYTE)(_trans_color->blue>>nshift);
#else
info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_values.red>>nshift);
info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
@@ -202,15 +264,24 @@
}
// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
- if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
+ if (_color_type & PNG_COLOR_MASK_COLOR){
png_set_bgr(png_ptr);
}
// <vho> - handle cancel
- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
+ if (info.nEscape)
+#if PNG_LIBPNG_VER > 10399
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
+ longjmp(png_ptr->jmpbuf, 1);
+#endif
// row_bytes is the width x number of channels x (bit-depth / 8)
+#if PNG_LIBPNG_VER > 10399
+ row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];
+#else
row_pointers = new BYTE[info_ptr->rowbytes + 8];
+#endif
// turn on interlace handling
int number_passes = png_set_interlace_handling(png_ptr);
@@ -221,8 +292,12 @@
SetCodecOption(0);
}
- int chan_offset = info_ptr->bit_depth >> 3;
+ int chan_offset = _bit_depth >> 3;
+#if PNG_LIBPNG_VER > 10399
+ int pixel_offset = (_bit_depth * png_get_channels(png_ptr,info_ptr)) >> 3;
+#else
int pixel_offset = info_ptr->pixel_depth >> 3;
+#endif
for (int pass=0; pass < number_passes; pass++) {
iter.Upset();
@@ -230,7 +305,12 @@
do {
// <vho> - handle cancel
- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
+ if (info.nEscape)
+#if PNG_LIBPNG_VER > 10399
+ longjmp(png_jmpbuf(png_ptr), 1);
+#else
+ longjmp(png_ptr->jmpbuf, 1);
+#endif
#if CXIMAGE_SUPPORT_ALPHA // <vho>
if (AlphaIsValid()) {
@@ -241,7 +321,7 @@
BYTE* prow= iter.GetRow(ay);
//recover data from previous scan
- if (info_ptr->interlace_type && pass>0 && pass!=7){
+ if (_interlace_type && pass>0 && pass!=7){
for(ax=0;ax<head.biWidth;ax++){
long px = ax * pixel_offset;
if (channels == 2){
@@ -278,10 +358,14 @@
#endif // CXIMAGE_SUPPORT_ALPHA // vho
{
//recover data from previous scan
- if (info_ptr->interlace_type && pass>0){
+ if (_interlace_type && pass>0){
+#if PNG_LIBPNG_VER > 10399
+ iter.GetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
+#else
iter.GetRow(row_pointers, info_ptr->rowbytes);
+#endif
//re-expand buffer for images with bit depth > 8
- if (info_ptr->bit_depth > 8){
+ if (_bit_depth > 8){
for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
row_pointers[ax*chan_offset] = row_pointers[ax];
}
@@ -291,15 +375,19 @@
png_read_row(png_ptr, row_pointers, NULL);
//shrink 16 bit depth images down to 8 bits
- if (info_ptr->bit_depth > 8){
+ if (_bit_depth > 8){
for(long ax=0;ax<(head.biWidth*channels);ax++)
row_pointers[ax] = row_pointers[ax*chan_offset];
}
//copy the pixels
+#if PNG_LIBPNG_VER > 10399
+ iter.SetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
+#else
iter.SetRow(row_pointers, info_ptr->rowbytes);
+#endif
//<DP> expand 2 bpp images only in the last pass
- if (info_ptr->bit_depth==2 && pass==(number_passes-1))
+ if (_bit_depth==2 && pass==(number_passes-1))
expand2to4bpp(iter.GetRow());
//go on
@@ -361,9 +449,13 @@
/* Set error handling. REQUIRED if you aren't supplying your own
* error hadnling functions in the png_create_write_struct() call.
*/
+#if PNG_LIBPNG_VER > 10399
+ if (setjmp(png_jmpbuf(png_ptr))){
+#else
if (setjmp(png_ptr->jmpbuf)){
/* If we get here, we had a problem reading the file */
if (info_ptr->palette) free(info_ptr->palette);
+#endif
png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
cx_throw("Error saving PNG file");
}
@@ -372,9 +464,23 @@
//png_init_io(png_ptr, hFile);
// use custom I/O functions
- png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
+ png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
/* set the file information here */
+#if PNG_LIBPNG_VER > 10399
+ /* use variables to hold the values so it isnt necessary to png_get them later */
+ png_uint_32 _width,_height;
+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
+ png_byte _channels,_pixel_depth;
+
+ _width = GetWidth();
+ _height = GetHeight();
+ _pixel_depth = (BYTE)GetBpp();
+ _channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
+ _bit_depth = (BYTE)(GetBpp()/_channels);
+ _compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
+ _filter_type = PNG_FILTER_TYPE_DEFAULT;
+#else
info_ptr->width = GetWidth();
info_ptr->height = GetHeight();
info_ptr->pixel_depth = (BYTE)GetBpp();
@@ -382,13 +488,22 @@
info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
info_ptr->compression_type = info_ptr->filter_type = 0;
info_ptr->valid = 0;
+#endif
switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
case 1:
+#if PNG_LIBPNG_VER > 10399
+ _interlace_type = PNG_INTERLACE_ADAM7;
+#else
info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
+#endif
break;
default:
+#if PNG_LIBPNG_VER > 10399
+ _interlace_type = PNG_INTERLACE_NONE;
+#else
info_ptr->interlace_type = PNG_INTERLACE_NONE;
+#endif
}
/* set compression level */
@@ -398,22 +513,47 @@
if (GetNumColors()){
if (bGrayScale){
+#if PNG_LIBPNG_VER > 10399
+ _color_type = PNG_COLOR_TYPE_GRAY;
+#else
info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+#endif
} else {
+#if PNG_LIBPNG_VER > 10399
+ _color_type = PNG_COLOR_TYPE_PALETTE;
+#else
info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+#endif
}
} else {
+#if PNG_LIBPNG_VER > 10399
+ _color_type = PNG_COLOR_TYPE_RGB;
+#else
info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+#endif
}
#if CXIMAGE_SUPPORT_ALPHA
if (AlphaIsValid()){
+#if PNG_LIBPNG_VER > 10399
+ _color_type |= PNG_COLOR_MASK_ALPHA;
+ _channels++;
+ _bit_depth = 8;
+ _pixel_depth += 8;
+#else
info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
info_ptr->channels++;
info_ptr->bit_depth = 8;
info_ptr->pixel_depth += 8;
+#endif
}
#endif
+#if PNG_LIBPNG_VER > 10399
+ /* set the header here, since we're done modifying these values */
+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,_interlace_type,
+ _compression_type,_filter_type);
+#endif
+
/* set background */
png_color_16 image_background={ 0, 255, 255, 255, 0 };
RGBQUAD tc = GetTransColor();
@@ -427,22 +567,24 @@
/* set metrics */
png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
+#if PNG_LIBPNG_VER <= 10399
png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
info_ptr->color_type, info_ptr->interlace_type,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+#endif
//<DP> simple transparency
if (info.nBkgndIndex >= 0){
- info_ptr->num_trans = 1;
- info_ptr->valid |= PNG_INFO_tRNS;
#if PNG_LIBPNG_VER > 10399
- info_ptr->trans_alpha = trans;
- info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
- info_ptr->trans_color.red = tc.rgbRed;
- info_ptr->trans_color.green = tc.rgbGreen;
- info_ptr->trans_color.blue = tc.rgbBlue;
- info_ptr->trans_color.gray = info_ptr->trans_color.index;
+ png_color_16 _trans_color;
+ _trans_color.index = (BYTE)info.nBkgndIndex;
+ _trans_color.red = tc.rgbRed;
+ _trans_color.green = tc.rgbGreen;
+ _trans_color.blue = tc.rgbBlue;
+ _trans_color.gray = _trans_color.index;
#else
+ info_ptr->num_trans = 1;
+ info_ptr->valid |= PNG_INFO_tRNS;
info_ptr->trans = trans;
info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
info_ptr->trans_values.red = tc.rgbRed;
@@ -454,34 +596,53 @@
// the transparency indexes start from 0 for non grayscale palette
if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
SwapIndex(0,(BYTE)info.nBkgndIndex);
+
+#if PNG_LIBPNG_VER > 10399
+ png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,1,&_trans_color);
+#endif
}
/* set the palette if there is one */
+#if PNG_LIBPNG_VER > 10399
+ png_colorp _palette;
+#endif
if (GetPalette()){
+#if PNG_LIBPNG_VER <= 10399
if (!bGrayScale){
info_ptr->valid |= PNG_INFO_PLTE;
}
+#endif
int nc = GetClrImportant();
if (nc==0) nc = GetNumColors();
+ // copy the palette colors
+#if PNG_LIBPNG_VER > 10399
+ _palette = new png_color[nc];
+#else
+ info_ptr->palette = new png_color[nc];
+ info_ptr->num_palette = (png_uint_16) nc;
+#endif
+ for (int i=0; i<nc; i++)
+#if PNG_LIBPNG_VER > 10399
+ GetPaletteColor(i, &_palette[i].red, &_palette[i].green, &_palette[i].blue);
+
+ png_set_PLTE(png_ptr,info_ptr,_palette,nc);
+#else
+ GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
+#endif
+
if (info.bAlphaPaletteEnabled){
for(WORD ip=0; ip<nc;ip++)
trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
- info_ptr->num_trans = (WORD)nc;
- info_ptr->valid |= PNG_INFO_tRNS;
#if PNG_LIBPNG_VER > 10399
- info_ptr->trans_alpha = trans;
+ png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,nc,NULL);
#else
+ info_ptr->num_trans = (WORD)nc;
+ info_ptr->valid |= PNG_INFO_tRNS;
info_ptr->trans = trans;
#endif
}
-
- // copy the palette colors
- info_ptr->palette = new png_color[nc];
- info_ptr->num_palette = (png_uint_16) nc;
- for (int i=0; i<nc; i++)
- GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
}
#if CXIMAGE_SUPPORT_ALPHA // <vho>
@@ -495,8 +656,12 @@
} } }
#endif // CXIMAGE_SUPPORT_ALPHA // <vho>
+#if PNG_LIBPNG_VER > 10399
+ int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
+#else
int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
info_ptr->rowbytes = row_size;
+#endif
BYTE *row_pointers = new BYTE[row_size];
/* write the file information */
@@ -514,7 +679,11 @@
if (AlphaIsValid()){
for (long ax=head.biWidth-1; ax>=0;ax--){
c = BlindGetPixelColor(ax,ay);
+#if PNG_LIBPNG_VER > 10399
+ int px = ax * _channels;
+#else
int px = ax * info_ptr->channels;
+#endif
if (!bGrayScale){
row_pointers[px++]=c.rgbRed;
row_pointers[px++]=c.rgbGreen;
@@ -529,7 +698,11 @@
#endif //CXIMAGE_SUPPORT_ALPHA // <vho>
{
iter.GetRow(row_pointers, row_size);
+#if PNG_LIBPNG_VER > 10399
+ if (_color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
+#else
if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
+#endif
RGBtoBGR(row_pointers, row_size);
png_write_row(png_ptr, row_pointers);
}
@@ -546,9 +719,14 @@
png_write_end(png_ptr, info_ptr);
/* if you malloced the palette, free it here */
+#if PNG_LIBPNG_VER > 10399
+ if (_palette){
+ delete [] (_palette);
+#else
if (info_ptr->palette){
delete [] (info_ptr->palette);
info_ptr->palette = NULL;
+#endif
}
/* clean up after the write, and free any memory allocated */
12 years, 7 months
rpms/xbmc/F-16 xbmc-11.0-bluez.patch, NONE, 1.1 xbmc-11.0-bootstrap.patch, NONE, 1.1 xbmc-11.0-dvdread.patch, NONE, 1.1 xbmc-11.0-hdhomerun.patch, NONE, 1.1 xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch, NONE, 1.1 xbmc-10-Makefile.patch, 1.1, NONE xbmc-10-bootstrap.patch, 1.1, NONE xbmc-10-dvdread.patch, 1.1, NONE xbmc-10-hdhomerun.patch, 1.2, NONE xbmc-10-python2.7.patch, 1.2, NONE xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch, 1.1, NONE
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6827
Added Files:
xbmc-11.0-bluez.patch xbmc-11.0-bootstrap.patch
xbmc-11.0-dvdread.patch xbmc-11.0-hdhomerun.patch
xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
Removed Files:
xbmc-10-Makefile.patch xbmc-10-bootstrap.patch
xbmc-10-dvdread.patch xbmc-10-hdhomerun.patch
xbmc-10-python2.7.patch
xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch
Log Message:
Sync patches with devel/
xbmc-11.0-bluez.patch:
bluetooth.h | 4 !!!!
1 file changed, 4 modifications(!)
--- NEW FILE xbmc-11.0-bluez.patch ---
*** bluez-4.97/lib/bluetooth.h.orig 2012-01-16 09:06:07.171931288 +0100
--- bluez-4.97/lib/bluetooth.h 2012-01-16 09:07:02.523930152 +0100
***************
*** 113,119 ****
({ \
struct __attribute__((packed)) { \
typeof(*(ptr)) __v; \
! } *__p = (void *) (ptr); \
__p->__v; \
})
--- 113,119 ----
({ \
struct __attribute__((packed)) { \
typeof(*(ptr)) __v; \
! } *__p = (typeof(__p)) (ptr); \
__p->__v; \
})
***************
*** 121,127 ****
do { \
struct __attribute__((packed)) { \
typeof(*(ptr)) __v; \
! } *__p = (void *) (ptr); \
__p->__v = (val); \
} while(0)
--- 121,127 ----
do { \
struct __attribute__((packed)) { \
typeof(*(ptr)) __v; \
! } *__p = (typeof(__p)) (ptr); \
__p->__v = (val); \
} while(0)
xbmc-11.0-bootstrap.patch:
bootstrap | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE xbmc-11.0-bootstrap.patch ---
--- bootstrap.orig 2011-12-22 22:12:21.000000000 -0500
+++ bootstrap 2011-12-27 17:00:43.789624393 -0500
@@ -11,6 +11,7 @@
# order matters with libdvd and friends
[ -d lib/libdvd/libdvdcss ] && \
autoreconf -vif lib/libdvd/libdvdcss
+[ -d lib/libdvd/libdvdread ] && \
autoreconf -vif lib/libdvd/libdvdread
autoreconf -vif lib/libdvd/libdvdnav
xbmc-11.0-dvdread.patch:
configure.in | 21 +--------------------
lib/libdvd/Makefile.in | 13 ++++++-------
2 files changed, 7 insertions(+), 27 deletions(-)
--- NEW FILE xbmc-11.0-dvdread.patch ---
--- configure.in.orig 2011-12-27 17:22:07.212194848 -0500
+++ configure.in 2011-12-27 17:24:56.248461555 -0500
@@ -2110,28 +2110,9 @@
--with-pic
], [$SKIP_CONFIG_DVDCSS])
-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
- ./configure2 \
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \
- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --enable-static \
- --disable-shared \
- --disable-strip \
- --disable-opts \
- --cc="$CC" &&
- $MAKE dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
-], [0])
-
XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
./configure2 \
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \
- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --extra-cflags="-D_XBMC -fPIC -DPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--host=$host_alias \
--build=$build_alias \
--- lib/libdvd/Makefile.in.orig 2011-12-27 17:26:34.728220804 -0500
+++ lib/libdvd/Makefile.in 2011-12-27 17:29:31.835558231 -0500
@@ -5,8 +5,7 @@
SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
SOS= libdvdnav-$(ARCH).so
-DIRS= libdvdread \
- libdvdnav
+DIRS= libdvdnav
WRAPPER=@abs_top_srcdir(a)/xbmc/cores/DllLoader/exports/wrapper.o
WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
@@ -14,7 +13,7 @@
ifeq ($(findstring osx,$(ARCH)),osx)
LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
else
-LDFLAGS += -shared -fPIC -rdynamic
+LDFLAGS += -shared -fPIC -rdynamic -ldvdread
endif
ifeq ($(ARCH), powerpc-osx)
@@ -48,9 +47,9 @@
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
- $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
+ $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
else
@@ -59,8 +58,8 @@
libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
-Wl,--unresolved-symbols=ignore-all \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
xbmc-11.0-hdhomerun.patch:
Makefile.in | 5 --
configure.in | 1
xbmc/filesystem/DllHDHomeRun.h | 78 +++++++++++++++++++++++++++--------------
3 files changed, 53 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-11.0-hdhomerun.patch ---
--- Makefile.in.orig 2011-12-27 18:13:13.204873013 -0500
+++ Makefile.in 2011-12-27 18:14:17.225245721 -0500
@@ -131,7 +131,6 @@
lib/cximage-6.0 \
lib/libexif \
lib/cmyth \
- lib/libhdhomerun \
lib/libid3tag \
lib/libapetag \
lib/cpluff \
@@ -267,8 +266,6 @@
$(MAKE) -C lib/libexif
cmyth: dllloader
$(MAKE) -C lib/cmyth
-libhdhomerun: dllloader
- $(MAKE) -C lib/libhdhomerun
libid3tag: dllloader
$(MAKE) -C lib/libid3tag
papcodecs: dllloader dvdpcodecs
@@ -293,7 +290,7 @@
$(MAKE) -C lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
+libs: cmyth libid3tag imagelib libexif system/libcpluff-@ARCH@.so
externals: codecs libs visualizations screensavers
xcode_depends: \
--- configure.in.orig 2011-12-27 18:16:52.986149450 -0500
+++ configure.in 2011-12-27 18:17:09.552245330 -0500
@@ -1877,7 +1877,6 @@
lib/libexif/Makefile \
lib/libXDAAP/Makefile \
lib/cmyth/Makefile \
- lib/libhdhomerun/Makefile \
lib/libsquish/Makefile \
lib/libid3tag/Makefile \
lib/cximage-6.0/Makefile \
--- xbmc/filesystem/DllHDHomeRun.h.orig 2011-12-28 12:16:37.207493443 -0500
+++ xbmc/filesystem/DllHDHomeRun.h 2011-12-28 12:18:50.854262220 -0500
@@ -21,7 +21,7 @@
*/
#include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
class DllHdHomeRunInterface
{
@@ -42,30 +42,56 @@
class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
- END_METHOD_RESOLVE()
+public:
+ virtual ~DllHdHomeRun () {};
+
+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+ { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+ virtual void device_destroy (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_destroy (p1); }
+
+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
+ { return ::hdhomerun_device_stream_start (p1); }
+
+
+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
+ {
+ uint8_t *retval;
+
+ size_t tmp = *p3;
+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+ *p3 = tmp;
+
+ return retval;
+ }
+
+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_stream_stop (p1); }
+
+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+ { ::hdhomerun_device_set_tuner (p1, p2); }
+
+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+ // DLL faking.
+ virtual bool ResolveExports() { return true; }
+ virtual bool Load() { return true; }
+ virtual void Unload() {}
};
xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch:
ximapng.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
--- NEW FILE xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch ---
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;
--- xbmc-10-Makefile.patch DELETED ---
--- xbmc-10-bootstrap.patch DELETED ---
--- xbmc-10-dvdread.patch DELETED ---
--- xbmc-10-hdhomerun.patch DELETED ---
--- xbmc-10-python2.7.patch DELETED ---
--- xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch DELETED ---
12 years, 7 months
rpms/xbmc/F-16 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xbmc-generate-tarball-xz.sh, 1.9, 1.10 xbmc.spec, 1.32, 1.33
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6115
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Update to Eden (11.0). Sync with devel/ branch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-16/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 30 Mar 2011 05:31:36 -0000 1.10
+++ .cvsignore 29 Mar 2012 21:53:00 -0000 1.11
@@ -1 +1 @@
-xbmc-10.1-patched.tar.xz
+xbmc-11.0-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-16/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 30 Mar 2011 05:31:36 -0000 1.10
+++ sources 29 Mar 2012 21:53:00 -0000 1.11
@@ -1 +1 @@
-48b245821464216f154aef16b88651f5 xbmc-10.1-patched.tar.xz
+139970aef7a228ac78486aea0d361d98 xbmc-11.0-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-16/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xbmc-generate-tarball-xz.sh 30 Mar 2011 05:31:36 -0000 1.9
+++ xbmc-generate-tarball-xz.sh 29 Mar 2012 21:53:00 -0000 1.10
@@ -1,82 +1,68 @@
#!/bin/sh
-MAJORVERSION=10.1
+MAJORVERSION=11
+MINORVERSION=0
+#PRERELEASE=Eden_rc2
-# FIXME: need to update to use git
-#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
+VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
-# uncomment this to switch to trunk
-#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
+# GITHUBURL below is obsolete, I think
+#GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden
-# use SVN version number passed from script, or otherwise use default
-SVNVERSION=${1-35567}
+# comment-out line below if using tarball
+#curl -L $GITHUBURL | tar xz
-VERSION=$MAJORVERSION
-# git snapshot
-#VERSION=$MAJORVERSION-$SVNVERSION
-# pre-release
-#VERSION=Dharma_rc2
+# Repair GitHub's odd auto-generated top-level directory...
+#mv xbmc-xbmc-* xbmc-$VERSION
-# remove existing checkout
-rm -r xbmc-$VERSION
-
-# don't need to extra tarball, already expanded
-# comment out with tarball
+# extract tarball
+# comment-out if not using tarball
tar -xzvf xbmc-$VERSION.tar.gz
cd xbmc-$VERSION
-# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
-# also remove legally problematic libGoAhead library
-for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun
+# remove bundled libraries, saves space and forces using external versions
+# grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream
+# seems to require files within that subdirectory <sigh>, filed
+# http://trac.xbmc.org/ticket/12370
+for i in cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 ffmpeg
do
- rm -r xbmc/lib/$i
+ rm -r lib/$i
done
-# bundled win32 binaries
-rm -r xbmc/visualizations/XBMCProjectM/win32
-
# remove more bundled codecs
-# libfaad2, libmad needs upstream patches to be able to remove from tarball
-# even though the bundled libaries aren't, I think, compiled
-# grrr, have to keep in ffmpeg for now (2010-07-019) since upstream
-# seems to require files within that subdirectory <sigh>
-for i in liba52 libmpeg2 libdts
+for i in libmpeg2
do
- rm -r xbmc/cores/dvdplayer/Codecs/$i
+ rm -r xbmc/cores/dvdplayer/DVDCodecs/Video/$i
done
# remove DVD stuff we can't ship, or is already in external libraries
for i in libdvdcss libdvdread includes
do
- rm -r xbmc/cores/dvdplayer/Codecs/libdvd/$i
+ rm -r lib/libdvd/$i
done
# remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
-find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f
+find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) -print0 | xargs -0 rm -f
# remove all other packages that should be system-wide
# except for libass, cpluff, jsoncpp (need to figure out how to
# remove these too)
# xbmc-dll-symbols seems to be XBMC-specific
-for i in enca freetype fribidi libcdio libcrystalhd libcurl-OSX libiconv liblame libmicrohttpd libmicrohttpd_win32 libmodplug libmysql_win32 libSDL-OSX libssh_win32 pcre libbluray libbluray_win32 librtmp bzip2
+for i in enca freetype liblame libmicrohttpd libmodplug libbluray librtmp win32
do
rm -r lib/$i
done
# TODO/FIXME: remove tools/XBMCLive/ and other things under tools/
# also remove anything to do with win32
-for i in arm MingwBuildEnvironment PackageMaker win32buildtools XBMCLive XBMCTex
+for i in arm darwin win32buildtools
do
rm -r tools/$i
done
-cd -
+cd ..
# repack
tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
-
-echo "Release:"
-echo "$(date +'%Y%m%d')svn${SVNVERSION}"
-
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-16/xbmc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xbmc.spec 21 Dec 2011 21:28:22 -0000 1.32
+++ xbmc.spec 29 Mar 2012 21:53:00 -0000 1.33
@@ -1,11 +1,11 @@
-#global PRERELEASE Dharma_rc2
+%global PRERELEASE Eden_rc2
%global DIRVERSION %{version}
# use below for pre-release
-#global DIRVERSION %{PRERELEASE}
+#global DIRVERSION %{version}-%{PRERELEASE}
Name: xbmc
-Version: 10.1
-Release: 7%{?dist}
+Version: 11.0
+Release: 1%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -21,11 +21,11 @@
# new patches for bootstrap
# no trac ticket filed as yet
-Patch1: xbmc-10-bootstrap.patch
+Patch1: xbmc-11.0-bootstrap.patch
# filed ticket, but patch still needs work
# http://trac.xbmc.org/ticket/9658
-Patch2: xbmc-10-dvdread.patch
+Patch2: xbmc-11.0-dvdread.patch
# and new problem with zlib in cximage
# trac ticket filed: http://trac.xbmc.org/ticket/9659
@@ -34,23 +34,16 @@
# need to file trac ticket, this patch just forces external hdhomerun
# functionality, needs to be able fallback internal version
-Patch4: xbmc-10-hdhomerun.patch
+Patch4: xbmc-11.0-hdhomerun.patch
-# fix "@#" in Makefile which seem to screw things up no trac filed
-# yet, don't know why this isn't a problem on other Linux systems
-Patch5: xbmc-10-Makefile.patch
-
-# add patch from upstream trac http://trac.xbmc.org/ticket/9584
-# to find Python 2.7 (needed for F-14+)
-Patch6: xbmc-10-python2.7.patch
-
-# patch from upstream to fix builds for GCC 4.6.x
-# (committed to git upstream: http://trac.xbmc.org/ticket/11383)
-Patch7: xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch
-
-# fixes https://bugzilla.rpmfusion.org/show_bug.cgi?id=1905
-# patch from OpenElec distribution
-Patch9: xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch
+
+# libpng 1.5 patch from gentoo
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-tv/xbmc/fil...
+# following two patches both submitted upstream:
+# http://trac.xbmc.org/ticket/12001
+Patch5: xbmc-10.1-libpng-1.5.patch
+# second libpng 1.5 patch avoids use of uninitialised values
+Patch6: xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
@@ -115,7 +108,7 @@
BuildRequires: libtiff-devel
BuildRequires: libvdpau-devel
BuildRequires: libdvdread-devel
-#BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel
BuildRequires: faad2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libdca-devel
@@ -126,13 +119,18 @@
BuildRequires: libmicrohttpd-devel
BuildRequires: expat-devel
BuildRequires: zip
-%if 0%{?fedora} >= 14
BuildRequires: gettext-autopoint
-%else
-BuildRequires: gettext
-%endif
BuildRequires: librtmp-devel
BuildRequires: libbluray-devel
+#BuildRequires: libbluray-devel >= 0.2.1
+BuildRequires: yajl-devel
+BuildRequires: bluez-libs-devel
+BuildRequires: cwiid-devel
+
+# nfs-utils-lib-devel package currently broken
+#BuildRequires: nfs-utils-lib-devel
+# afp build currently broken
+#BuildRequires: afpfs-ng-devel
# VAAPI currently not working, comment-out
#BuildRequires: libva-freeworld-devel
@@ -143,12 +141,27 @@
Requires: librtmp
Requires: libbluray
+# needed when doing a minimal install, see
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844
+Requires: glx-utils
+Requires: xorg-x11-utils
+
# These are just symlinked to, but needed both at build-time
# and for installation
BuildRequires: python-imaging
Requires: python-imaging
-BuildRequires: python-sqlite2
-Requires: python-sqlite2
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%description
XBMC media center is a free cross-platform media-player jukebox and
@@ -156,22 +169,31 @@
and featuring playlist, audio visualizations, slideshow, and weather
forecast functions, together third-party plugins.
+#%%package eventclients
+#%Summary: Media center event client remotes
+
+#%%description eventclients
+#%This package contains support for using XBMC with the PS3 Remote, the Wii
+#%Remote, a J2ME based remote and the command line xbmc-send utility.
+
+#%%package eventclients-devel
+#%Summary: Media center event client remotes development files
+#%Requires: %{name}-eventclients = %{version}-%{release}
+
+#%%description eventclients-devel
+#%This package contains the development header files for the eventclients
+#%library.
+
%prep
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p0
%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-%patch5 -p0
-%patch6 -p0
-%patch7 -p1
-%patch9 -p1
-
-# Prevent rerunning the autotools.
-touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
-$(find xbmc/screensavers/rsxs-0.9 \( -name 'configure.*' -o -name 'Makefile.*' \))
+#patch3 -p0
+%patch4 -p0
+#patch5 -p2
+#patch6 -p1
%build
@@ -180,16 +202,12 @@
# Can't use export nor %%configure (implies using export), because
# the Makefile pile up *FLAGS in this case.
-# FIXME: disable using external ffmpeg for the moment, until such time
-# as either we backport a fix for 0.8 ffmpeg or we build XBMC Eden (11.x)
-# --enable-external-ffmpeg
./configure \
--prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
--libdir=%{_libdir} --datadir=%{_datadir} \
--with-lirc-device=/var/run/lirc/lircd \
--enable-goom \
---enable-external-python \
---disable-libdts --disable-liba52 \
+--enable-external-libraries \
--disable-dvdcss \
--disable-optimizations --disable-debug \
CPPFLAGS="-I/usr/include/ffmpeg" \
@@ -199,16 +217,12 @@
LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
ASFLAGS=-fPIC
-# disable the following:
-# --enable-external-libraries
-# enumerate all the external libraries because the libdts/liba52 detection
-# is broken upstream: http://trac.xbmc.org/ticket/9277
-
make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+#make -C tools/EventClients DESTDIR=$RPM_BUILD_ROOT install
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
@@ -220,8 +234,8 @@
# the system Python interpreter, we also want to use the system libraries
install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib
ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL
-install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
-ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
+#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
+#ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
%clean
@@ -238,11 +252,77 @@
%{_datadir}/applications/xbmc.desktop
%{_datadir}/icons/hicolor/*/*/*.png
+#%%files eventclients
+#%%defattr(-,root,root)
+#%%python_sitelib/xbmc
+#%%dir %{_datadir}/pixmaps/xbmc
+#%%{_datadir}/pixmaps/xbmc/*.png
+#%%{_bindir}/xbmc-j2meremote
+#%%{_bindir}/xbmc-ps3d
+#%%{_bindir}/xbmc-ps3remote
+#%%{_bindir}/xbmc-send
+#%%{_bindir}/xbmc-wiiremote
+
+#%%files eventclients-devel
+#%%defattr(-,root,root)
+#%%dir %{_includedir}/xbmc
+#%%{_includedir}/xbmc/xbmcclient.h
+
%changelog
-* Tue Dec 20 2011 Alex Lancaster <alexlan[AT] fedoraproject org> - 10.1-7
+* Sun Mar 25 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-1
+- Update to Eden final 11.0
+- Drop libpng 1.5 patches, applied upstream
+
+* Fri Mar 9 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.10.Eden_rc2
+- Update to Eden release candidate 2 (rc2)
+
+* Fri Mar 9 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.9.Eden_beta2
+- Temporarily drop clientevents package (currently fails to build) to
+ fix overall FTBFS.
+
+* Fri Mar 9 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.8.Eden_beta2
+- Drop python-sqlite2 BR (obsoleted package), should use internal sqlite3 (#2217)
+
+* Fri Mar 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.0-0.7.Eden_beta2
+- Rebuilt for FFmpeg/x264
+
+* Sun Jan 29 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.6.Eden_beta2
+- Update to Eden beta2
+
+* Fri Dec 30 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.5.Eden_beta1
+- Add additional patch from http://trac.xbmc.org/ticket/12001 to
+ fix uninitialised pointer with libpng 1.5
+- Remove upstreamed, or otherwise obsoleted patches
+
+* Thu Dec 29 2011 Alex Lancaster <alexlan[AT] fedoraproject org> - 11.0-0.4.Eden_beta1
+- Enable libpng 1.5 patch, still needed, upstream bug is at:
+ http://trac.xbmc.org/ticket/12001
+
+* Wed Dec 28 2011 Alex Lancaster <alexlan[AT] fedoraproject org> - 11.0-0.3.Eden_beta1
+- Added glx-utils and xorg-x11-utils as Requires, so selecting
+ minimal install works out of the box (#1844)
+
+* Wed Dec 28 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.2.Eden_beta1
+- Re-enable external ffmpeg
+- Add EventClients sub-package (patch thanks to Ben Konrath <ben(a)bagu.org>)
+- More spec cleaning
+
+* Wed Dec 28 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.1.Eden_beta1
+- Update to 11.0 beta1
+- Disable patches that are obsolete (keep around while testing)
+- Update icon cache (#2097)
+
+* Tue Dec 20 2011 Alex Lancaster <alexlan[AT] fedoraproject org> - 10.1-9
- Add patch from OpenElec distribution to fix broken YouTube plugin
(should fix #1905)
+* Wed Dec 14 2011 Xavier Bachelot <xavier(a)bachelot.org> - 10.1-8
+- Add patch for newer libbluray support.
+- Add patch for libpng 1.5 support.
+
+* Wed Nov 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10.1-7
+- Rebuilt for libcdio
+
* Sat Nov 5 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-6
- Disable using external ffmpeg for the moment, until such time as
either we backport a fix for 0.8 ffmpeg or we build XBMC Eden (11.x)
12 years, 7 months