Bug#982747: libyami-utils: Switch from libbsd to libmd
Source: libyami-utils
Source-Version: 1.3.0-2
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
From 4bebced8e1b654c915c473c4d85ef8dd26cc6c55 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Sat, 13 Feb 2021 20:29:58 +0100
Subject: [PATCH] Switch from libbsd to libmd
The MD5 functions in libbsd have been superseded by the ones in the
libmd project, and they might disappear in the next SONAME bump.
---
debian/control | 2 +-
debian/patches/0003-use-libmd.patch | 53 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/0003-use-libmd.patch
diff --git a/debian/control b/debian/control
index 5e4706b..386ea8b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends:
libavcodec-dev,
libavformat-dev,
libavutil-dev,
- libbsd-dev,
libegl1-mesa-dev,
libgles2-mesa-dev,
+ libmd-dev,
libva-dev,
libwayland-dev,
libx11-dev,
diff --git a/debian/patches/0003-use-libmd.patch b/debian/patches/0003-use-libmd.patch
new file mode 100644
index 0000000..3f161ad
--- /dev/null
+++ b/debian/patches/0003-use-libmd.patch
@@ -0,0 +1,53 @@
+Author: Guillem Jover <guillem@hadrons.org>
+Subject: Use libmd instead of libbsd for message digest functions
+ The MD5 functions in libbsd have been superseded by the ones
+ in the libmd project. Switch to use those as the ones in libbsd
+ might disappear in the next SONAME bump.
+
+---
+ configure.ac | 2 +-
+ tests/Makefile.am | 2 +-
+ tests/decodeinputavformat.cpp | 2 +-
+ tests/decodeoutput.cpp | 9 +--------
+ 4 files changed, 4 insertions(+), 11 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -250,7 +250,7 @@ fi
+
+ #check openssl
+ if test "$enable_md5" = "yes"; then
+- PKG_CHECK_MODULES([LIBBSD], [libbsd],
++ PKG_CHECK_MODULES([LIBMD], [libmd],
+ [AC_DEFINE([__ENABLE_MD5__], [1],
+ [Defined to 1 if MD5 API and --enable-md5[default] are enabled])],
+ [])
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -59,7 +59,7 @@ YAMI_DECODE_LIBS += $(LIBEGL_LIBS) $(LIB
+ endif
+
+ if ENABLE_MD5
+-YAMI_DECODE_LIBS += $(LIBBSD_LIBS)
++YAMI_DECODE_LIBS += $(LIBMD_LIBS)
+ endif
+
+ YAMI_ENCODE_LIBS = \
+--- a/tests/decodeoutput.cpp
++++ b/tests/decodeoutput.cpp
+@@ -23,14 +23,7 @@
+ #include "common/VaapiUtils.h"
+
+ #if __ENABLE_MD5__
+-// including bsd/md5.h produces a warning with __bounded__ attribute,
+-// libyami-utils chooses to ignore this particular warning by pushing the
+-// current environment, ignoring attributes and then poping to restore the
+-// environment.
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wattributes"
+-#include <bsd/md5.h>
+-#pragma GCC diagnostic pop
++#include <md5.h>
+ #endif
+
+ #ifdef __ENABLE_X11__
diff --git a/debian/patches/series b/debian/patches/series
index 1b39d13..471321e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-decode-avformat-av_register_all-is-deprecated-since-.patch
0002-decode-avformat-use-LIBAVFORMAT_VERSION_INT-instead.patch
+0003-use-libmd.patch
--
2.30.0.284.gd98b1dd5eaa7
Reply to: