From nobody Thu Jan 18 21:46:56 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TGGYD3c9Sz5753g; Thu, 18 Jan 2024 21:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TGGYD2hJLz4nms; Thu, 18 Jan 2024 21:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705614416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fkp9luK8fTpe65M+MlCu1T+WaUTFwcoE1LX644fDan4=; b=nBK4VaMF066pMRzJ3y2Ig6/P/41UeOo/8YP0AOLg2jT5d1KDC97VFFSpQfFFOkRBhsdcmp 0+22KRoojv9j37jNFqkhRaw/KJjkN3Lv0uEloQA8RifTrZnKo66pyevj879qvM5AUXQLuk q9wPdWmXaJkLmPBUDHalytABNWproakOVZXIUUIiR9Ou64NKd80Tud8oOkCiQFh0JEQwSV BPFiYRQqxOQSuNkXkO9oLzQltdV4SHbFthi1wqE4y4GD9cvGYnqzNz7encb/U22pU46adD c9RoUt2T9C1LWxIarf8yqb+j6P1KZAXnLRhA2XPrsKUHMzVCg/4+8T0WYDeeBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705614416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fkp9luK8fTpe65M+MlCu1T+WaUTFwcoE1LX644fDan4=; b=kTPG5smI0Tbylxl01prasBKks+qVJ/AOa6SSxCQ1YLbN18Gsju9900NTXkd9SJHuYYbzbz M8msCCuPVly4ICrPvksXc3A4XaCBD1q5gvwucp6SxYqzHmFRLqSkIf13b1AWzkm3NzQ7nr lx+Dh9YoCVfaS4ynTTVHKdm5/qxTGDpl5IhQsJ/vZwcMo4t13d2Levdq8Bh3qiBgTtQs6g X+FZzkDPdFXqWGgyNlAr9iLRGX6FCCLYESmpyO12OSTE5jKBFXYXX+dVYf7xSZcx20nEME FPERXghMw58kIUd79RWUbfVMJrArNjeskO2o2OkYSLVMskQEbhddXmbPmFbfjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705614416; a=rsa-sha256; cv=none; b=K1/fHKzHlUUgjcvT2VUzzEqCpcR/ISceroa0jILuPyi/gqlFDeLxEGnc7dY6COfbjyNco0 KV5h5QxNaKoLPQrspAmU+Qk6AV5cKLUFE6pvZJLPBaNpdRfwNlwuuY1/ZeJNUfUEAcd3im bvMbf45ywiHl43pPQDt1UTLuc3mxhIHUlfJy+kBmaSQUMfDe1ecbQzB120Q3bqAe8Rr4qu xX8t5GbZEZ45kczsSPREZdug5SYFcANLb5R6ijuOtI14q5q+ztMm+lBuO9C3yy+Tu8ikFX MKof6TpEFXXgSLiEwcl1DiJoKmCUNuHZsWoLzj3L+0eC0sHTGjgL7avYWWhLyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TGGYD1RnLzPCs; Thu, 18 Jan 2024 21:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40ILkuVA020639; Thu, 18 Jan 2024 21:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ILkutd020636; Thu, 18 Jan 2024 21:46:56 GMT (envelope-from git) Date: Thu, 18 Jan 2024 21:46:56 GMT Message-Id: <202401182146.40ILkutd020636@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 77eed516e47e - main - multimedia/camserv: Fix build with graphics/imlib2 1.12.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77eed516e47e6217ebc7419bcc1b9f136e512f6a Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=77eed516e47e6217ebc7419bcc1b9f136e512f6a commit 77eed516e47e6217ebc7419bcc1b9f136e512f6a Author: Nuno Teixeira AuthorDate: 2024-01-18 21:45:20 +0000 Commit: Nuno Teixeira 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 | 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 -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 b/multimedia/camserv/files/patch-configure.in index 476c7b0583ee..ab3c1282ee48 100644 --- a/multimedia/camserv/files/patch-configure.in +++ b/multimedia/camserv/files/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 2002-05-12 18:06:12 UTC +++ 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) 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)