diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk index f8be65386d..3f305dd6e4 100644 --- a/packages/multimedia/SDL2/package.mk +++ b/packages/multimedia/SDL2/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="2.0.14" PKG_SHA256="d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" PKG_LICENSE="GPL" PKG_SITE="https://www.libsdl.org/" -PKG_URL="https://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://www.libsdl.org/release/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib systemd dbus" PKG_LONGDESC="A cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. " PKG_BUILD_FLAGS="+pic" -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" PKG_SDL2_X86ASM="-DASSEMBLY=ON" else @@ -24,7 +24,7 @@ PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \ -DSDL_SHARED=OFF \ -DLIBC=ON \ -DGCC_ATOMICS=ON \ - $PKG_SDL2_X86ASM \ + ${PKG_SDL2_X86ASM} \ -DALTIVEC=OFF \ -DOSS=OFF \ -DALSA=ON \ @@ -59,10 +59,10 @@ PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \ -DVIDEO_KMSDRM=OFF \ -DRENDER_D3D=OFF" -if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr" +if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libX11 libXrandr" - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_X11=ON \ -DX11_SHARED=ON \ -DVIDEO_X11_XCURSOR=OFF \ @@ -73,36 +73,36 @@ if [ "$DISPLAYSERVER" = "x11" ]; then -DVIDEO_X11_XSHAPE=OFF \ -DVIDEO_X11_XVM=OFF" else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_X11=OFF" fi -if [ ! "$OPENGL" = "no" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_OPENGL=ON \ -DVIDEO_OPENGLES=OFF" else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_OPENGL=OFF \ -DVIDEO_OPENGLES=ON" fi -if [ "$PULSEAUDIO_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" +if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" pulseaudio" - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DPULSEAUDIO=ON \ -DPULSEAUDIO_SHARED=ON" else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DPULSEAUDIO=OFF \ -DPULSEAUDIO_SHARED=OFF" fi post_makeinstall_target() { - sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/sdl2-config + sed -e "s:\(['=\" ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/sdl2-config - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk index 0d38628e93..73e967d922 100644 --- a/packages/multimedia/aom/package.mk +++ b/packages/multimedia/aom/package.mk @@ -16,7 +16,7 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_CCACHE=1 \ -DENABLE_TESTS=0 \ -DENABLE_TOOLS=0" -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" fi diff --git a/packages/multimedia/gmmlib/package.mk b/packages/multimedia/gmmlib/package.mk index 73665863bf..c4c73ceea4 100644 --- a/packages/multimedia/gmmlib/package.mk +++ b/packages/multimedia/gmmlib/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="d54d547f9f9e74196dead6a338923039ea10c859f1f693f33f10be1562b81d6d" PKG_ARCH="x86_64" PKG_LICENSE="MIT" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/gmmlib/archive/intel-gmmlib-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/gmmlib/archive/intel-gmmlib-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="gmmlib: The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) Graphics Compute Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI." diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk index 0b3b5bd49e..4b4c0ff6cf 100644 --- a/packages/multimedia/intel-vaapi-driver/package.mk +++ b/packages/multimedia/intel-vaapi-driver/package.mk @@ -8,14 +8,14 @@ PKG_SHA256="03cd7e16acc94f828b6e7f3087863d8ca06e99ffa3385588005b1984bdd56157" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libva libdrm" PKG_LONGDESC="intel-vaapi-driver: VA-API user mode driver for Intel GEN Graphics family" PKG_TOOLCHAIN="meson" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no" -elif [ "$DISPLAYSERVER" = "weston" ]; then +elif [ "${DISPLAYSERVER}" = "weston" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=yes" else DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no" @@ -23,5 +23,5 @@ fi PKG_MESON_OPTS_TARGET="-Denable_hybrid_code=false \ -Denable_tests=false \ - $DISPLAYSERVER_LIBVA" + ${DISPLAYSERVER_LIBVA}" diff --git a/packages/multimedia/libaacs/package.mk b/packages/multimedia/libaacs/package.mk index 0b82def679..06a92a2d07 100644 --- a/packages/multimedia/libaacs/package.mk +++ b/packages/multimedia/libaacs/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.11.0" PKG_SHA256="6d884381fbb659e2a565eba91e72499778635975e4b3d6fd94ab364a25965387" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/libaacs.html" -PKG_URL="http://download.videolan.org/pub/videolan/libaacs/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.videolan.org/pub/videolan/libaacs/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libgcrypt" PKG_LONGDESC="libaacs is a research project to implement the Advanced Access Content System specification." PKG_TOOLCHAIN="autotools" @@ -14,11 +14,11 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ --disable-extra-warnings \ --disable-optimizations \ - --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \ - --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \ + --with-libgcrypt-prefix=${SYSROOT_PREFIX}/usr \ + --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr \ --with-gnu-ld" post_makeinstall_target() { - mkdir -p $INSTALL/usr/config/aacs - cp -P ../KEYDB.cfg $INSTALL/usr/config/aacs + mkdir -p ${INSTALL}/usr/config/aacs + cp -P ../KEYDB.cfg ${INSTALL}/usr/config/aacs } diff --git a/packages/multimedia/libass/package.mk b/packages/multimedia/libass/package.mk index f41a17f31b..040e4cf9cf 100644 --- a/packages/multimedia/libass/package.mk +++ b/packages/multimedia/libass/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.15.0" PKG_SHA256="9f09230c9a0aa68ef7aa6a9e2ab709ca957020f842e52c5b2e52b801a7d9e833" PKG_LICENSE="BSD" PKG_SITE="https://github.com/libass/libass" -PKG_URL="https://github.com/libass/libass/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/libass/libass/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain freetype fontconfig fribidi harfbuzz" PKG_LONGDESC="A portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format." @@ -16,7 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-test \ --disable-silent-rules \ --with-gnu-ld" -if [ $TARGET_ARCH = "x86_64" ]; then +if [ ${TARGET_ARCH} = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" PKG_CONFIGURE_OPTS_TARGET+=" --enable-asm" fi diff --git a/packages/multimedia/libbdplus/package.mk b/packages/multimedia/libbdplus/package.mk index 40f8044f02..a7f34a868e 100644 --- a/packages/multimedia/libbdplus/package.mk +++ b/packages/multimedia/libbdplus/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="0.1.2" PKG_SHA256="a631cae3cd34bf054db040b64edbfc8430936e762eb433b1789358ac3d3dc80a" PKG_LICENSE="GPL" PKG_SITE="https://www.videolan.org/developers/libbdplus.html" -PKG_URL="http://download.videolan.org/pub/videolan/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.videolan.org/pub/videolan/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libgcrypt libgpg-error" PKG_LONGDESC="libbdplus is a research project to implement the BD+ System Specifications." PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ --disable-extra-warnings \ --disable-optimizations \ - --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \ - --with-gpg-error-prefix=$SYSROOT_PREFIX/usr \ + --with-libgcrypt-prefix=${SYSROOT_PREFIX}/usr \ + --with-gpg-error-prefix=${SYSROOT_PREFIX}/usr \ --with-gnu-ld" -if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs" - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --with-libaacs" +if [ "${BLURAY_AACS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libaacs" + PKG_CONFIGURE_OPTS_TARGET+=" --with-libaacs" else - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --without-libaacs" + PKG_CONFIGURE_OPTS_TARGET+=" --without-libaacs" fi diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk index c6f5df5ac9..17f7eaa0cb 100644 --- a/packages/multimedia/libbluray/package.mk +++ b/packages/multimedia/libbluray/package.mk @@ -7,17 +7,17 @@ PKG_VERSION="1.1.2" PKG_SHA256="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42" PKG_LICENSE="LGPL" PKG_SITE="https://www.videolan.org/developers/libbluray.html" -PKG_URL="http://download.videolan.org/pub/videolan/libbluray/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain fontconfig freetype libxml2" PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs playback for media players." PKG_TOOLCHAIN="autotools" -if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs" +if [ "${BLURAY_AACS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libaacs" fi -if [ "$BLURAY_BDPLUS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbdplus" +if [ "${BLURAY_BDPLUS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libbdplus" fi PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ diff --git a/packages/multimedia/libdvdcss/package.mk b/packages/multimedia/libdvdcss/package.mk index 07d5443511..4f6fc54818 100644 --- a/packages/multimedia/libdvdcss/package.mk +++ b/packages/multimedia/libdvdcss/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.4.2-Leia-Beta-5" PKG_SHA256="38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/libdvdcss" -PKG_URL="https://github.com/xbmc/libdvdcss/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/libdvdcss/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libdvdcss is a simple library designed for accessing DVDs as a block device without having to bother about the decryption." PKG_TOOLCHAIN="manual" diff --git a/packages/multimedia/libdvdnav/package.mk b/packages/multimedia/libdvdnav/package.mk index 4748b57592..a6c72bc481 100644 --- a/packages/multimedia/libdvdnav/package.mk +++ b/packages/multimedia/libdvdnav/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="9277007ce2263b908e9ce3091cc31b3dd87c351c" PKG_SHA256="e50db40a823ddc795d1fe5f18db2517fb3e05fe0c4a88abf1578d95d7a1cce63" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/libdvdnav" -PKG_URL="https://github.com/xbmc/libdvdnav/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/libdvdnav/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libdvdread" PKG_LONGDESC="libdvdnav is a library that allows easy use of sophisticated DVD navigation features such as DVD menus, multiangle playback and even interactive DVD games." PKG_TOOLCHAIN="manual" diff --git a/packages/multimedia/libdvdread/package.mk b/packages/multimedia/libdvdread/package.mk index ff20343762..4da8793c4e 100644 --- a/packages/multimedia/libdvdread/package.mk +++ b/packages/multimedia/libdvdread/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="bd6b329f0137ab6a9f779a28dd96f04713735e17" PKG_SHA256="2d9d6d185dd25a983d6dfc2a00207cafdc396a969c227d5edd84b6215b2fba89" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/libdvdread" -PKG_URL="https://github.com/xbmc/libdvdread/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/libdvdread/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libdvdread is a library which provides a simple foundation for reading DVDs." PKG_TOOLCHAIN="manual" -if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libdvdcss" +if [ "${KODI_DVDCSS_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libdvdcss" fi diff --git a/packages/multimedia/libhdhomerun/package.mk b/packages/multimedia/libhdhomerun/package.mk index 60d03880ee..28b9719f15 100644 --- a/packages/multimedia/libhdhomerun/package.mk +++ b/packages/multimedia/libhdhomerun/package.mk @@ -11,18 +11,18 @@ PKG_URL="https://github.com/Silicondust/libhdhomerun/archive/${PKG_VERSION}.tar. PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The library provides functionality to setup the HDHomeRun." -PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=$TARGET_PREFIX" +PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=${TARGET_PREFIX}" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -PR hdhomerun_config $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -PR hdhomerun_config ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/lib/ - cp -PR libhdhomerun.so $INSTALL/usr/lib/ + mkdir -p ${INSTALL}/usr/lib/ + cp -PR libhdhomerun.so ${INSTALL}/usr/lib/ - mkdir -p $SYSROOT_PREFIX/usr/include/hdhomerun - cp *.h $SYSROOT_PREFIX/usr/include/hdhomerun + mkdir -p ${SYSROOT_PREFIX}/usr/include/hdhomerun + cp *.h ${SYSROOT_PREFIX}/usr/include/hdhomerun - mkdir -p $SYSROOT_PREFIX/usr/lib - cp libhdhomerun.so $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp libhdhomerun.so ${SYSROOT_PREFIX}/usr/lib } diff --git a/packages/multimedia/libmpeg2/package.mk b/packages/multimedia/libmpeg2/package.mk index 692732281d..9b4b5bfe1c 100644 --- a/packages/multimedia/libmpeg2/package.mk +++ b/packages/multimedia/libmpeg2/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.5.1" PKG_SHA256="dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4" PKG_LICENSE="GPLv2" PKG_SITE="http://libmpeg2.sourceforge.net/" -PKG_URL="http://libmpeg2.sourceforge.net/files/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://libmpeg2.sourceforge.net/files/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The MPEG Library is a collection of C routines to decode MPEG-1 and MPEG-2 movies." @@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-sdl \ --without-x" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/multimedia/libudfread/package.mk b/packages/multimedia/libudfread/package.mk index b6562e8710..dabdc997c3 100644 --- a/packages/multimedia/libudfread/package.mk +++ b/packages/multimedia/libudfread/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.1.1" PKG_SHA256="5d237ff81caa46856dc75b8ddd1f17c0e262eea08ef59a466cc850585f1680dc" PKG_LICENSE="LGPLv2.1" PKG_SITE="https://code.videolan.org/videolan/libudfread" -PKG_URL="https://code.videolan.org/videolan/$PKG_NAME/-/archive/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://code.videolan.org/videolan/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="UDF reader" PKG_TOOLCHAIN="autotools" diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk index 82942677e7..54a2a3d792 100644 --- a/packages/multimedia/libva/package.mk +++ b/packages/multimedia/libva/package.mk @@ -8,14 +8,14 @@ PKG_SHA256="f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/libva/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/libva/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Libva is an implementation for VA-API (VIdeo Acceleration API)." PKG_TOOLCHAIN="meson" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm" DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_glx=no -Dwith_wayland=no" -elif [ "$DISPLAYSERVER" = "weston" ]; then +elif [ "${DISPLAYSERVER}" = "weston" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_glx=no -Dwith_wayland=yes" PKG_DEPENDS_TARGET="toolchain libdrm wayland" else @@ -26,4 +26,4 @@ fi PKG_MESON_OPTS_TARGET="-Ddisable_drm=false \ -Denable_docs=false \ -Denable_va_messaging=true \ - $DISPLAYSERVER_LIBVA" + ${DISPLAYSERVER_LIBVA}" diff --git a/packages/multimedia/media-driver/package.mk b/packages/multimedia/media-driver/package.mk index 6627862893..93e132beb3 100644 --- a/packages/multimedia/media-driver/package.mk +++ b/packages/multimedia/media-driver/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="3d856a963127ddd6690fc6dac521d7674947675d5f20452f1e6f45c0fc83f9e6" PKG_ARCH="x86_64" PKG_LICENSE="MIT" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/media-driver/archive/intel-media-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/media-driver/archive/intel-media-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libva libdrm gmmlib" PKG_LONGDESC="media-driver: The Intel(R) Media Driver for VAAPI is a new VA-API (Video Acceleration API) user mode driver supporting hardware accelerated decoding, encoding, and video post processing for GEN based graphics hardware." diff --git a/packages/multimedia/rtmpdump/package.mk b/packages/multimedia/rtmpdump/package.mk index 81d8a8390f..4811c6e3ef 100644 --- a/packages/multimedia/rtmpdump/package.mk +++ b/packages/multimedia/rtmpdump/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="c5f04a58fc2aeea6296ca7c44ee4734c18401aa3" PKG_SHA256="fd8c21263d93fbde8bee8aa6c5f6a657789674bb0f9e74f050651504d5f43b46" PKG_LICENSE="GPL" PKG_SITE="http://rtmpdump.mplayerhq.hu/" -PKG_URL="http://repo.or.cz/rtmpdump.git/snapshot/$PKG_VERSION.tar.gz" +PKG_URL="http://repo.or.cz/rtmpdump.git/snapshot/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="rtmpdump is a toolkit for RTMP streams." PKG_BUILD_FLAGS="+pic" @@ -17,56 +17,56 @@ make_target() { incdir=/usr/include/librtmp \ libdir=/usr/lib \ mandir=/usr/share/man \ - CC="$CC" \ - LD="$LD" \ - AR="$AR" \ + CC="${CC}" \ + LD="${LD}" \ + AR="${AR}" \ SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ - XCFLAGS="$CFLAGS" \ - XCFLAGS="$CFLAGS -Wno-unused-but-set-variable -Wno-unused-const-variable" \ - XLDFLAGS="$LDFLAGS" \ + XCFLAGS="${CFLAGS}" \ + XCFLAGS="${CFLAGS} -Wno-unused-but-set-variable -Wno-unused-const-variable" \ + XLDFLAGS="${LDFLAGS}" \ XLIBS="-lm" } makeinstall_target() { - make DESTDIR=$SYSROOT_PREFIX \ + make DESTDIR=${SYSROOT_PREFIX} \ prefix=/usr \ incdir=/usr/include/librtmp \ libdir=/usr/lib \ mandir=/usr/share/man \ - CC="$CC" \ - LD="$LD" \ - AR="$AR" \ + CC="${CC}" \ + LD="${LD}" \ + AR="${AR}" \ SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ - XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS" \ + XCFLAGS="${CFLAGS}" \ + XLDFLAGS="${LDFLAGS}" \ XLIBS="-lm" \ install - make DESTDIR=$INSTALL \ + make DESTDIR=${INSTALL} \ prefix=/usr \ incdir=/usr/include/librtmp \ libdir=/usr/lib \ mandir=/usr/share/man \ - CC="$CC" \ - LD="$LD" \ - AR="$AR" \ + CC="${CC}" \ + LD="${LD}" \ + AR="${AR}" \ SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ - XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS" \ + XCFLAGS="${CFLAGS}" \ + XLDFLAGS="${LDFLAGS}" \ XLIBS="-lm" \ install } post_makeinstall_target() { - rm -rf $INSTALL/usr/sbin + rm -rf ${INSTALL}/usr/sbin # # to be removed: hack for "compatibility" -# mkdir -p $INSTALL/usr/lib -# ln -sf librtmp.so.1 $INSTALL/usr/lib/librtmp.so.0 +# mkdir -p ${INSTALL}/usr/lib +# ln -sf librtmp.so.1 ${INSTALL}/usr/lib/librtmp.so.0 }