Attachment #47098 for bug #72206

View | Details | Raw Unified | Return to bug 72206
Collapse All | Expand All




#

PORTNAME=	mpeg4ip
PORTVERSION=	1.1
CATEGORIES=	multimedia audio ipv6 net
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
PKGNAMESUFFIX=	${PKG_NAME_SUFFIX}

MAINTAINER=	lioux@FreeBSD.org
COMMENT=	Standards-based system to encode, stream and play MPEG-4 audio/video

LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
		faad.0:${PORTSDIR}/audio/faad \
		mp3lame.0:${PORTSDIR}/audio/lame \
		id3tag.2:${PORTSDIR}/audio/libid3tag \
		a52.0:${PORTSDIR}/audio/liba52 \
		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
		avcodec.0:${PORTSDIR}/multimedia/ffmpeg

USE_GNOME=	gtk20
USE_GMAKE=	yes
USE_SDL=	sdl
USE_GMAKE=	yes
USE_INC_LIBTOOL_VER=15
USE_REINPLACE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS=	--enable-ffmpeg \
		--enable-mp4live \
		--disable-static
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
INSTALLS_SHLIB=	yes

OPTIONS=	ARTS "Enable Arts Support" Off \
		ESOUND "Enable Esound Support" Off \
		IPV6 "Enable IPV6 Support" On \
		NAS "Enable Nas Support" Off \
		OPTIMIZED_CFLAGS "Enable compilation optimizations" Off \
		XVID "Enable XVID Support" On

DOCS_FILES=	${PORTDOCS}
PORTDOCS=	MAINREADME.html MP4LIVE_INTERNALS.html MPEG4IP_Guide.pdf \
		MP4LIVE_README.html PLAYER_INTERNALS.html PLAYER_README.html \
		ReadingList.txt ReadingList.txt encoding.htm m4rm.html \
		mp4player.jpg mrm.html pi.html prm.html

MAN1=	gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1
MAN3=	MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
	MP4AddRtpESConfigurationPacket.3 MP4AddRtpHint.3 MP4AddRtpImmediateData.3 \
	MP4AddRtpPacket.3 MP4AddRtpSampleData.3 MP4AddRtpVideoHint.3 \
	MP4AddSceneTrack.3 MP4AddSystemsTrack.3 MP4AddTrack.3 \
	MP4AddTrackEdit.3 MP4AddVideoTrack.3 MP4AppendHintTrackSdp.3 \
	MP4AddTrackEdit.3 \
	MP4AppendSessionSdp.3 MP4BinaryToBase16.3 MP4BinaryToBase64.3 \
	MP4CloneTrack.3 MP4Close.3 MP4ConvertFromMovieDuration.3 \
	MP4Close.3 MP4ConvertFromMovieDuration.3 \
	MP4ConvertFromTrackDuration.3 MP4ConvertFromTrackTimestamp.3 \
	MP4ConvertToTrackDuration.3 MP4ConvertToTrackTimestamp.3 \
	MP4CopySample.3	MP4CopyTrack.3 MP4Create.3 MP4DeleteTrack.3 \
	MP4DeleteTrackEdit.3 MP4Dump.3 MP4FileInfo.3 MP4FindTrackId.3 \
	MP4FileInfo.3 \
	MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 MP4GetDuration.3 \
	MP4GetGraphicsProfileLevel.3 MP4GetHintTrackReferenceTrackId.3 \
	MP4GetHintTrackRtpPayload.3 MP4GetHintTrackSdp.3 MP4GetNumberOfTracks.3 \
	MP4GetODProfileLevel.3 MP4GetRtpHintNumberOfPackets.3 MP4GetRtpPacketBFrame.3 \
	MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 MP4GetSampleDuration.3 \
	MP4GetSampleIdFromEditTime.3 MP4GetSampleIdFromTime.3 MP4GetSampleRenderingOffset.3 \
	MP4GetSampleSize.3 MP4GetSampleSync.3 MP4GetSampleTime.3 \
	MP4GetSceneProfileLevel.3 MP4GetSessionSdp.3 MP4GetTimeScale.3 \
	MP4GetTrackAudioMpeg4Type.3 MP4GetTrackAudioType.3 MP4GetTrackBitRate.3 \
	MP4GetTrackDuration.3 MP4GetTrackESConfiguration.3 MP4GetTrackEditDuration.3 \
	MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 MP4GetTrackEditStart.3 \
	MP4GetTrackEditTotalDuration.3 MP4GetTrackFixedSampleDuration.3 MP4GetTrackMaxSampleSize.3 \
	MP4GetTrackNumberOfEdits.3 MP4GetTrackNumberOfSamples.3 MP4GetTrackTimeScale.3 \
	MP4GetTrackType.3 MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \
	MP4GetTrackTimeScale.3 MP4GetTrackType.3 \
	MP4GetTrackAudioMpeg4Type.3 MP4GetTrackEditDuration.3 \
	MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 \
	MP4GetTrackEditStart.3 MP4GetTrackEditTotalDuration.3 \
	MP4GetTrackNumberOfEdits.3 \
	MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \
	MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 MP4GetVerbosity.3 \
	MP4GetVideoProfileLevel.3 MP4Info.3 MP4MakeIsmaCompliant.3 \
	MP4Modify.3 MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 MP4ReadRtpPacket.3 \
	MP4ReadSample.3 MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 \
	MP4SetAudioProfileLevel.3 MP4SetGraphicsProfileLevel.3 MP4SetHintTrackRtpPayload.3 \
	MP4SetHintTrackSdp.3 MP4SetODProfileLevel.3 MP4SetRtpTimestampStart.3 \
	MP4SetSampleRenderingOffset.3 MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 \
	MP4SetTimeScale.3 MP4SetTrackESConfiguration.3 MP4SetTrackEditDuration.3 \
	MP4SetTrackEditDwell.3 MP4SetTrackEditMediaStart.3 MP4SetTrackTimeScale.3 \
	MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 MP4WriteSample.3
	MP4SetTrackEditDuration.3 MP4SetTrackEditDwell.3 \
	MP4SetTrackEditMediaStart.3 \
	MP4SetTrackESConfiguration.3 MP4SetTrackTimeScale.3 \
	MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 \
	MP4WriteSample.3

post-extract:
.for dir in SDL
	@${RM} -Rf ${WRKSRC}/lib/${dir}
.endfor

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 502100
EXTRA_PATCHES+=	${FILESDIR}/sdp-patch
.else
USE_GCC=	3.4
.endif

.if exists(${LOCALBASE}/lib/libartsc.so.0)
WITH_ARTS=	yes
.endif

.if ${HAVE_GNOME:Mesound}!=""
WITH_ESOUND=	yes
.endif

.if exists(${LOCALBASE}/lib/libaudio.so.2)
WITH_NAS=	yes
.endif

.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
WITH_XVID=	yes
.endif

.if defined(WITH_ARTS)
LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
.endif

.if defined(WITH_ESOUND)
USE_GNOME+=	esound

PKG_NAME_SUFFIX+=-esound
.endif

.if defined(WITH_NAS)
LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
.endif

.if defined(WITH_XVID)
LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
PLIST_SUB+=	XVID=""
.else
PLIST_SUB+=	XVID="@comment "
.endif

.if ${ARCH} == "amd64"

.endif

post-patch:
# don't compile or use libmp4v2
	@${REINPLACE_CMD} -e 's|mp4v2||' ${WRKSRC}/lib/Makefile.in
	@${REINPLACE_CMD} -e 's|-I$(top_srcdir)/lib/mp4v2||; \
		s|$$(top_builddir)/lib/mp4v2/libmp4v2.la||; \
		s|@LIBS@|@LIBS@ -lmp4v2|' \
		${WRKSRC}/player/src/Makefile.in \
		${WRKSRC}/lib/mpeg2t/Makefile.in \
		${WRKSRC}/util/*/Makefile.in \
		${WRKSRC}/server/*/Makefile.in
	@${REINPLACE_CMD} -e 's|-I$(top_srcdir)/lib/mp4v2||; \
		s|../mp4v2/libmp4v2.la||; s|@LIBS@|@LIBS@ -lmp4v2|' \
		${WRKSRC}/lib/mp4av/Makefile.in
	@${REINPLACE_CMD} -e 's|mp4venc_template.par||' \
		${WRKSRC}/server/util/mp4encode/Makefile.in
	@${FIND} ${WRKSRC} -type f -name "*.[ch]" -or -name "*.cpp" | ${XARGS} -n 10 \
		${REINPLACE_CMD} -e \
		's|<stdint.h>|<inttypes.h>|; \
		s|mp4v2/mp4.h|mp4.h|; \
		s|<malloc.h>|<stdlib.h>|; \
		s|<SDL/|<SDL11/|; \
		s|<strstream.h>|<iostream>|'
