Mailinglist Archive: opensuse-commit (1028 mails)

< Previous Next >
commit compiz
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 29 Jun 2006 22:59:38 +0200 (CEST)
  • Message-id: <20060629205938.CA90394294@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package compiz
checked in at Thu Jun 29 22:59:38 CEST 2006.

--------
--- compiz/compiz.changes 2006-06-21 17:29:39.000000000 +0200
+++ compiz/compiz.changes 2006-06-29 13:44:54.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 29 13:40:01 CEST 2006 - mhopf@xxxxxxx
+
+- Added patch for compiling against broken GLX_EXT_texture_from_pixmap
+ declaration in Mesa's glx.h
+
+-------------------------------------------------------------------

New:
----
compiz-broken-Mesa-decl.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.EgulcB/_old 2006-06-29 22:59:16.000000000 +0200
+++ /var/tmp/diff_new_pack.EgulcB/_new 2006-06-29 22:59:16.000000000 +0200
@@ -10,7 +10,7 @@


Name: compiz
-BuildRequires: control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool libdrm-devel libsvg-cairo-devel libwnck-devel pango-devel update-desktop-files xorg-x11-compat70-devel xorg-x11-sdk
+BuildRequires: control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool libdrm-devel libsvg-cairo-devel libwnck-devel pango-devel update-desktop-files xorg-x11-compat70-devel xorg-x11-devel
Url: http://www.freedesktop.org/Software/compiz
License: X11/MIT, GPL
Group: System/GUI/Other
@@ -18,7 +18,7 @@
Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526
Autoreqprov: on
Version: cvs_060621
-Release: 1
+Release: 2
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -37,6 +37,7 @@
Patch7: 184483-2.diff
Patch8: gnome-xgl-settings-i18n-more.patch
Patch9: gnome-xgl-settings-i18n-fixes.patch
+Patch10: compiz-broken-Mesa-decl.patch

%description
Compiz is an OpenGL compositing manager that use
@@ -61,6 +62,7 @@
patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch
patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff
patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/184483-2.diff
+patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/compiz-broken-Mesa-decl.patch
patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-install.patch
patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n.patch
patch -d gnome-xgl* -p1 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n-more.patch
@@ -152,6 +154,9 @@
/etc/opt/gnome/gconf/schemas/compiz.schemas

%changelog -n compiz
+* Thu Jun 29 2006 - mhopf@xxxxxxx
+- Added patch for compiling against broken GLX_EXT_texture_from_pixmap
+ declaration in Mesa's glx.h
* Wed Jun 21 2006 - dreveman@xxxxxxx
- Protect against circular transient dependencies. (bnc 186825)
- Constrain window dimensions if they are too large.

++++++ compiz-broken-Mesa-decl.patch ++++++
diff -urp compiz-0.0.13.orig/include/compiz.h compiz-0.0.13/include/compiz.h
--- compiz-0.0.13.orig/include/compiz.h 2006-06-29 13:26:05.000000000 +0200
+++ compiz-0.0.13/include/compiz.h 2006-06-29 13:29:10.000000000 +0200
@@ -962,6 +962,10 @@ disableTexture (CompScreen *screen,
#define COMP_SCREEN_OPTION_DEFAULT_ICON 6
#define COMP_SCREEN_OPTION_NUM 7

+#ifndef GLX_TEXTURE_FORMAT_EXT
+#undef GLX_EXT_texture_from_pixmap
+#endif
+
#ifndef GLX_EXT_texture_from_pixmap
#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx

< Previous Next >