Use legacy libva for Ubuntu 16.04 and earlier

This commit is contained in:
2022-01-14 01:59:54 -05:00
parent b1674538a7
commit 4f14e79419
2 changed files with 7 additions and 13 deletions

View File

@@ -24,7 +24,7 @@ You can always find the latest supported options by running `installJRMC --help`
deb: Download and install official MC package locally (useful with --compat flag for older distros) deb: Download and install official MC package locally (useful with --compat flag for older distros)
--build=[suse|fedora|centos] --build=[suse|fedora|centos]
Build RPM from source DEB but do not install Build RPM from source DEB but do not install
Specify cross-build target with optional argument, note '=' (ex. --build=suse) Optionally specify cross-build target, note the '=' (ex. --build=suse)
--compat --compat
Build/install MC without minimum library specifiers Build/install MC without minimum library specifiers
--mcversion VERSION --mcversion VERSION

View File

@@ -40,7 +40,7 @@ printHelp() {
deb: Download and install offcial MC package locally (useful with --compat flag for older distros) deb: Download and install offcial MC package locally (useful with --compat flag for older distros)
--build=[suse|fedora|centos] --build=[suse|fedora|centos]
Build RPM from source DEB but do not install Build RPM from source DEB but do not install
Specify cross-build target with optional argument, note '=' (ex. --build=suse) Optionally specify cross-build target, note the '=' (ex. --build=suse)
--compat --compat
Build/install MC without minimum library specifiers Build/install MC without minimum library specifiers
--mcversion VERSION --mcversion VERSION
@@ -393,14 +393,7 @@ installPackage() {
####################################### #######################################
# Installs a package using the system package manager # Installs Media Center DEB package and optional compatability fixes
# Arguments:
# One or more package names
# Options:
# --skip-check-installed: Do not check if package is already installed
# --nogpgcheck: Disable GPG checks for RPM based distros
# --allow-downgrades: Useful for installing compatability versions on DEB based distros
# --silent, -s: Do not report errors (useful if package is not strictly required and errors are noisy)
####################################### #######################################
installMCDEB() { installMCDEB() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
@@ -418,6 +411,8 @@ installMCDEB() {
# Remove minimum version specifiers from control file # Remove minimum version specifiers from control file
sed -i 's/ ([^)]*)//g' "control" sed -i 's/ ([^)]*)//g' "control"
sed -i 's/([^)]*)//g' "control" # TODO MC DEB package error sed -i 's/([^)]*)//g' "control" # TODO MC DEB package error
[[ "$ID" == "ubuntu" && "${VERSION_ID%.*}" -le 16 ]] &&
sed -i 's/libva2/libva1/g' "control"
tar -cJf "control.tar.xz" "control" "postinst" tar -cJf "control.tar.xz" "control" "postinst"
ar rcs "$mcdeb" "debian-binary" "control.tar.xz" "data.tar.xz" ar rcs "$mcdeb" "debian-binary" "control.tar.xz" "data.tar.xz"
popd &>/dev/null || return popd &>/dev/null || return
@@ -787,8 +782,7 @@ symlinkCerts() {
####################################### #######################################
# Automatically restore the mjr license file if it is found next to # Rstore the mjr license file if it is next to installJRMC or RESTOREFILE is set
# installJRMC or RESTOREFILE is set
####################################### #######################################
restoreLicense() { restoreLicense() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
@@ -1430,7 +1424,7 @@ uninstall() {
tests() { tests() {
# To test on Mint: sudo apt install -y spice-vdagent ca-certificates git; export GIT_SSL_NO_VERIFY=1 # To test on Mint/16.04: sudo apt install -y spice-vdagent ca-certificates git; export GIT_SSL_NO_VERIFY=1
exit $? exit $?
} }