diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-12 16:51:38 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-12 17:32:26 +0000 |
| commit | 61f7bb1aa99b72bf73e5e7831d236bb99bf130fc (patch) | |
| tree | 89368bdd40d93621bbcb82cd4d0bc3aeca4888d1 /media-video | |
| parent | media-video/libva-utils: new version 2.11.1 (diff) | |
| download | gentoo-61f7bb1aa99b72bf73e5e7831d236bb99bf130fc.tar.gz gentoo-61f7bb1aa99b72bf73e5e7831d236bb99bf130fc.tar.bz2 gentoo-61f7bb1aa99b72bf73e5e7831d236bb99bf130fc.zip | |
media-video/libva-utils: add missing || dies, use Bash tests
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/libva-utils/libva-utils-2.11.1.ebuild | 15 | ||||
| -rw-r--r-- | media-video/libva-utils/libva-utils-9999.ebuild | 14 |
2 files changed, 20 insertions, 9 deletions
diff --git a/media-video/libva-utils/libva-utils-2.11.1.ebuild b/media-video/libva-utils/libva-utils-2.11.1.ebuild index 86b1d9f1d1b4..69e7ac319061 100644 --- a/media-video/libva-utils/libva-utils-2.11.1.ebuild +++ b/media-video/libva-utils/libva-utils-2.11.1.ebuild @@ -45,21 +45,24 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" ) -# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git +# CONTRIBUTING.md and README.md are available only in .tar.gz tarballs and in git DOCS=( NEWS CONTRIBUTING.md README.md ) src_prepare() { default + sed -e 's/-Werror//' -i test/Makefile.am || die if ! use examples ; then - sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am + sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die fi + if ! use putsurface ; then - sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am + sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die fi + if ! use vainfo ; then - sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am + sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die fi eautoreconf @@ -72,18 +75,20 @@ src_configure() { $(use_enable wayland) $(use_enable X x11) ) + if use test || use test_va_api ; then myeconfargs+=( --enable-tests ) else myeconfargs+=( --disable-tests ) fi + econf "${myeconfargs[@]}" } src_install() { default if ! use test_va_api ; then - if [ -e "${ED}"/usr/bin/test_va_api ] ; then + if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then rm -f "${ED}"/usr/bin/test_va_api || die fi fi diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 86b1d9f1d1b4..fcb4d1864b75 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -50,16 +50,19 @@ DOCS=( NEWS CONTRIBUTING.md README.md ) src_prepare() { default + sed -e 's/-Werror//' -i test/Makefile.am || die if ! use examples ; then - sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am + sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die fi + if ! use putsurface ; then - sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am + sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die fi + if ! use vainfo ; then - sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am + sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die fi eautoreconf @@ -72,18 +75,21 @@ src_configure() { $(use_enable wayland) $(use_enable X x11) ) + if use test || use test_va_api ; then myeconfargs+=( --enable-tests ) else myeconfargs+=( --disable-tests ) fi + econf "${myeconfargs[@]}" } src_install() { default + if ! use test_va_api ; then - if [ -e "${ED}"/usr/bin/test_va_api ] ; then + if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then rm -f "${ED}"/usr/bin/test_va_api || die fi fi |