diff --git a/media-libs/faad2/faad2-2.9.1.recipe b/media-libs/faad2/faad2-2.10.0.recipe similarity index 92% rename from media-libs/faad2/faad2-2.9.1.recipe rename to media-libs/faad2/faad2-2.10.0.recipe index bb7093e55..3b1ba1803 100644 --- a/media-libs/faad2/faad2-2.9.1.recipe +++ b/media-libs/faad2/faad2-2.10.0.recipe @@ -7,9 +7,9 @@ library (libfaad) that may be used by other programs." HOMEPAGE="https://www.audiocoding.com/" COPYRIGHT="2003-2005 M. Bakker, Nero AG." LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/knik0/faad2/archive/${portVersion//./_}.tar.gz" -CHECKSUM_SHA256="7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a" +CHECKSUM_SHA256="0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb" SOURCE_DIR="faad2-${portVersion//./_}" PATCHES="faad2-$portVersion.patchset" @@ -51,7 +51,7 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure ./configure --disable-static make $jobArgs } diff --git a/media-libs/faad2/patches/faad2-2.9.1.patchset b/media-libs/faad2/patches/faad2-2.10.0.patchset similarity index 80% rename from media-libs/faad2/patches/faad2-2.9.1.patchset rename to media-libs/faad2/patches/faad2-2.10.0.patchset index 7c6b27cbb..ead7a86ea 100644 --- a/media-libs/faad2/patches/faad2-2.9.1.patchset +++ b/media-libs/faad2/patches/faad2-2.10.0.patchset @@ -1,11 +1,11 @@ -From 3d71c3fc14ae5cd28981c4a756a5c4a4c58db71e Mon Sep 17 00:00:00 2001 +From f0af93204cac097fd85735d2aabb7a739bb5c786 Mon Sep 17 00:00:00 2001 From: Robert Kausch Date: Tue, 4 Dec 2018 20:46:05 +0000 Subject: Patches for Haiku compatibility. diff --git a/configure.ac b/configure.ac -index 44faa0c..a8b9241 100644 +index 9b12f2c..9f9744d 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ AC_PROG_INSTALL @@ -17,7 +17,7 @@ index 44faa0c..a8b9241 100644 AC_CONFIG_HEADERS([config.h]) diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am -index 8ed57ae..aa9c745 100644 +index 9105625..4d79c00 100644 --- a/libfaad/Makefile.am +++ b/libfaad/Makefile.am @@ -1,12 +1,11 @@ @@ -35,17 +35,17 @@ index 8ed57ae..aa9c745 100644 libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ drm_dec.c error.c filtbank.c \ -- -2.23.0 +2.30.0 -From cb79ebf9a84b20630216ad5815d754d343e06df4 Mon Sep 17 00:00:00 2001 +From 36de2d100d7b710d0afa119fa5f6813e1947358a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 23 Nov 2019 23:02:50 +0100 Subject: gcc2 fix diff --git a/libfaad/hcr.c b/libfaad/hcr.c -index 3cefe60..ea0d84e 100644 +index 4ae4809..7227ed0 100644 --- a/libfaad/hcr.c +++ b/libfaad/hcr.c @@ -225,7 +225,7 @@ uint8_t reordered_spectral_data(NeAACDecStruct *hDecoder, ic_stream *ics, @@ -53,10 +53,10 @@ index 3cefe60..ea0d84e 100644 uint16_t sp_offset[8]; uint16_t g, i, sortloop, set, bitsread; - /*uint16_t bitsleft, codewordsleft*/; -+ /*uint16_t bitsleft, codewordsleft;*/ - uint8_t w_idx, sfb, this_CB, last_CB, this_sec_CB; - ++ /*uint16_t bitsleft, codewordsleft*/ + uint8_t w_idx, sfb, this_CB, last_CB, this_sec_CB; + const uint16_t nshort = hDecoder->frameLength/8; -- -2.23.0 +2.30.0