[compiz-manager] some updates to the patch

Adam Williamson adamwill at fedoraproject.org
Wed Jan 19 22:09:07 UTC 2011 

commit 4a01a43bb9b9b5068b04da55bc5c28fcd1fc52b7
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Jan 19 22:08:45 2011 +0000

    some updates to the patch

 compiz-manager-0.6.0.diff |  133 +++++++++++++++++++++++++++++++++++++++------
 compiz-manager.spec       |   14 ++++-
 2 files changed, 127 insertions(+), 20 deletions(-)
---
diff --git a/compiz-manager-0.6.0.diff b/compiz-manager-0.6.0.diff
index 7faae57..d480636 100644
--- a/compiz-manager-0.6.0.diff
+++ b/compiz-manager-0.6.0.diff
@@ -1,7 +1,6 @@
-diff -upNr compiz-manager-0.6.0.orign/compiz-manager compiz-manager-0.6.0/compiz-manager
---- compiz-manager-0.6.0.orign/compiz-manager	2007-10-15 21:10:06.000000000 +0200
-+++ compiz-manager-0.6.0/compiz-manager	2008-03-24 20:38:23.000000000 +0100
-@@ -26,17 +26,28 @@
+--- compiz-manager-0.6.0/compiz-manager	2011-01-19 19:08:08.540834340 +0000
++++ compiz-manager-0.6.0/compiz-manager.new2	2011-01-19 19:15:11.395063571 +0000
+@@ -26,17 +26,20 @@
  # started, and start a default plugin and possibly window decorator.
  # 
  
@@ -20,21 +19,15 @@ diff -upNr compiz-manager-0.6.0.orign/compiz-manager compiz-manager-0.6.0/compiz
  KWIN="/usr/bin/kwin"
  METACITY="/usr/bin/metacity"
  COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
-+LIBDIR=/usr/$ARCH_LIB/
- 
- # For Xgl LD_PRELOAD
+-
+-# For Xgl LD_PRELOAD
 -LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
 -LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
-+for driver in $LIBDIR/nvidia/libGL.so.*.xlibmesa ; do
-+        LIBGL_NVIDIA=$driver
-+done
-+for driver in $LIBDIR/fglrx/libGL.so.*.xlibmesa ; do
-+        LIBGL_FGLRX=$driver
-+done
++LIBDIR=/usr/$ARCH_LIB/
  
  # Minimum amount of memory (in kilo bytes) that nVidia cards need
  # to be allowed to start
-@@ -45,9 +56,14 @@ NVIDIA_MEMORY="65536" # 64MB
+@@ -45,13 +48,18 @@
  NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
  
  # For detecting what driver is in use, the + is for one or more /'s
@@ -51,7 +44,17 @@ diff -upNr compiz-manager-0.6.0.orign/compiz-manager compiz-manager-0.6.0/compiz
  FALLBACKWM_OPTIONS="--replace $@"
  
  # Driver whitelist
-@@ -65,8 +81,8 @@ COMPIZ_OPTIONS="--ignore-desktop-hints -
+-WHITELIST="nvidia intel ati radeon i810"
++WHITELIST="nvidia intel ati radeon i810 nouveau"
+ 
+ # blacklist based on the pci ids 
+ # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
+@@ -61,12 +69,12 @@
+ BLACKLIST_PCIIDS="$T"
+ unset T
+ 
+-COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
++COMPIZ_OPTIONS="--replace"
  COMPIZ_PLUGINS=""
  ENV=""
  
@@ -62,7 +65,27 @@ diff -upNr compiz-manager-0.6.0.orign/compiz-manager compiz-manager-0.6.0/compiz
  
  # No indirect by default
  INDIRECT="no"
