ports/124307: Update port: audio/bmp-faad to 2.6.1
KATO Tsuguru
tkato432 at yahoo.com
Thu Jun 5 18:10:02 UTC 2008
>Number: 124307
>Category: ports
>Synopsis: Update port: audio/bmp-faad to 2.6.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 05 18:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.3-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.6.1
Remove file:
files/patch-cofigure
files/patch-xmms-Makefile.am
files/patch-xmms-mp4_utils.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/bmp-faad/Makefile audio/bmp-faad/Makefile
--- /usr/ports/audio/bmp-faad/Makefile 2008-05-27 15:15:48.000000000 +0900
+++ audio/bmp-faad/Makefile 2008-06-05 03:19:16.000000000 +0900
@@ -6,8 +6,7 @@
#
PORTNAME= faad2
-PORTVERSION= 2.0
-PORTREVISION= 9
+PORTVERSION= 2.6.1
CATEGORIES= audio
MASTER_SITES= SF/faac
PKGNAMEPREFIX= bmp-
@@ -15,49 +14,43 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Beep Media Player (BMP) plugin for faad
-PATCH_DEPENDS= ${AUTOMAKE_DEPENDS} ${AUTOCONF_DEPENDS} ${LIBTOOL_DEPENDS}
-LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
- faad.0:${PORTSDIR}/audio/faad \
- mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+LIB_DEPENDS= faad.0:${PORTSDIR}/audio/faad \
beep.2:${PORTSDIR}/multimedia/beep-media-player
WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_GNOME= gnometarget gtk20
+USE_GMAKE= yes
USE_AUTOTOOLS= automake:15 autoheader:261 autoconf:261 libtool:15
-AUTOMAKE_ARGS= --add-missing
-USE_GMAKE= yes
-USE_GNOME= gtk20
-
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-xmms --with-mp4v2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+AUTOMAKE_ARGS= --add-missing
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
DESCR= ${PORTSDIR}/audio/faad/pkg-descr
-PLIST_FILES= lib/bmp/Input/libmp4.a \
- lib/bmp/Input/libmp4.la \
- lib/bmp/Input/libmp4.so
-
-BUILD_WRKSRC= ${WRKSRC}/plugins/xmms/src
-INSTALL_WRKSRC= ${WRKSRC}/plugins/xmms/src
+PLIST_FILES= lib/bmp/Input/libmp4.so
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/plugins/xmms/src/Makefile.am
- @${REINPLACE_CMD} -e 's|"faad.h"|<faad.h>|; s|"mp4.h"|<mp4.h>|' \
- ${WRKSRC}/plugins/xmms/src/libmp4.c
-# make sure everything is prepared prior to configure stage
-# pre-configure will not work since *AUTO* tools happen in-between
- @cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
- ${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
- @${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
- -e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4
-# CFLAGS safeness
- @${FIND} ${WRKSRC} -type f -name Makefile.am | \
- ${XARGS} -n 5 -x \
- ${REINPLACE_CMD} -e \
- 's|-O2|${CFLAGS}|'
- @${REINPLACE_CMD} -e 's|<xmms|<bmp|' ${WRKSRC}/plugins/xmms/src/libmp4.c
+ @${REINPLACE_CMD} -e '/AC_CONFIG_FILES(plugins/d' ${WRKSRC}/configure.in
+ @${REINPLACE_CMD} -e 's|"faad.h"|<faad.h>|g ; \
+ s|<xmms/|<bmp/|g' ${WRKSRC}/plugins/xmms/src/mp4_utils.c
+ @${ECHO_CMD} "SUBDIRS = common" > ${WRKSRC}/Makefile.am
+
+pre-configure:
+ @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+ && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
+
+post-build:
+ cd ${WRKSRC}/plugins/xmms/src && ${CC} ${CFLAGS} -fPIC -shared \
+ -DHAVE_BMP -I../../../common/mp4ff -I${LOCALBASE}/include \
+ `pkg-config --cflags bmp` *.c -o libmp4.so \
+ ../../../common/mp4ff/.libs/libmp4ff.a \
+ -L${LOCALBASE}/lib -lfaad \
+ `pkg-config --libs bmp`
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/plugins/xmms/src/libmp4.so \
+ ${PREFIX}/lib/bmp/Input
.include <bsd.port.post.mk>
diff -urN /usr/ports/audio/bmp-faad/distinfo audio/bmp-faad/distinfo
--- /usr/ports/audio/bmp-faad/distinfo 2006-08-25 07:27:39.000000000 +0900
+++ audio/bmp-faad/distinfo 2008-06-01 01:54:38.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07
-SHA256 (faad2-2.0.tar.gz) = a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861
-SIZE (faad2-2.0.tar.gz) = 766660
+MD5 (faad2-2.6.1.tar.gz) = 74e92df40c270f216a8305fc87603c8a
+SHA256 (faad2-2.6.1.tar.gz) = 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
+SIZE (faad2-2.6.1.tar.gz) = 839410
diff -urN /usr/ports/audio/bmp-faad/files/patch-configure audio/bmp-faad/files/patch-configure
--- /usr/ports/audio/bmp-faad/files/patch-configure 2004-10-14 09:18:12.000000000 +0900
+++ audio/bmp-faad/files/patch-configure 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- configure.in.orig Thu Sep 2 13:17:44 2004
-+++ configure.in Thu Sep 2 13:19:45 2004
-@@ -88,10 +88,6 @@
- fi
-
- if test x$WITHXMMS = xyes; then
-- AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
-- if test "$XMMS_CONFIG" = "not_found"; then
-- AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build")
-- fi
- AC_CHECK_HEADER(pthread.h,,
- AC_MSG_ERROR(*** pthread headers support not installed or not found))
- AC_CHECK_HEADER(id3.h,,
diff -urN /usr/ports/audio/bmp-faad/files/patch-xmms-Makefile.am audio/bmp-faad/files/patch-xmms-Makefile.am
--- /usr/ports/audio/bmp-faad/files/patch-xmms-Makefile.am 2005-10-02 02:48:39.000000000 +0900
+++ audio/bmp-faad/files/patch-xmms-Makefile.am 1970-01-01 09:00:00.000000000 +0900
@@ -1,21 +0,0 @@
---- plugins/xmms/src/Makefile.am.orig Fri Feb 6 11:05:07 2004
-+++ plugins/xmms/src/Makefile.am Thu Nov 11 18:56:18 2004
-@@ -1,13 +1,10 @@
--libdir = `$(XMMS_CONFIG) --input-plugin-dir`
-+libdir = `pkg-config --variable=input_plugin_dir bmp`
- lib_LTLIBRARIES = libmp4.la
-
--libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
-- `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
-+libmp4_la_CFLAGS = `pkg-config gtk+-2.0 --cflags` -Wall \
-+ `pkg-config bmp --cflags` \
- -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-
--libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4v2/libmp4v2.la
--
--libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
-- `$(GTK_CONFIG) --libs` -lpthread -lstdc++
-+libmp4_la_LDFLAGS = -module -avoid-version `pkg-config bmp --libs` \
-+ `pkg-config gtk+-2.0 --libs` -lstdc++ -lfaad -lmp4v2
- libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff -urN /usr/ports/audio/bmp-faad/files/patch-xmms-mp4_utils.c audio/bmp-faad/files/patch-xmms-mp4_utils.c
--- /usr/ports/audio/bmp-faad/files/patch-xmms-mp4_utils.c 2005-09-18 18:46:45.000000000 +0900
+++ audio/bmp-faad/files/patch-xmms-mp4_utils.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- plugins/xmms/src/mp4_utils.c.orig Thu Dec 4 03:37:56 2003
-+++ plugins/xmms/src/mp4_utils.c Sun Sep 18 00:00:40 2005
-@@ -54,7 +54,7 @@
- const char *trackType = MP4GetTrackType(file, trackID);
- if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
- int j=0;
-- u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
-+ u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
- while(mp4AudioTypes[j]){ // what kind of audio is ?
- if(mp4AudioTypes[j] == audiotype){
- if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
-@@ -126,7 +126,7 @@
- printf("Track %d, %s", trackID, trackType);
- if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
- int j=0;
-- u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
-+ u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
- while(mp4AudioTypes[j]){ // what kind of audio is ?
- if(mp4AudioTypes[j] == audiotype){
- if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list