From dc28cd2250dbecef19ab5b113c3e637538e66422 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:55 +0000 Subject: [PATCH] graphics: automated code cleanup Signed-off-by: Ian Leonard --- packages/graphics/bcm2835-driver/package.mk | 8 ++++---- packages/graphics/ftgl/package.mk | 4 ++-- packages/graphics/giflib/package.mk | 2 +- packages/graphics/glew/package.mk | 18 ++++++++--------- packages/graphics/glm/package.mk | 2 +- packages/graphics/glmark2/package.mk | 10 +++++----- packages/graphics/harfbuzz/package.mk | 2 +- packages/graphics/kmscube/package.mk | 6 +++--- packages/graphics/lcms2/package.mk | 2 +- packages/graphics/libde265/package.mk | 2 +- packages/graphics/libglvnd/package.mk | 2 +- packages/graphics/libheif/package.mk | 2 +- packages/graphics/libjpeg-turbo/package.mk | 6 +++--- packages/graphics/libmali/package.mk | 22 ++++++++++----------- packages/graphics/libpng/package.mk | 12 +++++------ packages/graphics/libprojectM/package.mk | 4 ++-- packages/graphics/libraw/package.mk | 2 +- packages/graphics/soil/package.mk | 6 +++--- packages/graphics/tiff/package.mk | 8 ++++---- 19 files changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 8ab7ae155a..6b86d2c000 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -23,17 +23,17 @@ makeinstall_target() { # Install vendor header files except proprietary GL headers mkdir -p ${SYSROOT_PREFIX}/usr/include for f in $(cd ${PKG_FLOAT}/opt/vc/include; ls | grep -v "GL"); do - cp -PRv ${PKG_FLOAT}/opt/vc/include/$f ${SYSROOT_PREFIX}/usr/include + cp -PRv ${PKG_FLOAT}/opt/vc/include/${f} ${SYSROOT_PREFIX}/usr/include done # Install vendor libs & pkgconfigs except proprietary GL libs mkdir -p ${SYSROOT_PREFIX}/usr/lib for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so *.a | grep -Ev "^lib(EGL|GL)"); do - cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f ${SYSROOT_PREFIX}/usr/lib + cp -PRv ${PKG_FLOAT}/opt/vc/lib/${f} ${SYSROOT_PREFIX}/usr/lib done mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig for f in $(cd ${PKG_FLOAT}/opt/vc/lib/pkgconfig; ls | grep -v "gl"); do - cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/$f ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/${f} ${SYSROOT_PREFIX}/usr/lib/pkgconfig done # Update prefix in vendor pkgconfig files @@ -49,7 +49,7 @@ makeinstall_target() { # Install vendor libs except proprietary GL mkdir -p ${INSTALL}/usr/lib for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so | grep -Ev "^lib(EGL|GL)"); do - cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f ${INSTALL}/usr/lib + cp -PRv ${PKG_FLOAT}/opt/vc/lib/${f} ${INSTALL}/usr/lib done # Install useful tools diff --git a/packages/graphics/ftgl/package.mk b/packages/graphics/ftgl/package.mk index 9e89044afb..a431490059 100644 --- a/packages/graphics/ftgl/package.mk +++ b/packages/graphics/ftgl/package.mk @@ -6,8 +6,8 @@ PKG_VERSION="2.1.2" PKG_SHA256="0f61d978c28cd5d78daded591f5b03f71248c0a51c7965733e8729c874265f50" PKG_LICENSE="GPL" PKG_SITE="http://sourceforge.net/projects/ftgl/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain freetype" PKG_LONGDESC="a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -PKG_CMAKE_OPTS_TARGET="-DOUTPUT_DIR=$SYSROOT_PREFIX/usr" +PKG_CMAKE_OPTS_TARGET="-DOUTPUT_DIR=${SYSROOT_PREFIX}/usr" diff --git a/packages/graphics/giflib/package.mk b/packages/graphics/giflib/package.mk index f424b10df7..f0f4440e1a 100644 --- a/packages/graphics/giflib/package.mk +++ b/packages/graphics/giflib/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="5.2.1" PKG_SHA256="31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd" PKG_LICENSE="OSS" PKG_SITE="http://giflib.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/giflib/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/giflib/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="zlib:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="giflib: giflib service library" diff --git a/packages/graphics/glew/package.mk b/packages/graphics/glew/package.mk index 276d48edf6..3a23c8c17e 100644 --- a/packages/graphics/glew/package.mk +++ b/packages/graphics/glew/package.mk @@ -7,23 +7,23 @@ PKG_VERSION="2.2.0" PKG_SHA256="d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" PKG_LICENSE="BSD" PKG_SITE="http://glew.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/glew/glew/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz" +PKG_URL="${SOURCEFORGE_SRC}/glew/glew/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain libX11" PKG_LONGDESC="A cross-platform C/C++ extension loading library." make_target() { - make CC="$CC" LD="$CC" AR="$AR" \ - POPT="$CFLAGS" LDFLAGS.EXTRA="$LDFLAGS" \ + make CC="${CC}" LD="${CC}" AR="${AR}" \ + POPT="${CFLAGS}" LDFLAGS.EXTRA="${LDFLAGS}" \ GLEW_DEST="/usr" LIBDIR="/usr/lib" lib/libGLEW.a glew.pc } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib - cp -PR lib/libGLEW.a $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp -PR lib/libGLEW.a ${SYSROOT_PREFIX}/usr/lib - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp -PR glew.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp -PR glew.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig - mkdir -p $SYSROOT_PREFIX/usr/include - cp -PR include/GL $SYSROOT_PREFIX/usr/include + mkdir -p ${SYSROOT_PREFIX}/usr/include + cp -PR include/GL ${SYSROOT_PREFIX}/usr/include } diff --git a/packages/graphics/glm/package.mk b/packages/graphics/glm/package.mk index 2a21c3d7c1..8ec1526d34 100644 --- a/packages/graphics/glm/package.mk +++ b/packages/graphics/glm/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.9.9.8" PKG_SHA256="37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c" PKG_LICENSE="MIT" PKG_SITE="https://glm.g-truc.net/" -PKG_URL="https://github.com/g-truc/glm/releases/download/$PKG_VERSION/glm-$PKG_VERSION.zip" +PKG_URL="https://github.com/g-truc/glm/releases/download/${PKG_VERSION}/glm-${PKG_VERSION}.zip" PKG_SOURCE_DIR="glm" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="OpenGL Mathematics (GLM)" diff --git a/packages/graphics/glmark2/package.mk b/packages/graphics/glmark2/package.mk index 5979563aa8..fc40d215f7 100644 --- a/packages/graphics/glmark2/package.mk +++ b/packages/graphics/glmark2/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="dab3e7d8ab185a59e7475845d189f9a2d7d67ad0" PKG_SHA256="01dc8adb82ae01e248e3d16f7510356bae87900e119089f7402e4915824fcd75" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/glmark2/glmark2" -PKG_URL="https://github.com/glmark2/glmark2/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/glmark2/glmark2/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark" -if [ "$OPENGLES_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGLES" +if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" PKG_MESON_OPTS_TARGET="-Dflavors=drm-glesv2" -elif [ "$OPENGL_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGL" +elif [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" PKG_MESON_OPTS_TARGET="-Dflavors=drm-gl" fi diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk index 593114e8fc..9f78b8fe42 100644 --- a/packages/graphics/harfbuzz/package.mk +++ b/packages/graphics/harfbuzz/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.7.4" PKG_SHA256="6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" -PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/$PKG_VERSION/harfbuzz-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PKG_VERSION}/harfbuzz-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain cairo freetype glib" PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine." PKG_TOOLCHAIN="meson" diff --git a/packages/graphics/kmscube/package.mk b/packages/graphics/kmscube/package.mk index 81c83cdc6d..a0633da090 100644 --- a/packages/graphics/kmscube/package.mk +++ b/packages/graphics/kmscube/package.mk @@ -10,9 +10,9 @@ PKG_URL="https://gitlab.freedesktop.org/mesa/kmscube/-/archive/master/kmscube-${ PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Example KMS/GBM/EGL application" -if [ "$OPENGLES_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGLES" -elif [ "$OPENGL_SUPPORT" = "yes" ]; then +if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +elif [ "${OPENGL_SUPPORT}" = "yes" ]; then echo "kmscube only supports OpenGLESv2" exit 0 fi diff --git a/packages/graphics/lcms2/package.mk b/packages/graphics/lcms2/package.mk index d81b246213..45c413a9c1 100644 --- a/packages/graphics/lcms2/package.mk +++ b/packages/graphics/lcms2/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="2.11" PKG_SHA256="dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e" PKG_LICENSE="MIT/GPLv3" PKG_SITE="http://www.littlecms.com" -PKG_URL="$SOURCEFORGE_SRC/lcms/lcms/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/lcms/lcms/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain tiff" PKG_LONGDESC="An small-footprint color management engine, with special focus on accuracy and performance." diff --git a/packages/graphics/libde265/package.mk b/packages/graphics/libde265/package.mk index 5774811272..c8bee4664d 100644 --- a/packages/graphics/libde265/package.mk +++ b/packages/graphics/libde265/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0.8" PKG_SHA256="24c791dd334fa521762320ff54f0febfd3c09fc978880a8c5fbc40a88f21d905" PKG_LICENSE="LGPLv3" PKG_SITE="http://www.libde265.org" -PKG_URL="https://github.com/strukturag/libde265/releases/download/v${PKG_VERSION}/${PKG_NAME}-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/strukturag/libde265/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Open h.265 video codec implementation." PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/libglvnd/package.mk b/packages/graphics/libglvnd/package.mk index 577283aba6..f17ac56975 100644 --- a/packages/graphics/libglvnd/package.mk +++ b/packages/graphics/libglvnd/package.mk @@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain libX11 libXext xorgproto" PKG_LONGDESC="libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors." PKG_TOOLCHAIN="autotools" -if [ "$OPENGLES_SUPPORT" = "no" ]; then +if [ "${OPENGLES_SUPPORT}" = "no" ]; then PKG_CONFIGURE_OPTS_TARGET+=" --disable-gles" fi diff --git a/packages/graphics/libheif/package.mk b/packages/graphics/libheif/package.mk index f206c573a7..471c57da19 100644 --- a/packages/graphics/libheif/package.mk +++ b/packages/graphics/libheif/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.10.0" PKG_SHA256="ad5af1276f341277dc537b0d19a4193e0833c247b2aacb936e0c5494141533ae" PKG_LICENSE="LGPLv3" PKG_SITE="http://www.libde265.org" -PKG_URL="https://github.com/strukturag/libheif/releases/download/v$PKG_VERSION/libheif-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/strukturag/libheif/releases/download/v${PKG_VERSION}/libheif-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libde265 libjpeg-turbo libpng" PKG_LONGDESC="A HEIF file format decoder and encoder." PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/libjpeg-turbo/package.mk b/packages/graphics/libjpeg-turbo/package.mk index 5da47cd936..35d0940b7f 100644 --- a/packages/graphics/libjpeg-turbo/package.mk +++ b/packages/graphics/libjpeg-turbo/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.0.6" PKG_SHA256="005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371" PKG_LICENSE="GPL" PKG_SITE="https://libjpeg-turbo.org/" -PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A high-speed version of libjpeg for x86 and x86-64 processors which uses SIMD." @@ -28,11 +28,11 @@ else PKG_CMAKE_OPTS_TARGET+=" -DWITH_SIMD=OFF" fi -if [ $TARGET_ARCH = "x86_64" ]; then +if [ ${TARGET_ARCH} = "x86_64" ]; then PKG_DEPENDS_HOST+=" nasm:host" PKG_DEPENDS_TARGET+=" nasm:host" fi post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/graphics/libmali/package.mk b/packages/graphics/libmali/package.mk index 9bec5dd7a3..18dc6356a1 100644 --- a/packages/graphics/libmali/package.mk +++ b/packages/graphics/libmali/package.mk @@ -7,32 +7,32 @@ PKG_SHA256="4f2103fc927cc006ee5c9b647e899f50b0dcaeee127fec713387d06a333eb404" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="https://github.com/LibreELEC/libmali" -PKG_URL="https://github.com/LibreELEC/libmali/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/libmali/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family" -PKG_STAMP="$MALI_FAMILY" +PKG_STAMP="${MALI_FAMILY}" PKG_DEPENDS_TARGET="libdrm" -if listcontains "$MALI_FAMILY" "(t620|t720)"; then +if listcontains "${MALI_FAMILY}" "(t620|t720)"; then PKG_DEPENDS_TARGET+=" wayland" fi -listcontains "$MALI_FAMILY" "4[0-9]+" && PKG_DEPENDS_TARGET+=" mali-utgard" -listcontains "$MALI_FAMILY" "t[0-9]+" && PKG_DEPENDS_TARGET+=" mali-midgard" -listcontains "$MALI_FAMILY" "g[0-9]+" && PKG_DEPENDS_TARGET+=" mali-bifrost" +listcontains "${MALI_FAMILY}" "4[0-9]+" && PKG_DEPENDS_TARGET+=" mali-utgard" +listcontains "${MALI_FAMILY}" "t[0-9]+" && PKG_DEPENDS_TARGET+=" mali-midgard" +listcontains "${MALI_FAMILY}" "g[0-9]+" && PKG_DEPENDS_TARGET+=" mali-bifrost" PKG_CMAKE_OPTS_TARGET="-DMALI_VARIANT=${MALI_FAMILY// /;}" -if [ "$TARGET_ARCH" = "aarch64" ]; then +if [ "${TARGET_ARCH}" = "aarch64" ]; then PKG_CMAKE_OPTS_TARGET+=" -DMALI_ARCH=aarch64-linux-gnu" fi post_makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -v $PKG_DIR/scripts/libmali-setup $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -v ${PKG_DIR}/scripts/libmali-setup ${INSTALL}/usr/bin - if [ $(ls -1q $INSTALL/usr/lib/libmali-*.so | wc -l) -gt 1 ]; then - ln -sfv /var/lib/libmali/libmali.so $INSTALL/usr/lib/libmali.so + if [ $(ls -1q ${INSTALL}/usr/lib/libmali-*.so | wc -l) -gt 1 ]; then + ln -sfv /var/lib/libmali/libmali.so ${INSTALL}/usr/lib/libmali.so fi } diff --git a/packages/graphics/libpng/package.mk b/packages/graphics/libpng/package.mk index 3a34b002b8..cc2b9c8bd2 100644 --- a/packages/graphics/libpng/package.mk +++ b/packages/graphics/libpng/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.6.37" PKG_SHA256="505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca" PKG_LICENSE="LibPNG2" PKG_SITE="http://www.libpng.org/" -PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${SOURCEFORGE_SRC}/libpng/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="zlib:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="An extensible file format for the lossless, portable, well-compressed storage of raster images." @@ -20,17 +20,17 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_z_zlibVersion=yes \ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared" pre_configure_host() { - export CPPFLAGS="$CPPFLAGS -I$TOOLCHAIN/include" + export CPPFLAGS="${CPPFLAGS} -I${TOOLCHAIN}/include" } pre_configure_target() { - export CPPFLAGS="$CPPFLAGS -I$SYSROOT_PREFIX/usr/include" + export CPPFLAGS="${CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include" } post_makeinstall_target() { - sed -e "s:\([\"'= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ + sed -e "s:\([\"'= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" \ -e "s:libs=\"-lpng16\":libs=\"-lpng16 -lz\":g" \ - -i $SYSROOT_PREFIX/usr/bin/libpng*-config + -i ${SYSROOT_PREFIX}/usr/bin/libpng*-config - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index aafa48885d..31864490ed 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -7,8 +7,8 @@ PKG_VERSION="3.1.7" PKG_SHA256="968551c5d6292179838bf5d3ab85f5bd785c6fec7c1de42c0cf5ec3dbf4b04f9" PKG_LICENSE="GPL" PKG_SITE="https://github.com/projectM-visualizer/projectm" -PKG_URL="https://github.com/projectM-visualizer/projectm/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain freetype glm $OPENGL" +PKG_URL="https://github.com/projectM-visualizer/projectm/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain freetype glm ${OPENGL}" PKG_LONGDESC="A MilkDrop compatible opensource music visualizer." PKG_TOOLCHAIN="configure" PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/libraw/package.mk b/packages/graphics/libraw/package.mk index c7b48e8e26..15083c3b23 100644 --- a/packages/graphics/libraw/package.mk +++ b/packages/graphics/libraw/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.20.2" PKG_SHA256="dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6" PKG_LICENSE="LGPL" PKG_SITE="http://www.libraw.org/" -PKG_URL="http://www.libraw.org/data/LibRaw-$PKG_VERSION.tar.gz" +PKG_URL="http://www.libraw.org/data/LibRaw-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libjpeg-turbo lcms2" PKG_LONGDESC="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/soil/package.mk b/packages/graphics/soil/package.mk index 1c6f5d87f0..2b8953120f 100644 --- a/packages/graphics/soil/package.mk +++ b/packages/graphics/soil/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="1.16" PKG_SHA256="5f2d8a8c78e81d29df07f0f97c34fa2f75187bcadfdc7222cbd026859acaff2f" PKG_LICENSE="CCPL" PKG_SITE="http://www.lonesock.net/soil.html" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain mesa" PKG_LONGDESC="A tiny C lib primarily for loading textures into OpenGL" PKG_BUILD_FLAGS="+pic" pre_make_target() { - sed "s/1.07-20071110/$PKG_VERSION/" -i Makefile + sed "s/1.07-20071110/${PKG_VERSION}/" -i Makefile } pre_makeinstall_target() { - export DESTDIR=$SYSROOT_PREFIX + export DESTDIR=${SYSROOT_PREFIX} } diff --git a/packages/graphics/tiff/package.mk b/packages/graphics/tiff/package.mk index fd1e4271ec..0e81f5a21f 100644 --- a/packages/graphics/tiff/package.mk +++ b/packages/graphics/tiff/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.2.0" PKG_SHA256="eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb" PKG_LICENSE="OSS" PKG_SITE="http://www.remotesensing.org/libtiff/" -PKG_URL="http://download.osgeo.org/libtiff/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.osgeo.org/libtiff/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libjpeg-turbo zlib" PKG_LONGDESC="libtiff is a library for reading and writing TIFF files." PKG_BUILD_FLAGS="+pic" @@ -21,10 +21,10 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-zstd \ --disable-webp \ --enable-cxx \ - --with-jpeg-lib-dir=$SYSROOT_PREFIX/usr/lib \ - --with-jpeg-include-dir=$SYSROOT_PREFIX/usr/include \ + --with-jpeg-lib-dir=${SYSROOT_PREFIX}/usr/lib \ + --with-jpeg-include-dir=${SYSROOT_PREFIX}/usr/include \ --without-x" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin }