From patchwork Thu Apr 24 02:11:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 41970 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8092B27BC4B; Thu, 24 Apr 2025 03:13:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F45C27BC49 for ; Thu, 24 Apr 2025 03:13:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7m5J-0004Of-MO; Wed, 23 Apr 2025 22:13:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7m5H-0004NW-IL for guix-patches@gnu.org; Wed, 23 Apr 2025 22:13:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7m5G-00046m-Sr for guix-patches@gnu.org; Wed, 23 Apr 2025 22:13:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=kEvqtjwcRatRuw3qoeQX+4IevNUAQpyzHY3pmybEzDc=; b=CL7PBT/hOr4bOWAczzLP9RTvG3tdkHWgLaGqjFww4J2mx3oVQ3O3QY/oMzB8KQ2MiIA6Vu301nofjO5cMDFKcQFrnuQcU4BVGHP0vfad92vPqG6l52fNxdrIEkO9DJ0pMAMMeibsQFMCl4Lk1uEcugZPG6Jh8IFx8sTw5yhR9+SjAwtvO8r55uMryo+uPj+i1tC5kA9+EFv7McuM3Ytk0G6xm1aSoZif3JH5cnZbVCByowxd13kuVYbUql3ZxTgcIuLxehjCQBKf9RSld3dO906/SSCdPauY4D0vVO29AqReJtzbQfHrcM7yFVJPcTWPMsEfLyb3E8hOTQupP0LweA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7m5G-0001jE-8M for guix-patches@gnu.org; Wed, 23 Apr 2025 22:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78024] [PATCH] gnu: liba52: Update to 0.8.0, change source and homepage Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Apr 2025 02:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78024 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78024@debbugs.gnu.org Cc: Andrew Wong X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17454607616604 (code B ref -1); Thu, 24 Apr 2025 02:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Apr 2025 02:12:41 +0000 Received: from localhost ([127.0.0.1]:60507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7m4q-0001iM-Ru for submit@debbugs.gnu.org; Wed, 23 Apr 2025 22:12:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42840) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7m4i-0001ha-Ql for submit@debbugs.gnu.org; Wed, 23 Apr 2025 22:12:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7m4U-0004Iy-TI for guix-patches@gnu.org; Wed, 23 Apr 2025 22:12:17 -0400 Received: from p-east3-cluster6-host2-snip6-3.eps.apple.com ([2a01:b747:3006:202::10] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7m4Q-00045I-MF for guix-patches@gnu.org; Wed, 23 Apr 2025 22:12:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=kEvqtjwcRatRuw3qoeQX+4IevNUAQpyzHY3pmybEzDc=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=UB4Vat1CIeh+Pq56BpVsiBT+DNSlw4Ki7PM7Q0UGsXuJMUGnrDAvHoSNqS+n/RSKq pCbLmlK6Oa9Y2dyPsIGTjKfq1OY6AGp9b33RhBVzdR9vcWowyISA5QIRsolc95HR/l OxfhOdmCTFUPbjpjmh+9EfTVNnKwAS5IeIuITX3C2XwraSnpApAdaSkqTKmZrmGVQP 4lad9LZGtURn8VcxVKTx2ErW7DvRqNevU5JFkWLAhF7ZJ7m7PI3oUpgcX7JdmPMYQD IRpdnkT6TZRYGdFhnLiJ21ATANfuztdAoYN9gWDLpBRs02LQcDsneHr9Hb1+/Bincj W23P6iN6C6zSg== Received: from wongworks.lan (qs-asmtp-me-k8s.p00.prod.me.com [17.57.155.37]) by outbound.qs.icloud.com (Postfix) with ESMTPSA id D58EE1800142; Thu, 24 Apr 2025 02:12:02 +0000 (UTC) Date: Wed, 23 Apr 2025 22:11:56 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Proofpoint-GUID: N_LYOgKRvYxUtbM7QRhPn-8e7CHFfwS0 X-Proofpoint-ORIG-GUID: N_LYOgKRvYxUtbM7QRhPn-8e7CHFfwS0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_01,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 clxscore=1015 phishscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2504240011 Received-SPF: pass client-ip=2a01:b747:3006:202::10; envelope-from=wongandj@icloud.com; helo=outbound.qs.icloud.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_BL_SPAMCOP_NET=1.347, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches X-Patchwork-Original-From: Andrew Wong via Guix-patches via From: Andrew Wong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (liba52): Update to 0.8.0. [source] : Switch to new, maintained repository. : Convert to substitutions for flexibility. : New substitutions. [arguments]: Remove redundant bootstrap phase replication. [home-page]: Switch to new homepage. * gnu/packages/patches/liba52-enable-pic.patch: Remove obsolete patch. * gnu/packages/patches/liba52-link-with-libm.patch: Remove obsolete patch. * gnu/packages/patches/liba52-set-soname.patch: Remove obsolete patch. * gnu/packages/patches/liba52-use-mtune-not-mcpu.patch: Remove obsolete patch. Change-Id: I65d61d2921a444b3f86fdc6f7e4be2143ada5ce5 --- gnu/packages/patches/liba52-enable-pic.patch | 25 ---------- .../patches/liba52-link-with-libm.patch | 33 ------------- gnu/packages/patches/liba52-set-soname.patch | 23 --------- .../patches/liba52-use-mtune-not-mcpu.patch | 24 ---------- gnu/packages/video.scm | 47 +++++++++---------- 5 files changed, 21 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/liba52-enable-pic.patch delete mode 100644 gnu/packages/patches/liba52-link-with-libm.patch delete mode 100644 gnu/packages/patches/liba52-set-soname.patch delete mode 100644 gnu/packages/patches/liba52-use-mtune-not-mcpu.patch base-commit: f7c41ab31f5023023385500f6eb9083d23dd1ccb diff --git a/gnu/packages/patches/liba52-enable-pic.patch b/gnu/packages/patches/liba52-enable-pic.patch deleted file mode 100644 index 924ac1331f..0000000000 --- a/gnu/packages/patches/liba52-enable-pic.patch +++ /dev/null @@ -1,25 +0,0 @@ -Copied from Debian. - -Description: Disabling -prefer-non-pic which enables -fPIC -Bug-Debian: http://bugs.debian.org/401590 -Author: Daniel Baumann , Dmitrijs Ledkovs - - ---- - liba52/configure.incl | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -Index: a52dec-deb/liba52/configure.incl -=================================================================== ---- a52dec-deb.orig/liba52/configure.incl 2009-12-05 02:52:12.000000000 +0000 -+++ a52dec-deb/liba52/configure.incl 2009-12-05 03:23:45.000000000 +0000 -@@ -1,9 +1,6 @@ - AC_SUBST([LIBA52_CFLAGS]) - AC_SUBST([LIBA52_LIBS]) - --dnl avoid -fPIC when possible --LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" -- - AC_ARG_ENABLE([double], - [ --enable-double use double-precision samples]) - if test x"$enable_double" = x"yes"; then diff --git a/gnu/packages/patches/liba52-link-with-libm.patch b/gnu/packages/patches/liba52-link-with-libm.patch deleted file mode 100644 index a0771aaa62..0000000000 --- a/gnu/packages/patches/liba52-link-with-libm.patch +++ /dev/null @@ -1,33 +0,0 @@ -Copied from Debian. - -Description: Explicitely link against -lm -Bug-Debian: http://bugs.debian.org/553595 -Author: Fabian Greffrath , Dmitrijs Ledkovs - ---- - libao/Makefile.am | 1 + - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,9 +1,9 @@ --CFLAGS = @A52DEC_CFLAGS@ -+AM_CFLAGS = @A52DEC_CFLAGS@ - - bin_PROGRAMS = a52dec extract_a52 - a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c - a52dec_LDADD = $(top_builddir)/liba52/liba52.la \ -- $(top_builddir)/libao/libao.a @LIBAO_LIBS@ -+ $(top_builddir)/libao/libao.a @LIBAO_LIBS@ -lm - extract_a52_SOURCES = extract_a52.c getopt.c - - man_MANS = a52dec.1 extract_a52.1 ---- a/liba52/Makefile.am -+++ b/liba52/Makefile.am -@@ -1,4 +1,4 @@ --CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ -+AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ - - lib_LTLIBRARIES = liba52.la - diff --git a/gnu/packages/patches/liba52-set-soname.patch b/gnu/packages/patches/liba52-set-soname.patch deleted file mode 100644 index 3eba1fb038..0000000000 --- a/gnu/packages/patches/liba52-set-soname.patch +++ /dev/null @@ -1,23 +0,0 @@ -Copied from Debian. - -Description: Sets the soname to liba52-$(VERSION).so -Bug-Debian: http://bugs.debian.org/401636 -Author: Daniel Baumann , Dmitrijs Ledkovs - - ---- - liba52/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: a52dec-deb/liba52/Makefile.am -=================================================================== ---- a52dec-deb.orig/liba52/Makefile.am 2009-12-05 02:52:12.000000000 +0000 -+++ a52dec-deb/liba52/Makefile.am 2009-12-05 03:23:47.000000000 +0000 -@@ -4,6 +4,6 @@ - - liba52_la_SOURCES = bitstream.c imdct.c bit_allocate.c parse.c downmix.c - liba52_la_LIBADD = @LIBA52_LIBS@ -lm --liba52_la_LDFLAGS = -no-undefined -+liba52_la_LDFLAGS = -no-undefined -release @VERSION@ - - EXTRA_DIST = configure.incl a52_internal.h bitstream.h tables.h diff --git a/gnu/packages/patches/liba52-use-mtune-not-mcpu.patch b/gnu/packages/patches/liba52-use-mtune-not-mcpu.patch deleted file mode 100644 index d78ecbbab0..0000000000 --- a/gnu/packages/patches/liba52-use-mtune-not-mcpu.patch +++ /dev/null @@ -1,24 +0,0 @@ -Copied from Debian. - -From: Rodeo -Origin: https://github.com/HandBrake/HandBrake/blob/master/contrib/a52dec/A04-modern-gcc-cflags.patch - ---- a52dec-0.7.4/configure.in.orig -+++ a52dec-0.7.4/configure.in -@@ -34,11 +34,11 @@ - case "$host" in - i?86-* | k?-*) - case "$host" in -- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; -- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; -- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; -- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; -- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; -+ i386-*) OPT_CFLAGS="$CFLAGS -mtune=i386";; -+ i486-*) OPT_CFLAGS="$CFLAGS -mtune=i486";; -+ i586-*) OPT_CFLAGS="$CFLAGS -mtune=pentium";; -+ i686-*) OPT_CFLAGS="$CFLAGS -mtune=pentiumpro";; -+ k6-*) OPT_CFLAGS="$CFLAGS -mtune=k6";; - esac - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; - sparc-* | sparc64-*) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9f18f4dcc2..f77e9296e3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -882,33 +882,28 @@ (define-public celluloid (define-public liba52 (package (name "liba52") - (version "0.7.4") - (source (origin - (method url-fetch) - (uri (string-append - ;; A mirror://sourceforge URI doesn't work, presumably - ;; because the SourceForge project is misconfigured. - "http://liba52.sourceforge.net/files/a52dec-" version - ".tar.gz")) - (sha256 - (base32 - "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2")) - (patches (search-patches "liba52-enable-pic.patch" - "liba52-set-soname.patch" - "liba52-use-mtune-not-mcpu.patch" - "liba52-link-with-libm.patch")))) + (version "0.8.0") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://git.adelielinux.org/community/a52dec") + (commit (string-append "v" version)))) + (sha256 + (base32 "0k1y7irz1hqfzs6yqv4brgwpa04biv50z05gc584h9md0y5y52k7")) + (modules '((guix build utils))) + (snippet + #~(begin (substitute* "liba52/Makefile.am" + ;; Set so name to liba52-$(VERSION).so + (("liba52_la_LDFLAGS = -no-undefined" all) + (string-append all " -release @VERSION@"))) + (substitute* "liba52/configure.incl" + ;; Don't avoid -fPIC + (("^.+-prefer-non-pic.*$") "")) + (substitute* "configure.ac" (("-mcpu") "-mtune")))))) (build-system gnu-build-system) - ;; XXX We need to run ./bootstrap because of the build system fixes above. - (native-inputs - (list autoconf automake libtool)) - (arguments `(#:configure-flags '("--enable-shared") - #:phases - (modify-phases %standard-phases - ;; XXX We need to run ./bootstrap because of the build - ;; system fixes above. - (replace 'bootstrap - (lambda _ (invoke "sh" "bootstrap")))))) - (home-page "https://liba52.sourceforge.net/") + (native-inputs (list autoconf automake libtool)) + (arguments (list #:configure-flags #~(list "--enable-shared"))) + (home-page "https://git.adelielinux.org/community/a52dec/") (synopsis "ATSC A/52 audio stream decoder") (description "liba52 is a library for decoding ATSC A/52 audio streams. The A/52 standard is used in a variety of applications, including digital