SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/compiz-manager/stuff/patches/compiz-manager.patch	Sat Nov 10 17:21:54 2018 +0200
     1.3 @@ -0,0 +1,153 @@
     1.4 +--- a/compiz-manager
     1.5 ++++ b/compiz-manager
     1.6 +@@ -1,4 +1,4 @@
     1.7 +-#!/bin/bash
     1.8 ++#!/bin/sh
     1.9 + # Compiz Manager wrapper script
    1.10 + #
    1.11 + # Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
    1.12 +@@ -27,15 +27,7 @@
    1.13 + #
    1.14 + 
    1.15 + 
    1.16 +-# LIBDIR differs between x86 and x86_64, arm and aarch64, ppc and ppc64.
    1.17 +-ARCH="$(uname -m)"
    1.18 +-if [ -d '/usr/lib64/' ] && [[ "$ARCH" = *64 ]]; then
    1.19 +-       LIBDIR='/usr/lib64'
    1.20 +-else
    1.21 +-       LIBDIR='/usr/lib'
    1.22 +-fi
    1.23 +-
    1.24 +-COMPIZ_BIN_PATH="$(dirname "$(which compiz)")" # For window decorators and compiz.
    1.25 ++COMPIZ_BIN_PATH="$(dirname $(which compiz))" # For window decorators and compiz.
    1.26 + PLUGIN_PATH="$LIBDIR/compiz"
    1.27 + GLXINFO="$(which glxinfo 2>/dev/null)"
    1.28 + METACITY="$(which metacity 2>/dev/null)"
    1.29 +@@ -52,9 +44,9 @@
    1.30 + # For detecting what driver is in use, the + is for one or more /'s.
    1.31 + XORG_DRIVER_PATH="$LIBDIR/xorg/.*/+"
    1.32 + FALLBACKWM="xterm"
    1.33 +-if [[ "$XDG_CURRENT_DESKTOP" == "MATE" ]] || [ ! -z "$MATE_DESKTOP_SESSION_ID" ]; then
    1.34 ++if [ "$XDG_CURRENT_DESKTOP" == "MATE" -o ! -z "$MATE_DESKTOP_SESSION_ID" ]; then
    1.35 + 	FALLBACKWM="$MARCO"
    1.36 +-elif [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]] || [ ! -z "$GNOME_DESKTOP_SESSION_ID" ]; then
    1.37 ++elif [ "$XDG_CURRENT_DESKTOP" == "GNOME" -o ! -z "$GNOME_DESKTOP_SESSION_ID" ]; then
    1.38 + 	FALLBACKWM="$METACITY"
    1.39 + elif ( xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1 ); then
    1.40 + 	FALLBACKWM="$XFWM"
    1.41 +@@ -78,7 +70,7 @@
    1.42 + # Echos the arguments if verbose.
    1.43 + verbose()
    1.44 + {
    1.45 +-	if [[ "$VERBOSE" == "yes" ]]; then
    1.46 ++	if [ "$VERBOSE" == "yes" ]; then
    1.47 + 		printf "$*"
    1.48 + 	fi
    1.49 + }
    1.50 +@@ -86,12 +78,12 @@
    1.51 + # Abort script and run fallback window manager.
    1.52 + abort_with_fallback_wm()
    1.53 + {
    1.54 +-	if [[ "$SKIP_CHECKS" == "yes" ]]; then
    1.55 ++	if [ "$SKIP_CHECKS" == "yes" ]; then
    1.56 + 		verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
    1.57 + 		return 0
    1.58 + 	fi
    1.59 + 
    1.60 +-	if [[ "$CM_DRY" == "yes" ]]; then
    1.61 ++	if [ "$CM_DRY" == "yes" ]; then
    1.62 + 		verbose "Dry run failed: Problems detected with 3D support.\n"
    1.63 + 		exit 1
    1.64 + 	fi
    1.65 +@@ -124,7 +116,7 @@
    1.66 + check_fbconfig()
    1.67 + {
    1.68 + 	verbose "Checking for FBConfig: "
    1.69 +-	if [[ "$INDIRECT" == "yes" ]]; then
    1.70 ++	if [ "$INDIRECT" == "yes" ]; then
    1.71 + 		"$GLXINFO" -i | grep -q 'GLX.*fbconfig'
    1.72 + 		FB=$?
    1.73 + 	else
    1.74 +@@ -132,7 +124,7 @@
    1.75 + 		FB=$?
    1.76 + 	fi
    1.77 + 
    1.78 +-	if [[ $FB == "0" ]]; then
    1.79 ++	if [ $FB == "0" ]; then
    1.80 + 		unset FB
    1.81 + 		verbose "present. \n"
    1.82 + 		return 0
    1.83 +@@ -153,7 +145,7 @@
    1.84 + 		return 0
    1.85 + 	else
    1.86 + 		verbose "not present. \n"
    1.87 +-		if [[ "$INDIRECT" == "yes" ]]; then
    1.88 ++		if [ "$INDIRECT" == "yes" ]; then
    1.89 + 			unset LIBGL_ALWAYS_INDIRECT
    1.90 + 			INDIRECT="no"
    1.91 + 			return 1
    1.92 +@@ -232,7 +224,7 @@
    1.93 + 		HRES=$(echo "$RESOLUTION" | cut -dx -f1)
    1.94 + 		VRES=$(echo "$RESOLUTION" | cut -dx -f2)
    1.95 + 		verbose "Comparing resolution ($res) to maximum 3D texture size ($TEXTURE_LIMIT): ";
    1.96 +-		if [ "$VRES" -gt "$TEXTURE_LIMIT" ] || [ "$HRES" -gt "$TEXTURE_LIMIT" ]; then
    1.97 ++		if [ "$VRES" -gt "$TEXTURE_LIMIT" -o "$HRES" -gt "$TEXTURE_LIMIT" ]; then
    1.98 + 			verbose "Failed.\n"
    1.99 + 			return 1
   1.100 + 		fi
   1.101 +@@ -246,7 +238,7 @@
   1.102 + 	if ( check_nvidia ); then
   1.103 + 		ENV="__GL_YIELD=NOTHING "
   1.104 + 	fi
   1.105 +-	if [[ "$INDIRECT" == "yes" ]]; then
   1.106 ++	if [ "$INDIRECT" == "yes" ]; then
   1.107 + 		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
   1.108 + 	fi
   1.109 + 
   1.110 +@@ -259,14 +251,14 @@
   1.111 + 
   1.112 + build_args()
   1.113 + {
   1.114 +-	if [[ "$LIBGL_ALWAYS_INDIRECT" == "1" ]]; then
   1.115 ++	if [ "$LIBGL_ALWAYS_INDIRECT" == "1" ]; then
   1.116 + 		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
   1.117 + 	fi
   1.118 + 	if [ ! -z "$DESKTOP_AUTOSTART_ID" ]; then
   1.119 + 		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --sm-client-id $DESKTOP_AUTOSTART_ID"
   1.120 + 	fi
   1.121 + 	if ( check_nvidia ); then
   1.122 +-		if [[ "$LIBGL_ALWAYS_INDIRECT" != "1" ]]; then
   1.123 ++		if [ "$LIBGL_ALWAYS_INDIRECT" != "1" ]; then
   1.124 + 			COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
   1.125 + 		fi
   1.126 + 	fi
   1.127 +@@ -309,7 +301,7 @@
   1.128 + 
   1.129 + # In case we are in a mate session, we always want matecompat
   1.130 + #  plugin loaded (session registering, key bindings).
   1.131 +-if [ -f "$PLUGIN_PATH/libmatecompat.so" ] && ( [ "$XDG_CURRENT_DESKTOP" = "MATE" ] || [ -n "$MATE_DESKTOP_SESSION_ID" ] ); then
   1.132 ++if [ -f "$PLUGIN_PATH/libmatecompat.so" ] && [ "$XDG_CURRENT_DESKTOP" == "MATE" -o -n "$MATE_DESKTOP_SESSION_ID" ]; then
   1.133 + 	COMPIZ_PLUGINS="$COMPIZ_PLUGINS matecompat"
   1.134 + fi
   1.135 + 
   1.136 +@@ -317,17 +309,17 @@
   1.137 + build_env
   1.138 + build_args
   1.139 + 
   1.140 +-if [[ "$CM_DRY" == "yes" ]]; then
   1.141 ++if [ "$CM_DRY" == "yes" ]; then
   1.142 + 	verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n"
   1.143 + 	verbose "Execute: $COMPIZ_BIN_PATH/$COMPIZ_NAME $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS \n"
   1.144 + 	exit 0
   1.145 + fi
   1.146 + 
   1.147 + # Start the decorator.
   1.148 +-if [ -x "$COMPIZ_BIN_PATH/emerald" ] && [[ "$USE_EMERALD" == "yes" ]]; then
   1.149 ++if [ -x "$COMPIZ_BIN_PATH/emerald" -a "$USE_EMERALD" == "yes" ]; then
   1.150 + 	verbose "Starting emerald\n"
   1.151 + 	"$COMPIZ_BIN_PATH/emerald" --replace &
   1.152 +-elif [ -x "$COMPIZ_BIN_PATH/mate-window-decorator" ] && ( [[ "$XDG_CURRENT_DESKTOP" == "MATE" ]] || [ ! -z "$MATE_DESKTOP_SESSION_ID" ] ); then
   1.153 ++elif [ -x "$COMPIZ_BIN_PATH/mate-window-decorator" ] && [ "$XDG_CURRENT_DESKTOP" == "MATE" -o ! -z "$MATE_DESKTOP_SESSION_ID" ]; then
   1.154 + 	verbose "Starting mate-window-decorator\n"
   1.155 + 	"$COMPIZ_BIN_PATH/mate-window-decorator" --replace &
   1.156 + elif [ -x "$COMPIZ_BIN_PATH/gtk-window-decorator" ]; then