nach ein neues auschkecke des gits und das erneute versuch neutrino -mp-next zu bauen bekomm den fehler
Code:==> Applying Patch: /home/ciccio/opti/StartHere-master/cdk/Patches/neutrino-mp-next.patch patching file acinclude.m4 patching file src/gui/vfd_setup.cpp patching file src/driver/vfd.cpp Hunk #1 FAILED at 53. Hunk #11 FAILED at 726. Hunk #15 FAILED at 1142. 3 out of 16 hunks FAILED -- saving rejects to file src/driver/vfd.cpp.rej make: *** [.deps/neutrino-mp-next.do_prepare] Fehler 1 ciccio@ciccio-VirtualBox:~/opti/StartHere-master/cdk$
und da is die ausgabe vom vfd.cpp.rej
Code:--- src/driver/vfd.cpp +++ src/driver/vfd.cpp @@ -53,12 +53,15 @@ #if defined (BOXMODEL_OCTAGON1008) || defined (BOXMODEL_TF7700) #define VFDLENGTH 8 -#elif defined (BOXMODEL_FORTIS_HDBOX) +#elif defined (BOXMODEL_FORTIS_HDBOX) || defined (BOXMODEL_ATEVIO7500) #define VFDLENGTH 12 -#elif defined (BOXMODEL_ATEVIO7500) - #define VFDLENGTH 12 -#elif defined (BOXMODEL_SPARK) +#elif defined (BOXMODEL_SPARK) \ + || defined (BOXMODEL_HS7810A) \ + || defined (BOXMODEL_HS7119) \ + || defined (BOXMODEL_HS7819) #define VFDLENGTH 4 +#elif defined (BOXMODEL_HS7110) + #define VFDLENGTH 0 #else #define VFDLENGTH 16 #endif @@ -726,19 +800,32 @@ strncat(VolumeBar, c0, 1); } ShowText(VolumeBar); -#elif defined (BOXMODEL_OCTAGON1008) || defined (BOXMODEL_TF7700) + #elif defined (BOXMODEL_TF7700) char vol_chr[64] = ""; snprintf(vol_chr, sizeof(vol_chr)-1, "VOL: %d%%", (int)vol); ShowText(vol_chr); -#elif defined (BOXMODEL_SPARK) + #elif defined (BOXMODEL_OCTAGON1008) char vol_chr[64] = ""; - snprintf(vol_chr, sizeof(vol_chr)-1, "%d", (int)vol); + snprintf(vol_chr, sizeof(vol_chr)-1, "VOL=%3d", (int)vol); ShowText(vol_chr); -#elif defined (BOXMODEL_FORTIS_HDBOX) || defined (BOXMODEL_ATEVIO7500) || defined (BOXMODEL_UFS912) || defined (BOXMODEL_UFS913) || defined (BOXMODEL_CUBEREVO) || defined (BOXMODEL_CUBEREVO_MINI2) || defined (BOXMODEL_CUBEREVO_2000HD) + #elif defined (BOXMODEL_SPARK) \ + || defined (BOXMODEL_HS7119) \ + || defined (BOXMODEL_HS7810A) \ + || defined (BOXMODEL_HS7819) + char vol_chr[64] = ""; + snprintf(vol_chr, sizeof(vol_chr)-1, "v%3d", (int)vol); + ShowText(vol_chr); + #elif defined (BOXMODEL_FORTIS_HDBOX) \ + || defined (BOXMODEL_ATEVIO7500) \ + || defined (BOXMODEL_UFS912) \ + || defined (BOXMODEL_UFS913) \ + || defined (BOXMODEL_CUBEREVO) \ + || defined (BOXMODEL_CUBEREVO_MINI2) \ + || defined (BOXMODEL_CUBEREVO_2000HD) char vol_chr[64] = ""; snprintf(vol_chr, sizeof(vol_chr)-1, "Volume: %d%%", (int)vol); ShowText(vol_chr); -#endif + #endif oldpp = pp; } #else @@ -1142,15 +1241,22 @@ #ifdef HAVE_DUCKBOX_HARDWARE void CVFD::ClearIcons() { -#if defined (BOXMODEL_ATEVIO7500) || defined (BOXMODEL_SPARK) + #if defined (BOXMODEL_ATEVIO7500) \ + || defined (BOXMODEL_HS7110) \ + || defined (BOXMODEL_HS7810A) \ + || defined (BOXMODEL_HS7119) \ + || defined (BOXMODEL_HS7819) \ + || defined (BOXMODEL_SPARK) return; -#endif + #endif for (int id = 0x10; id < FP_ICON_MAX; id++) { -#if defined (BOXMODEL_OCTAGON1008) || defined(BOXMODEL_FORTIS_HDBOX) || defined (BOXMODEL_TF7700) - if (id != 0x16) -#else + #if defined (BOXMODEL_OCTAGON1008) + if (id != FP_ICON_USB && id != FP_ICON_HDD) + #elif defined(BOXMODEL_FORTIS_HDBOX) || defined (BOXMODEL_TF7700) + if (id != FP_ICON_USB) + #else if (id != 0x10 && id != 0x12) -#endif + #endif ShowIcon((fp_icon)id, false); } return;