From 66dd93f663dbbeeb54a3c74fed3aee2bfba52ff3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 15 Nov 2016 17:16:04 +0100 Subject: [PATCH 1/4] libvdpau: Remove trailing spaces --- libvdpau-0.7-1.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvdpau-0.7-1.bee b/libvdpau-0.7-1.bee index f75b0b994..8ff6ac86d 100755 --- a/libvdpau-0.7-1.bee +++ b/libvdpau-0.7-1.bee @@ -52,7 +52,7 @@ SRCURL[0]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${PKGVERSION} #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { @@ -69,7 +69,7 @@ mee_install_post() { dest=$(readlink -f ${D}${LIBDIR}/libvdpau.so.1) dest=${dest##${D}} - + ln -svf ${dest} ${D}/usr/share/mxgfx-generic/lib/libvdpau.so.1 ln -svf /usr/share/mxgfx/lib/libvdpau.so.1 ${D}${LIBDIR}/libvdpau.so.1 } From a22756b64e01a3f5778a5f7f724044c4f3eaa080 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 15 Nov 2016 17:16:49 +0100 Subject: [PATCH 2/4] libvdpau: Convert to versionless bee file --- libvdpau-0.7-1.bee => libvdpau.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libvdpau-0.7-1.bee => libvdpau.be0 (98%) diff --git a/libvdpau-0.7-1.bee b/libvdpau.be0 similarity index 98% rename from libvdpau-0.7-1.bee rename to libvdpau.be0 index 8ff6ac86d..568c02540 100755 --- a/libvdpau-0.7-1.bee +++ b/libvdpau.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libvdpau-0.7-1 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 22301eb6da862a9aab8bdcfc20380b36f24b620d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 15 Nov 2016 17:20:12 +0100 Subject: [PATCH 3/4] libvdpau: Update version from 0.7 to 1.1.1 Update to version 1.1.1 released on August 31st, 2015 [1]. [1] https://cgit.freedesktop.org/vdpau/libvdpau/log/ --- libvdpau.be0 | 56 +++------------------------------------------------- 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/libvdpau.be0 b/libvdpau.be0 index 568c02540..e699ebe19 100755 --- a/libvdpau.be0 +++ b/libvdpau.be0 @@ -1,50 +1,18 @@ #!/usr/bin/env beesh -# BEE_VERSION libvdpau-0.7-1 - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. +# BEE_VERSION libvdpau-1.1.1-0 SRCURL[0]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${PKGVERSION}.tar.gz" -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - # PATCHURL+=() -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - # EXCLUDE+=() -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - # build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} @@ -54,7 +22,7 @@ SRCURL[0]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${PKGVERSION} #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { @@ -71,26 +39,8 @@ mee_install_post() { dest=$(readlink -f ${D}${LIBDIR}/libvdpau.so.1) dest=${dest##${D}} - + ln -svf ${dest} ${D}/usr/share/mxgfx-generic/lib/libvdpau.so.1 - ln -svf /usr/share/mxgfx/lib/libvdpau.so.1 ${D}${LIBDIR}/libvdpau.so.1 } -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0]="" is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From 4021c8e0a04a70387711b23e45016b2dd07f1aad Mon Sep 17 00:00:00 2001 From: david Date: Wed, 16 Nov 2016 09:23:28 +0100 Subject: [PATCH 4/4] nvidia-mxlinks: Remove libvdpau.so from NVLIBS Currently, on machines with modern Nvidia graphics devices using the current driver (367.x), ffmpeg fails to start, as libvdpau.so.1 is not there. Fix this by using the generic library, which is shipped separately. ``` pmenzel@keineahnung:~> more /dev/shm/nvidia_current-368.57-0.x86_64/source/NVIDIA_Changelog 2016-01-05 version 361.16 * Removed the VDPAU wrapper and trace libraries libvdpau.so.1 and libvdpau_trace.so.1 from the driver package. These libraries may be available via your distribution's package management system, or can be compiled from the sources available at: http://people.freedesktop.org/~aplattner/vdpau/ Please see http://freedesktop.org/wiki/Software/VDPAU/ for more information. ``` --- nvidia-mxlinks-0.8-5.bee => nvidia-mxlinks.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename nvidia-mxlinks-0.8-5.bee => nvidia-mxlinks.be0 (98%) diff --git a/nvidia-mxlinks-0.8-5.bee b/nvidia-mxlinks.be0 similarity index 98% rename from nvidia-mxlinks-0.8-5.bee rename to nvidia-mxlinks.be0 index 02f8cb3c0..6dab0937a 100755 --- a/nvidia-mxlinks-0.8-5.bee +++ b/nvidia-mxlinks.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION nvidia-mxlinks-0.8-6 + EXCLUDE=("^/usr/lib/(X11|xorg)(|/modules(|/drivers))$") mee_install() { @@ -11,7 +13,6 @@ mee_install() { "libnvidia-cfg.so.1" "libnvidia-opencl.so.1" "libnvidia-encode.so.1" - "libvdpau.so.1" "libvdpau_nvidia.so.1" "libvdpau_trace.so.1" "libnvcuvid.so.1"