From bb42c5d3638ee456f52c2a0881d39fcbd1da5283 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Thu, 31 Mar 2022 00:59:04 -0500 Subject: libraries/libvdpau-va-gl: New maintainer + cleanup Marcel has given up maintenance of his scripts. Update the github download link to include the package name in the tarball. Remove the /etc/profile.d scripts in favor of editing existing /etc/profile.d scripts, to avoid conflicts. See the README. Signed-off-by: Kyle Guinn Signed-off-by: Willy Sudiarto Raharjo --- libraries/libvdpau-va-gl/README | 9 ++---- libraries/libvdpau-va-gl/doinst.sh | 15 --------- libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild | 36 ++++++++-------------- libraries/libvdpau-va-gl/libvdpau-va-gl.info | 8 ++--- libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.csh | 3 -- libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.sh | 4 --- libraries/libvdpau-va-gl/slack-desc | 2 +- 7 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 libraries/libvdpau-va-gl/doinst.sh delete mode 100644 libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.csh delete mode 100644 libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.sh (limited to 'libraries/libvdpau-va-gl') diff --git a/libraries/libvdpau-va-gl/README b/libraries/libvdpau-va-gl/README index 628ba5215a..b4c64e143f 100644 --- a/libraries/libvdpau-va-gl/README +++ b/libraries/libvdpau-va-gl/README @@ -22,9 +22,6 @@ Intel chips, and on some AMD video adapters with help of xvba-va-driver. OpenGL is available, you know, on systems with OpenGL available. -Note: - -This SlackBuild creates scripts in /etc/profile.d for enabling -the backend. This may conflicts with the dependent `libvdpau' -package. Whilst `libvdpau' has the VDPAU_DRIVER variable disabled -per default it may conflicts if you changed anything in there. +After installation, it may be necessary to edit + /etc/profile.d/vdpau.{sh,csh} +to select a backend by uncommenting the appropriate VDPAU_DRIVER. diff --git a/libraries/libvdpau-va-gl/doinst.sh b/libraries/libvdpau-va-gl/doinst.sh deleted file mode 100644 index 76c6259a2d..0000000000 --- a/libraries/libvdpau-va-gl/doinst.sh +++ /dev/null @@ -1,15 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/profile.d/vdpau-va-gl.sh.new -config etc/profile.d/vdpau-va-gl.csh.new diff --git a/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild b/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild index d414a5f0b0..4c65d67200 100644 --- a/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild +++ b/libraries/libvdpau-va-gl/libvdpau-va-gl.SlackBuild @@ -1,8 +1,9 @@ #!/bin/bash -# Slackware build script for "libvdpau-va-gl". +# Slackware build script for libvdpau-va-gl # Copyright 2015-2016 Marcel Saegebarth +# Copyright 2022 Kyle Guinn # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,30 +29,29 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvdpau-va-gl VERSION=${VERSION:-0.4.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then - case "$( uname -m )" in + case "$(uname -m)" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} +DOCS="ChangeLog LICENSE README.md" + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -72,14 +72,10 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +chmod -R u+w,go-w,a+rX-st . mkdir -p build cd build @@ -88,24 +84,18 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_BUILD_TYPE=Release \ + .. make make install/strip DESTDIR=$PKG cd .. -mkdir -p $PKG/etc/profile.d -cp $CWD/profile.d/vdpau-va-gl.sh $PKG/etc/profile.d/vdpau-va-gl.sh.new -cp $CWD/profile.d/vdpau-va-gl.csh $PKG/etc/profile.d/vdpau-va-gl.csh.new -chown root:root $PKG/etc/profile.d/* -chmod 755 $PKG/etc/profile.d/* - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libvdpau-va-gl/libvdpau-va-gl.info b/libraries/libvdpau-va-gl/libvdpau-va-gl.info index 6b0b0f4cce..799dcf36e6 100644 --- a/libraries/libvdpau-va-gl/libvdpau-va-gl.info +++ b/libraries/libvdpau-va-gl/libvdpau-va-gl.info @@ -1,10 +1,10 @@ PRGNAM="libvdpau-va-gl" VERSION="0.4.2" -HOMEPAGE="https://github.com/i-rinat/libvdpau-va-gl/" -DOWNLOAD="https://github.com/i-rinat/libvdpau-va-gl/archive/v0.4.2.tar.gz" +HOMEPAGE="https://github.com/i-rinat/libvdpau-va-gl" +DOWNLOAD="https://github.com/i-rinat/libvdpau-va-gl/archive/v0.4.2/libvdpau-va-gl-0.4.2.tar.gz" MD5SUM="8db21dcfd5cd14c6ec51b992e20369dc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +MAINTAINER="Kyle Guinn" +EMAIL="elyk03@gmail.com" diff --git a/libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.csh b/libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.csh deleted file mode 100644 index f11658b6b5..0000000000 --- a/libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.csh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/csh - -setenv VDPAU_DRIVER va_gl diff --git a/libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.sh b/libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.sh deleted file mode 100644 index d39e5d69e5..0000000000 --- a/libraries/libvdpau-va-gl/profile.d/vdpau-va-gl.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -VDPAU_DRIVER=va_gl -export VDPAU_DRIVER=va_gl diff --git a/libraries/libvdpau-va-gl/slack-desc b/libraries/libvdpau-va-gl/slack-desc index e4d0b18f6f..f2203b6249 100644 --- a/libraries/libvdpau-va-gl/slack-desc +++ b/libraries/libvdpau-va-gl/slack-desc @@ -10,7 +10,7 @@ libvdpau-va-gl: libvdpau-va-gl (VDPAU driver with VA-API/OpenGL backend) libvdpau-va-gl: libvdpau-va-gl: VDPAU driver with VA-API/OpenGL backend. libvdpau-va-gl: -libvdpau-va-gl: Homepage: https://github.com/i-rinat/libvdpau-va-gl/ +libvdpau-va-gl: libvdpau-va-gl: libvdpau-va-gl: libvdpau-va-gl: -- cgit v1.2.3-65-gdbad