Skip to content

Commit

Permalink
Solve #2: LinuxMint 19.1 support added; Bugfix add-apt-repository und…
Browse files Browse the repository at this point in the history
…er C locale; Bugfix forward struct declaration in x265.h
  • Loading branch information
ilyaevseev committed Dec 27, 2018
1 parent 6f24f6f commit 90e0c2f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

* Ubuntu 16.04
* Ubuntu 18.04
* LinuxMint 19.1
* CentOS 7

### Based on:
Expand Down
11 changes: 9 additions & 2 deletions ffmpeg-nvenc-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ installYumLibs() {
installLibs() {
echo "Installing prerequisites"
. /etc/os-release
if test "$ID" = "ubuntu"; then installAptLibs; else installYumLibs; fi
case "$ID" in
ubuntu | linuxmint ) installAptLibs ;;
* ) installYumLibs ;;
esac
}

installCUDASDKdeb() {
Expand All @@ -58,7 +61,7 @@ installCUDASDKdeb() {
sudo apt-get -y update
sudo apt-get -y install cuda

sudo add-apt-repository -y ppa:graphics-drivers/ppa
sudo env LC_ALL=C.UTF-8 add-apt-repository -y ppa:graphics-drivers/ppa
sudo apt-get -y update
sudo apt-get -y upgrade
}
Expand All @@ -77,6 +80,7 @@ installCUDASDK() {
case "$ID-$VERSION_ID" in
ubuntu-16.04 ) installCUDASDKdeb 1604 ;;
ubuntu-18.04 ) installCUDASDKdeb 1804 ;;
linuxmint-19.1)installCUDASDKdeb 1804 ;;
centos-7 ) installCUDASDKyum ;;
* ) echo "ERROR: only CentOS 7, Ubuntu 16.04 or 18.04 are supported now."; exit 1;;
esac
Expand Down Expand Up @@ -140,6 +144,9 @@ compileLibX265() {
cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$DEST_DIR" -DENABLE_SHARED:bool=off ../../source
make -j$(nproc)
make install

# forward declaration should not be used without struct keyword!
sed -i.orig -e 's,^ *x265_param\* zoneParam,struct x265_param* zoneParam,' "$DEST_DIR/include/x265.h"
}

compileLibAom() {
Expand Down

0 comments on commit 90e0c2f

Please sign in to comment.