mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 21:56:42 +00:00
xbmc-pvr:
- update to xbmc-pvr-27665
This commit is contained in:
parent
a6f7fdce7d
commit
c12ea96a66
@ -63,12 +63,9 @@ $SCRIPTS/install samba
|
||||
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
ln -s /usr/share/xbmc/xbmc.bin $INSTALL/usr/bin/xbmc
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc
|
||||
cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc/xbmc.bin
|
||||
cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc/xbmc-xrandr
|
||||
cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc
|
||||
cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/language
|
||||
cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language
|
||||
@ -121,20 +118,17 @@ mkdir -p $INSTALL/usr/share/xbmc/system/shaders
|
||||
mkdir -p $INSTALL/usr/share/xbmc/userdata
|
||||
cp -PR $PKG_BUILD/userdata/* $INSTALL/usr/share/xbmc/userdata
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/visualisations
|
||||
cp -PR $PKG_BUILD/visualisations/Waveform.vis $INSTALL/usr/share/xbmc/visualisations
|
||||
cp -PR $PKG_BUILD/visualisations/opengl_spectrum.vis $INSTALL/usr/share/xbmc/visualisations
|
||||
#mkdir -p $INSTALL/usr/share/xbmc/visualisations
|
||||
# cp -PR $PKG_BUILD/visualisations/Waveform.vis $INSTALL/usr/share/xbmc/visualisations
|
||||
# cp -PR $PKG_BUILD/visualisations/opengl_spectrum.vis $INSTALL/usr/share/xbmc/visualisations
|
||||
# cp -PR $PKG_BUILD/visualisations/Milkdrop $INSTALL/usr/share/xbmc/visualisations #not need
|
||||
# cp -PR $PKG_BUILD/visualisations/projectM $INSTALL/usr/share/xbmc/visualisations #not need
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/web
|
||||
cp -R $PKG_BUILD/web/Project_Mayhem_III/* $INSTALL/usr/share/xbmc/web
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/addons/pvr/VDR
|
||||
cp -PR $PKG_BUILD/addons/pvr/VDR/resources $INSTALL/usr/share/xbmc/addons/pvr/VDR/
|
||||
cp -PR $PKG_BUILD/addons/pvr/VDR/description.xml $INSTALL/usr/share/xbmc/addons/pvr/VDR/
|
||||
cp -PR $PKG_BUILD/addons/pvr/VDR/vdr.tbn $INSTALL/usr/share/xbmc/addons/pvr/VDR/
|
||||
cp -PR $PKG_BUILD/addons/pvr/VDR/XBMC_VDR.pvr $INSTALL/usr/share/xbmc/addons/pvr/VDR/
|
||||
mkdir -p $INSTALL/usr/share/xbmc/addons
|
||||
cp -PR $PKG_BUILD/addons/* $INSTALL/usr/share/xbmc/addons
|
||||
|
||||
# other programs needed to run
|
||||
$SCRIPTS/install alsa
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,84 +0,0 @@
|
||||
diff -Naur xbmc-27495/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp xbmc-27495.patch/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
|
||||
--- xbmc-27495/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp 2010-02-05 23:40:42.000000000 +0100
|
||||
+++ xbmc-27495.patch/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp 2010-02-08 03:37:44.901982746 +0100
|
||||
@@ -142,9 +142,17 @@
|
||||
if (info_ptr->num_trans!=0){ //palette transparency
|
||||
if (info_ptr->num_trans==1){
|
||||
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
|
||||
+#if PNG_LIBPNG_VER > 10399
|
||||
+ info.nBkgndIndex = info_ptr->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;
|
||||
+#else
|
||||
info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
if (info_ptr->num_trans>1){
|
||||
@@ -152,7 +160,11 @@
|
||||
if (pal){
|
||||
DWORD ip;
|
||||
for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
|
||||
+#if PNG_LIBPNG_VER > 10399
|
||||
+ pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
|
||||
+#else
|
||||
pal[ip].rgbReserved=info_ptr->trans[ip];
|
||||
+#endif
|
||||
for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
|
||||
pal[ip].rgbReserved=255;
|
||||
}
|
||||
@@ -166,9 +178,15 @@
|
||||
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);
|
||||
+#else
|
||||
info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_values.red>>nshift);
|
||||
info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
|
||||
info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_values.blue>>nshift);
|
||||
+#endif
|
||||
info.nBkgndColor.rgbReserved = 0;
|
||||
info.nBkgndIndex = 0;
|
||||
}
|
||||
@@ -417,12 +435,21 @@
|
||||
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;
|
||||
+#else
|
||||
info_ptr->trans = trans;
|
||||
info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
|
||||
info_ptr->trans_values.red = tc.rgbRed;
|
||||
info_ptr->trans_values.green = tc.rgbGreen;
|
||||
info_ptr->trans_values.blue = tc.rgbBlue;
|
||||
info_ptr->trans_values.gray = info_ptr->trans_values.index;
|
||||
+#endif
|
||||
|
||||
// the transparency indexes start from 0 for non grayscale palette
|
||||
if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
|
||||
@@ -443,7 +470,11 @@
|
||||
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;
|
||||
+#else
|
||||
info_ptr->trans = trans;
|
||||
+#endif
|
||||
}
|
||||
|
||||
// copy the palette colors
|
||||
diff -Naur xbmc-27495/xbmc/lib/cximage-6.0/libpng.diff xbmc-27495.patch/xbmc/lib/cximage-6.0/libpng.diff
|
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-pvr-27594.tar.bz2
|
||||
http://sources.openelec.tv/svn/xbmc-pvr-27665.tar.bz2
|
||||
|
Loading…
x
Reference in New Issue
Block a user