diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index d85ec41dba..75c9bdd79b 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -2,30 +2,35 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="unrar" -PKG_VERSION="5.6.8" -PKG_SHA256="a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff" +PKG_VERSION="5.9.3" +PKG_SHA256="28c176c29da86d7efe3cb9a227255d8340f761ba95969195982ec87c8eb2dd69" PKG_LICENSE="free" -PKG_SITE="http://www.rarlab.com" -PKG_URL="http://www.rarlab.com/rar/unrarsrc-$PKG_VERSION.tar.gz" +PKG_SITE="https://www.rarlab.com/rar_add.htm" +PKG_URL="http://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="unrar extract, test and view RAR archives" PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="+pic -sysroot" +unpack() { + mkdir -p $PKG_BUILD/unrar lib + tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz -C $PKG_BUILD/ + cp -a $PKG_BUILD/unrar $PKG_BUILD/lib +} + make_target() { make CXX="$CXX" \ CXXFLAGS="$TARGET_CXXFLAGS" \ RANLIB="$RANLIB" \ AR="$AR" \ - STRIP="$STRIP" \ - -f makefile unrar - - make clean + -C unrar \ + -f makefile make CXX="$CXX" \ CXXFLAGS="$TARGET_CXXFLAGS" \ RANLIB="$RANLIB" \ AR="$AR" \ + -C lib \ -f makefile lib } @@ -34,8 +39,8 @@ post_make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/include/unrar $INSTALL/usr/lib $INSTALL/usr/bin - cp -p *.hpp $INSTALL/usr/include/unrar/ - cp -p libunrar.a $INSTALL/usr/lib/ - cp -p unrar $INSTALL/usr/bin/ + mkdir -p $INSTALL/usr/include/unrar $INSTALL/usr/lib $INSTALL/usr/bin + cp -p lib/*.hpp $INSTALL/usr/include/unrar/ + cp -p lib/libunrar.a $INSTALL/usr/lib/ + cp -p unrar/unrar $INSTALL/usr/bin/ } diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 68271cb0da..5600160adf 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -165,7 +165,7 @@ addon() { cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng $ADDON_BUILD/$PKG_ADDON_ID/bin # unrar - cp -P $(get_install_dir unrar)/usr/bin/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir unrar)/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin # usb-modeswitch cp -P $(get_install_dir usb-modeswitch)/usr/sbin/usb_modeswitch $ADDON_BUILD/$PKG_ADDON_ID/bin