Re: git: 77eed516e47e - main - multimedia/camserv: Fix build with graphics/imlib2 1.12.1
Date: Thu, 18 Jan 2024 21:53:59 UTC
On 2024-01-18T22:46:56.000+01:00, Nuno Teixeira <eduardo@FreeBSD.org>
wrote:
> The branch main has been updated by eduardo:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=77eed516e47e6217ebc7419bcc1b9f136e512f6a
>
> commit 77eed516e47e6217ebc7419bcc1b9f136e512f6a
>
> Author: Nuno Teixeira <eduardo@FreeBSD.org>
>
> AuthorDate: 2024-01-18 21:45:20 +0000
>
> Commit: Nuno Teixeira <eduardo@FreeBSD.org>
>
> CommitDate: 2024-01-18 21:45:20 +0000
>
> multimedia/camserv: Fix build with graphics/imlib2 1.12.1
>
>
>
> Add minimal support to `pkg-config imlib2`; imlib2-config has been
>
> dropped since imlib2-1.7.5.
>
>
>
> PR: 276438
>
> ---
>
> multimedia/camserv/Makefile | 4 ++--
>
> multimedia/camserv/files/patch-configure.in [http://patch-configure.in] | 22 +++++++++++++++++++---
>
> 2 files changed, 21 insertions(+), 5 deletions(-)
>
> diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
>
> index ec612ebc6489..13c9df527aa2 100644
>
> --- a/multimedia/camserv/Makefile
>
> +++ b/multimedia/camserv/Makefile
>
> @@ -1,6 +1,6 @@
>
> PORTNAME= camserv
>
> PORTVERSION= 0.5.1
>
> -PORTREVISION= 21
>
> +PORTREVISION= 22
>
> PORTEPOCH= 1
>
> CATEGORIES= multimedia
>
> MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
>
> @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
>
>
>
> LIB_DEPENDS= libltdl.so:devel/libltdl [http://libltdl.so:devel/libltdl]
>
>
>
> -USES= autoreconf jpeg libtool
>
> +USES= autoreconf jpeg libtool pkgconfig
>
> GNU_CONFIGURE= yes
>
> INSTALL_TARGET= install-strip
>
>
>
> diff --git a/multimedia/camserv/files/patch-configure.in [http://patch-configure.in] b/multimedia/camserv/files/patch-configure.in [http://patch-configure.in]
>
> index 476c7b0583ee..ab3c1282ee48 100644
>
> --- a/multimedia/camserv/files/patch-configure.in [http://patch-configure.in]
>
> +++ b/multimedia/camserv/files/patch-configure.in [http://patch-configure.in]
>
> @@ -1,6 +1,9 @@
>
> +Add minimal support to `pkg-config imlib2`; imlib2-config has been
>
> +dropped since imlib2-1.7.5.
>
> +
>
> --- configure.in.orig [http://configure.in.orig] 2002-05-12 18:06:12 UTC
>
> +++ configure.in [http://configure.in]
>
> -@@ -9,15 +9,13 @@ AM_INIT_AUTOMAKE(camserv,$CAMSERV_VER_MA
>
> +@@ -9,15 +9,13 @@ AM_MAINTAINER_MODE
>
> AM_CONFIG_HEADER(include/camserv_config.h:config.in [http://config.in])
>
> AM_MAINTAINER_MODE
>
>
>
> @@ -19,7 +22,20 @@
>
>
>
> AC_CHECK_LIB(m,sqrt)
>
> AC_CHECK_LIB(jpeg,jpeg_start_compress)
>
> -@@ -55,7 +53,7 @@ AC_PATH_PROG(GDKPIXBUF_CONFIG,gdk-pixbuf
>
> +@@ -35,6 +33,12 @@ if test "$IMLIB2_CONFIG"x != "x"; then
>
> + CFLAGS="$CFLAGS $IMLIB2_CFLAGS"
>
> + ;;
>
> + esac
>
> ++ else
>
> ++ if pkg-config imlib2; then
>
> ++ IMLIB2_CFLAGS=`pkg-config --cflags imlib2`
>
> ++ IMLIB2_LIBS=`pkg-config --libs imlib2`
>
> ++ AC_CHECK_HEADER(Imlib2.h,have_imlib2=yes)
>
> ++ fi
>
> + fi
>
> +
>
> + AC_SUBST(IMLIB2_CFLAGS)
>
> +@@ -55,7 +59,7 @@ if test "$GDKPIXBUF_CONFIG"x != "x"; then
>
> if test "$GDKPIXBUF_CONFIG"x != "x"; then
>
> GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
>
> case "$GDKPIXBUF_VERSION" in
>
> @@ -28,7 +44,7 @@
>
> GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
>
> GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
>
> CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
>
> -@@ -93,7 +91,7 @@ AC_CHECK_HEADERS(linux/videodev.h,
>
> +@@ -93,7 +97,7 @@ AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
>
> [video_v4l=yes],[video_v4l=no])
>
> AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
Hi,
I would recommend deprecating it, set exp date and point people to
multimedia/ustreamer and multimedia/ffmpeg as alternatives given it's
about 20 years old and things have evolved since.
Best regards,
Daniel