From nobody Mon May 01 11:09:44 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 4Q90px1LWSz48P47; Mon, 1 May 2023 11:09:45 +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 4Q90px0vHwz4JNL; Mon, 1 May 2023 11:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682939385; 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=pvcFdWNShiAKlC7Y0e2azmJAxEsDQ28t7u973+GKlyI=; b=yXcSadKRPyEgAMv7vdFKnwqw6M+nblynb4JN2np6Fnjgw/yKwqwPQ/kyjjzEUSxMs5mniL tHODr2B08C6AfIQJtN5yaNAbnJCkMrfJAV5BB3isllIy2AHXdlZyd82mxv97pdliDFO4je UpCKCE3wnbjDUmuKm+D3+aqaWVba/TuxgFCmFFeD6dn663MalTiMonKziHsOwdmsBrveWk 4zGVRR9+BdQhaAAp7VO6FrWZjLEfKKBrUgaB9BzT3TaVtflU1ryh9eYHWg9Byc7qI5M03o WMDfIEDBCrlW3ZSPrGrLBtW2aIDIg1BryMlSylP6bx08WmG6Iz/ZBY//gXLwBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682939385; 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=pvcFdWNShiAKlC7Y0e2azmJAxEsDQ28t7u973+GKlyI=; b=tqx+BqAhtSR0JWNtKaMjeYSkWayJxOESNph5p5nQcgFhqjcQEwLXI0aOKj2aBfmZ2Epo55 d/V4B14nFdBZiNg7oh+WLGO43CT9F6x1U35uhDV1ZGAuUEssOaRpf6c+oY1mVqUTduzuv5 Q17+UI8l8kaVn5Zv273sqow0ucGieRYnosfWUrSj+fowoj9j4YFUm2u4PQdUkeH9IjVuD1 SXYZGcDYyKbIa3dgh20BGQ8FhJLd2bg+T6zY9o4aNFytooIneaJ7BmLBfit5nPzcTbgUzx uO1iyZGjx9ANIUjDXMQA74KwYA/saw/Go3G1BuyYdMB0aA4J4Fozwv3fI0MvkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682939385; a=rsa-sha256; cv=none; b=k+/S9LURRHsmfW0I1av8StKHAb0vOOIeS4qj2rKtoWCzgLddTmbYDGioB9NaChytmvM/zB kYQXES9jUQVxmX44WQ3WJUbo1EYm7g5pKJxOpKFxWmMTHzYFIXkub8M5K2IXgh+IMraa5M U9+z7cA3vSumuYC0QOl/nW42a5vKc8+aQ4IsvHJsmW4aT5ZBVyPc+ampF4u6qMMHwVLs+D yI2V/MUZHrpbASFTyjpQZyk5xja3EIyOnKbjVHW4IHW1Fndzg8jR3g4O9rDgZNZFtosaLS dMIq66o4HcV2dBl4tQVAqZnukNdpaYNqQdrXMKnx28NpVTxhZV9jDLM2jU6PMQ== 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 4Q90px01TFz12xF; Mon, 1 May 2023 11:09:45 +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 341B9i5q060000; Mon, 1 May 2023 11:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341B9iJL059999; Mon, 1 May 2023 11:09:44 GMT (envelope-from git) Date: Mon, 1 May 2023 11:09:44 GMT Message-Id: <202305011109.341B9iJL059999@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: cb1700979999 - main - audio/liba52: Switch to fork and update to 0.8.0 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: cb17009799995528557cded011e2e40b7e3be538 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb17009799995528557cded011e2e40b7e3be538 commit cb17009799995528557cded011e2e40b7e3be538 Author: Daniel Engberg AuthorDate: 2023-05-01 10:58:37 +0000 Commit: Daniel Engberg CommitDate: 2023-05-01 11:08:32 +0000 audio/liba52: Switch to fork and update to 0.8.0 * Switch to Adélie Linux's fork * Drop support for unmaintained djbfft library * Use stock framework optimization Changelog: https://git.adelielinux.org/community/a52dec/-/blob/c388f3b6d911c246e0b2a7b2c436c3de2e79c74d/ChangeLog --- audio/liba52/Makefile | 36 ++++++---------------- audio/liba52/distinfo | 5 +-- audio/liba52/files/patch-configure.ac | 58 +++++++++++++++++++++++++++++++++++ audio/liba52/pkg-plist | 1 + 4 files changed, 72 insertions(+), 28 deletions(-) diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index cbba52b735d3..915f01f8fce0 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -1,46 +1,30 @@ PORTNAME= liba52 -PORTVERSION= 0.7.4 -PORTREVISION= 3 +DISTVERSION= 0.8.0 CATEGORIES= audio -MASTER_SITES= http://liba52.sourceforge.net/files/ -DISTNAME= a52dec-${PORTVERSION:S/.b/b/} +MASTER_SITES= https://distfiles.adelielinux.org/source/a52dec/ +DISTNAME= a52dec-${DISTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= Free library for decoding ATSC A/52 streams, aka AC-3 -WWW= http://liba52.sourceforge.net/ +WWW= https://git.adelielinux.org/community/a52dec/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-oss --enable-shared +USES= autoreconf libtool pathfix USE_LDCONFIG= yes -OPTIONS_DEFINE= DJBFFT OPTIMIZED_CFLAGS DOCS -DJBFFT_DESC= djb fft support - -DJBFFT_BUILD_DEPENDS= ${LOCALBASE}/lib/libdjbfft.a:math/djbfft -DJBFFT_RUN_DEPENDS= ${LOCALBASE}/lib/libdjbfft.a:math/djbfft -DJBFFT_CFLAGS= -I${LOCALBASE}/include -DJBFFT_LDFLAGS= -L${LOCALBASE}/lib -DJBFFT_CONFIGURE_ON= --enable-djbfft - -HEADER_FILES= liba52/a52_internal.h +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +TEST_TARGET= check -post-patch: - @${REINPLACE_CMD} '/-prefer-non-pic/d' ${WRKSRC}/configure +CONFIGURE_ARGS= --disable-oss --enable-shared -post-patch-OPTIMIZED_CFLAGS-off: - @${REINPLACE_CMD} -E -e 's!-O3!${CFLAGS}!' -e 's!-mcpu=[^"]+"!"!' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -post-patch-DJBFFT-on: - @${REINPLACE_CMD} -E -e 's|(fftc4.h)|djbfft/\1|' ${WRKSRC}/liba52/imdct.c +OPTIONS_DEFINE= DOCS post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/liba52.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/liba52/a52_internal.h ${STAGEDIR}${PREFIX}/include/a52dec - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liba52.so.0.* .include diff --git a/audio/liba52/distinfo b/audio/liba52/distinfo index 289e354f1445..f8f514125447 100644 --- a/audio/liba52/distinfo +++ b/audio/liba52/distinfo @@ -1,2 +1,3 @@ -SHA256 (a52dec-0.7.4.tar.gz) = a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 -SIZE (a52dec-0.7.4.tar.gz) = 241507 +TIMESTAMP = 1682932929 +SHA256 (a52dec-0.8.0.tar.gz) = 03c181ce9c3fe0d2f5130de18dab9bd8bc63c354071515aa56983c74a9cffcc9 +SIZE (a52dec-0.8.0.tar.gz) = 456192 diff --git a/audio/liba52/files/patch-configure.ac b/audio/liba52/files/patch-configure.ac new file mode 100644 index 000000000000..245630ecf5ec --- /dev/null +++ b/audio/liba52/files/patch-configure.ac @@ -0,0 +1,58 @@ +--- configure.ac.orig 2022-11-05 09:23:41 UTC ++++ configure.ac +@@ -29,12 +29,12 @@ if test x"$GCC" = x"yes"; then + TRY_CFLAGS="$OPT_CFLAGS -Wall" + AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]) + +- dnl -O3 +- changequote(<<,>>) +- TRY_CFLAGS=`echo "$OPT_CFLAGS $CFLAGS"|sed "s/-O[0-9]*//g"` +- changequote([,]) +- TRY_CFLAGS="$TRY_CFLAGS -O3" +- AC_TRY_CFLAGS([$TRY_CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"; CFLAGS=""]) ++# dnl -O3 ++# changequote(<<,>>) ++# TRY_CFLAGS=`echo "$OPT_CFLAGS $CFLAGS"|sed "s/-O[0-9]*//g"` ++# changequote([,]) ++# TRY_CFLAGS="$TRY_CFLAGS -O3" ++# AC_TRY_CFLAGS([$TRY_CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"; CFLAGS=""]) + + AC_ARG_ENABLE([debug], + [ --enable-debug debug mode configuration]) +@@ -50,21 +50,21 @@ if test x"$GCC" = x"yes"; then + TRY_CFLAGS="$OPT_CFLAGS -fno-common" + AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]) + +- dnl arch-specific flags +- case "$host" in +- i?86-* | k?-*) +- case "$host" in +- i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";; +- i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";; +- i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";; +- i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";; +- k6-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";; +- esac +- AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]);; +- sparc-* | sparc64-*) +- TRY_CFLAGS="$OPT_CFLAGS -mtune=ultrasparc" +- AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]);; +- esac ++# dnl arch-specific flags ++# case "$host" in ++# i?86-* | k?-*) ++# case "$host" in ++# i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";; ++# i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";; ++# i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";; ++# i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";; ++# k6-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";; ++# esac ++# AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]);; ++# sparc-* | sparc64-*) ++# TRY_CFLAGS="$OPT_CFLAGS -mtune=ultrasparc" ++# AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]);; ++# esac + elif test x"$CC" = x"tendracc"; then + dnl TenDRA portability checking compiler + TENDRA=yes diff --git a/audio/liba52/pkg-plist b/audio/liba52/pkg-plist index 77ebd8fb252c..5f5bfa178d58 100644 --- a/audio/liba52/pkg-plist +++ b/audio/liba52/pkg-plist @@ -9,6 +9,7 @@ lib/liba52.so.0.0.0 lib/liba52.so.0 lib/liba52.so lib/liba52.a +libdata/pkgconfig/liba52.pc man/man1/a52dec.1.gz man/man1/extract_a52.1.gz %%PORTDOCS%%%%DOCSDIR%%/liba52.txt