Date: Thu, 13 May 2004 02:46:47 -0400 (EDT) From: michael johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/66598: [MAINTAINER] audio/faad2: [update to 2.0 release] Message-ID: <20040513064647.CF6926854@ahze.ahze.net> Resent-Message-ID: <200405130650.i4D6oIYb058740@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66598
>Category: ports
>Synopsis: [MAINTAINER] audio/faad2: [update to 2.0 release]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 12 23:50:18 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: michael johnson
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #45: Mon May 3 05:09:04 EDT
>Description:
- update to 2.0 release
I decided to install mpeg4ip default for two reasons
mpeg4ip has a newer version of mp4v2 and mpeg4ip conflicts with faad
if installed after faad
people that have faad2 installed already might have problems installing this version.
Could we add some kind of note in UPDATING that if you have problems building faad2 you should pkg_delete faad then retry ?
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- faad2-2.0,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/faad/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 12 May 2004 13:23:47 -0000 1.15
+++ Makefile 13 May 2004 06:33:46 -0000
@@ -7,11 +7,10 @@
PORTNAME= faad2
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= faac
-DISTNAME= ${PORTNAME}-${PORTVERSION}-rc3
MAINTAINER= ahze@ahze.net
COMMENT= A LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder
@@ -20,15 +19,16 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER= 15
-USE_AUTOHEADER= yes
+USE_AUTOMAKE_VER=15
+USE_AUTOHEADER= yes
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GETOPT_LONG= yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
+USE_SDL= yes
CONFIGURE_ARGS= --with-mp4v2 --with-drm
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -36,6 +36,32 @@
INSTALLS_SHLIB= yes
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libmp4v2.a)
+HAS_MP4V2= yes
+.endif
+
+.if defined(WITHOUT_MPEG4IP) && !defined(HAS_MP4V2)
+PLIST_FILES+= include/mp4.h include/mpeg4ip.h include/systems.h \
+ lib/libmp4v2.so lib/libmp4v2.so.0 lib/libmp4v2.a
+.else
+LIB_DEPENDS+= mp4.0:${PORTSDIR}/multimedia/mpeg4ip
+.endif
+
+pre-everything::
+ @${ECHO_MSG} "===>"
+.if !defined(WITHOUT_MPEG4IP)
+ @${ECHO_MSG} "===> you can disable mpeg4ip support by"
+ @${ECHO_MSG} "===> defining WITHOUT_MPEG4IP"
+.else
+ @${ECHO_MSG} "===> WARNING: WITHOUT_MPEG4IP is defined"
+ @${ECHO_MSG} "===> Having WITHOUT_MPEG4IP defined conflicts"
+ @${ECHO_MSG} "===> with multimedia/mpeg4ip and you will not"
+ @${ECHO_MSG} "===> be able to install mpeg4ip after you install faad2"
+.endif
+ @${ECHO_MSG} "===>"
+
pre-patch: build-depends
post-patch:
@@ -45,17 +71,25 @@
${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
@${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
${WRKSRC}/aclocal.m4
+ @${REINPLACE_CMD} -e 's|<SDL|<SDL11|' \
+ ${WRKSRC}/plugins/mpeg4ip/faad2.cpp
+ @${ECHO_CMD} "SUBDIRS = libfaad common frontend plugins" > \
+ ${WRKSRC}/Makefile.am
+.if ${OSVERSION} < 500000
+ @${REINPLACE_CMD} -e 's|uint8_t|unsigned char|; \
+ s|uint16_t|unsigned short|; s|uint32_t|unsigned long|; \
+ s|int8_t|char|;' ${WRKSRC}/libfaad/structs.h
+ @${REINPLACE_CMD} -e 's|stdint.h|sys/inttypes.h|' \
+ ${WRKSRC}/common/mp4ff/mp4ff_int_types.h
+.endif
# CFLAGS safeness
- @${FIND} ${WRKSRC} -type f -name Makefile.am | \
+ @${FIND} ${WRKSRC} -type f -name Makefile.am | \
${XARGS} -n 5 -x \
${REINPLACE_CMD} -e \
's|-O2|${CFLAGS}|'
-
-post-configure:
-# sync the multiple libtool copies
- @${CP} ${WRKSRC}/libtool ${WRKSRC}/common/mp4v2/
-
post-install:
+.if defined(WITHOUT_MPEG4IP)
@${INSTALL_DATA} ${WRKSRC}/common/mp4v2/systems.h ${PREFIX}/include
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/faad/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 12 May 2004 13:23:47 -0000 1.3
+++ distinfo 13 May 2004 02:03:05 -0000
@@ -1,2 +1,2 @@
-MD5 (faad2-2.0-rc3.tar.gz) = 0080076438655ed7facf1089a9805aff
-SIZE (faad2-2.0-rc3.tar.gz) = 704005
+MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07
+SIZE (faad2-2.0.tar.gz) = 766660
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/faad/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 10 May 2004 09:12:16 -0000 1.3
+++ pkg-plist 13 May 2004 06:29:09 -0000
@@ -1,15 +1,9 @@
bin/faad
include/faad.h
include/mp4ff.h
-include/mp4.h
-include/mpeg4ip.h
-include/systems.h
lib/libfaad.a
lib/libfaad.so
lib/libfaad.so.0
lib/libmp4ff.a
lib/libmp4ff.so
lib/libmp4ff.so.0
-lib/libmp4v2.so
-lib/libmp4v2.so.0
-lib/libmp4v2.a
Index: files/patch-frontend_main_c
===================================================================
RCS file: /home/ncvs/ports/audio/faad/files/patch-frontend_main_c,v
retrieving revision 1.2
diff -u -r1.2 patch-frontend_main_c
--- files/patch-frontend_main_c 5 Mar 2004 07:27:02 -0000 1.2
+++ files/patch-frontend_main_c 13 May 2004 01:54:47 -0000
@@ -1,38 +0,0 @@
---- frontend/main.c.orig Thu Nov 6 16:45:08 2003
-+++ frontend/main.c Wed Dec 10 06:27:37 2003
-@@ -1074,7 +1074,7 @@
- if (optarg)
- {
- char dr[10];
-- if (sscanf(optarg, "%s", dr) < 1) {
-+ if (sscanf(optarg, "%9s", dr) < 1) {
- def_srate = 0;
- } else {
- def_srate = atoi(dr);
-@@ -1085,7 +1085,7 @@
- if (optarg)
- {
- char dr[10];
-- if (sscanf(optarg, "%s", dr) < 1)
-+ if (sscanf(optarg, "%9s", dr) < 1)
- {
- format = 1;
- } else {
-@@ -1099,7 +1099,7 @@
- if (optarg)
- {
- char dr[10];
-- if (sscanf(optarg, "%s", dr) < 1)
-+ if (sscanf(optarg, "%9s", dr) < 1)
- {
- outputFormat = FAAD_FMT_16BIT; /* just use default */
- } else {
-@@ -1113,7 +1113,7 @@
- if (optarg)
- {
- char dr[10];
-- if (sscanf(optarg, "%s", dr) < 1)
-+ if (sscanf(optarg, "%9s", dr) < 1)
- {
- object_type = LC; /* default */
- } else {
Index: files/patch-structs.h
===================================================================
RCS file: /home/ncvs/ports/audio/faad/files/patch-structs.h,v
retrieving revision 1.1
diff -u -r1.1 patch-structs.h
--- files/patch-structs.h 13 Apr 2004 12:57:26 -0000 1.1
+++ files/patch-structs.h 13 May 2004 02:02:44 -0000
@@ -1,92 +1 @@
---- libfaad/structs.h.orig Thu Nov 13 07:47:59 2003
-+++ libfaad/structs.h Sun Apr 11 22:01:09 2004
-@@ -297,57 +297,57 @@
- typedef struct mp4AudioSpecificConfig
- {
- /* Audio Specific Info */
-- uint8_t objectTypeIndex;
-- uint8_t samplingFrequencyIndex;
-- uint32_t samplingFrequency;
-- uint8_t channelsConfiguration;
-+ unsigned char objectTypeIndex;
-+ unsigned char samplingFrequencyIndex;
-+ unsigned long samplingFrequency;
-+ unsigned char channelsConfiguration;
-
- /* GA Specific Info */
-- uint8_t frameLengthFlag;
-- uint8_t dependsOnCoreCoder;
-- uint16_t coreCoderDelay;
-- uint8_t extensionFlag;
-- uint8_t aacSectionDataResilienceFlag;
-- uint8_t aacScalefactorDataResilienceFlag;
-- uint8_t aacSpectralDataResilienceFlag;
-- uint8_t epConfig;
-+ unsigned char frameLengthFlag;
-+ unsigned char dependsOnCoreCoder;
-+ unsigned short coreCoderDelay;
-+ unsigned char extensionFlag;
-+ unsigned char aacSectionDataResilienceFlag;
-+ unsigned char aacScalefactorDataResilienceFlag;
-+ unsigned char aacSpectralDataResilienceFlag;
-+ unsigned char epConfig;
-
-- int8_t sbr_present_flag;
-- int8_t forceUpSampling;
-+ char sbr_present_flag;
-+ char forceUpSampling;
- } mp4AudioSpecificConfig;
-
- typedef struct faacDecConfiguration
- {
-- uint8_t defObjectType;
-- uint32_t defSampleRate;
-- uint8_t outputFormat;
-- uint8_t downMatrix;
-- uint8_t useOldADTSFormat;
-+ unsigned char defObjectType;
-+ unsigned long defSampleRate;
-+ unsigned char outputFormat;
-+ unsigned char downMatrix;
-+ unsigned char useOldADTSFormat;
- } faacDecConfiguration, *faacDecConfigurationPtr;
-
- typedef struct faacDecFrameInfo
- {
-- uint32_t bytesconsumed;
-- uint32_t samples;
-- uint8_t channels;
-- uint8_t error;
-- uint32_t samplerate;
-+ unsigned long bytesconsumed;
-+ unsigned long samples;
-+ unsigned char channels;
-+ unsigned char error;
-+ unsigned long samplerate;
-
- /* SBR: 0: off, 1: on; normal, 2: on; downsampled */
-- uint8_t sbr;
-+ unsigned char sbr;
-
- /* MPEG-4 ObjectType */
-- uint8_t object_type;
-+ unsigned char object_type;
-
- /* AAC header type; MP4 will be signalled as RAW also */
-- uint8_t header_type;
-+ unsigned char header_type;
-
- /* multichannel configuration */
-- uint8_t num_front_channels;
-- uint8_t num_side_channels;
-- uint8_t num_back_channels;
-- uint8_t num_lfe_channels;
-- uint8_t channel_position[MAX_CHANNELS];
-+ unsigned char num_front_channels;
-+ unsigned char num_side_channels;
-+ unsigned char num_back_channels;
-+ unsigned char num_lfe_channels;
-+ unsigned char channel_position[MAX_CHANNELS];
- } faacDecFrameInfo;
-
- typedef struct
+
--- faad2-2.0,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040513064647.CF6926854>