# replacing distfile's libs with ports' versions
# CFLAGS safeness
	@${REINPLACE_CMD} -E -e 's|lib/SDL/sdl-config|${SDL_CONFIG}|; \
		s|sdl-config|${SDL_CONFIG}|; \
		s|^(SDL_LIBS=).+$$|\1"`${SDL_CONFIG} --libs`"|; \
		s|-Wmissing-declarations||; s|-Wmissing-prototypes||; \
		s|>&/|>/|' \
		${CONFIGURE_WRKSRC}/configure
	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
		-n 10 ${REINPLACE_CMD} -E -e \
		's|-I[^ ]+lib/SDL/include|-I${LOCALBASE}/include/SDL11|; \
		s|-O[0-3]|-O|; \
		s|\$$[^ ]+/lib/SDL/src/main/libSDLmain.a|${LOCALBASE}/lib/libSDLmain-1.1.a|'
	@${REINPLACE_CMD} -E -e \
		's!SDL_(AudioDelayMsec|HasAudioDelayMsec).*;$$!0;!' \
		${WRKSRC}/player/src/audio_sdl.cpp
# do not install manm man pages
	@${REINPLACE_CMD} -E \
		-e 's|api.mpt||' \
		-e 's|^(install-man.*)install-manm|\1|' \
		${WRKSRC}/doc/mp4v2/Makefile.in
# Disable xvid support - mpep4ip doesn't support xvid 1.0.x, but tries
# to use it anyway.
	@${REINPLACE_CMD} -e 's|use_mpeg4ip_xvid=false|use_mpeg4ip_xvid=true|g' \
		-e 's|#define HAVE_XVID_H 1||g'	\
		${WRKSRC}/configure

.if ${ARCH} != "i386"
# emms opcode should be noop in non-i386 non-MMX ARCH
	@${ECHO_CMD} '#define EMMS()' \
		>> ${WRKSRC}/lib/xvid/portab.h
.endif

post-configure:
# disable GNU auto* tools
# remove -Werror
	@${FIND} ${WRKSRC} -type f -name "Makefile" | ${XARGS} \
		-n 10 ${REINPLACE_CMD} -E -e \
		's! (autoconf|autoheader|automake|aclocal)$$! ${TRUE}!; \
		s|-Werror||g'
# configure is not propagating PTHREAD_LIBS to the makefiles
# investigated by David Yeske <dyeske@yahoo.com>
.if ${OSVERSION} >= 500000
	@${REINPLACE_CMD} -E \
		-e 's|(-lSDL-...)|"${PTHREAD_LIBS} \1"|' \

.endif

post-install:
	@${MKDIR} ${DATADIR}
	@${INSTALL_DATA} ${WRKSRC}/server/util/mp4encode/mp4venc_template.par ${DATADIR}
.ifndef(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for files in ${DOC_FILES}
	@${INSTALL_DATA} ${WRKSRC}/doc/${files} ${DOCSDIR}
.endfor
.endif


WITHOUT_MMX=	yes
.else
. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")
OPTIONS+=	OPTIMIZED_BYTESWAP "Enable optimized byteswap routines" On \
		MMX "Enable MMX Optimizations" On
. endif

. if defined(WITH_OPTIMIZED_BYTESWAP)


.ifdef(WITHOUT_MMX)
CONFIGURE_ARGS+=	--disable-mmx
.else
BUILD_DEPEND+S=	nasm:${PORTSDIR}/devel/nasm
.endif

.if defined(WITH_OPTIMIZED_CFLAGS)
CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
.endif

pre-everything::
.ifndef(WITHOUT_IPV6)
	@${ECHO_MSG} '===> Define WITHOUT_IPV6 if you want to disable IPv6 support'
.endif
.ifndef(WITHOUT_MMX)
	@${ECHO_MSG} '===> Define WITHOUT_MMX if your system does not support MMX'
.endif
.ifndef(WITH_OPTIMIZED_BYTESWAP)
	@${ECHO_MSG}
	@${ECHO_MSG} '===> Define WITH_OPTIMIZED_BYTESWAP to use optimized byteswap'
	@${ECHO_MSG} '===> routines. This works only in the i386 architecture, and'
	@${ECHO_MSG} '===> only with 486 processors and above.'
.endif
.if !defined(WITH_OPTIMIZED_CFLAGS)
	@${ECHO_MSG}
	@${ECHO_MSG} '===> You can enable additional compilation optimizations'
	@${ECHO_MSG} '===> by defining WITH_OPTIMIZED_CFLAGS'
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)/usr/ports/multimedia/mpeg4ip/distinfo (-2 / +2 lines)
1	MD5 (mpeg4ip-1.0.tar.gz) = 6ac635a1dd02d874054d6092f350157c	1	MD5 (mpeg4ip-1.1.tar.gz) = fef0224a45485653a8db87bdd5c9e745
2	SIZE (mpeg4ip-1.0.tar.gz) = 5442521	2	SIZE (mpeg4ip-1.1.tar.gz) = 4351378




--- common/video/libmpeg32/video/Makefile.in.orig	Tue Sep 28 23:54:37 2004
+++ common/video/libmpeg32/video/Makefile.in	Tue Sep 28 23:55:25 2004
@@ -290,11 +290,11 @@
 @AMDEP_TRUE@	./$(DEPDIR)/seek.Plo ./$(DEPDIR)/slice.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/vlc.Plo
 CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+LTCCASCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CCAS) $(AM_CCASFLAGS) \
 	$(CCASFLAGS)
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \




--- common/video/mpeg4-2000/idct/idct.hpp.orig	Thu Sep 30 01:01:36 2004
+++ common/video/mpeg4-2000/idct/idct.hpp	Thu Sep 30 01:01:56 2004
@@ -22,6 +22,9 @@
 #ifndef _INT_IDCT_
 #define _INT_IDCT_ 1
 
+#ifndef BLOCK_SIZE
+#define BLOCK_SIZE 5
+#endif
 
 #define IDCT_BLOCK_SIZE	8
 class idct{




--- common/video/mpeg4-2000/tools/entropy/huffman.cpp.orig	Tue Sep 28 22:51:26 2004
+++ common/video/mpeg4-2000/tools/entropy/huffman.cpp	Tue Sep 28 22:51:47 2004
@@ -243,9 +243,6 @@
 Void CHuffmanTree::printStatistics (Double dEntropy, Double dNOfBits, ostream &stream)
 {
     stream<<endl<<endl;
-    stream<<"//Entropy Per Symbol : "<<dEntropy<<endl;
-    stream<<"//Bits Per Symbol    : "<<dNOfBits<<endl;
-    stream<<"//Table Efficiency   : "<<dEntropy/dNOfBits<<endl;
 }
 
 Int CHuffmanCoDec::makeIndexFromSymbolInTable(istream &huffmanTable)  
--- common/video/mpeg4-2000/tools/entropy/bitstrm.cpp.orig	Tue Sep 28 22:56:07 2004
+++ common/video/mpeg4-2000/tools/entropy/bitstrm.cpp	Tue Sep 28 22:56:25 2004
@@ -323,7 +323,6 @@
 	if (m_pstrmTrace != NULL)	{
 		m_pstrmTrace->width (20);
 		(*m_pstrmTrace) << rgchSymbolName << "= ";
-		(*m_pstrmTrace) << fltValue << "\n";
 		m_pstrmTrace->flush ();
 	}
 }
@@ -356,8 +355,6 @@
 	if (m_pstrmTrace != NULL)	{
 		m_pstrmTrace->width (20);
 		(*m_pstrmTrace) << rgchSymbolName << "= ";
-		(*m_pstrmTrace) << vctValue.x << ", ";
-		(*m_pstrmTrace) << vctValue.y << "\n ";
 		m_pstrmTrace->flush ();
 	}
 }
--- common/video/mpeg4-2000/sys/mode.cpp.orig	Tue Sep 28 23:05:10 2004
+++ common/video/mpeg4-2000/sys/mode.cpp	Tue Sep 28 23:05:59 2004
@@ -409,12 +409,6 @@
 //	if (bVOPPrint)
 		cout << "\t" << "Shape:" << "\t\t\t" << nBitsShape << "\n";
 	cout << "\t" << "Total:" << "\t\t\t" << nBitsTotal << "\n";
-	cout << "\t" << "SNR Y:" << "\t\t\t" << dSNRY / nVOPs << " dB\n";
-	cout << "\t" << "SNR U:" << "\t\t\t" << dSNRU / nVOPs << " dB\n";
-	cout << "\t" << "SNR V:" << "\t\t\t" << dSNRV / nVOPs << " dB\n";
-  for(Int iAuxComp=0;iAuxComp<m_iAuxCompCount;iAuxComp++)  // MAC (SB) 26-Nov-99
-	  cout << "\t" << "SNR A[" << iAuxComp << "]:" << "\t\t" << dSNRA[iAuxComp] / nVOPs << " dB\n";
-	cout << "\n\t" << "average Qp:" << "\t\t" << (Double)nQp / nQMB << "\n\n";
 	cout.flush ();
 }




