Bug#982749: apitrace: Switch from libbsd to libmd
Source: apitrace
Source-Version: 9.0+repack-1
Severity: normal
Tags: patch
Hi!
The MD5 functions in libbsd have been superseded by the ones in the
libmd project, and they might be removed in the next SONAME bump. The
current implementations in libbsd are just wrappers for the real
functions from libmd.
Attached a patch fixing this.
Thanks,
Guillem
diff -Nru apitrace-9.0+repack/debian/control apitrace-9.0+repack/debian/control
--- apitrace-9.0+repack/debian/control 2019-11-29 06:21:20.000000000 +0100
+++ apitrace-9.0+repack/debian/control 2021-02-13 00:10:39.000000000 +0100
@@ -17,7 +17,7 @@
zlib1g-dev,
libsnappy-dev,
libpng-dev,
- libbsd-dev,
+ libmd-dev,
libprocps-dev,
libgtest-dev,
Standards-Version: 4.4.0
diff -Nru apitrace-9.0+repack/debian/patches/use-system-md5 apitrace-9.0+repack/debian/patches/use-system-md5
--- apitrace-9.0+repack/debian/patches/use-system-md5 2019-11-29 06:17:05.000000000 +0100
+++ apitrace-9.0+repack/debian/patches/use-system-md5 2021-02-13 00:14:58.000000000 +0100
@@ -1,10 +1,14 @@
-Description: Use md5 implementation from system libbsd
+Description: Use md5 implementation from system libmd
Forwarded: not-needed
Author: Christopher James Halse Rogers <raof@ubuntu.com>
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -534,9 +534,7 @@ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "EL
+@@ -543,9 +543,7 @@ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "EL
add_definitions (-DHAVE_BACKTRACE=1)
endif ()
@@ -15,14 +19,3 @@
# We use bundled headers for all Khronos APIs, to guarantee support for both
# OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
---- a/lib/image/image_md5.cpp
-+++ b/lib/image/image_md5.cpp
-@@ -28,7 +28,7 @@
- #include <fstream>
- #include "image.hpp"
-
--#include "md5.h"
-+#include <bsd/md5.h>
-
-
- using namespace std;
diff -Nru apitrace-9.0+repack/debian/patches/use-system-snappy apitrace-9.0+repack/debian/patches/use-system-snappy
--- apitrace-9.0+repack/debian/patches/use-system-snappy 2019-11-29 06:17:05.000000000 +0100
+++ apitrace-9.0+repack/debian/patches/use-system-snappy 2021-02-13 00:14:58.000000000 +0100
@@ -6,9 +6,14 @@
Forwarded: not-needed
Author: Christopher James Halse Rogers <raof@ubuntu.com>
+---
+ CMakeLists.txt | 10 +++++-----
+ wrappers/CMakeLists.txt | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -476,10 +476,10 @@ if (NOT ENABLE_STATIC_SNAPPY)
+@@ -485,10 +485,10 @@ if (NOT ENABLE_STATIC_SNAPPY)
find_package (SNAPPY)
endif ()
if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
@@ -23,6 +28,15 @@
endif ()
include_directories (${SNAPPY_INCLUDE_DIRS})
+@@ -543,7 +543,7 @@ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "EL
+ add_definitions (-DHAVE_BACKTRACE=1)
+ endif ()
+
+-set (MD5_LIBRARIES bsd)
++set (MD5_LIBRARIES md)
+
+ # We use bundled headers for all Khronos APIs, to guarantee support for both
+ # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
--- a/wrappers/CMakeLists.txt
+++ b/wrappers/CMakeLists.txt
@@ -79,7 +79,7 @@ target_link_libraries (trace
Reply to: