Date: Thu, 18 Jan 2024 22:53:59 +0100 From: Daniel Engberg <daniel.engberg.lists@pyret.net> To: Nuno Teixeira <eduardo@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 77eed516e47e - main - multimedia/camserv: Fix build with graphics/imlib2 1.12.1 Message-ID: <e4b8179c5fb396c1aacf861e028f162a@mail.infomaniak.com> In-Reply-To: <202401182146.40ILkutd020636@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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 [-- Attachment #2 --] <div>On 2024-01-18T22:46:56.000+01:00, Nuno Teixeira <eduardo@FreeBSD.org> wrote:<br></div><div class="ik_mail_quote answerContentMessage"><blockquote class="ws-ng-quote"><pre style="white-space: normal;"><div>The branch main has been updated by eduardo:<br></div><div><br></div><div>URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=77eed516e47e6217ebc7419bcc1b9f136e512f6a" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">https://cgit.FreeBSD.org/ports/commit/?id=77eed516e47e6217ebc7419bcc1b9f136e512f6a</a><br></div><div><br></div><div>commit 77eed516e47e6217ebc7419bcc1b9f136e512f6a<br></div><div>Author: Nuno Teixeira <<a href="mailto:eduardo@FreeBSD.org" class="defaultMailLink">eduardo@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-01-18 21:45:20 +0000<br></div><div>Commit: Nuno Teixeira <<a href="mailto:eduardo@FreeBSD.org" class="defaultMailLink">eduardo@FreeBSD.org</a>><br></div><div>CommitDate: 2024-01-18 21:45:20 +0000<br></div><div><br></div><div> multimedia/camserv: Fix build with graphics/imlib2 1.12.1<br></div><div> <br></div><div> Add minimal support to `pkg-config imlib2`; imlib2-config has been<br></div><div> dropped since imlib2-1.7.5.<br></div><div> <br></div><div> PR: 276438<br></div><div>---<br></div><div> multimedia/camserv/Makefile | 4 ++--<br></div><div> multimedia/camserv/files/<a href="http://patch-configure.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">patch-configure.in</a> | 22 +++++++++++++++++++---<br></div><div> 2 files changed, 21 insertions(+), 5 deletions(-)<br></div><div><br></div><div>diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile<br></div><div>index ec612ebc6489..13c9df527aa2 100644<br></div><div>--- a/multimedia/camserv/Makefile<br></div><div>+++ b/multimedia/camserv/Makefile<br></div><div>@@ -1,6 +1,6 @@<br></div><div> PORTNAME= camserv<br></div><div> PORTVERSION= 0.5.1<br></div><div>-PORTREVISION= 21<br></div><div>+PORTREVISION= 22<br></div><div> PORTEPOCH= 1<br></div><div> CATEGORIES= multimedia<br></div><div> MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}<br></div><div>@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING<br></div><div> <br></div><div> LIB_DEPENDS= <a href="http://libltdl.so:devel/libltdl" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">libltdl.so:devel/libltdl</a><br></div><div> <br></div><div>-USES= autoreconf jpeg libtool<br></div><div>+USES= autoreconf jpeg libtool pkgconfig<br></div><div> GNU_CONFIGURE= yes<br></div><div> INSTALL_TARGET= install-strip<br></div><div> <br></div><div>diff --git a/multimedia/camserv/files/<a href="http://patch-configure.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">patch-configure.in</a> b/multimedia/camserv/files/<a href="http://patch-configure.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">patch-configure.in</a><br></div><div>index 476c7b0583ee..ab3c1282ee48 100644<br></div><div>--- a/multimedia/camserv/files/<a href="http://patch-configure.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">patch-configure.in</a><br></div><div>+++ b/multimedia/camserv/files/<a href="http://patch-configure.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">patch-configure.in</a><br></div><div>@@ -1,6 +1,9 @@<br></div><div>+Add minimal support to `pkg-config imlib2`; imlib2-config has been<br></div><div>+dropped since imlib2-1.7.5.<br></div><div>+<br></div><div> --- <a href="http://configure.in.orig" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">configure.in.orig</a> 2002-05-12 18:06:12 UTC<br></div><div> +++ <a href="http://configure.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">configure.in</a><br></div><div>-@@ -9,15 +9,13 @@ AM_INIT_AUTOMAKE(camserv,$CAMSERV_VER_MA<br></div><div>+@@ -9,15 +9,13 @@ AM_MAINTAINER_MODE<br></div><div> AM_CONFIG_HEADER(include/camserv_config.h:<a href="http://config.in" class="defaultMailLink" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">config.in</a>)<br></div><div> AM_MAINTAINER_MODE<br></div><div> <br></div><div>@@ -19,7 +22,20 @@<br></div><div> <br></div><div> AC_CHECK_LIB(m,sqrt)<br></div><div> AC_CHECK_LIB(jpeg,jpeg_start_compress)<br></div><div>-@@ -55,7 +53,7 @@ AC_PATH_PROG(GDKPIXBUF_CONFIG,gdk-pixbuf<br></div><div>+@@ -35,6 +33,12 @@ if test "$IMLIB2_CONFIG"x != "x"; then<br></div><div>+ CFLAGS="$CFLAGS $IMLIB2_CFLAGS"<br></div><div>+ ;;<br></div><div>+ esac<br></div><div>++ else<br></div><div>++ if pkg-config imlib2; then<br></div><div>++ IMLIB2_CFLAGS=`pkg-config --cflags imlib2`<br></div><div>++ IMLIB2_LIBS=`pkg-config --libs imlib2`<br></div><div>++ AC_CHECK_HEADER(Imlib2.h,have_imlib2=yes)<br></div><div>++ fi<br></div><div>+ fi <br></div><div>+ <br></div><div>+ AC_SUBST(IMLIB2_CFLAGS)<br></div><div>+@@ -55,7 +59,7 @@ if test "$GDKPIXBUF_CONFIG"x != "x"; then<br></div><div> if test "$GDKPIXBUF_CONFIG"x != "x"; then<br></div><div> GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`<br></div><div> case "$GDKPIXBUF_VERSION" in<br></div><div>@@ -28,7 +44,7 @@<br></div><div> GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`<br></div><div> GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`<br></div><div> CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"<br></div><div>-@@ -93,7 +91,7 @@ AC_CHECK_HEADERS(linux/videodev.h,<br></div><div>+@@ -93,7 +97,7 @@ AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)<br></div><div> [video_v4l=yes],[video_v4l=no])<br></div><div> AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)<br></div></pre></blockquote></div><div><div>Hi,<br></div><div><div><br></div></div><div>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.<br></div><div><div><br></div></div><div>Best regards,<br></div><div>Daniel<br></div></div><div><br></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e4b8179c5fb396c1aacf861e028f162a>