--- include/mpeg4ip.h.orig	Wed Sep 29 14:43:52 2004
+++ include/mpeg4ip.h	Wed Sep 29 14:44:10 2004
@@ -160,14 +160,14 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
+#if 0
 #if !defined(HAVE_INTTYPES_H) || !defined(HAVE_STDINT_H)
 #error "Don't have stdint.h or inttypes.h - no way to get uint8_t"
+#endif
 #endif
 
 #include <unistd.h>

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-lib::Makefile.in (-11 lines)
1	--- lib/Makefile.in.orig Wed Jan 1 21:46:28 2003
2	+++ lib/Makefile.in Wed Jan 1 21:47:39 2003
3	@@ -110,7 +110,7 @@
4	am__include = @am__include@
5	am__quote = @am__quote@
6	install_sh = @install_sh@
7	-SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp SDL xvid mpeg2t SDL_VisualC
8	+SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp xvid mpeg2t
9	subdir = lib
10	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11	CONFIG_HEADER = $(top_builddir)/config.h




--- lib/xvid/bitstream/h263.h.orig	Wed Nov 13 16:53:29 2002
+++ lib/xvid/bitstream/h263.h	Wed Nov 13 16:55:31 2002
@@ -25,6 +25,10 @@
 /* #define FFMPEG_VERSION_INT 0x000405 */
 /* #define FFMPEG_VERSION     "0.4.5" */
 
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+
 #ifdef WIN32
 #define CONFIG_WIN32
 #endif
@@ -69,11 +73,16 @@
 #define DEBUG
 #endif
 
+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
+#include <sys/endian.h>
+#define be2me_32(x) (be32toh(x))
+#else
 // code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
 #define bswap_32(x) \
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 #define be2me_32(x) bswap_32(x)
+#endif
 
 #define snprintf _snprintf
 




--- ltmain.sh.orig	Thu Sep 30 04:09:46 2004
+++ ltmain.sh	Thu Sep 30 04:11:06 2004
@@ -5425,10 +5425,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"




--- mpeg4ip_config.h.in.orig	Tue May 18 13:31:06 2004
+++ mpeg4ip_config.h.in	Wed Sep 29 14:40:59 2004
@@ -25,16 +25,12 @@
 #undef HAVE_FPOS_T___POS
 
 /* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT

-#undef HAVE_GETOPT_LONG
 
 /* Define to 1 if you have the `getopt_long_only' function. */
-#undef HAVE_GETOPT_LONG_ONLY
 
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
@@ -67,7 +63,6 @@
 #undef HAVE_IPv6
 
 /* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */
