Changeset 15776 in niluje


Ignore:
Timestamp:
Feb 12, 2019, 4:16:20 AM (6 months ago)
Author:
NiLuJe
Message:

Kindle Hacks:

  • Oops, now that we link IM dynamically, everyone needs a copy of FT+HB in the ScreenSavers? hack libdir…
Location:
Configs/trunk/Kindle
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Configs/trunk/Kindle/Hacks/ScreenSavers/src/build-updates.sh

    r15703 r15776  
    112112                # NOTE: This isn't particularly pretty, and we end up bundling only one version of the binaries in the zip files, but at least the .bin files end up with the correct set of binaries ;)
    113113                # K4/K5 binaries...
    114                 # Note that we don't pickup lib/libfreetype.so.x and lib/libharfbuzz.so.x because they're only needed for a FW 5.x-only feature (pinfo), and as such aren't there to begin with ;).
    115                 KINDLE_MODEL_BINARIES="bin/convert bin/mogrify bin/identify bin/inotifywait bin/shlock bin/sort lib/libz.so.1 lib/libpng16.so.16 lib/libturbojpeg.so.0 lib/libjpeg.so.62 lib/libMagickWand-6.Q8.so.6 lib/libMagickCore-6.Q8.so.6"
     114                KINDLE_MODEL_BINARIES="bin/convert bin/mogrify bin/identify bin/inotifywait bin/shlock bin/sort lib/libz.so.1 lib/libpng16.so.16 lib/libharfbuzz.so.0 lib/libfreetype.so.6 lib/libturbojpeg.so.0 lib/libjpeg.so.62 lib/libMagickWand-6.Q8.so.6 lib/libMagickCore-6.Q8.so.6"
    116115
    117116                # Archive custom directory
  • Configs/trunk/Kindle/Misc/x-compile.sh

    r15773 r15776  
    866866        ${CROSS_TC}-strip --strip-unneeded ${BASE_HACKDIR}/Fonts/src/linkfonts/lib/libharfbuzz.so.${HB_SOVER%%.*}
    867867        # We also need it for the K5 ScreenSavers hack, because the pinfo support relies on it, and Amazon's FT build is evil (it segfaults since FW 5.6.1)...
    868         if [[ "${KINDLE_TC}" == "K5" ]] || [[ "${KINDLE_TC}" == "PW2" ]] ; then
    869                 cp ../lib/libharfbuzz.so.${HB_SOVER} ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libharfbuzz.so.${HB_SOVER%%.*}
    870                 ${CROSS_TC}-strip --strip-unneeded ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libharfbuzz.so.${HB_SOVER%%.*}
    871         fi
     868        # Now that we link IM dynamically, everybody needs it :).
     869        cp ../lib/libharfbuzz.so.${HB_SOVER} ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libharfbuzz.so.${HB_SOVER%%.*}
     870        ${CROSS_TC}-strip --strip-unneeded ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libharfbuzz.so.${HB_SOVER%%.*}
    872871        unset PKG_CONFIG
    873872
     
    956955        ${CROSS_TC}-strip --strip-unneeded ${BASE_HACKDIR}/Fonts/src/linkfonts/lib/bci/libfreetype.so
    957956        # As with harfbuzz, we need it for the K5 ScreenSavers hack, because the pinfo support relies on it, and Amazon's FT build is evil (it segfaults since FW 5.6.1)...
    958         if [[ "${KINDLE_TC}" == "K5" ]] || [[ "${KINDLE_TC}" == "PW2" ]] ; then
    959                 cp ../lib/libfreetype.so.${FT_SOVER} ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libfreetype.so.${FT_SOVER%%.*}
    960                 ${CROSS_TC}-strip --strip-unneeded ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libfreetype.so.${FT_SOVER%%.*}
    961         fi
     957        # Now that we link IM dynamically, everybody needs it :).
     958        cp ../lib/libfreetype.so.${FT_SOVER} ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libfreetype.so.${FT_SOVER%%.*}
     959        ${CROSS_TC}-strip --strip-unneeded ${BASE_HACKDIR}/ScreenSavers/src/linkss/lib/libfreetype.so.${FT_SOVER%%.*}
    962960        # fc-scan will also need it in the Fonts hack...
    963961        cp ../lib/libfreetype.so.${FT_SOVER} ${BASE_HACKDIR}/Fonts/src/linkfonts/lib/libfreetype.so.${FT_SOVER%%.*}
Note: See TracChangeset for help on using the changeset viewer.