From nobody Sat Feb 11 06:40:36 2023 X-Original-To: dev-commits-ports-main@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 4PDLZr4PzWz3q5sw; Sat, 11 Feb 2023 06:40:36 +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 4PDLZr3z0Yz3sWN; Sat, 11 Feb 2023 06:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676097636; 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=/87E47vXAlE+JWzrjJBQLseBI/SPkyqVwifRa/Rt4cA=; b=QXGWLMBgmGMjnojsxDbDoNwmH4Tph3Pqt/AW8W38pTeu4xOp2Z9aasN5xcCrZghKNtJ4rc wpFVpmPxwAWzHlEOh3Oc+2od5Ulj5vX95WUF5ZO8ULSMgZyKdxI2ATYjA36Q35aoUeAuTa uDMtFpXSO0XB02m4Nt5+2BBT21+5uG8WFZD8LMUlP9O4OJf/eqFZ8NW9O3Ky9RPA6f2i9n /lKtdIp7Uoy4wHPIG+geMHIWQ/MYNCX1eY3LYmNkVG0SjfNDDndSRDC+TLWxyFF+UX2ftL inJvU8m6mGGaKrp3cRm+OkoMMSSAAmBILyBRXqFyaFM2kN8VB+e2KPe8V+vrkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676097636; 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=/87E47vXAlE+JWzrjJBQLseBI/SPkyqVwifRa/Rt4cA=; b=BK2sQeTu4sJ7KasypI0tGmrhlvDw2UWqHyFVeplcb5L0WLxfxVppvqdRoeofn+OsB3B+uP o7fiNJEIRoqnyXQI9NqGz6dben/9XbYGHhBe+kkAgrpIOiS4Kz0kzkoKHGYbP4WM7Tywbv J2kT0gZvARa70ktt55eXu4uDWDqaMTsQGO0dP0MQWwjku0ueOWEW4DYjjVWix0yQ08szmY JA0inIFlrE7heJpnsoQQh5a4Ps+orb7wZROM1drf/s0wJXV+VEU6TB+2vdMxcPl/Z3AGZI YY6rUKSKCRVqsVeTps+0WhGq9cg75Wx6sTwGko2+yJIm8s71qO0rZDC40dM3Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676097636; a=rsa-sha256; cv=none; b=sDD8rnmrebj0FVuQfEwTxjCJyHDCPhU6aGQ5BrMC/UHS4A3+nalEA2pZI6wwqWWpOLz8Y1 NJxzZN1ZvlPllPmgwomdBfAk8++n5zV1oWeF08+6NGCRvhDynatXPCkhA4LjBxKGmduoRo AAlIAXfpBEXfc6OoLcY+Ub/iNdZqa+ms9Q8f1SU+CwM9jFwJxr6eDyH+L7qVI8+vR/+JzN yU4j0W8WuN3IQ7qo6E1dfKO5WED3T0c5hgLQ1tje16cjy5nA96fcHcxAbs0gArsqhWI1cJ srXbuWOV+ZsPS6IJZNRgMoLIfEK8lhvl4HoNdl26n7E9/Oh2S/g46LzjWQd80Q== 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 4PDLZr2xvKzpbk; Sat, 11 Feb 2023 06:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31B6ea3g012994; Sat, 11 Feb 2023 06:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31B6eaw5012992; Sat, 11 Feb 2023 06:40:36 GMT (envelope-from git) Date: Sat, 11 Feb 2023 06:40:36 GMT Message-Id: <202302110640.31B6eaw5012992@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: cf16b1c90633 - main - devel/libspice-server: Remove "openssl" in spice-server.pc List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf16b1c9063351325f04a31dc5cd6e8cfe5cdd42 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf16b1c9063351325f04a31dc5cd6e8cfe5cdd42 commit cf16b1c9063351325f04a31dc5cd6e8cfe5cdd42 Author: Hiroki Sato AuthorDate: 2023-02-11 03:46:24 +0000 Commit: Hiroki Sato CommitDate: 2023-02-11 03:46:24 +0000 devel/libspice-server: Remove "openssl" in spice-server.pc - The "openssl" package listed in spice-server.pc prevented the library checking in the downstream software from working because OpenSSL in the base system does not use pkgconfig. - Eliminate dependency on the old autoconf-archive. Approved by: maintainer timeout (1 month) PR: 268819 --- devel/libspice-server/Makefile | 6 ++-- devel/libspice-server/files/patch-configure.ac | 43 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/devel/libspice-server/Makefile b/devel/libspice-server/Makefile index 667f4e4bccfb..4a00d0742467 100644 --- a/devel/libspice-server/Makefile +++ b/devel/libspice-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= libspice-server DISTVERSION= 0.15.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.spice-space.org/download/releases/spice-server/ DISTNAME= spice-${PORTVERSION} @@ -11,8 +12,7 @@ WWW= https://spice-space.org/ LICENSE= GPLv2 LIB_DEPENDS= libopus.so:audio/opus -BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive \ - spice-protocol>=0.12.10:devel/spice-protocol +BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol OPTIONS_DEFINE= GSTREAMER LZ4 SASL STATISTICS OPTIONS_DEFAULT= GSTREAMER LZ4 SASL @@ -31,7 +31,7 @@ SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 STATISTICS_CONFIGURE_ENABLE= statistics -USES= autoreconf:2.69 compiler:c++11-lang cpe gmake gnome jpeg \ +USES= autoreconf compiler:c++11-lang cpe gmake gnome jpeg \ libtool localbase:ldflag pkgconfig python ssl tar:bzip2 xorg USE_GNOME= glib20 diff --git a/devel/libspice-server/files/patch-configure.ac b/devel/libspice-server/files/patch-configure.ac new file mode 100644 index 000000000000..4d1a2e049a7d --- /dev/null +++ b/devel/libspice-server/files/patch-configure.ac @@ -0,0 +1,43 @@ +--- configure.ac.orig 2021-04-17 06:49:29 UTC ++++ configure.ac +@@ -41,6 +41,7 @@ AC_PROG_CC_C99 + if test x"$ac_cv_prog_cc_c99" = xno; then + AC_MSG_ERROR([C99 compiler is required.]) + fi ++AC_PROG_CPP + AC_PROG_INSTALL + AC_CANONICAL_HOST + LT_INIT([disable-static]) +@@ -204,7 +205,8 @@ AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN + PKG_CHECK_MODULES(SSL, openssl >= 1.0.0) + AC_SUBST(SSL_CFLAGS) + AC_SUBST(SSL_LIBS) +-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) ++dnl OpenSSL in the base system is not managed by pkgconfig ++dnl AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) + + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $SSL_CFLAGS" +@@ -217,15 +219,16 @@ CFLAGS="$save_CFLAGS" + + AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + AC_MSG_CHECKING([for jpeglib.h]) +- AC_TRY_CPP( +-[#include ++ AC_PREPROC_IFELSE( ++[AC_LANG_SOURCE([[ ++#include + #undef PACKAGE + #undef VERSION + #undef HAVE_STDLIB_H +-#include ], +- JPEG_LIBS='-ljpeg' +- AC_MSG_RESULT($jpeg_ok), +- AC_MSG_ERROR([jpeglib.h not found])), ++#include ]])], ++ [JPEG_LIBS='-ljpeg' ++ AC_MSG_RESULT($jpeg_ok)], ++ [AC_MSG_ERROR([jpeglib.h not found])]), + AC_MSG_ERROR([libjpeg not found])) + AC_SUBST(JPEG_LIBS) +