From nobody Sat Mar 18 12:54:39 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 4Pf1DH5P4hz3yXtH; Sat, 18 Mar 2023 12:54:39 +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 4Pf1DH4p1Bz46mG; Sat, 18 Mar 2023 12:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679144079; 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=OZuGQOKY1acl9FNS8e1ZB0Oy/IfUwNX6uz4memSeCL4=; b=mhs7KHTHTt2wUW7ocQY0vQVTR70GF21WMQqXbd7hSSq2AC/oFZVhnv3q09VjU31rg4LJUZ 8xFEPLu66xj+rBbYGwPyZ1a9mlyx94hL4Mc5+mNIRZuMCR+URJIkbTnFKVXUQr2XbVN+KL 2LRjF1sZjLoxsBJXZseKXddU0LgpPl0q/50pQ4m0TlPEkS67pHYa3MZmmvYmpD1r7xn3AU YnSklqZ+PaF8VnrrYfTpYjwCphFjVyd1ZJuLGDI0GE66Np6IKKTA7ZbuupbaR7kwxwHPxc 75m9VZzHehLZGOZYthwwtvXG5l6F3T4XWcCzpkgceACnhx3Xicg80vXFexJOoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679144079; 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=OZuGQOKY1acl9FNS8e1ZB0Oy/IfUwNX6uz4memSeCL4=; b=NVQ69qbcOeMKgJo95sbHAmn3xEmKMwcf8AfFQq6K9aywZ80A8BJgrwOspMg7od//sGSVng 1ojh89e6/Z3i5m/y1Cqx6HUV6H1XVJtcIxvPdR36PoWAD+Arba2EV3Avix1lV//+SNZju/ Z4D7sGP+NoRwFybmd7MuhR+beO7wejKebddKHBz7r9dzzcTp0aEY2GYaDmQRRNc2tI/pPn Yi7thMWf1QSde092hWHcW1S2nSq8g2/7pjuqHVIqGGEFdlzo+Qa30xwatzP0nOjpndU7+w OUU+panVx3YTdimeiGeULGqubINjVP/PfK631HfbTAp9Ff4Qx+q5sGBOb4VR8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679144079; a=rsa-sha256; cv=none; b=pqa1gT27Yb5tFIqbve4xXINrNOFRpcYbtKSb2fxTanwMQaM7r+uXqtFVDmqQ4SzXnnCdOb TpW2LEJX9RqigXQdaP6Tk9SqHlPFlRayQsdLy8i1AcDH0lCflzKrcTSv1F0MPLphfVea+B Ut0kHqyjJqUNhcHsSCIm/Ck3OwbMs8oYJhPGFt9NE85JBEgLww+K8Nwg86U+uZTC9EI4+q dT/zZre4YmsJ9W+73YEDjXHJb45LXrjtQxhcO51tn8emjUCjHMPV7NjJSkrGOYf2UQnB1w xOFAOJfM9IYYojhN45caWDrnBTrFg2PQxmv7CbgxDRmCwNsUXpbtPa2+B4W35A== 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 4Pf1DH3rBYz17Rw; Sat, 18 Mar 2023 12:54:39 +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 32ICsda2077765; Sat, 18 Mar 2023 12:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ICsdI4077764; Sat, 18 Mar 2023 12:54:39 GMT (envelope-from git) Date: Sat, 18 Mar 2023 12:54:39 GMT Message-Id: <202303181254.32ICsdI4077764@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: 91a3c4def796 - main - textproc/libextractor: Remove FFmpeg support 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91a3c4def796cf45e6c2c404a2f8808e14ae7355 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=91a3c4def796cf45e6c2c404a2f8808e14ae7355 commit 91a3c4def796cf45e6c2c404a2f8808e14ae7355 Author: Daniel Engberg AuthorDate: 2023-03-18 12:51:27 +0000 Commit: Daniel Engberg CommitDate: 2023-03-18 12:51:30 +0000 textproc/libextractor: Remove FFmpeg support Breaks build with FFmpeg 6.0 and support is removed upstream Reference: https://git.gnunet.org/libextractor.git/commit/?id=2332716ae48d6b899e4d2bb07f468e8c076d2608 PR: 261302 --- textproc/libextractor/Makefile | 11 +++++------ textproc/libextractor/pkg-plist | 4 ---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index dfe2b173dc9f..abde85e69b0a 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -1,6 +1,6 @@ PORTNAME= libextractor PORTVERSION= 1.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= GNU @@ -25,7 +25,8 @@ USE_LDCONFIG= yes CONFLICTS_INSTALL= csound outguess # bin/extract GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gtk-version=2 \ +CONFIGURE_ARGS= --disable-ffmpeg \ + --with-gtk-version=2 \ --with-ltdl=${LOCALBASE} INSTALL_TARGET= install-strip @@ -35,10 +36,10 @@ LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} INFO= libextractor -OPTIONS_DEFINE= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \ +OPTIONS_DEFINE= EXIV2 FLAC GIF GSF GSTREAMER MPEG2 MP4 \ NLS RPM SMF TIDY VORBIS -OPTIONS_DEFAULT= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \ +OPTIONS_DEFAULT= EXIV2 FLAC GIF GSF GSTREAMER MPEG2 MP4 \ RPM SMF TIDY VORBIS OPTIONS_SUB= yes @@ -50,8 +51,6 @@ SMF_DESC= Standard MIDI file support via LibSMF EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_CONFIGURE_ENV= EXIV2_H="" EXIV2_CONFIGURE_ENV_OFF= EXIV2_H="" -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -FFMPEG_CONFIGURE_ENABLE= ffmpeg FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_ENV_OFF=ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no GIF_LIB_DEPENDS= libgif.so:graphics/giflib diff --git a/textproc/libextractor/pkg-plist b/textproc/libextractor/pkg-plist index 6a404d29abc4..65a0d10845ab 100644 --- a/textproc/libextractor/pkg-plist +++ b/textproc/libextractor/pkg-plist @@ -46,8 +46,6 @@ lib/libextractor/libextractor_pdf.a lib/libextractor/libextractor_pdf.so lib/libextractor/libextractor_png.a lib/libextractor/libextractor_png.so -%%FFMPEG%%lib/libextractor/libextractor_previewopus.a -%%FFMPEG%%lib/libextractor/libextractor_previewopus.so lib/libextractor/libextractor_ps.a lib/libextractor/libextractor_ps.so lib/libextractor/libextractor_riff.a @@ -58,8 +56,6 @@ lib/libextractor/libextractor_s3m.a lib/libextractor/libextractor_s3m.so lib/libextractor/libextractor_sid.a lib/libextractor/libextractor_sid.so -%%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.a -%%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.so lib/libextractor/libextractor_thumbnailgtk.a lib/libextractor/libextractor_thumbnailgtk.so lib/libextractor/libextractor_tiff.a