From nobody Sat Mar 18 14:56:42 2023 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 4Pf3x71244z3yg42; Sat, 18 Mar 2023 14:56:43 +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 4Pf3x66hWnz4MYl; Sat, 18 Mar 2023 14:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679151402; 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=Q8yYu6kh6HuGUXjMBX+nDWhtYrg0BOTFhBF77Hx+y0c=; b=w6QoX7fUAkS1zCrwmAdTeZZPFAvUePM8/RGDGCwXFrMKr8eYc7Dk9h3uAwsKnmMixh5j+r GbIUvwnSM6hvWXgxrUVEdXJN/RVM6eBHt1WDWsCFxXdzjQjNdDDA/D/wfAIyRevpQqsXDG x+tPVsC+CLa3ua8viaZ226gqG5pUm+PZhBo+5YOyt7xbd9h3pHjTXzGNCSBVVIiCTT3g2b XEfzQsWgZ13eZVOwM6e3UmgmtUR/tPTekV66KYZjD3CUMrXTSkBdbYsUBy+kLudeEgcG22 AG31Btl1tOoGfIa7qIkD40MM/udRhcecPa4/+twlIN8FCgjaW1Fv82vqUGtrqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679151402; 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=Q8yYu6kh6HuGUXjMBX+nDWhtYrg0BOTFhBF77Hx+y0c=; b=lA+0rUxkntQo1AEJtMxqu2Xces1wbp7ACBJXoO5PLA5JHigbrVTaxAbE5C+FqLNyBzjuYW NOtusC61nqjqGxPWLtSvGOvY6l/Egti4UAYxJvdcizMpSyruopaGcnZ6W3IvySriAAoV/P HPIvjgnh8YMREfS4bB3jLZRxhkvRyHWlwwqm0mBdgZQ5lke9h12NQrnfIm8oXAx8N/J1F2 +uxl+7OZ/OfOfwMm3z6iFDdH+z0RlC4px8nsF07ktPA1K2udauqTpXOEWpukuE1bbHconB PWGV+XMyB9mby+4qf/cbzS4XvoXgYSI5ukjjGPVB6SzGHcdmRiIrD5QzNC93bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679151402; a=rsa-sha256; cv=none; b=O+KhtfYWHXdC2T8Iu4yLWZf3h1MgVUlfYdnNdMYV8xgWv+tXYFRX6yL7k94VjJWYFeuLXB 06ZTSJhz5aO4/P2mq0BvQspHOAVPxo97Ct3EYEg3Lzq1MdqH8gVFdyKzRKWp1CngQPILLc 1HrDBuuczsXbfsZm43zsYABDba7yIISuYWkj9woRokcelml/2PK5ni9oMdCvhI8DJZ6e5x Fm2nHAfBg3fFcryzSl0bs9fAYtdD/FYSoOb23l3sPGTtday3d3qqlom73900WTnj2/gcMO 4MkeHtoTTZpqRGuAvADv8qMulbkxgOK7bA3v9Nbel1nZgk55i+4uSVXCh8dcSg== 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 4Pf3x65pfxz19nZ; Sat, 18 Mar 2023 14:56:42 +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 32IEug2a077040; Sat, 18 Mar 2023 14:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32IEugi4077039; Sat, 18 Mar 2023 14:56:42 GMT (envelope-from git) Date: Sat, 18 Mar 2023 14:56:42 GMT Message-Id: <202303181456.32IEugi4077039@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: 1db489e2c896 - main - multimedia/xawtv: Remove (lib)QuickTime support and disable optional libraries 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: 1db489e2c8962687dffececed57f374e3cf9afa8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1db489e2c8962687dffececed57f374e3cf9afa8 commit 1db489e2c8962687dffececed57f374e3cf9afa8 Author: Daniel Engberg AuthorDate: 2023-03-18 14:37:01 +0000 Commit: Daniel Engberg CommitDate: 2023-03-18 14:56:02 +0000 multimedia/xawtv: Remove (lib)QuickTime support and disable optional libraries libquicktime is abandoned by upstream with last release over a decade ago and doesn't compile with newer versions of FFmpeg While at it disable autodetection of alsa and OpenGL support PR: 261302 Approved by: portmgr (blanket, build fix) --- multimedia/xawtv/Makefile | 12 +++--------- multimedia/xawtv/pkg-plist | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index facd1ceab728..4cffc119450f 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -20,7 +20,7 @@ USES= cpe gmake iconv jpeg motif ncurses perl5 tar:bzip2 pkgconfig xorg CPE_VENDOR= linuxtv -OPTIONS_DEFINE= AALIB BKTR DV QUICKTIME ZVBI +OPTIONS_DEFINE= AALIB BKTR DV ZVBI OPTIONS_DEFINE_i386= MMX OPTIONS_DEFAULT= AALIB BKTR .if !exists(/usr/include/dev/bktr/ioctl_bt848.h) @@ -42,6 +42,8 @@ USE_LDCONFIG= yes FILES_LIBJPEG= console/Subdir.mk x11/Subdir.mk libng/plugins/Subdir.mk +CONFIGURE_ARGS= --enable-alsa=no --enable-quicktime=no --enable-gl=no + .include .if ${PORT_OPTIONS:MAALIB} @@ -70,19 +72,11 @@ CONFIGURE_ARGS+=--enable-mmx CFLAGS+= -DMMX=1 .endif -.if ${PORT_OPTIONS:MQUICKTIME} -CONFIGURE_ARGS+=--enable-quicktime -LIB_DEPENDS+= libquicktime.so:multimedia/libquicktime -.else -CONFIGURE_ARGS+=--enable-quicktime=no -.endif - PLIST_SUB+= X11PREFIX=${LOCALBASE} post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/usr/local|${LOCALBASE}|g; \ - s|-lquicktime|-L${LOCALBASE}/lib &|g; \ s|LIBV4L="yes"|LIBV4L="no"|g; \ s|-lunicode|-liconv &|g' \ ${WRKSRC}/configure diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index f658f601a0be..947c45c4f52b 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -29,11 +29,9 @@ lib/xawtv/linear-blend.so lib/xawtv/linedoubler.so lib/xawtv/read-avi.so %%DV%%lib/xawtv/read-dv.so -%%QUICKTIME%%lib/xawtv/read-qt.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so %%DV%%lib/xawtv/write-dv.so -%%QUICKTIME%%lib/xawtv/write-qt.so man/man1/alevtd.1.gz man/man1/dump-mixers.1.gz man/man1/fbtv.1.gz