configure.ac | 2 debian/changelog | 4 - debian/libdrm-freedreno1.lintian-overrides | 1 debian/libdrm-freedreno1.symbols | 4 - debian/libdrm-intel1.symbols | 6 - debian/libdrm-nouveau2.symbols | 7 -- debian/libdrm-radeon1.lintian-overrides | 1 debian/libdrm-radeon1.symbols | 19 ----- debian/patches/03_hide_symbols.diff | 98 +++++++++++++++++++++++++++++ debian/patches/series | 1 include/drm/qxl_drm.h | 2 radeon/radeon_surface.c | 2 12 files changed, 105 insertions(+), 42 deletions(-)
New commits: commit abba37f34253ffe0ed2c6e5833f5e0f35f413fd3 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Wed Jul 30 11:42:20 2014 +0200 bump version diff --git a/debian/changelog b/debian/changelog index 90e937b..3cb47be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.55-1) UNRELEASED; urgency=medium +libdrm (2.4.56-1) UNRELEASED; urgency=medium * New upstream release. * Enable building freedreno and exynos on arm. (Closes: #741509) commit c8e6bc23d5baaa59739d33d0019a10097425ce59 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Wed Jul 30 11:40:02 2014 +0200 Add a patch to hide all private symbols. 03_hide_symbols.diff diff --git a/debian/changelog b/debian/changelog index f899150..90e937b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libdrm (2.4.55-1) UNRELEASED; urgency=medium * New upstream release. * Enable building freedreno and exynos on arm. (Closes: #741509) + * Add a patch to hide all private symbols. + - 03_hide_symbols.diff -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Fri, 25 Jul 2014 10:24:34 +0200 diff --git a/debian/libdrm-freedreno1.lintian-overrides b/debian/libdrm-freedreno1.lintian-overrides deleted file mode 100644 index 2efb4e6..0000000 --- a/debian/libdrm-freedreno1.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libdrm-freedreno1: symbols-declares-dependency-on-other-package libdrm-freedreno-private diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols index 751d8e4..4321a4f 100644 --- a/debian/libdrm-freedreno1.symbols +++ b/debian/libdrm-freedreno1.symbols @@ -1,8 +1,4 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER# -| libdrm-freedreno-private - is_kgsl_pipe@Base 0 1 - (regex)"^msm_.*@Base" 0 1 - (regex)"^kgsl_.*@Base" 0 1 fd_bo_cpu_fini@Base 0 fd_bo_cpu_prep@Base 0 fd_bo_del@Base 0 diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols index d5c48aa..c1d5e7c 100644 --- a/debian/libdrm-intel1.symbols +++ b/debian/libdrm-intel1.symbols @@ -67,9 +67,3 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER# drm_intel_get_pipe_from_crtc_id@Base 2.4.11 drm_intel_get_reset_stats@Base 2.4.48 drm_intel_reg_read@Base 2.4.38 - drm_mmAllocMem@Base 2.4.1 - drm_mmDestroy@Base 2.4.1 - drm_mmDumpMemInfo@Base 2.4.1 - drm_mmFindBlock@Base 2.4.1 - drm_mmFreeMem@Base 2.4.1 - drm_mmInit@Base 2.4.1 diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols index 278ee55..bd64f4b 100644 --- a/debian/libdrm-nouveau2.symbols +++ b/debian/libdrm-nouveau2.symbols @@ -1,12 +1,5 @@ libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER# | libdrm-nouveau-private - abi16_bo_info@Base 0 1 - abi16_bo_init@Base 0 1 - abi16_chan_nv04@Base 0 1 - abi16_chan_nvc0@Base 0 1 - abi16_chan_nve0@Base 0 1 - abi16_engobj@Base 0 1 - abi16_ntfy@Base 0 1 nouveau_bo_map@Base 2.4.34 nouveau_bo_name_get@Base 2.4.34 nouveau_bo_name_ref@Base 2.4.34 diff --git a/debian/libdrm-radeon1.lintian-overrides b/debian/libdrm-radeon1.lintian-overrides deleted file mode 100644 index 0e452e0..0000000 --- a/debian/libdrm-radeon1.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libdrm-radeon1: symbols-declares-dependency-on-other-package libdrm-radeon-private diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols index e9578a6..5a763a4 100644 --- a/debian/libdrm-radeon1.symbols +++ b/debian/libdrm-radeon1.symbols @@ -1,23 +1,4 @@ libdrm_radeon.so.1 libdrm-radeon1 #MINVER# -| libdrm-radeon-private - bof_array@Base 0 1 - bof_array_append@Base 0 1 - bof_array_get@Base 0 1 - bof_array_size@Base 0 1 - bof_blob@Base 0 1 - bof_blob_size@Base 0 1 - bof_blob_value@Base 0 1 - bof_decref@Base 0 1 - bof_dump_file@Base 0 1 - bof_incref@Base 0 1 - bof_int32@Base 0 1 - bof_int32_value@Base 0 1 - bof_load_file@Base 0 1 - bof_object@Base 0 1 - bof_object_get@Base 0 1 - bof_object_set@Base 0 1 - bof_print@Base 0 1 - bof_string@Base 0 1 radeon_bo_debug@Base 2.4.17 radeon_bo_get_handle@Base 2.4.17 radeon_bo_get_src_domain@Base 2.4.17 diff --git a/debian/patches/03_hide_symbols.diff b/debian/patches/03_hide_symbols.diff new file mode 100644 index 0000000..71a01f7 --- /dev/null +++ b/debian/patches/03_hide_symbols.diff @@ -0,0 +1,98 @@ +diff --git a/exynos/Makefile.am b/exynos/Makefile.am +index 0a2663a..0cd753d 100644 +--- a/exynos/Makefile.am ++++ b/exynos/Makefile.am +@@ -7,7 +7,8 @@ AM_CFLAGS = \ + + libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la + libdrm_exynos_ladir = $(libdir) +-libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ ++ -export-symbols-regex '^(exynos|g2d)_' + libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + + libdrm_exynos_la_SOURCES = \ +diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am +index 7903e5b..5fdee22 100644 +--- a/freedreno/Makefile.am ++++ b/freedreno/Makefile.am +@@ -9,7 +9,8 @@ AM_CFLAGS = \ + + libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la + libdrm_freedreno_ladir = $(libdir) +-libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ ++ -export-symbols-regex '^fd_' + libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + + libdrm_freedreno_la_SOURCES = \ +diff --git a/intel/Makefile.am b/intel/Makefile.am +index f49b099..2b9ee48 100644 +--- a/intel/Makefile.am ++++ b/intel/Makefile.am +@@ -33,7 +33,8 @@ AM_CFLAGS = \ + + libdrm_intel_la_LTLIBRARIES = libdrm_intel.la + libdrm_intel_ladir = $(libdir) +-libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ ++ -export-symbols-regex '^drm_intel_' + libdrm_intel_la_LIBADD = ../libdrm.la \ + @PTHREADSTUBS_LIBS@ \ + @PCIACCESS_LIBS@ \ +diff --git a/libkms/Makefile.am b/libkms/Makefile.am +index 449a73b..e3c727a 100644 +--- a/libkms/Makefile.am ++++ b/libkms/Makefile.am +@@ -5,7 +5,8 @@ AM_CFLAGS = \ + + libkms_la_LTLIBRARIES = libkms.la + libkms_ladir = $(libdir) +-libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ ++ -export-symbols-regex '^kms_' + libkms_la_LIBADD = ../libdrm.la + + #if HAVE_LIBUDEV +diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am +index 206e892..257cab9 100644 +--- a/nouveau/Makefile.am ++++ b/nouveau/Makefile.am +@@ -8,7 +8,8 @@ AM_CFLAGS = \ + + libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la + libdrm_nouveau_ladir = $(libdir) +-libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined ++libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined \ ++ -export-symbols-regex '^nouveau_' + libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + + libdrm_nouveau_la_SOURCES = nouveau.c \ +diff --git a/omap/Makefile.am b/omap/Makefile.am +index c77520b..bcbe98e 100644 +--- a/omap/Makefile.am ++++ b/omap/Makefile.am +@@ -7,7 +7,8 @@ AM_CFLAGS = \ + + libdrm_omap_la_LTLIBRARIES = libdrm_omap.la + libdrm_omap_ladir = $(libdir) +-libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ ++ -export-symbols-regex '^omap_' + libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + + libdrm_omap_la_SOURCES = omap_drm.c +diff --git a/radeon/Makefile.am b/radeon/Makefile.am +index a8cd100..9fa19a8 100644 +--- a/radeon/Makefile.am ++++ b/radeon/Makefile.am +@@ -31,7 +31,8 @@ AM_CFLAGS = \ + + libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la + libdrm_radeon_ladir = $(libdir) +-libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined ++libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined \ ++ -export-symbols-regex '^radeon_' + libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + + libdrm_radeon_la_SOURCES = \ diff --git a/debian/patches/series b/debian/patches/series index d2f7405..eb3793b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01_default_perms.diff 02_fix_qxl_drm_h.diff +03_hide_symbols.diff \ No newline at end of file commit d6861609b2b887612d652bb2be7c39f199802937 Author: Marek Olšák <marek.ol...@amd.com> Date: Tue Jul 29 18:54:33 2014 +0200 configure.ac: bump version to 2.4.56 for release diff --git a/configure.ac b/configure.ac index a7be095..5e9cb6c 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.55], + [2.4.56], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) commit 2169dce96c5503ef8f6e4bb008e989d0ef02ec8e Author: Marek Olšák <marek.ol...@amd.com> Date: Sat Jul 26 20:07:33 2014 +0200 radeon: fix typo in sample split / fixes MSAA on Hawaii Reviewed-by: Michel Dänzer <michel.daen...@amd.com> diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c index 9c3a192..8a1fe7d 100644 --- a/radeon/radeon_surface.c +++ b/radeon/radeon_surface.c @@ -1914,7 +1914,7 @@ static void cik_get_2d_params(struct radeon_surface_manager *surf_man, sample_split = 1; break; case CIK__SAMPLE_SPLIT__2: - sample_split = 1; + sample_split = 2; break; case CIK__SAMPLE_SPLIT__4: sample_split = 4; commit 8bdb4cfa450b16f2c70729f923fa05d9553d7118 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Mon May 5 23:28:23 2014 +0200 libdrm: Fix drm.h include in qxl drm header file Use "drm.h" instead of "drm/drm.h" as used in the other header files. Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this file is installed in /usr/include/libdrm. Fixes Debian bug #746807 Reported-by: Bastian Blank <wa...@debian.org> Signed-off-by: Andreas Boll <andreas.boll....@gmail.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h index 5d7de70..1e331a8 100644 --- a/include/drm/qxl_drm.h +++ b/include/drm/qxl_drm.h @@ -25,7 +25,7 @@ #define QXL_DRM_H #include <stddef.h> -#include "drm/drm.h" +#include "drm.h" /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. -- 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/e1xcqq9-00053v...@moszumanska.debian.org