From a9b0716bd59a78524bd0a43e298b3e41f972f40b Mon Sep 17 00:00:00 2001 From: Begasus Date: Sat, 10 May 2014 16:17:07 +0200 Subject: [PATCH 1/5] faad2 now compiling on gcc2 and gcc4 with the developer files in place, thanks to DiverHQ for the pointers and help --- media-libs/faad2/faad2-2.7.recipe | 74 +++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe index 9f84734f3..16fd9e5d8 100644 --- a/media-libs/faad2/faad2-2.7.recipe +++ b/media-libs/faad2/faad2-2.7.recipe @@ -1,30 +1,78 @@ +SUMMARY="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" + HOMEPAGE="http://www.audiocoding.com/" SRC_URI="http://downloads.sourceforge.net/faac/faad2-2.7.tar.gz" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="ee1b4d67ea2d76ee52c5621bc6dbf61e" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2005 M. Bakker, Nero AG." + +CHECKSUM_SIZE="1137407" +CHECKSUM_RMD160="3f0ca461e2953014d5b17edccb3337767d478b8d" +CHECKSUM_SHA512="8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="faad2-2.7.patch" + +PROVIDES=" + faad$secondaryArchSuffix = $portVersion + lib:libfaad$secondaryArchSuffix = $portVersion + lib:libmp4ff$secondaryArchSuffix = $portVersion + cmd:faad$secondaryArchSuffix = $portVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion +" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:libtool + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +SOURCE_DIR="faad2-2.7" + +PATCH() +{ + sed -i 's/(LTCOMPILE) -c/(LTCOMPILE) -nostart/' libfaad/Makefile.in + sed -i 's/iquote/I/' libfaad/Makefile.am +} + BUILD() { - cd faad2-2.7 libtoolize --force --copy --install aclocal autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + + runConfigure ./configure make } INSTALL() { - cd faad2-2.7 make install + prepareInstalledDevelLibs libfaad libmp4ff + + # devel package + packageEntries devel \ + $developDir + } -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2005 M. Bakker, Nero AG." +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + faad${secondaryArchSuffix}_devel = $portVersion + devel:libfaad$secondaryArchSuffix + devel:libmp4ff$secondaryArchSuffix + " +REQUIRES_devel=" + " From 16661fa93b2c71badffbb323322848ee35e4f51d Mon Sep 17 00:00:00 2001 From: Begasus Date: Sat, 10 May 2014 16:27:15 +0200 Subject: [PATCH 2/5] Updated patch file --- media-libs/faad2/patches/faad2-2.7.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-libs/faad2/patches/faad2-2.7.patch b/media-libs/faad2/patches/faad2-2.7.patch index e5f4b63ce..e5a716041 100644 --- a/media-libs/faad2/patches/faad2-2.7.patch +++ b/media-libs/faad2/patches/faad2-2.7.patch @@ -6,8 +6,9 @@ diff -urN faad2-2.7.orig/configure.in faad2-2.7/configure.in AC_PROG_MAKE_SET AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm) +AC_CHECK_LIBM - - AM_CONFIG_HEADER(config.h) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADER(config.h) @@ -91,7 +92,7 @@ ac_cv_c99_lrintf, @@ -18,3 +19,4 @@ diff -urN faad2-2.7.orig/configure.in faad2-2.7/configure.in AC_TRY_LINK([ #define _ISOC9X_SOURCE 1 #define _ISOC99_SOURCE 1 + From 4008cc20a60e0f2e8b78f9b63adcaf92b844b13d Mon Sep 17 00:00:00 2001 From: Begasus Date: Sat, 10 May 2014 17:05:01 +0200 Subject: [PATCH 3/5] Had to update haikuporter to it's latest revision --- media-libs/faad2/faad2-2.7.recipe | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe index 16fd9e5d8..aac8ea7a9 100644 --- a/media-libs/faad2/faad2-2.7.recipe +++ b/media-libs/faad2/faad2-2.7.recipe @@ -7,9 +7,7 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2003-2005 M. Bakker, Nero AG." -CHECKSUM_SIZE="1137407" -CHECKSUM_RMD160="3f0ca461e2953014d5b17edccb3337767d478b8d" -CHECKSUM_SHA512="8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161" +CHECKSUM_SHA256="ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -38,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="faad2-2.7" PATCH() { From 1aab49bf7038aedcdfd054e875a47bf5d496a131 Mon Sep 17 00:00:00 2001 From: Begasus Date: Sun, 11 May 2014 08:11:30 +0200 Subject: [PATCH 4/5] changed lines according to comments on the pull request --- media-libs/faad2/faad2-2.7.recipe | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe index aac8ea7a9..7f8d12e96 100644 --- a/media-libs/faad2/faad2-2.7.recipe +++ b/media-libs/faad2/faad2-2.7.recipe @@ -15,13 +15,12 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="faad2-2.7.patch" PROVIDES=" - faad$secondaryArchSuffix = $portVersion - lib:libfaad$secondaryArchSuffix = $portVersion - lib:libmp4ff$secondaryArchSuffix = $portVersion + faad2$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libfaad$secondaryArchSuffix = 2.0.0 compat >= 2 cmd:faad$secondaryArchSuffix = $portVersion " -BUILD_REQUIRES=" +REQUIRES=" haiku${secondaryArchSuffix} >= $haikuVersion " @@ -33,7 +32,7 @@ BUILD_PREREQUIRES=" cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:make + cmd:make $jobArgs " @@ -67,9 +66,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - faad${secondaryArchSuffix}_devel = $portVersion - devel:libfaad$secondaryArchSuffix - devel:libmp4ff$secondaryArchSuffix + faad2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 + devel:libfaad$secondaryArchSuffix = 2.0.0 compat >= 2 + devel:libmp4ff$secondaryArchSuffix = $portVersion " REQUIRES_devel=" + faad2$secondaryArchSuffix == $portVersion base " From 68b552f68e8ecdcde9fca9353fc1b28ed6a42084 Mon Sep 17 00:00:00 2001 From: Begasus Date: Sun, 11 May 2014 08:16:33 +0200 Subject: [PATCH 5/5] modified make argument with $jobArgs --- media-libs/faad2/faad2-2.7.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe index 7f8d12e96..e121591c5 100644 --- a/media-libs/faad2/faad2-2.7.recipe +++ b/media-libs/faad2/faad2-2.7.recipe @@ -32,7 +32,7 @@ BUILD_PREREQUIRES=" cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:make $jobArgs + cmd:make " @@ -49,7 +49,7 @@ BUILD() autoconf runConfigure ./configure - make + make $jobArgs } INSTALL()