File remove-unwanted-dependency-and-xnvctrl-support.... of Package mythtv

File remove-unwanted-dependency-and-xnvctrl-support.patch of Package mythtv (Revision 17)

Currently displaying revision 17 , Show latest

mythtv/configure | 71 ++------------------------------------------------------
 1 file changed, 2 insertions(+), 69 deletions(-)

diff --git a/mythtv/configure b/mythtv/configure
index 4f526864a5..7905327347 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -5925,44 +5925,7 @@ if enabled libbluray_external; then
     if $(pkg-config --atleast-version="0.9.3" libbluray); then
         use_pkg_config libbluray libbluray libbluray/bluray.h bd_open
     else
-        case $target_os in
-            linux)
-                # Some older supported linux versions don't have a
-                # libbluray current enough to support MythTV.  Allow
-                # only those systems to reach the bottom of the
-                # following case statement.  This list should only
-                # shrink over time.
-                . /etc/os-release
-                case $ID in
-                    centos)
-                        if test $VERSION_ID -gt 7; then
-                            die "ERROR: can not find libbluray."
-                        fi
-                        ;;
-                    ubuntu)
-                        case $VERSION_ID in
-                            17*|18*|19*|2*)
-                                die "ERROR: can not find libbluray."
-                                ;;
-                        esac
-                        ;;
-                    debian)
-                        if test $VERSION_ID -gt 8; then
-                            die "ERROR: can not find libbluray."
-                        fi
-                        ;;
-                    *)
-                        die "ERROR: can not find libbluray."
-                        ;;
-                esac
-                disable libbluray_external
-                ;;
-            *)
-                # FreeBSD provides libbluray 1.0.2
-                # All others unknown.
-                die "ERROR: can not find libbluray."
-                ;;
-        esac
+        die "ERROR: can not find libbluray."
     fi
 fi
 
@@ -6642,37 +6605,7 @@ if enabled x11; then
     require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama
     require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext
     if enabled xnvctrl; then
-        case $target_os in
-            linux)
-                # Bah. Suse linux doesn't have xnvctrl.
-                . /etc/os-release
-                case $ID in
-                    *suse*)
-			# This is hopefully temporary.
-			disable xnvctrl_external
-			;;
-                    *gentoo*)
-                        if [ -e "/usr/bin/nvidia-settings" ]
-                        then
-                            require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
-                        else
-                            disable xnvctrl_external
-                        fi
-                        ;;
-		    *)
-                        require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
-                        ;;
-                esac
-                ;;
-            freebsd)
-                # This is hopefully temporary, and will eventually
-                # check for a system library too.
-                disable xnvctrl_external
-                ;;
-            *)
-                disable xnvctrl
-                ;;
-        esac
+        require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
     fi
 fi