-#undef HAVE_LIBGNUGETOPT
 
 /* have libmpeg2 decoder library */
 #undef HAVE_LIBMPEG2

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp (+10 lines)
	1	--- player/src/codec/mp3/mp3_file.cpp.orig Wed Sep 29 00:24:31 2004
	2	+++ player/src/codec/mp3/mp3_file.cpp Wed Sep 29 00:28:47 2004
	3	@@ -126,6 +126,7 @@
	4	descptr[1] = strdup(desc);
	5	CHECK_AND_FREE(ret);
	6	}
	7	+ ret = ID3_v1_genre_description[NULL];
	8	ret = ID3_GetAlbum(&myTag);
	9	if (ret) {
	10




--- player/src/mpeg3_rtp_bytestream.cpp.orig	Thu Sep 30 03:10:31 2004
+++ player/src/mpeg3_rtp_bytestream.cpp	Thu Sep 30 03:09:12 2004
@@ -32,6 +32,10 @@
 #else
 #define rtp_message(loglevel, fmt...) message(loglevel, "rtpbyst", fmt)
 #endif
+
+uint8_t temp_ref;
+int frame_type;
+
 static rtp_packet *end_of_pak (rtp_packet *start)
 {
   while (start->rtp_next->rtp_pak_ts == start->rtp_pak_ts) 
@@ -74,7 +78,6 @@
   int32_t diff;
   int correct_hdr;
   int dropped_seq;
-  uint8_t temp_ref;
   diff = m_buffer_len - m_bytes_used;
 
   if (diff > 2) {
@@ -86,7 +89,6 @@
 #endif
     return (m_last_realtime);
   }
-  int frame_type;
   m_buffer_len = 0;
   dropped_seq = 0;
   while (finished == 0) {




--- lib/sdp/sdp_decode.c.orig	Thu Sep 30 01:32:23 2004
+++ lib/sdp/sdp_decode.c	Thu Sep 30 01:32:45 2004
@@ -378,7 +378,7 @@
   q = NULL;
   while (p != NULL) {
     if (new->adj_time == p->adj_time) {
-      sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", p->adj_time);
+      sdp_debug(LOG_NOTICE, "Duplicate time %d in adj description", p->adj_time);
       free(new);
       return (start);
     }
@@ -1580,7 +1580,7 @@
       continue;
     }
     // process <adjustment time> - adjust it from NTP to unix time
-    sscanf(sep, "%ld", &adj_time);
+    sscanf(sep, "%d", &adj_time);
 
     // Check for negative sign for offset.
     ADV_SPACE(lptr);




bin/avi2raw
bin/avidump
bin/gmp4player
bin/h264_parse
bin/lboxcrop
bin/mp4creator
bin/mp4dump
bin/mp4encode
bin/mp4extract
bin/mp4info
bin/mp4player
bin/mpeg2video_parse
bin/mp4trackdump
bin/mpeg4ip-config
bin/mpeg4vol
bin/rgb2yuv
bin/xvidenc
bin/yuvdump
include/codec_plugin.h
include/mp4.h
include/mp4av.h
include/mp4av_aac.h
include/mp4av_adts.h

include/mpeg4_audio_config.h
include/mpeg4_sdp.h
include/mpeg4ip.h
include/mpeg4ip_byteswap.h
include/mpeg4ip_config.h
include/mpeg4ip_config_set.h
include/mpeg4ip_getopt.h
include/mpeg4ip_version.h
include/rtp_plugin.h
include/sdp.h
include/sdp_error.h
lib/libhttp.so
lib/libhttp.so.0
lib/libconfig_file.so
lib/libconfig_file.so.0
lib/libhttp.a
lib/libhttp.la
lib/libmp4.a
lib/libmp4.la
lib/libmp4.so
lib/libmp4.so.0
lib/libmp4av.a
lib/libmp4av.la
lib/libmp4av.so
lib/libmp4av.so.0
lib/libmp4util.a
lib/libmp4util.la
lib/libmp4util.so
lib/libmp4util.so.0
lib/libmpeg4ipSDL.la
lib/libmpeg4ipSDL-1.2.so
lib/libmpeg4ipSDL-1.2.so.7
lib/libmpeg4ipSDL.so
lib/libmpeg4ip_xvid.a
lib/libmpeg4ip_xvid.la
lib/libmpeg4ip_xvid.so
lib/libmpeg4ip_xvid.so.0
lib/libmsg_queue.a
lib/libmsg_queue.la
lib/libmsg_queue.so
lib/libmsg_queue.so.0
lib/libsdp.a
lib/libsdp.la
lib/libsdp.so
lib/libsdp.so.0
lib/mp4player_plugin/a52_audio_plugin.so
lib/mp4player_plugin/a52_audio_plugin.so.0
lib/mp4player_plugin/aac_plugin.so
lib/mp4player_plugin/aac_plugin.so.0
lib/mp4player_plugin/celp_plugin.a
lib/mp4player_plugin/celp_plugin.la
lib/mp4player_plugin/celp_plugin.so
lib/mp4player_plugin/celp_plugin.so.0
lib/mp4player_plugin/h261_plugin.a
lib/mp4player_plugin/h261_plugin.la
lib/mp4player_plugin/h261_plugin.so
lib/mp4player_plugin/h261_plugin.so.0
lib/mp4player_plugin/h261_rtp_plugin.a
lib/mp4player_plugin/h261_rtp_plugin.la
lib/mp4player_plugin/h261_rtp_plugin.so
lib/mp4player_plugin/h261_rtp_plugin.so.0
lib/mp4player_plugin/isma_enc_rtp_plugin.so
lib/mp4player_plugin/isma_enc_rtp_plugin.so.0
lib/mp4player_plugin/isma_enc_video_rtp_plugin.so
lib/mp4player_plugin/isma_enc_video_rtp_plugin.so.0
lib/mp4player_plugin/isma_rtp_plugin.so
lib/mp4player_plugin/isma_rtp_plugin.so.0
lib/mp4player_plugin/mp3_plugin.a
lib/mp4player_plugin/mp3_plugin.la
lib/mp4player_plugin/mp3_plugin.so
lib/mp4player_plugin/mp3_plugin.so.0
lib/mp4player_plugin/mpeg2dec_video_plugin.so
lib/mp4player_plugin/mpeg2dec_video_plugin.so.0
lib/mp4player_plugin/mpeg3_video_plugin.so
lib/mp4player_plugin/mpeg3_video_plugin.so.0
lib/mp4player_plugin/mpeg4_iso_plugin.a
lib/mp4player_plugin/mpeg4_iso_plugin.la
lib/mp4player_plugin/mpeg4_iso_plugin.so
lib/mp4player_plugin/mpeg4_iso_plugin.so.0
lib/mp4player_plugin/raw_audio_plugin.a
lib/mp4player_plugin/raw_audio_plugin.la
lib/mp4player_plugin/raw_audio_plugin.so
lib/mp4player_plugin/raw_audio_plugin.so.0
lib/mp4player_plugin/raw_video_plugin.a
lib/mp4player_plugin/raw_video_plugin.la
lib/mp4player_plugin/raw_video_plugin.so
lib/mp4player_plugin/raw_video_plugin.so.0
lib/mp4player_plugin/wav_plugin.a
lib/mp4player_plugin/wav_plugin.la
lib/mp4player_plugin/wav_plugin.so
lib/mp4player_plugin/wav_plugin.so.0
%%XVID%%lib/mp4player_plugin/xvid10_plugin.so
%%XVID%%lib/mp4player_plugin/xvid10_plugin.so.0
%%DATADIR%%/mp4venc_template.par
@dirrm %%DATADIR%%
@dirrm share/doc/mpeg4ip
@dirrm share/mpeg4ip
@dirrm lib/mp4player_plugin

Return to bug 72206

Lines 6-102 Link Here

(-)/usr/ports/multimedia/mpeg4ip/Makefile (-112 / +122 lines)
6	#	6	#
7		7
8	PORTNAME= mpeg4ip	8	PORTNAME= mpeg4ip
9	PORTVERSION= 1.0	9	PORTVERSION= 1.1
10	CATEGORIES= multimedia audio ipv6 net	10	CATEGORIES= multimedia audio ipv6 net
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
		13	PKGNAMESUFFIX= ${PKG_NAME_SUFFIX}
13		14
14	MAINTAINER= lioux@FreeBSD.org	15	MAINTAINER= lioux@FreeBSD.org
15	COMMENT= Standards-based system to encode, stream and play MPEG-4 audio/video	16	COMMENT= Standards-based system to encode, stream and play MPEG-4 audio/video
16		17
17	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm \	18	LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \
18	pkg-config:${PORTSDIR}/devel/pkgconfig	19	faad.0:${PORTSDIR}/audio/faad \
		20	mp3lame.0:${PORTSDIR}/audio/lame \
		21	id3tag.2:${PORTSDIR}/audio/libid3tag \
		22	a52.0:${PORTSDIR}/audio/liba52 \
		23	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
		24	avcodec.0:${PORTSDIR}/multimedia/ffmpeg
19		25
20	USE_GNOME= gtk20	26	USE_GNOME= gtk20
21	USE_GMAKE= yes
22	USE_SDL= sdl	27	USE_SDL= sdl
23	USE_INC_LIBTOOL_VER=13	28	USE_GMAKE= yes
		29	USE_INC_LIBTOOL_VER=15
24	USE_REINPLACE= yes	30	USE_REINPLACE= yes
25	CONFIGURE_ARGS= --datadir=${DATADIR} \	31	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
26	--with-glib-prefix=${LOCALBASE} \	32	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
27	--with-gtk-prefix=${X11BASE} \	33	CONFIGURE_ARGS= --enable-ffmpeg \
28	--program-transform-name=''	34	--enable-mp4live \
29	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	35	--disable-static
30	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
31	INSTALLS_SHLIB= yes	36	INSTALLS_SHLIB= yes
32		37
33	DOC_FILES= COPYING README doc/MPEG4IP_Guide.pdf	38	OPTIONS= ARTS "Enable Arts Support" Off \
34	PORTDOCS= COPYING MPEG4IP_Guide.pdf README	39	ESOUND "Enable Esound Support" Off \
		40	IPV6 "Enable IPV6 Support" On \
		41	NAS "Enable Nas Support" Off \
		42	OPTIMIZED_CFLAGS "Enable compilation optimizations" Off \
		43	XVID "Enable XVID Support" On
		44
		45	DOCS_FILES= ${PORTDOCS}
		46	PORTDOCS= MAINREADME.html MP4LIVE_INTERNALS.html MPEG4IP_Guide.pdf \
		47	MP4LIVE_README.html PLAYER_INTERNALS.html PLAYER_README.html \
		48	ReadingList.txt ReadingList.txt encoding.htm m4rm.html \
		49	mp4player.jpg mrm.html pi.html prm.html
35		50
36	MAN1= gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1	51	MAN1= gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1
37	MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \	52	MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
38	MP4AddRtpESConfigurationPacket.3 MP4AddRtpHint.3 \	53	MP4AddRtpESConfigurationPacket.3 MP4AddRtpHint.3 MP4AddRtpImmediateData.3 \
39	MP4AddRtpImmediateData.3 MP4AddRtpPacket.3 MP4AddRtpSampleData.3 \	54	MP4AddRtpPacket.3 MP4AddRtpSampleData.3 MP4AddRtpVideoHint.3 \
40	MP4AddRtpVideoHint.3 MP4AddSceneTrack.3 MP4AddSystemsTrack.3 \	55	MP4AddSceneTrack.3 MP4AddSystemsTrack.3 MP4AddTrack.3 \
41	MP4AddTrack.3 MP4AddVideoTrack.3 MP4AppendHintTrackSdp.3 \	56	MP4AddTrackEdit.3 MP4AddVideoTrack.3 MP4AppendHintTrackSdp.3 \
42	MP4AddTrackEdit.3 \
43	MP4AppendSessionSdp.3 MP4BinaryToBase16.3 MP4BinaryToBase64.3 \	57	MP4AppendSessionSdp.3 MP4BinaryToBase16.3 MP4BinaryToBase64.3 \
44	MP4CloneTrack.3 \	58	MP4CloneTrack.3 MP4Close.3 MP4ConvertFromMovieDuration.3 \
45	MP4Close.3 MP4ConvertFromMovieDuration.3 \
46	MP4ConvertFromTrackDuration.3 MP4ConvertFromTrackTimestamp.3 \	59	MP4ConvertFromTrackDuration.3 MP4ConvertFromTrackTimestamp.3 \
47	MP4ConvertToTrackDuration.3 MP4ConvertToTrackTimestamp.3 \	60	MP4ConvertToTrackDuration.3 MP4ConvertToTrackTimestamp.3 \
48	MP4CopySample.3 MP4CopyTrack.3 MP4DeleteTrackEdit.3 \	61	MP4CopySample.3 MP4CopyTrack.3 MP4Create.3 MP4DeleteTrack.3 \
49	MP4Create.3 MP4DeleteTrack.3 MP4Dump.3 MP4FindTrackId.3 \	62	MP4DeleteTrackEdit.3 MP4Dump.3 MP4FileInfo.3 MP4FindTrackId.3 \
50	MP4FileInfo.3 \
51	MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 MP4GetDuration.3 \	63	MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 MP4GetDuration.3 \
52	MP4GetGraphicsProfileLevel.3 MP4GetHintTrackReferenceTrackId.3 \	64	MP4GetGraphicsProfileLevel.3 MP4GetHintTrackReferenceTrackId.3 \
53	MP4GetHintTrackRtpPayload.3 MP4GetHintTrackSdp.3 \	65	MP4GetHintTrackRtpPayload.3 MP4GetHintTrackSdp.3 MP4GetNumberOfTracks.3 \
54	MP4GetNumberOfTracks.3 MP4GetODProfileLevel.3 \	66	MP4GetODProfileLevel.3 MP4GetRtpHintNumberOfPackets.3 MP4GetRtpPacketBFrame.3 \
55	MP4GetRtpHintNumberOfPackets.3 MP4GetRtpPacketBFrame.3 \	67	MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 MP4GetSampleDuration.3 \
56	MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 \	68	MP4GetSampleIdFromEditTime.3 MP4GetSampleIdFromTime.3 MP4GetSampleRenderingOffset.3 \
57	MP4GetSampleDuration.3 MP4GetSampleIdFromTime.3 \	69	MP4GetSampleSize.3 MP4GetSampleSync.3 MP4GetSampleTime.3 \
58	MP4GetSampleIdFromEditTime.3 \	70	MP4GetSceneProfileLevel.3 MP4GetSessionSdp.3 MP4GetTimeScale.3 \
59	MP4GetSampleRenderingOffset.3 MP4GetSampleSize.3 \	71	MP4GetTrackAudioMpeg4Type.3 MP4GetTrackAudioType.3 MP4GetTrackBitRate.3 \
60	MP4GetSampleSync.3 MP4GetSampleTime.3 MP4GetSceneProfileLevel.3 \	72	MP4GetTrackDuration.3 MP4GetTrackESConfiguration.3 MP4GetTrackEditDuration.3 \
61	MP4GetSessionSdp.3 MP4GetTimeScale.3 MP4GetTrackAudioType.3 \	73	MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 MP4GetTrackEditStart.3 \
62	MP4GetTrackBitRate.3 MP4GetTrackDuration.3 \	74	MP4GetTrackEditTotalDuration.3 MP4GetTrackFixedSampleDuration.3 MP4GetTrackMaxSampleSize.3 \
63	MP4GetTrackESConfiguration.3 MP4GetTrackFixedSampleDuration.3 \	75	MP4GetTrackNumberOfEdits.3 MP4GetTrackNumberOfSamples.3 MP4GetTrackTimeScale.3 \
64	MP4GetTrackMaxSampleSize.3 MP4GetTrackNumberOfSamples.3 \	76	MP4GetTrackType.3 MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \
65	MP4GetTrackTimeScale.3 MP4GetTrackType.3 \
66	MP4GetTrackAudioMpeg4Type.3 MP4GetTrackEditDuration.3 \
67	MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 \
68	MP4GetTrackEditStart.3 MP4GetTrackEditTotalDuration.3 \
69	MP4GetTrackNumberOfEdits.3 \
70	MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \
71	MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 MP4GetVerbosity.3 \	77	MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 MP4GetVerbosity.3 \
72	MP4GetVideoProfileLevel.3 MP4MakeIsmaCompliant.3 MP4Modify.3 \	78	MP4GetVideoProfileLevel.3 MP4Info.3 MP4MakeIsmaCompliant.3 \
73	MP4Info.3 \	79	MP4Modify.3 MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 MP4ReadRtpPacket.3 \
74	MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 MP4ReadRtpPacket.3 \	80	MP4ReadSample.3 MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 \
75	MP4ReadSample.3 MP4SetAudioProfileLevel.3 \	81	MP4SetAudioProfileLevel.3 MP4SetGraphicsProfileLevel.3 MP4SetHintTrackRtpPayload.3 \
76	MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 \	82	MP4SetHintTrackSdp.3 MP4SetODProfileLevel.3 MP4SetRtpTimestampStart.3 \
77	MP4SetGraphicsProfileLevel.3 MP4SetHintTrackRtpPayload.3 \	83	MP4SetSampleRenderingOffset.3 MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 \
78	MP4SetHintTrackSdp.3 MP4SetODProfileLevel.3 \	84	MP4SetTimeScale.3 MP4SetTrackESConfiguration.3 MP4SetTrackEditDuration.3 \
79	MP4SetRtpTimestampStart.3 MP4SetSampleRenderingOffset.3 \	85	MP4SetTrackEditDwell.3 MP4SetTrackEditMediaStart.3 MP4SetTrackTimeScale.3 \
80	MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 MP4SetTimeScale.3 \	86	MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 MP4WriteSample.3
81	MP4SetTrackEditDuration.3 MP4SetTrackEditDwell.3 \
82	MP4SetTrackEditMediaStart.3 \
83	MP4SetTrackESConfiguration.3 MP4SetTrackTimeScale.3 \
84	MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 \
85	MP4WriteSample.3
86
87	post-extract:
88	.for dir in SDL
89	@${RM} -Rf ${WRKSRC}/lib/${dir}
90	.endfor
91		87
92	.include <bsd.port.pre.mk>	88	.include <bsd.port.pre.mk>
93		89
94	.if ${OSVERSION} >= 502126	90	.if ${OSVERSION} >= 502100
95	BROKEN= "Does not compile on FreeBSD >= 5.x"	91	EXTRA_PATCHES+= ${FILESDIR}/sdp-patch
		92	.else
		93	USE_GCC= 3.4
		94	.endif
		95
		96	.if exists(${LOCALBASE}/lib/libartsc.so.0)
		97	WITH_ARTS= yes
		98	.endif
		99
		100	.if ${HAVE_GNOME:Mesound}!=""
		101	WITH_ESOUND= yes
		102	.endif
		103
		104	.if exists(${LOCALBASE}/lib/libaudio.so.2)
		105	WITH_NAS= yes
		106	.endif
		107
		108	.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
		109	WITH_XVID= yes
		110	.endif
		111
		112	.if defined(WITH_ARTS)
		113	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
		114	.endif
		115
		116	.if defined(WITH_ESOUND)
		117	USE_GNOME+= esound
		118
		119	PKG_NAME_SUFFIX+=-esound
96	.endif	120	.endif
97		121
98	.if exists(${LOCALBASE}/include/systems.h)	122	.if defined(WITH_NAS)
99	CONFLICTS= faad*	123	LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas
		124	.endif
		125
		126	.if defined(WITH_XVID)
		127	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
		128	PLIST_SUB+= XVID=""
		129	.else
		130	PLIST_SUB+= XVID="@comment "
100	.endif	131	.endif
101		132
102	.if ${ARCH} == "amd64"	133	.if ${ARCH} == "amd64"
Lines 104-154 Link Here
104	.endif	135	.endif
105		136
106	post-patch:	137	post-patch:
		138	# don't compile or use libmp4v2
		139	@${REINPLACE_CMD} -e 's\|mp4v2\|\|' ${WRKSRC}/lib/Makefile.in
		140	@${REINPLACE_CMD} -e 's\|-I$(top_srcdir)/lib/mp4v2\|\|; \
		141	s\|$$(top_builddir)/lib/mp4v2/libmp4v2.la\|\|; \
		142	s\|@LIBS@\|@LIBS@ -lmp4v2\|' \
		143	${WRKSRC}/player/src/Makefile.in \
		144	${WRKSRC}/lib/mpeg2t/Makefile.in \
		145	${WRKSRC}/util/*/Makefile.in \
		146	${WRKSRC}/server/*/Makefile.in
		147	@${REINPLACE_CMD} -e 's\|-I$(top_srcdir)/lib/mp4v2\|\|; \
		148	s\|../mp4v2/libmp4v2.la\|\|; s\|@LIBS@\|@LIBS@ -lmp4v2\|' \
		149	${WRKSRC}/lib/mp4av/Makefile.in
		150	@${REINPLACE_CMD} -e 's\|mp4venc_template.par\|\|' \
		151	${WRKSRC}/server/util/mp4encode/Makefile.in
107	@${FIND} ${WRKSRC} -type f -name ".[ch]" -or -name ".cpp" \| ${XARGS} -n 10 \	152	@${FIND} ${WRKSRC} -type f -name ".[ch]" -or -name ".cpp" \| ${XARGS} -n 10 \
108	${REINPLACE_CMD} -e \	153	${REINPLACE_CMD} -e \
109	's\|<stdint.h>\|<inttypes.h>\|; \	154	's\|<stdint.h>\|<inttypes.h>\|; \
		155	s\|mp4v2/mp4.h\|mp4.h\|; \
110	s\|<malloc.h>\|<stdlib.h>\|; \	156	s\|<malloc.h>\|<stdlib.h>\|; \
		157	s\|<SDL/\|<SDL11/\|; \
111	s\|<strstream.h>\|<iostream>\|'	158	s\|<strstream.h>\|<iostream>\|'
112	# replacing distfile's libs with ports' versions	159	# replacing distfile's libs with ports' versions
113	# CFLAGS safeness	160	# CFLAGS safeness
114	@${REINPLACE_CMD} -E -e 's\|lib/SDL/sdl-config\|${SDL_CONFIG}\|; \	161	@${REINPLACE_CMD} -E -e 's\|lib/SDL/sdl-config\|${SDL_CONFIG}\|; \
		162	s\|sdl-config\|${SDL_CONFIG}\|; \
115	s\|^(SDL_LIBS=).+$$\|\1"`${SDL_CONFIG} --libs`"\|; \	163	s\|^(SDL_LIBS=).+$$\|\1"`${SDL_CONFIG} --libs`"\|; \
116	s\|-Wmissing-declarations\|\|' \	164	s\|-Wmissing-declarations\|\|; s\|-Wmissing-prototypes\|\|; \
		165	s\|>&/\|>/\|' \
117	${CONFIGURE_WRKSRC}/configure	166	${CONFIGURE_WRKSRC}/configure
118	@${FIND} ${WRKSRC} -type f -name "Makefile.in" \| ${XARGS} \
119	-n 10 ${REINPLACE_CMD} -E -e \
120	's\|-I[^ ]+lib/SDL/include\|-I${LOCALBASE}/include/SDL11\|; \
121	s\|-O[0-3]\|-O\|; \
122	s\|\$$[^ ]+/lib/SDL/src/main/libSDLmain.a\|${LOCALBASE}/lib/libSDLmain-1.1.a\|'
123	@${REINPLACE_CMD} -E -e \
124	's!SDL_(AudioDelayMsec\|HasAudioDelayMsec).*;$$!0;!' \
125	${WRKSRC}/player/src/audio_sdl.cpp
126	# do not install manm man pages	167	# do not install manm man pages
127	@${REINPLACE_CMD} -E \	168	@${REINPLACE_CMD} -E \
128	-e 's\|api.mpt\|\|' \	169	-e 's\|api.mpt\|\|' \
129	-e 's\|^(install-man.*)install-manm\|\1\|' \	170	-e 's\|^(install-man.*)install-manm\|\1\|' \
130	${WRKSRC}/doc/mp4v2/Makefile.in	171	${WRKSRC}/doc/mp4v2/Makefile.in
131	# Disable xvid support - mpep4ip doesn't support xvid 1.0.x, but tries
132	# to use it anyway.
133	@${REINPLACE_CMD} -e 's\|use_mpeg4ip_xvid=false\|use_mpeg4ip_xvid=true\|g' \
134	-e 's\|#define HAVE_XVID_H 1\|\|g' \
135	${WRKSRC}/configure
136
137	.if ${ARCH} != "i386"
138	# emms opcode should be noop in non-i386 non-MMX ARCH
139	@${ECHO_CMD} '#define EMMS()' \
140	>> ${WRKSRC}/lib/xvid/portab.h
141	.endif
142		172
143	post-configure:	173	post-configure:
144	# disable GNU auto* tools	174	# disable GNU auto* tools
145	# remove -Werror	175	# remove -Werror
146	@${FIND} ${WRKSRC} -type f -name "Makefile" \| ${XARGS} \
147	-n 10 ${REINPLACE_CMD} -E -e \
148	's! (autoconf\|autoheader\|automake\|aclocal)$$! ${TRUE}!; \
149	s\|-Werror\|\|g'
150	# configure is not propagating PTHREAD_LIBS to the makefiles
151	# investigated by David Yeske <dyeske@yahoo.com>
152	.if ${OSVERSION} >= 500000	176	.if ${OSVERSION} >= 500000
153	@${REINPLACE_CMD} -E \	177	@${REINPLACE_CMD} -E \
154	-e 's\|(-lSDL-...)\|"${PTHREAD_LIBS} \1"\|' \	178	-e 's\|(-lSDL-...)\|"${PTHREAD_LIBS} \1"\|' \
Lines 158-167 Link Here
158	.endif	182	.endif
159		183
160	post-install:	184	post-install:
		185	@${MKDIR} ${DATADIR}
		186	@${INSTALL_DATA} ${WRKSRC}/server/util/mp4encode/mp4venc_template.par ${DATADIR}
161	.ifndef(NOPORTDOCS)	187	.ifndef(NOPORTDOCS)
162	@${MKDIR} ${DOCSDIR}	188	@${MKDIR} ${DOCSDIR}
163	.for files in ${DOC_FILES}	189	.for files in ${DOC_FILES}
164	@${INSTALL_DATA} ${WRKSRC}/${files} ${DOCSDIR}/${files:C\|^[^/]+/\|\|}	190	@${INSTALL_DATA} ${WRKSRC}/doc/${files} ${DOCSDIR}
165	.endfor	191	.endfor
166	.endif	192	.endif
167		193
Lines 169-175 Link Here
169	WITHOUT_MMX= yes	195	WITHOUT_MMX= yes
170	.else	196	.else
171	. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")	197	. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")
172	WITH_OPTIMIZED_BYTESWAP=yes	198	OPTIONS+= OPTIMIZED_BYTESWAP "Enable optimized byteswap routines" On \
		199	MMX "Enable MMX Optimizations" On
173	. endif	200	. endif
174		201
175	. if defined(WITH_OPTIMIZED_BYTESWAP)	202	. if defined(WITH_OPTIMIZED_BYTESWAP)
Lines 183-211 Link Here
183		210
184	.ifdef(WITHOUT_MMX)	211	.ifdef(WITHOUT_MMX)
185	CONFIGURE_ARGS+= --disable-mmx	212	CONFIGURE_ARGS+= --disable-mmx
		213	.else
		214	BUILD_DEPEND+S= nasm:${PORTSDIR}/devel/nasm
186	.endif	215	.endif
187		216
188	.if defined(WITH_OPTIMIZED_CFLAGS)	217	.if defined(WITH_OPTIMIZED_CFLAGS)
189	CFLAGS+= -O3 -ffast-math -fomit-frame-pointer	218	CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
190	.endif
191
192	pre-everything::
193	.ifndef(WITHOUT_IPV6)
194	@${ECHO_MSG} '===> Define WITHOUT_IPV6 if you want to disable IPv6 support'
195	.endif
196	.ifndef(WITHOUT_MMX)
197	@${ECHO_MSG} '===> Define WITHOUT_MMX if your system does not support MMX'
198	.endif
199	.ifndef(WITH_OPTIMIZED_BYTESWAP)
200	@${ECHO_MSG}
201	@${ECHO_MSG} '===> Define WITH_OPTIMIZED_BYTESWAP to use optimized byteswap'
202	@${ECHO_MSG} '===> routines. This works only in the i386 architecture, and'
203	@${ECHO_MSG} '===> only with 486 processors and above.'
204	.endif
205	.if !defined(WITH_OPTIMIZED_CFLAGS)
206	@${ECHO_MSG}
207	@${ECHO_MSG} '===> You can enable additional compilation optimizations'
208	@${ECHO_MSG} '===> by defining WITH_OPTIMIZED_CFLAGS'
209	.endif	219	.endif
210		220
211	.include <bsd.port.post.mk>	221	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-common::video::libmpeg32::video::Makefile.in (+16 lines)
	1	--- common/video/libmpeg32/video/Makefile.in.orig Tue Sep 28 23:54:37 2004
	2	+++ common/video/libmpeg32/video/Makefile.in Tue Sep 28 23:55:25 2004
	3	@@ -290,11 +290,11 @@
	4	@AMDEP_TRUE@ ./$(DEPDIR)/seek.Plo ./$(DEPDIR)/slice.Plo \
	5	@AMDEP_TRUE@ ./$(DEPDIR)/vlc.Plo
	6	CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
	7	-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
	8	+LTCCASCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CCAS) $(AM_CCASFLAGS) \
	9	$(CCASFLAGS)
	10	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	11	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
	12	-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
	13	+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
	14	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
	15	CCLD = $(CC)
	16	LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-common::video::mpeg4-2000::idct::idct.hpp (+12 lines)
	1	--- common/video/mpeg4-2000/idct/idct.hpp.orig Thu Sep 30 01:01:36 2004
	2	+++ common/video/mpeg4-2000/idct/idct.hpp Thu Sep 30 01:01:56 2004
	3	@@ -22,6 +22,9 @@
	4	#ifndef _INT_IDCT_
	5	#define _INT_IDCT_ 1
	6
	7	+#ifndef BLOCK_SIZE
	8	+#define BLOCK_SIZE 5
	9	+#endif
	10
	11	#define IDCT_BLOCK_SIZE 8
	12	class idct{

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-gcc34 (-10 / +44 lines)
1	--- common/video/mpeg4-2000/idct/idct.hpp.orig Fri Jul 23 01:57:47 2004	1	--- common/video/mpeg4-2000/tools/entropy/huffman.cpp.orig Tue Sep 28 22:51:26 2004
2	+++ common/video/mpeg4-2000/idct/idct.hpp Fri Jul 23 02:02:41 2004	2	+++ common/video/mpeg4-2000/tools/entropy/huffman.cpp Tue Sep 28 22:51:47 2004
3	@@ -22,7 +22,7 @@	3	@@ -243,9 +243,6 @@
4	#ifndef _INT_IDCT_	4	Void CHuffmanTree::printStatistics (Double dEntropy, Double dNOfBits, ostream &stream)
5	#define _INT_IDCT_ 1	5	{
		6	stream<<endl<<endl;
		7	- stream<<"//Entropy Per Symbol : "<<dEntropy<<endl;
		8	- stream<<"//Bits Per Symbol : "<<dNOfBits<<endl;
		9	- stream<<"//Table Efficiency : "<<dEntropy/dNOfBits<<endl;
		10	}
6		11
7	-	12	Int CHuffmanCoDec::makeIndexFromSymbolInTable(istream &huffmanTable)
8	+#define BLOCK_SIZE 5	13	--- common/video/mpeg4-2000/tools/entropy/bitstrm.cpp.orig Tue Sep 28 22:56:07 2004
9	#define IDCT_BLOCK_SIZE 8	14	+++ common/video/mpeg4-2000/tools/entropy/bitstrm.cpp Tue Sep 28 22:56:25 2004
10	class idct{	15	@@ -323,7 +323,6 @@
11	public:	16	if (m_pstrmTrace != NULL) {
		17	m_pstrmTrace->width (20);
		18	(*m_pstrmTrace) << rgchSymbolName << "= ";
		19	- (*m_pstrmTrace) << fltValue << "\n";
		20	m_pstrmTrace->flush ();
		21	}
		22	}
		23	@@ -356,8 +355,6 @@
		24	if (m_pstrmTrace != NULL) {
		25	m_pstrmTrace->width (20);
		26	(*m_pstrmTrace) << rgchSymbolName << "= ";
		27	- (*m_pstrmTrace) << vctValue.x << ", ";
		28	- (*m_pstrmTrace) << vctValue.y << "\n ";
		29	m_pstrmTrace->flush ();
		30	}
		31	}
		32	--- common/video/mpeg4-2000/sys/mode.cpp.orig Tue Sep 28 23:05:10 2004
		33	+++ common/video/mpeg4-2000/sys/mode.cpp Tue Sep 28 23:05:59 2004
		34	@@ -409,12 +409,6 @@
		35	// if (bVOPPrint)
		36	cout << "\t" << "Shape:" << "\t\t\t" << nBitsShape << "\n";
		37	cout << "\t" << "Total:" << "\t\t\t" << nBitsTotal << "\n";
		38	- cout << "\t" << "SNR Y:" << "\t\t\t" << dSNRY / nVOPs << " dB\n";
		39	- cout << "\t" << "SNR U:" << "\t\t\t" << dSNRU / nVOPs << " dB\n";
		40	- cout << "\t" << "SNR V:" << "\t\t\t" << dSNRV / nVOPs << " dB\n";
		41	- for(Int iAuxComp=0;iAuxComp<m_iAuxCompCount;iAuxComp++) // MAC (SB) 26-Nov-99
		42	- cout << "\t" << "SNR A[" << iAuxComp << "]:" << "\t\t" << dSNRA[iAuxComp] / nVOPs << " dB\n";
		43	- cout << "\n\t" << "average Qp:" << "\t\t" << (Double)nQp / nQMB << "\n\n";
		44	cout.flush ();
		45	}

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-include::mpeg4ip.h (+19 lines)
	1	--- include/mpeg4ip.h.orig Wed Sep 29 14:43:52 2004
	2	+++ include/mpeg4ip.h Wed Sep 29 14:44:10 2004
	3	@@ -160,14 +160,14 @@
	4	#include <errno.h>
	5	#include <stdlib.h>
	6
	7	-#ifdef HAVE_INTTYPES_H
	8	#include <inttypes.h>
	9	-#endif
	10	#ifdef HAVE_STDINT_H
	11	#include <stdint.h>
	12	#endif
	13	+#if 0
	14	#if !defined(HAVE_INTTYPES_H) \|\| !defined(HAVE_STDINT_H)
	15	#error "Don't have stdint.h or inttypes.h - no way to get uint8_t"
	16	+#endif
	17	#endif
	18
	19	#include <unistd.h>