-@@ -262,14 +278,14 @@ running_under_whitelisted_driver()
+@@ -177,19 +185,6 @@
+ 	fi
+ }
+ 
+-# Detects if Xgl is running
+-check_xgl()
+-{
+-	verbose "Checking for Xgl: "
+-	if xvinfo | grep -q Xgl ; then
+-		verbose "present. \n"
+-		return 0;
+-	else
+-		verbose "not present. \n"
+-		return 1;
+-	fi
+-}
+-
+ # Check if the nVidia card has enough video ram to make sense
+ check_nvidia_memory()
+ {
+@@ -262,14 +257,14 @@
  # check pciid blacklist
  have_blacklisted_pciid()
  {
@@ -79,7 +102,83 @@ diff -upNr compiz-manager-0.6.0.orign/compiz-manager compiz-manager-0.6.0/compiz
  	verbose "Detected PCI ID for VGA: $OUTPUT\n"
  	return 1
  }
-@@ -374,10 +390,17 @@ if [ -x ${COMPIZ_BIN_PATH}emerald ] && [
+@@ -282,16 +277,6 @@
+ 	if [ "$INDIRECT" = "yes" ]; then
+ 		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
+ 	fi
+-	if check_xgl; then
+-		if [ -f ${LIBGL_NVIDIA} ]; then
+-			ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
+-			verbose "Enabling Xgl with nVidia drivers...\n"
+-		fi
+-		if [ -f ${LIBGL_FGLRX} ]; then
+-			ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
+-			verbose "Enabling Xgl with fglrx ATi drivers...\n"
+-		fi
+-	fi
+ 
+ 	ENV="$ENV FROM_WRAPPER=yes"
+ 
+@@ -305,9 +290,6 @@
+ 	if [ $INDIRECT = "yes" ]; then
+ 		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
+ 	fi
+-	if check_nvidia; then
+-		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
+-	fi
+ }
+ 
+ ####################
+@@ -335,32 +317,27 @@
+ 	INDIRECT="yes";
+ fi
+ 
+-# if we run under Xgl, we can skip some tests here
+-if ! check_xgl; then
+-	# if vesa or vga are in use, do not even try glxinfo (LP#119341)
+-	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
+-		abort_with_fallback_wm
+-	fi
+-	# check if we have the required bits to run compiz and if not, 
+-	# fallback
+-	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
+-		abort_with_fallback_wm
+-	fi
++# if vesa or vga are in use, do not even try glxinfo (LP#119341)
++if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
++	abort_with_fallback_wm
++fi
++# check if we have the required bits to run compiz and if not, 
++# fallback
++if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
++	abort_with_fallback_wm
++fi
+ 
+-	if check_nvidia && ! check_nvidia_memory; then
+-		abort_with_fallback_wm
+-	fi
++if check_nvidia && ! check_nvidia_memory; then
++	abort_with_fallback_wm
++fi
+ 
+-	if ! check_fbconfig; then
+-		abort_with_fallback_wm
+-	fi
++if ! check_fbconfig; then
++	abort_with_fallback_wm
+ fi
+ 
+-# load the ccp plugin if present and fallback to plain gconf if not
++# load the ccp plugin if present
+ if [ -f ${PLUGIN_PATH}libccp.so ]; then
+ 	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
+-elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
+-	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
+ fi
+ 
+ # get environment
+ build_env
+@@ -374,10 +350,17 @@
  elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
  	verbose "Starting gtk-window-decorator\n"
  	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
diff --git a/compiz-manager.spec b/compiz-manager.spec
index c145e9b..929b951 100644
--- a/compiz-manager.spec
+++ b/compiz-manager.spec
@@ -1,12 +1,12 @@
 Name:           compiz-manager
 Version:        0.6.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A wrapper script to start compiz with proper options
 
 Group:          Applications/System
 License:        GPLv2+
-URL:            http://www.opencompositing.org/
-Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.gz
+URL:            http://www.compiz.org/
+Source0:        http://releases.compiz.org/%{version}/%{name}-%{version}.tar.gz
 Source1:        compiz-manager.license
 Source2:        README.fedora
 Patch0:         compiz-manager-0.6.0.diff
@@ -46,6 +46,14 @@ rm -rf %{buildroot}
 %{_bindir}/compiz-manager
 
 %changelog
+* Wed Jan 19 2011 Adam Williamson <awilliam at redhat.com> - 0.6.0-11
+- modernization of script:
+	+ drop all the Xgl stuff
+	+ add nouveau to the supported drivers
+	+ drop no longer valid compiz parameter
+	+ drop use of gconf and glib plugins (no longer exist)
+- update URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

More information about the scm-commits mailing list