From patchwork Tue Jul 2 07:20:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3140 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id CDA573F102 for ; Tue, 2 Jul 2024 09:20:34 +0200 (CEST) Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2ec613ce7ffsf36696981fa.0 for ; Tue, 02 Jul 2024 00:20:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719904834; cv=pass; d=google.com; s=arc-20160816; b=C9YnWSonBjokRSn4ur4pyKUjRH5g2TDWYWT/Ubx5p0r/TvEQVoLasgQMaRoSUugUQ9 xrfO7Eq+MArSa9FITX41RiaopzcX3gkA16j02i6nxCCrUiO7a1LfuDTmcEsR9tUOHG6u 6JfP+o4hZ7dGj1hVtCEa2IDfbeVoi4GuX0JXH7ZKzkg2eWkwPBfh3MJ6hwJzzn2vH0AU tLK8BZEZ6vwQx1BPIwscBzoRVlh3+5v9TVkw/0nI9XpATpSIggoDHM2bZKSqKVixPiBn +rg7SEM/BJf110nAoCsSk+RD+m5slchqBM7MX3708md3G7QgfYABVXHVYDbwiiN9OxH5 EkvA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=R+ZTmHfZJHCIaaL+rVk6JO1CJ0KBDJUwUXO2mDCjY4Q=; fh=UexHED6JSLNrhIV5KtHNnTAsuWXFI2xfIFTec2r7Lv4=; b=eW5+5BCMHnjTWZ6Id2OBqzv6aCe7MlXvzTl9WiLj9a5RyQxisbGm5SMi4/FhzPNiwj OoodDqEkyIGtCbr1dBhuZwru0TM8JNu6n4ytDY50RjTqleC+V5TOn7p6FEUlgjX5vw/o BmBohWJZJdfVqUwNk/y81yMIw70lpUzHuCZattcVsTcLpJY/5yjw68oeI8TpyWb0iWGt gI6t0NJUYODRlP4+/Cf/SiB/HtJKM1qBsNIBGzZnqgfwrYG/Dak7akyVJRw3CxeoUNoz dnjZvK9LCrLyxViAkMisOkZdSgAuxPSGa9ZsdVyBRoTWZnx9qGjMCpgI8tP7OaaBs8jI BtVA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jEMvsqId; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1719904834; x=1720509634; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=R+ZTmHfZJHCIaaL+rVk6JO1CJ0KBDJUwUXO2mDCjY4Q=; b=XJGXywQXeZ6GzCktvwmoC4Y0e+vrk26/vZ8bLbdC6cd6x4iLmyHgsJS9yrpL8Xvaka ls4bYa9Pji6JrRDqZVJY0tqh2lt8rEGuLexs4MfdJSyGhXU/QemN8fJqTOt7mrkJbZoA 6iRmYqqiTxg1/hDF/BVvB/FrTvvvQOOTg2cuU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719904834; x=1720509634; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=R+ZTmHfZJHCIaaL+rVk6JO1CJ0KBDJUwUXO2mDCjY4Q=; b=uGLEKaJl+4WSsEhtpMQzknBjPbMtvNGrOg/qi4kYIOv+Usxymeo+1TTi9AMuZC/H6R zLRF5657SuMhhoYJsrcmUeEah12yKVD025YzI0GwTOpfMUzkwVhKEra1AXGC0nAM64lS UW1yyOzS341JAeZFyrd9ueT4LGwxLxzbJi/u9XlHTOD/Qra8ejrJfFuD1PXmvLeWd23k C4CI3h5RKTHvBOSo6g7HRce+a4N6v7PstbZTllHO0BstnDX9ad+VlgCy27LNSZ/84Pmg yAt3/P75CCdh/wWHVivJf2TEJ1/EaP9091tB3pbSwm3aAuDpEuaRAVmIJweNlxk3ABNr OpBg== X-Forwarded-Encrypted: i=2; AJvYcCW5YcPgOIj46ClylErj5GmwBzUMgwEKCjUXi+QFT/afZCDm4snv3zQDVIeU78AUcSCEL+eNGBtQqxmiwn/hzDoVL3+LuoLREm/6kimBCpxQNvNi8v+kDVGGTiPoKQ== X-Gm-Message-State: AOJu0Yx7LfsUapnqkF7YblKcPQaIraT9+SjZ8MuaV/MSHY8B2AP2ISxI ESzrb/qzyYYG8z6GVt924x1Z+A+OiPqNddz3jwaThqd6ZZHuSfEz/9XbjunySPCFJA== X-Google-Smtp-Source: AGHT+IG/adsCVjfVCWVD3fSMaqP3uxndYKzn2AuFKnRX3n/jVxd+j59DGXISTLTryS78VEW6fp38FA== X-Received: by 2002:a2e:8681:0:b0:2ed:136c:4ce8 with SMTP id 38308e7fff4ca-2ee5e359591mr47786691fa.6.1719904834065; Tue, 02 Jul 2024 00:20:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:651c:10af:b0:2ec:5b1e:9119 with SMTP id 38308e7fff4ca-2ee51e0d9e3ls16982901fa.1.-pod-prod-02-eu; Tue, 02 Jul 2024 00:20:32 -0700 (PDT) X-Received: by 2002:a05:651c:893:b0:2ee:6277:a888 with SMTP id 38308e7fff4ca-2ee6277a9f3mr49010091fa.38.1719904832205; Tue, 02 Jul 2024 00:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719904832; cv=none; d=google.com; s=arc-20160816; b=w+fD6C3Yr4Kmwg1dlPLRXSo046Earl5G+8SgGsURact9wz/ISfm+euZJ3pT51nedgg egpVCi9HkPfSoiWvQmv0j66yDAVeZ3iKz2I25UHhXZ8ZsGwmIcRD4WET5eSl1haopxhI fpmlitJiGoqS5PGoH4Q7qEapD6lRwTBFqvAa+fiIMvuS+TMY972L0QTltUU5n9q0EAxo QH8BnSPHovYcQsjsK0aqxQN2PTJfhh3bCDhqLAVLhNATOXftOOu64qx2zWDtJdFNh8sa aywX4C0+a74ZL2gMDY+iedCWHsjgRSpB1xEyAi3KwGLpibpdnH25VV8UDIEhEbj9CJ1i Xj9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=luyl9x/A5blUPiW1pjWvMH0OeXcafsOOwuT2Ca7zb8o=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=xLQfNZmbpeUZDx0T2lRMOkQN/o8ommQt83zU084FLoqI81vNX5+IlUo3cl/KdtCujm hi08oGIxm9htXeX8FDMQGdG2VejZxc0NAhETWrZd0Aj7xWJK5Lt75r1rlKGRpSDWlpTv brjZmP/g4tuxWayNTVws8aY19pKlno/BeiTfThDsFbfJsauTtXE3bqcS/Ud+2qQj5yXK bXBI2T26zUAl6PeQD88EaGt7/H0USgLdcKtr62pZdvZksYTINYq8t7R95KYv8dRXN3qr aWyKKwn3lvET0x1A+7FOWwQWLDHb8Zt8CKsMF5OZ0elJSnFwQlRVMaVDtqK7sL2J/x1s 2yEg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jEMvsqId; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-584d3039124sor2692145a12.6.2024.07.02.00.20.32 for (Google Transport Security); Tue, 02 Jul 2024 00:20:32 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6402:11d1:b0:57d:17c3:a593 with SMTP id 4fb4d7f45d1cf-5879f983dbdmr4997391a12.22.1719904831683; Tue, 02 Jul 2024 00:20:31 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:c733:f73f:670d:ca47]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58612c835cfsm5255807a12.14.2024.07.02.00.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 00:20:31 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/libtheora: update the patches to be applied with fuzz 0 Date: Tue, 2 Jul 2024 09:20:24 +0200 Message-ID: <20240702072024.2375844-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jEMvsqId; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, theora fails to build with output: Applying 0002-fix-autoreconf.patch using patch: patching file Makefile.am Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej patching file configure.ac Hunk #1 FAILED at 68. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- .checkpackageignore | 1 - package/libtheora/0002-fix-autoreconf.patch | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 949b7467cfe6..94ed9a19fdd4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -911,7 +911,6 @@ package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch lib_pa package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch lib_patch.Upstream package/libtelnet/0001-fix-compilation-without-zlib.patch lib_patch.Upstream package/libtheora/0001-link-libtheoradec.patch lib_patch.Upstream -package/libtheora/0002-fix-autoreconf.patch lib_patch.Upstream package/libtomcrypt/0001-fix-CVE-2019-17362.patch lib_patch.Upstream package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch lib_patch.Upstream package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch lib_patch.Upstream diff --git a/package/libtheora/0002-fix-autoreconf.patch b/package/libtheora/0002-fix-autoreconf.patch index dd3f47322235..27fc379ad404 100644 --- a/package/libtheora/0002-fix-autoreconf.patch +++ b/package/libtheora/0002-fix-autoreconf.patch @@ -1,9 +1,10 @@ Fix broken autoreconf -Downloaded from upstream git -https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 +Upstream: https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi From: Tim Terriberry @@ -22,9 +23,8 @@ diff --git a/Makefile.am b/Makefile.am index 89fd753..1783857 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -4,6 +4,8 @@ - #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2 - AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz +@@ -2,5 +2,7 @@ + AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 +ACLOCAL_AMFLAGS=-I m4 + @@ -35,7 +35,7 @@ diff --git a/configure.ac b/configure.ac index 1cbec1a..456b603 100644 --- a/configure.ac +++ b/configure.ac -@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL +@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl Add parameters for aclocal @@ -43,4 +43,4 @@ index 1cbec1a..456b603 100644 +AC_CONFIG_MACRO_DIR([m4]) dnl Check for doxygen - AC_ARG_ENABLE([doc], + AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)