Lines 1-30 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-lib::xvid::bitstream::h263.h (-30 lines)
1	--- lib/xvid/bitstream/h263.h.orig Wed Nov 13 16:53:29 2002
2	+++ lib/xvid/bitstream/h263.h Wed Nov 13 16:55:31 2002
3	@@ -25,6 +25,10 @@
4	/* #define FFMPEG_VERSION_INT 0x000405 */
5	/* #define FFMPEG_VERSION "0.4.5" */
6
7	+#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
8	+#include <sys/param.h>
9	+#endif
10	+
11	#ifdef WIN32
12	#define CONFIG_WIN32
13	#endif
14	@@ -69,11 +73,16 @@
15	#define DEBUG
16	#endif
17
18	+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
19	+#include <sys/endian.h>
20	+#define be2me_32(x) (be32toh(x))
21	+#else
22	// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
23	#define bswap_32(x) \
24	((((x) & 0xff000000) >> 24) \| (((x) & 0x00ff0000) >> 8) \| \
25	(((x) & 0x0000ff00) << 8) \| (((x) & 0x000000ff) << 24))
26	#define be2me_32(x) bswap_32(x)
27	+#endif
28
29	#define snprintf _snprintf
30

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-ltmain.sh (+15 lines)
	1	--- ltmain.sh.orig Thu Sep 30 04:09:46 2004
	2	+++ ltmain.sh Thu Sep 30 04:11:06 2004
	3	@@ -5425,10 +5425,12 @@
	4	fi
	5
	6	# Install the pseudo-library for information purposes.
	7	+ if /usr/bin/false; then
	8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
	9	instname="$dir/$name"i
	10	$show "$install_prog $instname $destdir/$name"
	11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
	12	+ fi
	13
	14	# Maybe install the static library, too.
	15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-7 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-mpeg4ip_config.h.in (-8 / +11 lines)
