commit:     9a3e762a530087daea0bc72e44402b75a143094f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 23:24:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 23:25:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3e762a

media-video/motion: fix build w/ newer libwebp

The patch isn't perfect as upstream (even before this) called `pkgconf` directly
and this one doesn't update CFLAGS but as a driveby this is good enough.

Closes: https://bugs.gentoo.org/910601
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/motion-4.5.1-webp-underlinking.patch     | 24 ++++++++++++++++++++++
 ...tion-4.5.1-r2.ebuild => motion-4.5.1-r3.ebuild} |  5 ++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/media-video/motion/files/motion-4.5.1-webp-underlinking.patch 
b/media-video/motion/files/motion-4.5.1-webp-underlinking.patch
new file mode 100644
index 000000000000..19d111fd3039
--- /dev/null
+++ b/media-video/motion/files/motion-4.5.1-webp-underlinking.patch
@@ -0,0 +1,24 @@
+https://github.com/Motion-Project/motionplus/issues/74
+https://github.com/Motion-Project/motionplus/commit/af632f831127499ee541d9c719a930321718f294
+https://bugs.gentoo.org/910601
+
+From af632f831127499ee541d9c719a930321718f294 Mon Sep 17 00:00:00 2001
+From: Mr-Dave <motionmrd...@gmail.com>
+Date: Sat, 8 Jul 2023 21:36:06 -0600
+Subject: [PATCH] Fix webp libs.  Closes #74
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.ac     2022-12-17 17:36:49.000000000 -0700
++++ b/configure.ac     2023-09-25 06:39:39.399220672 -0600
+@@ -192,7 +192,7 @@
+         AC_MSG_RESULT(yes)
+         AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around])
+         TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux`
+-        TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux`
++        TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp`
+       ],[
+         AC_MSG_RESULT(no)
+       ]

diff --git a/media-video/motion/motion-4.5.1-r2.ebuild 
b/media-video/motion/motion-4.5.1-r3.ebuild
similarity index 95%
rename from media-video/motion/motion-4.5.1-r2.ebuild
rename to media-video/motion/motion-4.5.1-r3.ebuild
index 8e786bb8fe9e..b145c2763090 100644
--- a/media-video/motion/motion-4.5.1-r2.ebuild
+++ b/media-video/motion/motion-4.5.1-r3.ebuild
@@ -36,7 +36,10 @@ DEPEND="${RDEPEND}
        )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch )
+PATCHES=(
+       "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch
+       "${FILESDIR}"/${P}-webp-underlinking.patch
+)
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="

Reply via email to