From 7948124dc7f50c621e7f30ea76598ce2b63fb1be Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 30 Sep 2017 12:44:51 +0200 Subject: [PATCH] faad2: bump version. --- ...{faad2-2.8.1.recipe => faad2-2.8.3.recipe} | 6 ++--- ...d2-2.8.1.patchset => faad2-2.8.3.patchset} | 26 +++---------------- 2 files changed, 7 insertions(+), 25 deletions(-) rename media-libs/faad2/{faad2-2.8.1.recipe => faad2-2.8.3.recipe} (92%) rename media-libs/faad2/patches/{faad2-2.8.1.patchset => faad2-2.8.3.patchset} (52%) diff --git a/media-libs/faad2/faad2-2.8.1.recipe b/media-libs/faad2/faad2-2.8.3.recipe similarity index 92% rename from media-libs/faad2/faad2-2.8.1.recipe rename to media-libs/faad2/faad2-2.8.3.recipe index 46310fe6a..9a878047f 100644 --- a/media-libs/faad2/faad2-2.8.1.recipe +++ b/media-libs/faad2/faad2-2.8.3.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2003-2005 M. Bakker, Nero AG." LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://downloads.sourceforge.net/faac/faad2-$portVersion.tar.gz" -CHECKSUM_SHA256="133270a9be0c9ab8fea18017703ab4a94f9eddbb45a8aa6a511a1469fa413591" +CHECKSUM_SHA256="9e4fd094080c27f6f419f3fe1fce369621b9469de396e126405153784134da00" PATCHES="faad2-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" @@ -38,18 +38,18 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:libtool cmd:aclocal cmd:autoconf cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make " BUILD() { - ./bootstrap + autoreconf -fi runConfigure ./configure make $jobArgs } diff --git a/media-libs/faad2/patches/faad2-2.8.1.patchset b/media-libs/faad2/patches/faad2-2.8.3.patchset similarity index 52% rename from media-libs/faad2/patches/faad2-2.8.1.patchset rename to media-libs/faad2/patches/faad2-2.8.3.patchset index 2fe370882..7179e6267 100644 --- a/media-libs/faad2/patches/faad2-2.8.1.patchset +++ b/media-libs/faad2/patches/faad2-2.8.3.patchset @@ -1,16 +1,11 @@ -From c786109ac9fa3ff9d820074721b15e14b0443af6 Mon Sep 17 00:00:00 2001 +From 746c2f70bee80b3b65b5f8f80ee750e94d987e7d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 31 Jul 2017 21:36:50 +0200 -Subject: [PATCH] patch from 2.7 +Subject: patch from 2.7 ---- - configure.ac | 3 ++- - frontend/getopt.c | 2 +- - libfaad/Makefile.am | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 4470f22..acf046d 100644 +index fe2a3a5..eee1153 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ AC_PROG_INSTALL @@ -30,21 +25,8 @@ index 4470f22..acf046d 100644 AC_TRY_LINK([ #define _ISOC9X_SOURCE 1 #define _ISOC99_SOURCE 1 -diff --git a/frontend/getopt.c b/frontend/getopt.c -index 185d49b..40c7a22 100644 ---- a/frontend/getopt.c -+++ b/frontend/getopt.c -@@ -172,7 +172,7 @@ static enum - #if __STDC__ || defined(PROTO) - extern char *getenv(const char *name); - extern int strcmp (const char *s1, const char *s2); --extern int strncmp(const char *s1, const char *s2, unsigned int n); -+extern int strncmp(const char *s1, const char *s2, size_t n); - - static int my_strlen(const char *s); - static char *my_index (const char *str, int chr); diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am -index a042c47..8c46c14 100644 +index 8ed57ae..4751347 100644 --- a/libfaad/Makefile.am +++ b/libfaad/Makefile.am @@ -1,6 +1,6 @@