1	--- mpeg4ip_config.h.in.orig Sun Apr 11 10:24:26 2004	1	--- mpeg4ip_config.h.in.orig Tue May 18 13:31:06 2004
2	+++ mpeg4ip_config.h.in Sun Apr 11 10:24:48 2004	2	+++ mpeg4ip_config.h.in Wed Sep 29 14:40:59 2004
3	@@ -22,13 +22,10 @@	3	@@ -25,16 +25,12 @@
4	#undef HAVE_FPOS_T_POS	4	#undef HAVE_FPOS_T___POS
5		5
6	/* Define to 1 if you have the `getopt' function. */	6	/* Define to 1 if you have the `getopt' function. */
7	-#undef HAVE_GETOPT	7	-#undef HAVE_GETOPT
Lines 13-24 Link Here
13	-#undef HAVE_GETOPT_LONG	13	-#undef HAVE_GETOPT_LONG
14		14
15	/* Define to 1 if you have the `getopt_long_only' function. */	15	/* Define to 1 if you have the `getopt_long_only' function. */
16	#undef HAVE_GETOPT_LONG_ONLY	16	-#undef HAVE_GETOPT_LONG_ONLY
17	@@ -58,7 +55,6 @@	17
		18	/* Define to 1 if you have the `getrusage' function. */
		19	#undef HAVE_GETRUSAGE
		20	@@ -67,7 +63,6 @@
