diff options
| author | crees <crees@FreeBSD.org> | 2012-02-07 02:23:38 +0800 |
|---|---|---|
| committer | crees <crees@FreeBSD.org> | 2012-02-07 02:23:38 +0800 |
| commit | a93227a6b0dbe3b63dd5aebfb32921025cbc9189 (patch) | |
| tree | 4604960801297bdcbe4d50481fdd07feb518bede | |
| parent | 33261edaaa74dc44c072654e266c946e8a43c750 (diff) | |
| download | freebsd-ports-gnome-a93227a6b0dbe3b63dd5aebfb32921025cbc9189.tar.gz freebsd-ports-gnome-a93227a6b0dbe3b63dd5aebfb32921025cbc9189.tar.zst freebsd-ports-gnome-a93227a6b0dbe3b63dd5aebfb32921025cbc9189.zip | |
- Mark MAKE_JOBS_UNSAFE
PR: ports/163465
Submitted by: "T.J." <baotserver@gmail.com>
- Remove dependency on unzip
Submitted by: Takefu <takefu@airport.fm> (maintainer)
| -rw-r--r-- | audio/libaacplus/Makefile | 4 | ||||
| -rw-r--r-- | audio/libaacplus/files/patch-configure.ac | 30 | ||||
| -rw-r--r-- | audio/libaacplus/files/patch-src_Makefile.am | 19 |
3 files changed, 47 insertions, 6 deletions
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile index 12a8a2b3a750..38e0be6942b4 100644 --- a/audio/libaacplus/Makefile +++ b/audio/libaacplus/Makefile @@ -20,9 +20,6 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:site1\ MAINTAINER= takefu@airport.fm COMMENT= HE-AAC+ Codec as Shared Library -EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip - RESTRICTED= unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies CONFLICTS= aacplusenc-0* @@ -32,6 +29,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool libtoolize aclocal autoheader automake GNOME_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE= yes AUTOMAKE_ARGS= --add-missing ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \ diff --git a/audio/libaacplus/files/patch-configure.ac b/audio/libaacplus/files/patch-configure.ac index f5a574955fe1..c9eece272255 100644 --- a/audio/libaacplus/files/patch-configure.ac +++ b/audio/libaacplus/files/patch-configure.ac @@ -1,6 +1,30 @@ ---- configure.ac.orig 2009-10-09 01:02:10.000000000 +0400 -+++ configure.ac 2010-09-16 04:08:51.000000000 +0400 -@@ -114,7 +114,7 @@ +--- configure.ac.orig 2010-11-11 06:27:45.000000000 +0900 ++++ configure.ac 2012-01-26 17:47:39.000000000 +0900 +@@ -8,7 +8,7 @@ + AM_CONFIG_HEADER(config.h) + AC_CONFIG_MACRO_DIR([m4]) + # Checks for programs. +-AC_PROG_CC ++AC_PROG_CC(clang gcc cc) + AM_PROG_CC_C_O + AC_PROG_CPP + AC_PROG_INSTALL +@@ -16,10 +16,10 @@ + AC_PROG_MAKE_SET + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL +-AC_PATH_PROG([UNZIP],[unzip]) +-if test x"$UNZIP" = x -a ! -f "aacenc.c" ; then +- AC_MSG_ERROR([You need unzip utility to prepare sources.]) +-fi ++dnl AC_PATH_PROG([UNZIP],[unzip]) ++dnl if test x"$UNZIP" = x -a ! -f "aacenc.c" ; then ++dnl AC_MSG_ERROR([You need unzip utility to prepare sources.]) ++dnl fi + AC_PATH_PROG([PATCH],[patch]) + if test x"$PATCH" = x -a ! -f "aacenc.c" ; then + AC_MSG_ERROR([You need patch utility to prepare sources.]) +@@ -123,7 +123,7 @@ AACPLUS_VERSION="$VERSION" AACPLUS_CPPFLAGS="-I$aacplus_includedir $FFTW3_CPPFLAGS" diff --git a/audio/libaacplus/files/patch-src_Makefile.am b/audio/libaacplus/files/patch-src_Makefile.am new file mode 100644 index 000000000000..72947be022e6 --- /dev/null +++ b/audio/libaacplus/files/patch-src_Makefile.am @@ -0,0 +1,19 @@ +--- src/Makefile.am.orig 2012-02-05 17:48:09.719522837 +0000 ++++ src/Makefile.am 2012-02-05 17:49:47.572522148 +0000 +@@ -206,14 +206,14 @@ + $(MAKE) unpack_3gp_sources + + $(srcdir)/FloatFR_aacPlusenc: +- cd $(srcdir) && $(UNZIP) 26410-800-ANSI-C_source_code.zip ++ cd $(srcdir) && /usr/bin/tar xf 26410-800-ANSI-C_source_code.zip + mv -f $(srcdir)/3GPP_enhanced_aacPlus_src_*/FloatFR_aacPlusenc $(srcdir) + rm -rf $(srcdir)/3GPP_enhanced_aacPlus_src_* + + + $(srcdir)/26410-800-ANSI-C_source_code.zip: $(srcdir)/26410-800.zip + rm -f $(srcdir)/26410-800-ANSI-C_source_code.zip $(srcdir)/26410-800.doc +- cd $(srcdir) && $(UNZIP) 26410-800.zip ++ cd $(srcdir) && /usr/bin/tar xf 26410-800.zip + mv $(srcdir)/26410-800.doc $(top_srcdir)/26410-800.doc + chmod og-w $(top_srcdir)/26410-800.doc + |