From nobody Sat May 7 21:05:22 2022 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 BC4441ABA31E; Sat, 7 May 2022 21:05:22 +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 4Kwg1t4wJmz3Qvn; Sat, 7 May 2022 21:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651957522; 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=W1d+tU3f0gGJVRl8Wwt46yyj78RJUbUV6sSEVzJhtj0=; b=Ve/WPj+TfZ1I/1KW5tE9BwNbrTGNt+fb4WJW11VdqpLEs0aMHpcfneB6DtCPstp4JsfbTt yZ4r4+bBazKpVrGbyN9Y8OvNMQAVUUyMYGabR6f+PyIh5GM4LbPCAMr196XWT48hp3UlpL GQTJ1YqOO5BwZr5Im4HGbSmzyS7jORIWanWAmH8e7QtwpXEHxb7ULPvgW1TC2vR48FMnU6 kohJ+KI5yJb6rxISeIrOFS1uaHG4uFOesO40g7cEtR/VUkuzw3S4Y88YMLLaoYN42FI1wq MiThxb6zJEaHLhPprIv0WlxuaN8YoWtOlMNzCAzGjrt05YyF37fWUDa7Hf+Wiw== 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 881B817EA2; Sat, 7 May 2022 21:05:22 +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 247L5Mf3036226; Sat, 7 May 2022 21:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 247L5Ma2036225; Sat, 7 May 2022 21:05:22 GMT (envelope-from git) Date: Sat, 7 May 2022 21:05:22 GMT Message-Id: <202205072105.247L5Ma2036225@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: ba0f767392d9 - main - multimedia/libxine: Fix build with libmad 0.16 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba0f767392d911d9cff7a47704fce9a2c355d671 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651957522; 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=W1d+tU3f0gGJVRl8Wwt46yyj78RJUbUV6sSEVzJhtj0=; b=km3sYh5JQoAhDXI6536a041yxpKJlztazy9K6OY44cOpjDqUnY1Tmszr192FidXjonYAG6 vmKMoszZpMf6ou0K7aJPY3vICyYyO0U/IVs0hs6rJTuSXykMFSi4Mg4v4278GtPR8hpip/ eyDY79aGWtoSLP8cf+WaPH+Xdx7W34+tmm5I5qLGRe0tMKCmLcTUHxvNJe++/neQuOHfUp d0CXh5X59dN98+YDLhKlUR/Y3gJtI0U8WujgRDyHIWIiPl4oUs6rfMs52W0ohKHq2R0kBZ 9C7UhWyKrwh+nllKGBMta4mZfYAOPONagbLeH+mTzaHN29XEQRJAJ4GHzz4NYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651957522; a=rsa-sha256; cv=none; b=Q/5HTODAP8r2ZRjvfoOJTygOMSBTjk8MlyLyp411Kt6sIe3cgFb0LT2BovaNWHGa9l/dyX NMG+t4ZzUytb8PSIf6BBGAm57z2ZC5TiECRd/jIAUZS27D2EzsSjgc6BoqCH2pmoRx3R2O CWqER2WFjRIV0HhJ1kH2Q/mP889+5rhikrZFJ4C5uCO6m1fs7ReHmbFKifcVM+StjlFL66 KT7D+7ssf2LgAx+gNJ7n0dDZNe8UJdHfnTobcTiUAglutN8YL16FqjQq3VkYjBlZoGalx/ wV9pFycOuvNafNWm9Fs72nF/LJ9+MbEUcpNSi/xZbtEi5OhEAnvtVnDQbEjhng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba0f767392d911d9cff7a47704fce9a2c355d671 commit ba0f767392d911d9cff7a47704fce9a2c355d671 Author: Daniel Engberg AuthorDate: 2022-05-07 20:58:48 +0000 Commit: Daniel Engberg CommitDate: 2022-05-07 21:04:11 +0000 multimedia/libxine: Fix build with libmad 0.16 Filename for libmad's pc file is now libmad.pc Approved by: portmgr (blanket) --- multimedia/libxine/files/patch-configure | 52 +++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure index 2bec61c76694..5ef94ba0253e 100644 --- a/multimedia/libxine/files/patch-configure +++ b/multimedia/libxine/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2018-01-11 12:51:16 UTC +--- configure.orig 2022-03-09 13:16:43 UTC +++ configure -@@ -21288,7 +21288,7 @@ $as_echo "#define ARCH_X86_X32 /**/" >>confdefs.h +@@ -21806,7 +21806,7 @@ $as_echo "#define ARCH_X86_X32 /**/" >>confdefs.h ;; @@ -9,7 +9,7 @@ arch_x86=64 -@@ -21752,7 +21752,7 @@ fi +@@ -22270,7 +22270,7 @@ fi if test "$sarchopt" != "no"; then case "$host_or_hostalias" in @@ -18,7 +18,7 @@ i486-*) archopt_val="i486" ;; i586-*) archopt_val="pentium" ;; pentium-mmx-*) archopt_val="pentium-mmx" ;; -@@ -28089,7 +28089,7 @@ fi +@@ -29561,7 +29561,7 @@ fi if test x"$enable_dvb" != x"no"; then case "$host_os" in @@ -27,3 +27,47 @@ *) have_dvb=no ;; esac if test x"$hard_enable_dvb" = x"yes" && test x"$have_dvb" != x"yes"; then +@@ -32826,12 +32826,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LIBMAD_CFLAGS="$LIBMAD_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "mad" 2>/dev/null` ++ pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "libmad" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -32844,12 +32844,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LIBMAD_LIBS="$LIBMAD_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "mad" 2>/dev/null` ++ pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "libmad" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -32868,9 +32868,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBMAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mad"` ++ LIBMAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmad"` + else +- LIBMAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mad"` ++ LIBMAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmad"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBMAD_PKG_ERRORS" >&5