18	#undef HAVE_IPv6	21	#undef HAVE_IPv6
19		22
20	/* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */	23	/* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */
21	-#undef HAVE_LIBGNUGETOPT	24	-#undef HAVE_LIBGNUGETOPT
22		25
23	/* Define to 1 if you have the `socket' library (-lsocket). */	26	/* have libmpeg2 decoder library */
24	#undef HAVE_LIBSOCKET	27	#undef HAVE_LIBMPEG2

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/patch-player::src::mpeg3_rtp_bytestream.cpp (+29 lines)
	1	--- player/src/mpeg3_rtp_bytestream.cpp.orig Thu Sep 30 03:10:31 2004
	2	+++ player/src/mpeg3_rtp_bytestream.cpp Thu Sep 30 03:09:12 2004
	3	@@ -32,6 +32,10 @@
	4	#else
	5	#define rtp_message(loglevel, fmt...) message(loglevel, "rtpbyst", fmt)
	6	#endif
	7	+
	8	+uint8_t temp_ref;
	9	+int frame_type;
	10	+
	11	static rtp_packet end_of_pak (rtp_packet start)
	12	{
	13	while (start->rtp_next->rtp_pak_ts == start->rtp_pak_ts)
	14	@@ -74,7 +78,6 @@
	15	int32_t diff;
	16	int correct_hdr;
	17	int dropped_seq;
	18	- uint8_t temp_ref;
	19	diff = m_buffer_len - m_bytes_used;
	20
	21	if (diff > 2) {
	22	@@ -86,7 +89,6 @@
	23	#endif
	24	return (m_last_realtime);
	25	}
	26	- int frame_type;
	27	m_buffer_len = 0;
	28	dropped_seq = 0;
	29	while (finished == 0) {

Line 0 Link Here

(-)/usr/ports/multimedia/mpeg4ip/files/sdp-patch (+20 lines)
	1	--- lib/sdp/sdp_decode.c.orig Thu Sep 30 01:32:23 2004
	2	+++ lib/sdp/sdp_decode.c Thu Sep 30 01:32:45 2004
	3	@@ -378,7 +378,7 @@
	4	q = NULL;
	5	while (p != NULL) {
	6	if (new->adj_time == p->adj_time) {
	7	- sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", p->adj_time);
	8	+ sdp_debug(LOG_NOTICE, "Duplicate time %d in adj description", p->adj_time);
	9	free(new);
	10	return (start);
	11	}
	12	@@ -1580,7 +1580,7 @@
	13	continue;
	14	}
	15	// process <adjustment time> - adjust it from NTP to unix time
	16	- sscanf(sep, "%ld", &adj_time);
	17	+ sscanf(sep, "%d", &adj_time);
	18
	19	// Check for negative sign for offset.
	20	ADV_SPACE(lptr);

Lines 1-21 Link Here

(-)/usr/ports/multimedia/mpeg4ip/pkg-plist (-59 / +26 lines)
1	bin/avi2raw	1	bin/avi2raw
2	bin/avidump	2	bin/avidump
3	bin/gmp4player	3	bin/gmp4player
		4	bin/h264_parse
4	bin/lboxcrop	5	bin/lboxcrop
5	bin/mp4creator	6	bin/mp4creator
6	bin/mp4dump
7	bin/mp4encode	7	bin/mp4encode
8	bin/mp4extract
9	bin/mp4info
10	bin/mp4player	8	bin/mp4player
11	bin/mp4tags	9	bin/mpeg2video_parse
12	bin/mp4trackdump
13	bin/mpeg4ip-config	10	bin/mpeg4ip-config
		11	bin/mpeg4vol
14	bin/rgb2yuv	12	bin/rgb2yuv
15	bin/xvidenc
16	bin/yuvdump	13	bin/yuvdump
17	include/codec_plugin.h	14	include/codec_plugin.h
18	include/mp4.h
19	include/mp4av.h	15	include/mp4av.h
20	include/mp4av_aac.h	16	include/mp4av_aac.h
21	include/mp4av_adts.h	17	include/mp4av_adts.h
Lines 27-118 Link Here
27	include/mpeg4_audio_config.h	23	include/mpeg4_audio_config.h
28	include/mpeg4_sdp.h	24	include/mpeg4_sdp.h
29	include/mpeg4ip.h	25	include/mpeg4ip.h
		26	include/mpeg4ip_byteswap.h
30	include/mpeg4ip_config.h	27	include/mpeg4ip_config.h
		28	include/mpeg4ip_config_set.h
		29	include/mpeg4ip_getopt.h
		30	include/mpeg4ip_version.h
31	include/rtp_plugin.h	31	include/rtp_plugin.h
32	include/sdp.h	32	include/sdp.h
33	include/sdp_error.h	33	include/sdp_error.h
34	lib/libconfig_file.a	34	lib/libhttp.so
35	lib/libconfig_file.la	35	lib/libhttp.so.0
36	lib/libconfig_file.so
37	lib/libconfig_file.so.0
38	lib/libhttp.a
39	lib/libhttp.la
40	lib/libmp4.a
41	lib/libmp4.la
42	lib/libmp4.so	36	lib/libmp4.so
43	lib/libmp4.so.0	37	lib/libmp4.so.0
44	lib/libmp4av.a
45	lib/libmp4av.la
46	lib/libmp4av.so	38	lib/libmp4av.so
47	lib/libmp4av.so.0	39	lib/libmp4av.so.0
48	lib/libmp4util.a
49	lib/libmp4util.la
50	lib/libmp4util.so	40	lib/libmp4util.so
51	lib/libmp4util.so.0	41	lib/libmp4util.so.0
52	lib/libmp4v2.a	42	lib/libmpeg4ipSDL.la
53	lib/libmp4v2.la	43	lib/libmpeg4ipSDL-1.2.so
54	lib/libmp4v2.so	44	lib/libmpeg4ipSDL-1.2.so.7
55	lib/libmp4v2.so.0	45	lib/libmpeg4ipSDL.so
56	lib/libmpeg4ip_xvid.a
57	lib/libmpeg4ip_xvid.la
58	lib/libmpeg4ip_xvid.so
59	lib/libmpeg4ip_xvid.so.0
60	lib/libmsg_queue.a
61	lib/libmsg_queue.la
62	lib/libmsg_queue.so	46	lib/libmsg_queue.so
63	lib/libmsg_queue.so.0	47	lib/libmsg_queue.so.0
64	lib/libsdp.a
65	lib/libsdp.la
66	lib/libsdp.so	48	lib/libsdp.so
67	lib/libsdp.so.0	49	lib/libsdp.so.0
68	lib/mp4player_plugin/aac_plugin.a	50	lib/mp4player_plugin/a52_audio_plugin.so
69	lib/mp4player_plugin/aac_plugin.la	51	lib/mp4player_plugin/a52_audio_plugin.so.0
70	lib/mp4player_plugin/aac_plugin.so	52	lib/mp4player_plugin/aac_plugin.so
71	lib/mp4player_plugin/aac_plugin.so.0	53	lib/mp4player_plugin/aac_plugin.so.0
72	lib/mp4player_plugin/celp_plugin.a
73	lib/mp4player_plugin/celp_plugin.la
74	lib/mp4player_plugin/celp_plugin.so	54	lib/mp4player_plugin/celp_plugin.so
75	lib/mp4player_plugin/celp_plugin.so.0	55	lib/mp4player_plugin/celp_plugin.so.0
76	lib/mp4player_plugin/h261_plugin.a
77	lib/mp4player_plugin/h261_plugin.la
78	lib/mp4player_plugin/h261_plugin.so	56	lib/mp4player_plugin/h261_plugin.so
79	lib/mp4player_plugin/h261_plugin.so.0	57	lib/mp4player_plugin/h261_plugin.so.0
80	lib/mp4player_plugin/h261_rtp_plugin.a
81	lib/mp4player_plugin/h261_rtp_plugin.la
82	lib/mp4player_plugin/h261_rtp_plugin.so	58	lib/mp4player_plugin/h261_rtp_plugin.so
83	lib/mp4player_plugin/h261_rtp_plugin.so.0	59	lib/mp4player_plugin/h261_rtp_plugin.so.0
84	lib/mp4player_plugin/isma_rtp_plugin.a	60	lib/mp4player_plugin/isma_enc_rtp_plugin.so
85	lib/mp4player_plugin/isma_rtp_plugin.la	61	lib/mp4player_plugin/isma_enc_rtp_plugin.so.0
		62	lib/mp4player_plugin/isma_enc_video_rtp_plugin.so
		63	lib/mp4player_plugin/isma_enc_video_rtp_plugin.so.0
86	lib/mp4player_plugin/isma_rtp_plugin.so	64	lib/mp4player_plugin/isma_rtp_plugin.so
87	lib/mp4player_plugin/isma_rtp_plugin.so.0	65	lib/mp4player_plugin/isma_rtp_plugin.so.0
88	lib/mp4player_plugin/mp3_plugin.a
89	lib/mp4player_plugin/mp3_plugin.la
90	lib/mp4player_plugin/mp3_plugin.so	66	lib/mp4player_plugin/mp3_plugin.so
91	lib/mp4player_plugin/mp3_plugin.so.0	67	lib/mp4player_plugin/mp3_plugin.so.0
92	lib/mp4player_plugin/mpeg3_video_plugin.a	68	lib/mp4player_plugin/mpeg2dec_video_plugin.so
93	lib/mp4player_plugin/mpeg3_video_plugin.la	69	lib/mp4player_plugin/mpeg2dec_video_plugin.so.0
94	lib/mp4player_plugin/mpeg3_video_plugin.so	70	lib/mp4player_plugin/mpeg3_video_plugin.so
95	lib/mp4player_plugin/mpeg3_video_plugin.so.0	71	lib/mp4player_plugin/mpeg3_video_plugin.so.0
96	lib/mp4player_plugin/mpeg4_iso_plugin.a
97	lib/mp4player_plugin/mpeg4_iso_plugin.la
98	lib/mp4player_plugin/mpeg4_iso_plugin.so	72	lib/mp4player_plugin/mpeg4_iso_plugin.so
99	lib/mp4player_plugin/mpeg4_iso_plugin.so.0	73	lib/mp4player_plugin/mpeg4_iso_plugin.so.0
100	lib/mp4player_plugin/raw_audio_plugin.a
101	lib/mp4player_plugin/raw_audio_plugin.la
102	lib/mp4player_plugin/raw_audio_plugin.so	74	lib/mp4player_plugin/raw_audio_plugin.so
103	lib/mp4player_plugin/raw_audio_plugin.so.0	75	lib/mp4player_plugin/raw_audio_plugin.so.0
104	lib/mp4player_plugin/raw_video_plugin.a
105	lib/mp4player_plugin/raw_video_plugin.la
106	lib/mp4player_plugin/raw_video_plugin.so	76	lib/mp4player_plugin/raw_video_plugin.so
107	lib/mp4player_plugin/raw_video_plugin.so.0	77	lib/mp4player_plugin/raw_video_plugin.so.0
108	lib/mp4player_plugin/wav_plugin.a
109	lib/mp4player_plugin/wav_plugin.la
110	lib/mp4player_plugin/wav_plugin.so	78	lib/mp4player_plugin/wav_plugin.so
111	lib/mp4player_plugin/wav_plugin.so.0	79	lib/mp4player_plugin/wav_plugin.so.0
112	lib/mp4player_plugin/xvid_plugin.a	80	%%XVID%%lib/mp4player_plugin/xvid10_plugin.so
113	lib/mp4player_plugin/xvid_plugin.la	81	%%XVID%%lib/mp4player_plugin/xvid10_plugin.so.0
114	lib/mp4player_plugin/xvid_plugin.so	82	%%DATADIR%%/mp4venc_template.par
115	lib/mp4player_plugin/xvid_plugin.so.0	83	@dirrm %%DATADIR%%
116	share/mpeg4ip/mp4venc_template.par	84	@dirrm share/doc/mpeg4ip
117	@dirrm share/mpeg4ip
118	@dirrm lib/mp4player_plugin	85	@dirrm lib/mp4player_plugin