Attachment 244870 Details for Bug 273810 – Workaround webp 1.31 pkg-config issue (in a way that is safe with 1.30)

[patch] Workaround webp 1.31 pkg-config issue (in a way that is safe with 1.30)

003.patch (text/plain), 1.57 KB, created by ports on 2023-09-15 07:04:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ports

Created: 2023-09-15 07:04:31 UTC

Size: 1.57 KB

patch

obsolete

> multimedia/motion/files/patch-configure.ac | 23 ++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
>diff --git a/multimedia/motion/files/patch-configure.ac b/multimedia/motion/files/patch-configure.ac
>index 90ec4379d3b6..4be2e6f53e91 100644
>--- a/multimedia/motion/files/patch-configure.ac
>+++ b/multimedia/motion/files/patch-configure.ac
>@@ -1,6 +1,17 @@
>---- configure.ac.orig	2020-10-25 20:53:44 UTC
>-+++ configure.ac
>-@@ -327,15 +327,11 @@ AS_IF([test "${MYSQL}" = "no"], [
>+--- configure.ac.orig	2022-12-18 00:36:49.000000000 +0000
>++++ configure.ac	2023-09-15 07:00:35.656555000 +0000
>+@@ -191,8 +191,8 @@
>+     AS_IF([pkg-config libwebpmux ], [
>+         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_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux libwebp`
>++        TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp`
>+       ],[
>+         AC_MSG_RESULT(no)
>+       ]
>+@@ -350,15 +350,11 @@
>      AC_MSG_CHECKING(for MySQL)
>      AC_MSG_RESULT(skipped)
>    ],[
>@@ -14,10 +25,10 @@
>      )
> -    export PKG_CONFIG_PATH
> -    AC_MSG_RESULT($PKG_CONFIG_PATH)
>-
>+
>      AC_MSG_CHECKING(for MySQL)
>      AS_IF([pkg-config mysqlclient], [
>-@@ -347,8 +343,6 @@ AS_IF([test "${MYSQL}" = "no"], [
>+@@ -370,8 +366,6 @@
>        ]
>      )
>      AC_MSG_RESULT([$MYSQL])
>@@ -25,4 +36,4 @@
> -    export PKG_CONFIG_PATH
>    ]
>  )
>-
>+

Actions: View | Diff

Attachments on bug 273810: 244865 | 244867 | 244868 | 244870 | 244871 | 244906 | 244929 | 244950 | 245012 | 245106 | 245130 | 245235