# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	audio_bmp-faad.diff
#	audio_xmms-faad.diff
#
echo x - audio_bmp-faad.diff
sed 's/^X//' >audio_bmp-faad.diff << '44e42ed9ec1ae923e136f7de4f78d220'
Xdiff -urN /usr/ports/audio/bmp-faad/Makefile audio/bmp-faad/Makefile
X--- /usr/ports/audio/bmp-faad/Makefile	2008-08-20 14:17:05.000000000 +0900
X+++ audio/bmp-faad/Makefile	2009-02-19 00:07:13.000000000 +0900
X@@ -5,53 +5,11 @@
X # $FreeBSD: ports/audio/bmp-faad/Makefile,v 1.22 2008/08/20 00:56:25 ade Exp $
X #
X 
X-PORTNAME=	faad2
X-PORTVERSION=	2.6.1
X-PORTREVISION=	1
X-CATEGORIES=	audio
X-MASTER_SITES=	SF/faac
X PKGNAMEPREFIX=	bmp-
X 
X MAINTAINER=	ports@FreeBSD.org
X COMMENT=	Beep Media Player (BMP) plugin for faad
X 
X-LIB_DEPENDS=	faad.0:${PORTSDIR}/audio/faad \
X-		beep.2:${PORTSDIR}/multimedia/beep-media-player
X+MASTERDIR=	${.CURDIR}/../xmms-faad
X 
X-WRKSRC=		${WRKDIR}/${PORTNAME}
X-
X-USE_GNOME=	gnometarget gtk20
X-USE_GMAKE=	yes
X-USE_AUTOTOOLS=	automake:15 autoheader:262 autoconf:262 libtool:15
X-AUTOMAKE_ARGS=	--add-missing
X-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
X-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
X-
X-DESCR=		${PORTSDIR}/audio/faad/pkg-descr
X-PLIST_FILES=	lib/bmp/Input/libmp4.so
X-
X-.include <bsd.port.pre.mk>
X-
X-post-patch:
X-	@${REINPLACE_CMD} -e '/AC_CONFIG_FILES(plugins/d' ${WRKSRC}/configure.in
X-	@${REINPLACE_CMD} -e 's|"faad.h"|<faad.h>|g ; \
X-		 s|<xmms/|<bmp/|g' ${WRKSRC}/plugins/xmms/src/mp4_utils.c
X-	@${ECHO_CMD} "SUBDIRS = common" > ${WRKSRC}/Makefile.am
X-
X-pre-configure:
X-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
X-		&& ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
X-
X-post-build:
X-	cd ${WRKSRC}/plugins/xmms/src && ${CC} ${CFLAGS} -fPIC -shared \
X-		-DHAVE_BMP -I../../../common/mp4ff -I${LOCALBASE}/include \
X-		`pkg-config --cflags bmp` *.c -o libmp4.so \
X-		../../../common/mp4ff/.libs/libmp4ff.a \
X-		-L${LOCALBASE}/lib -lfaad \
X-		`pkg-config --libs bmp`
X-
X-do-install:
X-	${INSTALL_DATA} ${WRKSRC}/plugins/xmms/src/libmp4.so \
X-		${PREFIX}/lib/bmp/Input
X-
X-.include <bsd.port.post.mk>
X+.include "${MASTERDIR}/Makefile.inc"
Xdiff -urN /usr/ports/audio/bmp-faad/distinfo audio/bmp-faad/distinfo
X--- /usr/ports/audio/bmp-faad/distinfo	2008-06-06 16:05:58.000000000 +0900
X+++ audio/bmp-faad/distinfo	1970-01-01 09:00:00.000000000 +0900
X@@ -1,3 +0,0 @@
X-MD5 (faad2-2.6.1.tar.gz) = 74e92df40c270f216a8305fc87603c8a
X-SHA256 (faad2-2.6.1.tar.gz) = 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
X-SIZE (faad2-2.6.1.tar.gz) = 839410
44e42ed9ec1ae923e136f7de4f78d220
echo x - audio_xmms-faad.diff
sed 's/^X//' >audio_xmms-faad.diff << '87764c8454790ea5a7c632f095b6ccd8'
Xdiff -urN /usr/ports/audio/xmms-faad/Makefile audio/xmms-faad/Makefile
X--- /usr/ports/audio/xmms-faad/Makefile	2009-02-03 14:15:00.000000000 +0900
X+++ audio/xmms-faad/Makefile	2009-02-19 01:53:02.000000000 +0900
X@@ -5,59 +5,11 @@
X # $FreeBSD: ports/audio/xmms-faad/Makefile,v 1.31 2009/02/02 23:43:55 linimon Exp $
X #
X 
X-PORTNAME=	faad2
X-PORTVERSION=	2.0
X-PORTREVISION=	7
X-CATEGORIES=	audio
X-MASTER_SITES=	SF
X-MASTER_SITE_SUBDIR=	faac
X PKGNAMEPREFIX=	xmms-
X 
X MAINTAINER=	ports@FreeBSD.org
X COMMENT=	XMMS plugin for faad
X 
X-BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
X-LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
X-		xmms.4:${PORTSDIR}/multimedia/xmms \
X-		faad.0:${PORTSDIR}/audio/faad \
X-		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
X-PATCH_DEPENDS=	${BUILD_DEPENDS}
X+MASTERDIR=	${.CURDIR}
X 
X-WRKSRC=		${WRKDIR}/${PORTNAME}
X-
X-USE_AUTOTOOLS=	automake:15 autoheader:262 autoconf:262 libtool:15
X-AUTOMAKE_ARGS=		--add-missing
X-USE_GNOME=		gtk12
X-USE_GMAKE=		yes
X-
X-CONFIGURE_ARGS=	--with-xmms --with-mp4v2
X-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \
X-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
X-
X-DESCR=		${PORTSDIR}/audio/faad/pkg-descr
X-PLIST_FILES=	lib/xmms/Input/libmp4.a \
X-		lib/xmms/Input/libmp4.la \
X-		lib/xmms/Input/libmp4.so
X-
X-BUILD_WRKSRC=	${WRKSRC}/plugins/xmms/src
X-INSTALL_WRKSRC=	${WRKSRC}/plugins/xmms/src
X-
X-pre-patch: build-depends
X-
X-post-patch:
X-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/plugins/xmms/src/Makefile.am
X-	@${REINPLACE_CMD} -e 's|"faad.h"|<faad.h>|; s|"mp4.h"|<mp4.h>|' \
X-		${WRKSRC}/plugins/xmms/src/libmp4.c
X-# make sure everything is prepared prior to configure stage
X-# pre-configure will not work since *AUTO* tools happen in-between
X-	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
X-		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
X-	@${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
X-		-e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4
X-# CFLAGS safeness
X-	@${FIND} ${WRKSRC} -type f -name Makefile.am | \
X-		${XARGS} -n 5 -x \
X-			${REINPLACE_CMD} -e \
X-				's|-O2|${CFLAGS}|'
X-
X-.include <bsd.port.mk>
X+.include "${MASTERDIR}/Makefile.inc"
Xdiff -urN /usr/ports/audio/xmms-faad/Makefile.inc audio/xmms-faad/Makefile.inc
X--- /usr/ports/audio/xmms-faad/Makefile.inc	1970-01-01 09:00:00.000000000 +0900
X+++ audio/xmms-faad/Makefile.inc	2009-02-18 23:22:48.000000000 +0900
X@@ -0,0 +1,47 @@
X+# $FreeBSD$
X+
X+PORTNAME=	faad2
X+PORTVERSION=	2.7
X+CATEGORIES=	audio
X+MASTER_SITES=	SFE/faac
X+
X+BUILD_DEPENDS=	faad2>=2.7:${PORTSDIR}/audio/faad
X+RUN_DEPENDS=	faad2>=2.7:${PORTSDIR}/audio/faad
X+
X+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/plugins/xmms/src
X+
X+USE_BZIP2=	yes
X+WANT_GNOME=	yes
X+
X+DESCR=		${PORTSDIR}/audio/faad/pkg-descr
X+PLIST_FILES=	${PLUGINS_DIR:S,^${PREFIX}/,,}/libmp4.so
X+
X+.include <bsd.port.pre.mk>
X+
X+.if ${PKGNAMEPREFIX} == "bmp-"
X+LIB_DEPENDS+=	beep.2:${PORTSDIR}/multimedia/beep-media-player
X+USE_GNOME+=	gtk20
X+PLUGINS_DIR=	${PREFIX}/lib/bmp/Input
X+EXTRA_CFLAGS=	`pkg-config --cflags bmp` -DHAVE_BMP
X+EXTRA_LDFLAGS=	`pkg-config --libs bmp`
X+.endif
X+
X+.if ${PKGNAMEPREFIX} == "xmms-"
X+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
X+USE_GNOME+=	gtk12
X+PLUGINS_DIR=	${PREFIX}/lib/xmms/Input
X+EXTRA_CFLAGS=	`xmms-config --cflags`
X+EXTRA_LDFLAGS+=	`xmms-config --libs`
X+.endif
X+
X+do-build:
X+	cd ${WRKSRC} && ${CC} ${CFLAGS} -fPIC -shared \
X+		-I${LOCALBASE}/include -DHAVE_STDINT_H \
X+		${EXTRA_CFLAGS} *.c -o libmp4.so \
X+		-L${LOCALBASE}/lib -lfaad -lmp4ff \
X+		${EXTRA_LDFLAGS}
X+
X+do-install:
X+	cd ${WRKSRC}; ${INSTALL_DATA} libmp4.so ${PLUGINS_DIR}
X+
X+.include <bsd.port.post.mk>
Xdiff -urN /usr/ports/audio/xmms-faad/distinfo audio/xmms-faad/distinfo
X--- /usr/ports/audio/xmms-faad/distinfo	2006-08-25 07:27:39.000000000 +0900
X+++ audio/xmms-faad/distinfo	2009-02-18 22:27:00.000000000 +0900
X@@ -1,3 +1,3 @@
X-MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07
X-SHA256 (faad2-2.0.tar.gz) = a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861
X-SIZE (faad2-2.0.tar.gz) = 766660
X+MD5 (faad2-2.7.tar.bz2) = 4c332fa23febc0e4648064685a3d4332
X+SHA256 (faad2-2.7.tar.bz2) = 14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5
X+SIZE (faad2-2.7.tar.bz2) = 901043
Xdiff -urN /usr/ports/audio/xmms-faad/files/patch-mp4_utils.c audio/xmms-faad/files/patch-mp4_utils.c
X--- /usr/ports/audio/xmms-faad/files/patch-mp4_utils.c	1970-01-01 09:00:00.000000000 +0900
X+++ audio/xmms-faad/files/patch-mp4_utils.c	2009-02-18 23:10:04.000000000 +0900
X@@ -0,0 +1,26 @@
X+--- mp4_utils.c.orig	2004-10-18 05:44:51.000000000 +0900
X++++ mp4_utils.c	2009-02-12 02:53:15.000000000 +0900
X+@@ -3,15 +3,22 @@
X+ */
X+ 
X+ #include "mp4ff.h"
X+-#include "faad.h"
X++#include "neaacdec.h"
X+ 
X+ #include <gtk/gtk.h>
X+ #include <stdio.h>
X+ #include <string.h>
X+ #include <stdlib.h>
X++
X++#if defined(HAVE_BMP)
X++#include <bmp/plugin.h>
X++#include <bmp/titlestring.h>
X++#include <bmp/util.h>
X++#else
X+ #include <xmms/plugin.h>
X+ #include <xmms/titlestring.h>
X+ #include <xmms/util.h>
X++#endif /*HAVE_BMP*/
X+ 
X+ const char *mp4AudioNames[]=
X+   {
Xdiff -urN /usr/ports/audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.in audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.in
X--- /usr/ports/audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.in	2004-11-23 12:57:49.000000000 +0900
X+++ audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.in	1970-01-01 09:00:00.000000000 +0900
X@@ -1,12 +0,0 @@
X---- plugins/xmms/src/Makefile.am.orig	Wed Sep 29 13:33:13 2004
X-+++ plugins/xmms/src/Makefile.am	Wed Sep 29 13:34:27 2004
X-@@ -5,8 +5,7 @@
X-        `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
X-        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
X- 
X--libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
X--       $(top_builddir)/common/mp4v2/libmp4v2.la
X-+LIBS=	-lfaad -lmp4v2
X- 
X- libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
X-        `$(GTK_CONFIG) --libs` -lpthread -lstdc++
Xdiff -urN /usr/ports/audio/xmms-faad/files/patch-plugins_xmms_src_mp4__utils.c audio/xmms-faad/files/patch-plugins_xmms_src_mp4__utils.c
X--- /usr/ports/audio/xmms-faad/files/patch-plugins_xmms_src_mp4__utils.c	2005-09-14 13:18:23.000000000 +0900
X+++ audio/xmms-faad/files/patch-plugins_xmms_src_mp4__utils.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,87 +0,0 @@
X---- plugins/xmms/src/mp4_utils.c.orig	Thu Dec  4 05:07:56 2003
X-+++ plugins/xmms/src/mp4_utils.c	Fri Jul 29 11:11:21 2005
X-@@ -6,23 +6,35 @@
X- 
X- const char *mp4AudioNames[]=
X-   {
X--    "MPEG-1 Audio Layers 1,2 or 3",
X--    "MPEG-2 low biterate (MPEG-1 extension) - MP3",
X--    "MPEG-2 AAC Main Profile",
X--    "MPEG-2 AAC Low Complexity profile",
X--    "MPEG-2 AAC SSR profile",
X--    "MPEG-4 audio (MPEG-4 AAC)",
X--    0
X-+    "MPEG-4 AAC Main profile",
X-+    "MPEG-4 AAC Low Complexity profile",
X-+    "MPEG-4 AAC SSR profile",
X-+    "MPEG-4 AAC Long Term Prediction profile",
X-+    "MPEG-4 AAC Scalable",
X-+    "MPEG-4 CELP",
X-+    "MPEG-4 HVXC",
X-+    "MPEG-4 Text to Speech",
X-+    "MPEG-4 Main Synthetic profile",
X-+    "MPEG-4 Wavetable Synthesis profile",
X-+    "MPEG-4 MIDI profile",
X-+    "MPEG-4 Algorithmic Synthesis and Audio FX profile",
X-+    NULL
X-   };
X- 
X- const u_int8_t mp4AudioTypes[] =
X-   {
X--    MP4_MPEG1_AUDIO_TYPE,		// 0x6B
X--    MP4_MPEG2_AUDIO_TYPE,		// 0x69
X--    MP4_MPEG2_AAC_MAIN_AUDIO_TYPE,	// 0x66
X--    MP4_MPEG2_AAC_LC_AUDIO_TYPE,	// 0x67
X--    MP4_MPEG2_AAC_SSR_AUDIO_TYPE,	// 0x68
X--    MP4_MPEG4_AUDIO_TYPE,		// 0x40
X-+    MP4_MPEG4_AAC_MAIN_AUDIO_TYPE,
X-+    MP4_MPEG4_AAC_LC_AUDIO_TYPE,
X-+    MP4_MPEG4_AAC_SSR_AUDIO_TYPE,
X-+    MP4_MPEG4_AAC_LTP_AUDIO_TYPE,
X-+    MP4_MPEG4_AAC_SCALABLE_AUDIO_TYPE,
X-+    MP4_MPEG4_CELP_AUDIO_TYPE,
X-+    MP4_MPEG4_HVXC_AUDIO_TYPE,
X-+    MP4_MPEG4_TTSI_AUDIO_TYPE,
X-+    MP4_MPEG4_MAIN_SYNTHETIC_AUDIO_TYPE,
X-+    MP4_MPEG4_WAVETABLE_AUDIO_TYPE,
X-+    MP4_MPEG4_MIDI_AUDIO_TYPE,
X-+    MP4_MPEG4_ALGORITHMIC_FX_AUDIO_TYPE,
X-     0
X-   };
X- 
X-@@ -54,7 +66,7 @@
X-     const char *trackType = MP4GetTrackType(file, trackID);
X-     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
X-       int j=0;
X--      u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
X-+      u_int8_t audiotype = MP4GetTrackAudioMpeg4Type(file, trackID);
X-       while(mp4AudioTypes[j]){ // what kind of audio is ?
X- 	if(mp4AudioTypes[j] == audiotype){
X- 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
X-@@ -64,9 +76,9 @@
X- 	  }
X- 	  else{
X- 	    printf("%s\n", mp4AudioNames[j]);
X--	    if (mp4AudioTypes[j]== MP4_MPEG2_AAC_LC_AUDIO_TYPE ||
X--		mp4AudioTypes[j]== MP4_MPEG2_AAC_MAIN_AUDIO_TYPE ||
X--		mp4AudioTypes[j]== MP4_MPEG2_AAC_SSR_AUDIO_TYPE)
X-+	    if (mp4AudioTypes[j]== MP4_MPEG4_AAC_MAIN_AUDIO_TYPE ||
X-+		mp4AudioTypes[j]== MP4_MPEG4_AAC_LC_AUDIO_TYPE ||
X-+		mp4AudioTypes[j]== MP4_MPEG4_AAC_SSR_AUDIO_TYPE)
X- 	      return(trackID);
X- 	    return(-1);
X- 	  }
X-@@ -126,10 +138,11 @@
X-     printf("Track %d, %s", trackID, trackType);
X-     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
X-       int j=0;
X--      u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
X-+      u_int8_t audiotype = MP4GetTrackAudioMpeg4Type(mp4file, trackID);
X-       while(mp4AudioTypes[j]){ // what kind of audio is ?
X- 	if(mp4AudioTypes[j] == audiotype){
X--	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){
X-+	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE ||
X-+	     mp4AudioTypes[j] == MP4_MPEG4_AAC_LC_AUDIO_TYPE){
X- 	    audiotype = MP4GetTrackAudioMpeg4Type(mp4file, trackID);
X- 	    g_print(" %s", mpeg4AudioNames[audiotype]);
X- 	  }
87764c8454790ea5a7c632f095b6ccd8
exit