debian/changelog | 14 +++
debian/libegl1-mesa-drivers.install.linux.in | 4
debian/patches/fix-bsymbolic-madness.patch | 121 +++++++++++++++++++++++++++
debian/patches/series | 1
4 files changed, 138 insertions(+), 2 deletions(-)
New commits:
commit ad600c7c13e8ff6f223123b1d6dfbe967861983d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Mar 5 14:20:59 2014 +0100
Add --dynamic-list to undo damage from -Bsymbolic-functions.
This fixes vdpau interop properly.
diff --git a/debian/changelog b/debian/changelog
index 48903a1..bac3357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0~rc3-0ubuntu3) UNRELEASED; urgency=low
+
+ * Add --dynamic-list to undo damage from -Bsymbolic-functions.
+ - This fixes vdpau interop properly.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Mar 2014
14:19:17 +0100
+
mesa (10.1.0~rc3-0ubuntu2) trusty; urgency=medium
* Install libegl-wayland in /mesa-egl again.
diff --git a/debian/patches/fix-bsymbolic-madness.patch
b/debian/patches/fix-bsymbolic-madness.patch
new file mode 100644
index 0000000..0d4822f
--- /dev/null
+++ b/debian/patches/fix-bsymbolic-madness.patch
@@ -0,0 +1,121 @@
+diff --git a/src/gallium/targets/dri-nouveau/Makefile.am
b/src/gallium/targets/dri-nouveau/Makefile.am
+index 4bd4e21..f34acf8 100644
+--- a/src/gallium/targets/dri-nouveau/Makefile.am
++++ b/src/gallium/targets/dri-nouveau/Makefile.am
+@@ -35,7 +35,9 @@ dri_LTLIBRARIES = nouveau_dri.la
+ nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp
+ nouveau_dri_la_SOURCES = target.c
+
+-nouveau_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++nouveau_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/nouveau_dri.dyn
+
+ nouveau_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/dri-nouveau/nouveau_dri.dyn
b/src/gallium/targets/dri-nouveau/nouveau_dri.dyn
+new file mode 100644
+index 0000000..a10356b
+--- /dev/null
++++ b/src/gallium/targets/dri-nouveau/nouveau_dri.dyn
+@@ -0,0 +1,3 @@
++{
++ nouveau_drm_screen_create;
++};
+diff --git a/src/gallium/targets/r300/dri/Makefile.am
b/src/gallium/targets/r300/dri/Makefile.am
+index 4bd9ea4..e2becdb 100644
+--- a/src/gallium/targets/r300/dri/Makefile.am
++++ b/src/gallium/targets/r300/dri/Makefile.am
+@@ -37,7 +37,9 @@ nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
+ r300_dri_la_SOURCES = \
+ drm_target.c
+
+-r300_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++r300_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/radeon.dyn
+
+ r300_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/r300/dri/radeon.dyn
b/src/gallium/targets/r300/dri/radeon.dyn
+new file mode 100644
+index 0000000..8d243dc
+--- /dev/null
++++ b/src/gallium/targets/r300/dri/radeon.dyn
+@@ -0,0 +1,3 @@
++{
++ radeon_drm_winsys_create;
++};
+diff --git a/src/gallium/targets/r600/dri/Makefile.am
b/src/gallium/targets/r600/dri/Makefile.am
+index 1f13b80..149106f 100644
+--- a/src/gallium/targets/r600/dri/Makefile.am
++++ b/src/gallium/targets/r600/dri/Makefile.am
+@@ -36,7 +36,9 @@ dri_LTLIBRARIES = r600_dri.la
+ r600_dri_la_SOURCES = \
+ drm_target.c
+
+-r600_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++r600_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
+ r600_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/r600/vdpau/Makefile.am
b/src/gallium/targets/r600/vdpau/Makefile.am
+index 509b954..d1a528d 100644
+--- a/src/gallium/targets/r600/vdpau/Makefile.am
++++ b/src/gallium/targets/r600/vdpau/Makefile.am
+@@ -35,7 +35,8 @@ libvdpau_r600_la_SOURCES = \
+ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+ libvdpau_r600_la_LDFLAGS = \
+- $(GALLIUM_VDPAU_LINKER_FLAGS)
++ $(GALLIUM_VDPAU_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
+ libvdpau_r600_la_LIBADD = \
+ $(top_builddir)/src/gallium/drivers/r600/libr600.la \
+diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am
b/src/gallium/targets/radeonsi/dri/Makefile.am
+index eab28b5..a8db0a8 100644
+--- a/src/gallium/targets/radeonsi/dri/Makefile.am
++++ b/src/gallium/targets/radeonsi/dri/Makefile.am
+@@ -37,7 +37,9 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
+ radeonsi_dri_la_SOURCES = \
+ drm_target.c
+
+-radeonsi_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++radeonsi_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
+ radeonsi_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am
b/src/gallium/targets/radeonsi/vdpau/Makefile.am
+index 54d65b3..0d53c18 100644
+--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
++++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
+@@ -36,7 +36,9 @@ libvdpau_radeonsi_la_SOURCES = \
+ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+ libvdpau_radeonsi_la_LDFLAGS = \
+- $(GALLIUM_VDPAU_LINKER_FLAGS)
++ $(GALLIUM_VDPAU_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
++
+
+ libvdpau_radeonsi_la_LIBADD = \
+ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
+diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am
b/src/gallium/targets/vdpau-nouveau/Makefile.am
+index 3cdf103..66738f1 100644
+--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
++++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
+@@ -36,7 +36,8 @@ libvdpau_nouveau_la_SOURCES = \
+ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+ libvdpau_nouveau_la_LDFLAGS = \
+- $(GALLIUM_VDPAU_LINKER_FLAGS)
++ $(GALLIUM_VDPAU_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../dri-nouveau/nouveau_dri.dyn
+
+ libvdpau_nouveau_la_LIBADD = \
+ $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
diff --git a/debian/patches/series b/debian/patches/series
index 34e3d53..a612d7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
120-hide-x86sse.patch
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
+fix-bsymbolic-madness.patch
commit ab2a875521003e4205dc800e5da75da414bfc26f
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Mar 5 10:17:57 2014 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 9f87b45..48903a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.1.0~rc3-0ubuntu2) UNRELEASED; urgency=low
+mesa (10.1.0~rc3-0ubuntu2) trusty; urgency=medium
* Install libegl-wayland in /mesa-egl again.
- Fixes FTBFS for g-c-c.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Mar 2014
10:16:47 +0100
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Mar 2014
10:17:21 +0100
mesa (10.1.0~rc3-0ubuntu1) trusty; urgency=medium
commit 5e0cc28c349bffd46c26537b209d9555562a5c82
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Mar 5 10:17:17 2014 +0100
Install libegl-wayland in /mesa-egl again.
Fixes FTBFS for g-c-c.
diff --git a/debian/changelog b/debian/changelog
index fadf620..9f87b45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0~rc3-0ubuntu2) UNRELEASED; urgency=low
+
+ * Install libegl-wayland in /mesa-egl again.
+ - Fixes FTBFS for g-c-c.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 05 Mar 2014
10:16:47 +0100
+
mesa (10.1.0~rc3-0ubuntu1) trusty; urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/libegl1-mesa-drivers.install.linux.in
b/debian/libegl1-mesa-drivers.install.linux.in
index 2c4c266..9bd3fde 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -2,5 +2,5 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
# Wayland support, only on Linux:
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1
usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0
usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wlduw-0008uy...@moszumanska.debian.org
