mesa: Changes to 'ubuntu'
debian/changelog | 15 +--
debian/libgl1-mesa-swx11-dev.links.in |1 +
debian/libopenvg1-mesa-dev.links.in |1 +
debian/rules |1 +
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit aa9d50d8f43efbc600cd28751448862935b0ed13
Author: Christopher James Halse Rogers
Date: Wed Aug 10 17:34:11 2011 +1000
Upload to oneiric
diff --git a/debian/changelog b/debian/changelog
index d21d14e..9770c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
+mesa (7.11-0ubuntu3) oneiric; urgency=low
[ Christopher James Halse Rogers ]
* debian/libopenvg1-mesa-dev.links.in:
commit 95f1cfc0a6f23acdc8df373425b65dbc894eecc5
Author: Christopher James Halse Rogers
Date: Wed Aug 10 12:58:44 2011 +1000
Fix the long-broken libgl1-mesa-swx11-dev
diff --git a/debian/changelog b/debian/changelog
index 42c3b0c..d21d14e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,16 @@ mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
* debian/libopenvg1-mesa-dev.links.in:
- Install a symlink to libOpenVG.so so that the linker can actually find
it.
+ * debian/rules:
+ * debian/libgl1-mesa-swx11-dev.links.in:
+- Make linking against libGL in libgl1-mesa-swx11-dev actually work. This
+ seems to have been broken since Ubuntu 10.04 without complaint, so it's
+ fairly clear that no-one actually uses this package.
[ Robert Hooker ]
* Correct gbm.h install location in libgbm-dev.
- -- Christopher James Halse Rogers Wed, 10 Aug 2011
12:26:53 +1000
+ -- Christopher James Halse Rogers Wed, 10 Aug 2011
12:58:15 +1000
mesa (7.11-0ubuntu2) oneiric; urgency=low
diff --git a/debian/libgl1-mesa-swx11-dev.links.in
b/debian/libgl1-mesa-swx11-dev.links.in
new file mode 100644
index 000..7726605
--- /dev/null
+++ b/debian/libgl1-mesa-swx11-dev.links.in
@@ -0,0 +1 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGL.so
/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
diff --git a/debian/rules b/debian/rules
index 2516c61..0635431 100755
--- a/debian/rules
+++ b/debian/rules
@@ -274,6 +274,7 @@ install: build
libegl1-mesa-drivers.install libegl1-mesa-dev.install \
libgl1-mesa-dev.install libgl1-mesa-dev.links \
libgl1-mesa-swx11-dev.install libgl1-mesa-swx11.install \
+ libgl1-mesa-swx11-dev.links \
libgl1-mesa-glx.postinst libgl1-mesa-glx.prerm \
libgl1-mesa-swx11.postinst libgl1-mesa-swx11.prerm \
libgbm1.install libgbm-dev.install \
commit 4167a5cee28974d7f099602885cd896898a4c3e6
Author: Christopher James Halse Rogers
Date: Wed Aug 10 10:58:01 2011 +1000
Fix libopenvg1-mesa-dev by actually adding the
{libdir}/mesa-egl/libOpenVG.so → {libdir}/libOpenVG.so link
diff --git a/debian/changelog b/debian/changelog
index 8d9c194..b87c9b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
* debian/libgbm-dev.install.in:
- Install gbm.h in the right place.
+ * debian/libopenvg1-mesa-dev.links.in:
+- Install a symlink to libOpenVG.so so that the linker can actually find
+ it.
- -- Christopher James Halse Rogers Wed, 10 Aug 2011
10:14:04 +1000
+ -- Christopher James Halse Rogers Wed, 10 Aug 2011
10:56:43 +1000
mesa (7.11-0ubuntu2) oneiric; urgency=low
diff --git a/debian/libopenvg1-mesa-dev.links.in
b/debian/libopenvg1-mesa-dev.links.in
new file mode 100644
index 000..7a80081
--- /dev/null
+++ b/debian/libopenvg1-mesa-dev.links.in
@@ -0,0 +1 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl/libOpenVG.so
/usr/lib/${DEB_HOST_MULTIARCH}/libOpenVG.so
commit 41895f77adc0eb53566534ccf0c950e06c756672
Author: Christopher James Halse Rogers
Date: Wed Aug 10 10:47:24 2011 +1000
Install gbm.h in the right place
diff --git a/debian/changelog b/debian/changelog
index 0f35c6bc..8d9c194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
+
+ * debian/libgbm-dev.install.in:
+- Install gbm.h in the right place.
+
+ -- Christopher James Halse Rogers Wed, 10 Aug 2011
10:14:04 +1000
+
mesa (7.11-0ubuntu2) oneiric; urgency=low
* No change rebuild against new libwayland-dev. Fixes PowerPC build.
diff --git a/debian/libgbm-dev.install.in b/debian/libgbm-dev.install.in
index f5b413a..6f9e50a 100644
--- a/debian/libgbm-dev.install.in
+++ b/debian/libgbm-dev.install.in
@@ -1,3 +1,3 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so usr/lib/${DEB_HOST_MULTIARCH}
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gbm.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-dri/usr/include/gbm.h usr/include/gbm.h
+dri/usr/include/gbm.h usr/include
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas.
Bug#624156: how did it work out?
Hi Cyril, I have ran into this issue as well. I wonder if you had some time to test tentative solution? Thanks in advance -- =--= Keep in touch www.onerussian.com Yaroslav Halchenko www.ohloh.net/accounts/yarikoptic -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110810153130.ga8...@onerussian.com
Xorg module searchpath "override" directory (was: Re: [RFC] proposal for reorganizing the MESA libraries to simplify replacing them with vendor implementations)
On 2011-07-25 19:03, Julien Cristau wrote:
> On Mon, Jul 25, 2011 at 18:57:17 +0200, Andreas Beckmann wrote:
>> libGL.so.1 is not the only file to be diverted, libglx.so is being
>> replaced by the vendors drivers, too. Or is there some way of "search
>> path magic" that would allow to place the "higher priority alternative"
>> in a different location where it would be picked up before
>> /usr/lib/xorg/modules/extensions/libglx.so ? That would allow to avoid
>> the diversion here. Something similar to /lib/modules/*/updates/ ...
>>
> That shouldn't be too hard.
I tried to look in the code (xorg-server (2:1.7.7-13)
hw/xfree86/loader/* ; the experimental version does not differ much in
that area) but didn't quite get how the search path is working.
Therefore I added a bit debugging code to trace FindModuleInSubdir().
Translating to pseudocode this now looks like
modulepath=/usr/lib/xorg/modules
for subdir in "" input drivers multimedia extensions internal
do
search_recursive ${modulepath}/${subdir}/linux/
search_recursive ${modulepath}/${subdir}/
done
So the order the directories are traversed and files are found depends
on the raw order in the filesystem (opendir()), except for the linux
subdir which is checked first.
hw/xfree86/loader/loadmod.c has
/* Standard set of module subdirectories to search, in order of
preference */
static const char *stdSubdirs[] = {
"",
"input/",
"drivers/",
"multimedia/",
"extensions/",
"internal/",
NULL
};
but since a recursive search is done on "" first, the other directories
in the list will be traversed (again and without hope of success) only
if the first search was unsuccessful. So that "order of preference" is
no more existant and the above pseudocode could be simplified to
modulepath=/usr/lib/xorg/modules
search_recursive ${modulepath}/linux/
search_recursive ${modulepath}/
Back to the original problem: replacing libglx.so with a vendor
implementation without using diversions.
I'd do the following:
* leave /usr/lib/xorg/modules/extensions/libglx.so where it is
(i.e. no longer divert it)
* the proprietary drivers register their libglx.so replacement with the
glx alternative which installs it as a slave link to
/usr/lib/xorg/modules/linux/libglx.so
so that it is picked up first and the original one is being ignored
"linux" is acually OSDIR in the code and may have had a different
intention, but it is the only deterministic place that is searched
"before" extensions/libglx.so
* no changes in Xorg needed regarding the search paths
* works on both unstable and squeeze, so backports don't need special
handling
If this is OK, I'll implement and test it and also verify that Xorg
works in the same way in testing/unstable/experimental.
That way, the first of the ugly diversions could be removed. :-)
Andreas
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4e42f368.7030...@abeckmann.de
Bug#637412: README.Debian is broken symlink
Package: compiz Version: 0.9.2.1+git20110226.f059fae9-4 Severity: normal $ file /usr/share/doc/compiz/README.Debian /usr/share/doc/compiz/README.Debian: broken symbolic link to `../compiz-core/README.Debian' -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: i386 (x86_64) Kernel: Linux 3.0.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages compiz depends on: ii compiz 0.9.2.1+git20110226.f059fae9-4OpenGL window and compositing mana ii compiz 0.9.2.1+git20110224.g4a6783f-2Compiz Fusion plugins - main colle ii compiz 0.9.2.1+git20110226.f059fae9-4OpenGL window and compositing mana ii compiz 0.9.2.1+git20110226.f059fae9-4OpenGL window and compositing mana ii libcom 0.9.2.1+git20110226.78a7cc8c-1+b1 Configuration settings library for compiz recommends no packages. Versions of packages compiz suggests: ii compizcon 0.9.2.1+git20110224.cb1268cb-1 Compizconfig Settings Manager -- no debconf information -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110811034051.12610.63901.reportbug@fluid.dannf
