|
|
@@ -19,7 +19,7 @@ URL: http://www.go-compiz.org
|
|
|
License: X11/MIT/GPL
|
|
|
Group: User Interface/Desktops
|
|
|
Version: 0.8.6
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 3%{?_dist_release}
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -69,11 +69,17 @@ Patch111: gconf-core-plugin-loopfix.patch
|
|
|
Patch123: compiz-0.7.8-pin-initial-plugins.patch
|
|
|
|
|
|
# Patches from ubuntu
|
|
|
-Patch200: 014-fix-gtk-window-decorator-no-argb-crash.patch
|
|
|
-Patch210: 049-damage-report-non-empty.patch
|
|
|
-
|
|
|
-# build fix
|
|
|
-Patch300: compiz-0.8.2-gconf-buildfix.patch
|
|
|
+Patch1140: 014-fix-gtk-window-decorator-no-argb-crash.patch
|
|
|
+Patch1150: 015_optional-fbo.patch
|
|
|
+Patch1160: 016_call_glxwaitx_before_drawing.patch
|
|
|
+Patch1170: 017_always_unredirect_screensaver_on_nvidia.patch
|
|
|
+Patch1200: 020_disable_gdk_gtk_disable_deprecated.patch
|
|
|
+Patch1490: 049-damage-report-non-empty.patch
|
|
|
+Patch1600: 060_move_checks_to_compiz.patch
|
|
|
+
|
|
|
+# Patches from upstream
|
|
|
+Patch2000: compiz-0.8.6-replace-gdk_draw_drawable-with-cairo-equiv.patch
|
|
|
+Patch2010: compiz-0.8.6-fix-pixmap-size-calculation.patch
|
|
|
|
|
|
%description
|
|
|
Compiz is one of the first OpenGL-accelerated compositing window
|
|
|
@@ -147,11 +153,18 @@ popd
|
|
|
|
|
|
## %patch123 -p1 -b .initial-plugins
|
|
|
|
|
|
-%patch200 -p1 -b .fix-gtk-window-decorator-no-argb-crash
|
|
|
-%patch210 -p1 -b .damage-report-non-empty
|
|
|
-
|
|
|
-## %patch300 -p1 -b .gconf-buildfix
|
|
|
-
|
|
|
+# ubuntu patch
|
|
|
+%patch1140 -p1 -b .fix-gtk-window-decorator-no-argb-crash
|
|
|
+%patch1150 -p1 -b .disable-fbo
|
|
|
+%patch1160 -p1 -b .call_glxwaitx_before_drawing
|
|
|
+%patch1170 -p1 -b .always_unredirect_screensaver_on_nvidia
|
|
|
+%patch1200 -p1 -b .disable_gdk_gtk_disable_deprecated
|
|
|
+%patch1490 -p1 -b .damage-report-non-empty
|
|
|
+%patch1600 -p1 -b .move-check-to-compiz
|
|
|
+
|
|
|
+# upstream patch
|
|
|
+%patch2000 -p1 -b .replace-gdk_draw_drawable-with-cairo-equiv
|
|
|
+%patch2010 -p1 -b .fix-pixmap-size-calculation
|
|
|
%build
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -372,6 +385,19 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Mar 12 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.6-3
|
|
|
+- rebuild with mesa-7.10.1
|
|
|
+- add cherry picked ubuntu patch
|
|
|
+ - Patch1150: add --no-fbo option
|
|
|
+ - Patch1200: disable GDK|GTK_DISABLE_DEPRECATED
|
|
|
+ - Patch1160: call glxwaitx before drawing
|
|
|
+ - Patch1170: always unredirect screensaver on nvidia
|
|
|
+ - Patch1490: damage report non empty
|
|
|
+ - Patch1600: move check to compiz
|
|
|
+- add upstream patch
|
|
|
+ - Patch2000: replace gdk_draw_drawable with cairo equivalents
|
|
|
+ - Patch2010: fix pixmap size calculation
|
|
|
+
|
|
|
* Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.6-2
|
|
|
- rebuild with rpm-4.8.1 for pkg-config file
|
|
|
|
daisuke