debian/changelog | 4 ++++
debian/compiz.wrapper | 13 +++++++++++--
debian/control | 2 +-
debian/rules | 1 +
4 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 2210ab926fc0e10fbbac8c708364d78b92530325
Author: Sean Finney <[EMAIL PROTECTED]>
Date: Mon Aug 20 00:25:54 2007 -0700
updated build dependencies
diff --git a/debian/changelog b/debian/changelog
index 547c4af..fa28543 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ compiz (0.5.2-0) UNRELEASED; urgency=low
* New upstream release.
* updated/massaged various quilt patches
+ * make sure configure is executable at build time. seems that this
+ causes problems in a pbuilder environment
+ * new build-dependencies on libxml-parser-perl and xsltproc
+ * patch compiz wrapper for Xgl support (closes: #393501).
-- sean finney <[EMAIL PROTECTED]> Sat, 18 Aug 2007 21:59:47 -0700
diff --git a/debian/control b/debian/control
index 5c1de8f..05d303a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Thierry Reding <[EMAIL PROTECTED]>, David Nusinow <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), libglib2.0-dev,
libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-2),
libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>=
2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev (>= 1:1.0.1), libsm-dev (>=
1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev,
libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-glib-1-dev,
libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1),
libxinerama-dev, libmetacity-dev, kdebase-dev, libdbus-qt-1-dev, libfuse-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), libglib2.0-dev,
libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-2),
libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>=
2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev (>= 1:1.0.1), libsm-dev (>=
1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev,
libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-glib-1-dev,
libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1),
libxinerama-dev, libxml-parser-perl, libmetacity-dev, kdebase-dev,
libdbus-qt-1-dev, libfuse-dev, xsltproc
Standards-Version: 3.7.2
Package: compiz
diff --git a/debian/rules b/debian/rules
index f3450ed..0527885 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ build-stamp:
dh_testdir
mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ chmod +x ./configure
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags) \
CFLAGS="$(CFLAGS)" QTDIR=/usr
commit 0af4cbe055b0423d3dff8218470280b3f71c426f
Author: Sean Finney <[EMAIL PROTECTED]>
Date: Mon Aug 20 00:25:23 2007 -0700
add xgl support to compiz wrapper
diff --git a/debian/compiz.wrapper b/debian/compiz.wrapper
index ae4bf40..258f85e 100644
--- a/debian/compiz.wrapper
+++ b/debian/compiz.wrapper
@@ -4,6 +4,7 @@ GLXINFO='/usr/bin/glxinfo'
EXT_TFP='GLX_EXT_texture_from_pixmap'
COMPIZ_OPTIONS="--no-fbo"
+COMPIZ_LD_PRELOAD=""
# Check whether the GLX_EXT_texture_from_pixmap extension is available in
# direct or indirect rendering contexts. If it is available only in indirect
@@ -33,6 +34,14 @@ if [ -f /usr/lib/compiz/libgconf.so ]; then
COMPIZ_PLUGINS="$COMPIZ_PLUGINS gconf"
fi
-# always load the gconf plugin
-/usr/bin/compiz.real $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS
+# use mesa library if Xgl is running
+if ps -C Xgl > /dev/null; then
+ if [ -f /usr/lib/nvidia/libGL.so.1.2.xlibmesa ]; then
+ COMPIZ_LD_PRELOAD="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
+ elif [ -f /usr/lib/fglrx/libGL.so.1.2.xlibmesa ]; then
+ COMPIZ_LD_PRELOAD="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
+ fi
+fi
+# always load the gconf plugin
+LD_PRELOAD=$COMPIZ_LD_PRELOAD /usr/bin/compiz.real $COMPIZ_OPTIONS "$@"
$COMPIZ_PLUGINS
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
