mesa: Changes to 'debian-experimental'
debian/changelog | 11 +++++++++++
debian/control | 4 ++--
debian/patches/01_no_undefined.diff | 35 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 49 insertions(+), 2 deletions(-)
New commits:
commit 40a99c0955ff470422a342b36b2c3ddb6dc67f07
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Sat Apr 26 17:04:28 2014 +0200
Add missing separator between dependency items '${misc:Depends}' and 'libglapi-mesa (= ${binary:Version})'.
(cherry picked from commit c1b6739f208899436af9565a5af47abafe954111)
diff --git a/debian/changelog b/debian/changelog
index fdc9702..20cfffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ mesa (10.2.0~rc1-1) UNRELEASED; urgency=medium
[ Andreas Boll ]
* Relax ocl-icd-libopencl1 dependency to allow the generic virtual
libopencl1 as a valid alternative (Closes: #745765).
+ * Add missing separator between dependency items '${misc:Depends}'
+ and 'libglapi-mesa (= ${binary:Version})'.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 11 Apr 2014 17:48:37 +0300
diff --git a/debian/control b/debian/control
index 6d1a102..026702b 100644
--- a/debian/control
+++ b/debian/control
@@ -581,7 +581,7 @@ Section: libs
Architecture: any
Depends:
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
libglapi-mesa (= ${binary:Version}),
libudev1 [linux-any],
Recommends: libgl1-mesa-dri (>= 7.2)
commit 5148a7d2adab7da834afc2319946832d0b978478
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Sat Apr 26 16:23:01 2014 +0200
Relax ocl-icd-libopencl1 dependency to allow the generic virtual libopencl1 as a valid alternative
Closes: #745765
(cherry picked from commit a69b60b48e8ef6e9def0e222fca9733a34654b86)
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 7d5361f..fdc9702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ mesa (10.2.0~rc1-1) UNRELEASED; urgency=medium
* Add 01_no_undefined.diff to actually add -Wl,--no-undefined to the linker
flags for our shared libraries.
+ [ Andreas Boll ]
+ * Relax ocl-icd-libopencl1 dependency to allow the generic virtual
+ libopencl1 as a valid alternative (Closes: #745765).
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 11 Apr 2014 17:48:37 +0300
mesa (10.1.0-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cebd4ce..6d1a102 100644
--- a/debian/control
+++ b/debian/control
@@ -826,7 +826,7 @@ Section: libs
Architecture: amd64 i386 armhf
Depends:
libclc-r600,
- ocl-icd-libopencl1,
+ ocl-icd-libopencl1 | libopencl1,
${shlibs:Depends},
${misc:Depends},
Provides: opencl-icd
commit 6d7c826456d6f174084a00ac2d648431c1a87082
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 14 18:30:25 2014 +0200
Add 01_no_undefined.diff
Actually add -Wl,--no-undefined to the linker flags for our shared
libraries. A hunk was lost in a rebase upstream.
diff --git a/debian/changelog b/debian/changelog
index a9a0703..7d5361f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mesa (10.2.0~rc1-1) UNRELEASED; urgency=medium
+ [ Timo Aaltonen ]
* New upstream release candidate.
- 02_gbm_no_undefined.diff dropped, upstream
- 03_gbm_make_devices_static.diff dropped, upstream
@@ -9,6 +10,10 @@ mesa (10.2.0~rc1-1) UNRELEASED; urgency=medium
04_osmesa_version.diff. Add a symlink with the old name to point to
the new lib.
+ [ Julien Cristau ]
+ * Add 01_no_undefined.diff to actually add -Wl,--no-undefined to the linker
+ flags for our shared libraries.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 11 Apr 2014 17:48:37 +0300
mesa (10.1.0-5) unstable; urgency=low
diff --git a/debian/patches/01_no_undefined.diff b/debian/patches/01_no_undefined.diff
new file mode 100644
index 0000000..2acd2b7
--- /dev/null
+++ b/debian/patches/01_no_undefined.diff
@@ -0,0 +1,35 @@
+Commit 11623be934f85 was meant to have this hunk, which
+I accidently dropped during git rebase.
+
+Cc: 10.2 <mesa-stable@lists.freedesktop.org>
+Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+---
+ configure.ac | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 99a761a..12a2896 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -332,6 +332,19 @@ LDFLAGS=$save_LDFLAGS
+ AC_SUBST([GC_SECTIONS])
+
+ dnl
++dnl OpenBSD does not have DT_NEEDED entries for libc by design
++dnl so when these flags are passed to ld via libtool the checks will fail
++dnl
++case "$host_os" in
++openbsd*)
++ LD_NO_UNDEFINED="" ;;
++*)
++ LD_NO_UNDEFINED="-Wl,--no-undefined" ;;
++esac
++
++AC_SUBST([LD_NO_UNDEFINED])
++
++dnl
+ dnl compatibility symlinks
+ dnl
+ case "$host_os" in
+--
+1.9.2
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..f973de2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_no_undefined.diff
07_gallium-fix-build-failure-on-powerpcspe.diff
Reply to: