From nobody Sat Oct 19 15:40:55 2024 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 4XW5Pz6w7Qz5bD3r; Sat, 19 Oct 2024 15:40:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XW5Pz6NgPz4j3P; Sat, 19 Oct 2024 15:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729352455; 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=3cDcxM6reBkt1tEBJIcRdqOEnD2dR/6Ir4q8HY6waOI=; b=XtNiS+TPTYUrRsu4q9M34vYR5HHn3P21EkeDiO0Rsq2XQKN+3CKgIVm/r05ZzEZXz2UXk/ HBBYEIDMEacCcLnKNlGNgqabZ14OrKGGD7ZuE+0mIgpMgYI779foGLyv3SmA+/4f35yLKc yUAtCRrDC+mcKuhzrM7ON2JooO7gjcoPM8OUjBzklX/sSyU8iYnvVBQnjhENkihkblVsA4 eyhfqU5+vIaUJqhhOqAND94+j+D8bWm7Fix3a/JEl99dLZPUZlB+WWjDctWiJyyo3+TjMt u2f3t9TFiHWFlieThGPZgc90AOOMLd0RHDyFvQY3EdTdu4vI8+Aum93KWFTv1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729352455; 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=3cDcxM6reBkt1tEBJIcRdqOEnD2dR/6Ir4q8HY6waOI=; b=NAbzfNnTW3P4d6SnGZIsR8xFmbDHt4cM03MinMA24oGneEs58HgXcuD2eC68nFebDh1cl2 gViGzYrtzrXw8pKXbhk/vPjvLRBmVzf0tX71v+869WchLaujOxfnOdcA64Nurq7c/vXjGP zJecZEWWEzt89Ps9+mnMoRUMrwsNSuQJbqjNs2o6iy7SyU9Q6ywZHvFYgkdIqh5/un7+Zg NfRBvuMdfoKNs+H5yhq/85Eg1PuMWjTyYAvqFChBbZbCgCno5ehGnL1ym/3VLbN/zGLQgm ODPZ5XRLZagXy9L8RCu6Ox2UALTZsWwA97y6kO6pyqRLiTCzImwPRh26ZtxYug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729352455; a=rsa-sha256; cv=none; b=HAvFMqDvxAkX5O8O2+ZuEOyPEvvm2yaG+aSehIkTui8yxk/e3Kaw7Jnmj//+tykVn/83hv s+p5n2YNLzSo35RyavryemofZFDeCBIJ710IsAacRmRv/1tdU4OiMqiOr2h4QgwCpK+iDo CnJhBX9EQmycX8nwhAZki37Tw1RUD3tq6zwz2EfOhjcNmUnnPGYIvALctxKp3ynyv0DQTY /IuljhInb0wcknrqnxTJuweDIWRiTIk2tFLG4bjkx9bdxNMCY0eTBkJ845wfaPDqE3eW1D TKaU8hja/gB6JEEHhNNiKAz9crjndURTj4jOomDCNcfzMEUx3py1Kkf3lzdq/Q== 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 4XW5Pz5zltzNKp; Sat, 19 Oct 2024 15:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49JFetYI072358; Sat, 19 Oct 2024 15:40:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49JFetb2072355; Sat, 19 Oct 2024 15:40:55 GMT (envelope-from git) Date: Sat, 19 Oct 2024 15:40:55 GMT Message-Id: <202410191540.49JFetb2072355@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: d78f92cabfc6 - main - multimedia/{mplayer|mencoder}: Fix WITH_DEBUG build 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d78f92cabfc61e61fa5f13705134f6b0e0e2f599 Auto-Submitted: auto-generated The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=d78f92cabfc61e61fa5f13705134f6b0e0e2f599 commit d78f92cabfc61e61fa5f13705134f6b0e0e2f599 Author: Thomas Zander AuthorDate: 2024-10-19 15:32:01 +0000 Commit: Thomas Zander CommitDate: 2024-10-19 15:40:53 +0000 multimedia/{mplayer|mencoder}: Fix WITH_DEBUG build Newer clang versions are not happy when passing -mcpu= on i386 and amd64. This fixes the construction of CFLAGS during configure in the WITH_DEBUG case. Also, as it turns out, there was a const ptr issue in libmpcodecs/ad_spdif.c whith also needed to be fixed. PR: 280818 Reported by: cryptogranny@gmail.com --- multimedia/mencoder/Makefile | 1 + multimedia/mplayer/Makefile | 1 + multimedia/mplayer/files/patch-configure | 39 ++++++++++++++-------- .../mplayer/files/patch-libmpcodecs_ad__spdif.c | 11 ++++++ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 181fa7f55f9b..76a31e365c92 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,5 +1,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 737ad94c1077..40a1dc0f450b 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,5 +1,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure index 7dd394ab72c7..a079eeeccd3e 100644 --- a/multimedia/mplayer/files/patch-configure +++ b/multimedia/mplayer/files/patch-configure @@ -89,7 +89,20 @@ if test -z "$_target" ; then cat > $TMPC << EOF -@@ -3104,7 +3073,7 @@ if x86_32 ; then +@@ -2975,7 +2944,11 @@ if test -z "$CFLAGS" || test "$_profile" != "" || test + fi + + if test "$_profile" != "" || test "$_debug" != ""; then +- CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile" ++ if test "$cc_vendor" = "gnu"; then ++ CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile" ++ else ++ CFLAGS="-O2 $_march $_pipe $_debug $_profile" ++ fi + WARNFLAGS="-W -Wall $WARNFLAGS" + _install_strip= + fi +@@ -3104,7 +3077,7 @@ if x86_32 ; then _pref_as_version='2.16.92' echo 'pabsd %xmm0, %xmm1' >> $TMPS fi @@ -98,7 +111,7 @@ if test "$as_verc_fail" != yes ; then echores "ok" -@@ -3264,8 +3233,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_ +@@ -3264,8 +3237,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_ # check if AltiVec is supported by the compiler, and how to enable it echocheck "GCC AltiVec flags" @@ -109,7 +122,7 @@ # check if should be included if $(header_check altivec.h $_altivec_gcc_flags) ; then def_altivec_h='#define HAVE_ALTIVEC_H 1' -@@ -3371,6 +3340,13 @@ if arm ; then +@@ -3371,6 +3344,13 @@ if arm ; then fi echores "$setend" @@ -123,7 +136,7 @@ echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no -@@ -4281,7 +4257,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then +@@ -4281,7 +4261,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -132,7 +145,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -4291,7 +4267,7 @@ if ! hpux ; then +@@ -4291,7 +4271,7 @@ if ! hpux ; then EOF _pthreads=no if ! hpux ; then @@ -141,7 +154,7 @@ # for crosscompilation, we cannot execute the program, be happy if we can link statically cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break done -@@ -4434,7 +4410,7 @@ EOF +@@ -4434,7 +4414,7 @@ EOF } EOF _iconv=no @@ -150,7 +163,7 @@ cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -5848,15 +5824,6 @@ EOF +@@ -5848,15 +5828,6 @@ EOF break fi done @@ -166,7 +179,7 @@ if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes -@@ -6391,7 +6358,7 @@ elif freebsd ; then +@@ -6391,7 +6362,7 @@ elif freebsd ; then elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -175,7 +188,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -6404,7 +6371,7 @@ fi +@@ -6404,7 +6375,7 @@ fi default_cdrom_device="/dev/cdrom" fi @@ -184,7 +197,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6931,7 +6898,7 @@ if test "$_libgsm" = auto ; then +@@ -6931,7 +6902,7 @@ if test "$_libgsm" = auto ; then echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -193,7 +206,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7363,6 +7330,16 @@ if test "$_librtmp" = yes && test "$networking" = yes; +@@ -7363,6 +7334,16 @@ if test "$_librtmp" = yes && test "$networking" = yes; nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -210,7 +223,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7780,7 +7757,7 @@ if test "$_mencoder" = no ; then +@@ -7780,7 +7761,7 @@ if test "$_mencoder" = no ; then echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -219,7 +232,7 @@ fi echores "$_mencoder" -@@ -8384,7 +8361,7 @@ libs_mplayer=$ld_tmp +@@ -8384,7 +8365,7 @@ libs_mplayer=$ld_tmp ############################################################################# diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c b/multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c new file mode 100644 index 000000000000..dbd61b231791 --- /dev/null +++ b/multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c @@ -0,0 +1,11 @@ +--- libmpcodecs/ad_spdif.c.orig 2024-09-21 09:30:04 UTC ++++ libmpcodecs/ad_spdif.c +@@ -54,7 +54,7 @@ static int read_packet(void *p, uint8_t *buf, int buf_ + return 0; + } + +-static int write_packet(void *p, const uint8_t *buf, int buf_size) ++static int write_packet(void *p, uint8_t *buf, int buf_size) + { + int len; + struct spdifContext *ctx = p;