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 ---