Attachment #47207 for bug #72363

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




#

PORTNAME=	avifile
PORTVERSION=	0.7.41
PORTREVISION=	4
PORTEPOCH=	2
CATEGORIES=	multimedia
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

USE_REINPLACE=	yes
USE_XLIB=	yes
USE_GMAKE=	yes
USE_LIBTOOL_VER=15
INSTALLS_SHLIB=	yes

LIBTOOLFILES=	acinclude.m4


.include <bsd.port.pre.mk>

# fix compile with gcc-3.4.x
.if ${OSVERSION} >= 502126
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include::aviplay.h \
		${FILESDIR}/extra-patch-include::avm_map.h \
		${FILESDIR}/extra-patch-include::avm_stl.h \
		${FILESDIR}/extra-patch-lib::aviread::AsfNetworkInputStream.cpp \
		${FILESDIR}/extra-patch-lib::common::image.cpp \
		${FILESDIR}/extra-patch-plugins::libvorbis::libvorbis.cpp \
		${FILESDIR}/extra-patch-ffmpeg::libavcodec::i386::dsputil_mmx.c \
		${FILESDIR}/extra-patch-ffmpeg::libavcodec::i386::motion_est_mmx.c \
		${FILESDIR}/extra-patch-ffmpeg::libavcodec::i386::simple_idct_mmx.c \
		${FILESDIR}/extra-patch-ffmpeg::libavcodec::liba52::resample_mmx.c \
		${FILESDIR}/extra-patch-plugins::libmp3lame_audioenc::lame3.70::quantize-pvt.c
.endif

WITHOUT_XVID=yes	# Does not support xvid 1.0.x

.if (${ARCH} != "i386") && (${ARCH} != "amd64")
WITHOUT_A52=yes
WITHOUT_XVID=yes
BROKEN=		"Does not compile on !i386"
.endif


.if !defined(WITHOUT_A52)
LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52

# --enable-ffmpeg-a52bin breaks build
CONFIGURE_ARGS+=	--enable-a52 \
			--enable-ffmpeg-a52 \
			--with-a52-prefix=${LOCALBASE}
PLIST_SUB+=	A52=""
.else

# xvid
.if !defined(WITHOUT_XVID)
LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid

CONFIGURE_ARGS+=	--with-xvid-prefix=${LOCALBASE}
PLIST_SUB+=	XVID=""
.else

	@${REINPLACE_CMD} -E \
		-e 's|^subdirs[[:space:]]*=.*libmad.*$$||' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
# int_fast16/32_t are not in 4.x
.if ${OSVERSION} < 500000
	@${REINPLACE_CMD} -e 's|int_fast16_t|int16_t|g; \
		s|int_fast32_t|int32_t|g' \
		${WRKSRC}/ffmpeg/libavcodec/jfdctfst.c \
		${WRKSRC}/ffmpeg/libavcodec/jfdctint.c \
		${WRKSRC}/ffmpeg/libavcodec/ffv1.c
.endif

post-configure:
	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool

Lines 1-2 Link Here

(-)/usr/ports/multimedia/avifile/distinfo (-2 / +2 lines)
1	MD5 (avifile-0.7-0.7.38.tar.gz) = db90c4bc0a8a8182b1ec084feca86bbb	1	MD5 (avifile-0.7-0.7.41.tar.gz) = a08911965d81a02ded95ddb95f63e1cf
2	SIZE (avifile-0.7-0.7.38.tar.gz) = 2888580	2	SIZE (avifile-0.7-0.7.41.tar.gz) = 3498203




--- ffmpeg/libavcodec/i386/dsputil_mmx.c.orig	Fri Aug  6 13:59:15 2004
+++ ffmpeg/libavcodec/i386/dsputil_mmx.c	Fri Aug  6 14:07:13 2004
@@ -29,8 +29,8 @@
 static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
 static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
 
-static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
-static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
+static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) __attribute__((used)) = 0x0014001400140014ULL;
+static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) __attribute__((used)) = 0x0003000300030003ULL;
 static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
 static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
 

Lines 1-11 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-ffmpeg::libavcodec::i386::motion_est_mmx.c (-11 lines)
1	--- ffmpeg/libavcodec/i386/motion_est_mmx.c.orig Fri Aug 6 13:59:15 2004
2	+++ ffmpeg/libavcodec/i386/motion_est_mmx.c Fri Aug 6 14:08:21 2004
3	@@ -26,7 +26,7 @@
4	0x0002000200020002,
5	};
6
7	-static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
8	+static __attribute__((aligned(8))) __attribute__((used)) uint64_t bone= 0x0101010101010101LL;
9
10	static inline void sad8_mmx(uint8_t blk1, uint8_t blk2, int stride, int h)
11	{




--- ffmpeg/libavcodec/i386/simple_idct_mmx.c.orig	Fri Aug  6 13:59:15 2004
+++ ffmpeg/libavcodec/i386/simple_idct_mmx.c	Fri Aug  6 14:09:00 2004
@@ -45,8 +45,8 @@
 #define ROW_SHIFT 11
 #define COL_SHIFT 20 // 6
 
-static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
+static const uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000ULL;
+static const uint64_t __attribute__((aligned(8))) __attribute__((used)) d40000= 0x0000000000040000ULL;
 static int16_t __attribute__((aligned(8))) temp[64];
 static int16_t __attribute__((aligned(8))) coeffs[]= {
 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,




--- ffmpeg/libavcodec/liba52/resample_mmx.c.orig	Fri Aug  6 13:59:15 2004
+++ ffmpeg/libavcodec/liba52/resample_mmx.c	Fri Aug  6 14:09:51 2004
@@ -7,10 +7,10 @@
 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
 */
 
-static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
-static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
-static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
-static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
+static uint64_t __attribute__((aligned(8))) __attribute__((used)) magicF2W= 0x43c0000043c00000LL;
+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000LL;
+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm0101= 0x0000FFFF0000FFFFLL;
+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1100= 0xFFFFFFFF00000000LL;
 
 static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
     int32_t * f = (int32_t *) _f;




--- include/aviplay.h.orig	Fri Aug  6 12:35:41 2004
+++ include/aviplay.h	Fri Aug  6 12:36:36 2004
@@ -12,8 +12,8 @@
 #include "image.h"
 #include "avm_args.h"
 
-typedef void (*KILLHANDLER)(int, void* p = 0);
-typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p = 0);
+typedef void (*KILLHANDLER)(int, void* p);
+typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p);
 
 AVM_BEGIN_NAMESPACE;
 




--- include/avm_map.h.orig	Fri Aug  6 12:35:41 2004
+++ include/avm_map.h	Fri Aug  6 12:37:10 2004
@@ -198,7 +198,8 @@
 {
     // cast to the needed type - used to prevent internal compiler error
     // for old egcc
-    avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
+    //avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
+    _Tnode* node = (_Tnode*) n;
 
     if(node->entry)
     {




--- include/avm_stl.h.orig	Fri Aug  6 12:35:41 2004
+++ include/avm_stl.h	Fri Aug  6 12:41:47 2004
@@ -74,6 +74,10 @@
 	m_Type = new Type[m_uiCapacity];
     }
     ~qring() { delete[] m_Type; }
+    qring<Type>(const qring<Type>& t) : m_Type(0)
+    {
+	operator=(t);
+    }
     qring<Type>& operator=(const qring<Type>& t)
     {
 	if (this != &t)
@@ -149,7 +153,6 @@
 
     // disabled for now
     qring<Type>() {}
-    qring<Type>(const qring<Type>& t) {}
 
     uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; }
     uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; }
@@ -167,9 +170,21 @@
     static const uint_t invalid=(uint_t)(~0);
     typedef Type* iterator;
     typedef const Type* const_iterator;
-    vector<Type>(int prealloc = 0);
+    vector<Type>()
+	:m_Type(0), m_uiCapacity(0), m_uiSize(0)
+    {
+    }
+
+    vector<Type>(int prealloc)
+	:m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc)
+    {
+	if (m_uiCapacity > 0 )
+	    m_Type = new Type[m_uiCapacity];
+	//printf("vector %p   (%d)\n", this, m_uiSize);
+    }
+
     // we will not count references - we have to program with this in mind!
-    vector<Type>(const vector<Type>& t) :m_Type(0), m_uiCapacity(0), m_uiSize(0)
+    vector<Type>(const vector<Type>& t) :m_Type(0)
     {
 	operator=(t);
     }
@@ -270,15 +285,6 @@
     uint_t m_uiSize;
     void copy(const Type* in, uint_t size, uint_t alloc);
 };
-
-template <class Type>
-vector<Type>::vector<Type>(int prealloc)
-    :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc)
-{
-    if (m_uiCapacity > 0 )
-	m_Type = new Type[m_uiCapacity];
-    //printf("vector %p   (%d)\n", this, m_uiSize);
-}
 
 template <class Type>
 void vector<Type>::remove(const Type& t)




--- lib/aviread/AsfNetworkInputStream.cpp.orig	Fri Aug  6 12:35:40 2004
+++ lib/aviread/AsfNetworkInputStream.cpp	Fri Aug  6 12:46:32 2004
@@ -793,22 +793,24 @@
     return -1;
 }
 
-int AsfNetworkInputStream::write(const void* buffer, uint_t size)
+int AsfNetworkInputStream::write(const void* b, uint_t size)
 {
+    const char* buffer = (const char*) b;
     int wsize = size;
     while (wsize > 0)
     {
 	int i = ::write(m_iSocket, buffer, wsize);
 	if (i <= 0)
             return i;
-	(const char*)buffer += i;
+	buffer += i;
         wsize -= i;
     }
     return size;
 }
 
-int AsfNetworkInputStream::dwrite(const void* buffer, uint_t size)
+int AsfNetworkInputStream::dwrite(const void* b, uint_t size)
 {
+    const char* buffer = (const char*) b;
     if (m_lfd < 0)
     {
 	if (m_lfd == -12345)
@@ -843,7 +845,7 @@
 	int i = ::write(m_lfd, buffer, size);
 	if (i < 0)
             return i;
-	(const char*)buffer += i;
+	buffer += i;
 	size -= i;
     }
     fsync(m_lfd);

Lines 1-11 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-lib::common::image.cpp (-11 lines)
1	--- lib/common/image.cpp.orig Fri Aug 6 12:35:40 2004
2	+++ lib/common/image.cpp Fri Aug 6 12:47:59 2004
3	@@ -954,7 +954,7 @@
4	fillMembers();
5	if (!copy)
6	{
7	- (const uint8_t*) m_pPlane[0] = data;
8	+ m_pPlane[0] = (uint8_t*) data;
9	}
10	else
11	{

Lines 1-45 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-plugins::libmp3lame_audioenc::lame3.70::quantize-pvt.c (-45 lines)
1	--- plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c.orig Fri Aug 6 13:59:16 2004
2	+++ plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c Fri Aug 6 14:11:28 2004
3	@@ -976,6 +976,7 @@
4	{
5	int rx[4];
6	__asm__ __volatile__(
7	+ "\n\npush %%edx\n\t"
8	"\n\nloop1:\n\t"
9
10	"fld" F8type " 0(%1)\n\t"
11	@@ -1007,18 +1008,18 @@
12	"dec %4\n\t"
13
14	"movl %5, %%eax\n\t"
15	- "movl 4+%5, %%ebx\n\t"
16	+ "movl 4+%5, %%edx\n\t"
17	"fxch %%st(1)\n\t"
18	"fadd" F8type " (%2,%%eax," F8size ")\n\t"
19	"fxch %%st(3)\n\t"
20	- "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
21	+ "fadd" F8type " (%2,%%edx," F8size ")\n\t"
22
23	"movl 8+%5, %%eax\n\t"
24	- "movl 12+%5, %%ebx\n\t"
25	+ "movl 12+%5, %%edx\n\t"
26	"fxch %%st(2)\n\t"
27	"fadd" F8type " (%2,%%eax," F8size ")\n\t"
28	"fxch %%st(1)\n\t"
29	- "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
30	+ "fadd" F8type " (%2,%%edx," F8size ")\n\t"
31
32	"fxch %%st(3)\n\t"
33	"fistpl -16(%3)\n\t"
34	@@ -1028,9 +1029,10 @@
35	"fistpl -4(%3)\n\t"
36
37	"jnz loop1\n\n"
38	+ "pop %%edx\n\n"
39	: /* no outputs */
40	: "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
41	- : "%eax", "%ebx", "memory", "cc"
42	+ : "%eax", "memory", "cc"
43	);
44	}
45	#elif defined (USE_MSC_ASM)




--- plugins/libvorbis/libvorbis.cpp.orig	Fri Aug  6 12:35:41 2004
+++ plugins/libvorbis/libvorbis.cpp	Fri Aug  6 12:49:27 2004
@@ -96,7 +96,7 @@
 	op.packet = NULL;
 	op.b_o_s  = 1; /* beginning of stream for first packet */
 	op.bytes  = hdrsizes[0];
-	(const void*) op.packet = vorbishdr;
+	op.packet = (unsigned char*) vorbishdr;
 	vorbishdr += op.bytes;
 	if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
 	{
@@ -106,7 +106,7 @@
 
 	op.b_o_s  = 0;
 	op.bytes  = hdrsizes[1];
-	(const void*) op.packet = vorbishdr;
+	op.packet = (unsigned char*) vorbishdr;
 	vorbishdr += op.bytes;
 	if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
 	{
@@ -115,7 +115,7 @@
 	}
 
 	op.bytes  = hdrsizes[2];
-	(const void*) op.packet = vorbishdr;
+	op.packet = (unsigned char*) vorbishdr;
 	vorbishdr += op.bytes;
 	if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
 	{

Line 0 Link Here

(-)/usr/ports/multimedia/avifile/files/patch-configure (+11 lines)
	1	--- configure.orig Tue Oct 5 14:25:48 2004
	2	+++ configure Tue Oct 5 14:26:14 2004
	3	@@ -3768,7 +3768,7 @@
	4
	5	case "$target" in
	6	i?86*)
	7	- test x$ac_cv_c_compiler_gnu = xyes && DEFAULT_FLAGS="-mcpu=$DEFAULT_FLAGS -march=$DEFAULT_FLAGS -ffast-math -fomit-frame-pointer"
	8	+ test x$ac_cv_c_compiler_gnu = xyes && DEFAULT_FLAGS="-ffast-math -fomit-frame-pointer"
	9
	10	cat >>confdefs.h <<\_ACEOF
	11	#define ARCH_X86 1




--- ffmpeg/libavcodec/libpostproc/postprocess_template.c.orig	Tue Oct  5 14:36:15 2004
+++ ffmpeg/libavcodec/libpostproc/postprocess_template.c	Tue Oct  5 14:34:29 2004
@@ -49,6 +49,8 @@
 	"paddb " #a ", " #b " \n\t"
 #endif
 
+int xxx;
+
 //FIXME? |255-0| = 1 (shouldnt be a problem ...)
 #ifdef HAVE_MMX
 /**
@@ -2870,7 +2872,7 @@
 		);
 
 		src+= step; // src points to begin of the 8x8 Block
-                int xxx = dc_mask & eq_mask;
+                xxx = dc_mask & eq_mask;
 		asm volatile(
 		"movq %4, %%mm6					\n\t"
 		"pcmpeqb %%mm5, %%mm5				\n\t"




--- ffmpeg/libavformat/flvenc.c.orig	Wed Nov 19 10:06:53 2003
+++ ffmpeg/libavformat/flvenc.c	Wed Nov 19 10:08:10 2003
@@ -226,11 +226,12 @@
 {
     ByteIOContext *pb = &s->pb;
     FLVContext *flv = s->priv_data;
-
+    int64_t file_size;
+    int flags = 0;
+    
     Dump(flv,pb,1);
 
-    int64_t file_size = url_ftell(pb);
-    int flags = 0;
+    file_size = url_ftell(pb);
     flags |= flv->hasAudio ? 4 : 0;
     flags |= flv->hasVideo ? 1 : 0;
     url_fseek(pb, 4, SEEK_SET);

Line 0 Link Here

(-)/usr/ports/multimedia/avifile/files/patch-lib::aviread::AsfFileInputStream.cpp (+11 lines)
	1	--- lib/aviread/AsfFileInputStream.cpp.orig Tue Oct 5 14:00:28 2004
	2	+++ lib/aviread/AsfFileInputStream.cpp Tue Oct 5 14:00:38 2004
	3	@@ -18,6 +18,8 @@
	4	#define O_LARGEFILE 0
	5	#endif
	6
	7	+#define lseek64 lseek
	8	+
	9	AVM_BEGIN_NAMESPACE;
	10
	11	#define __MODULE__ "AsfFileInputStream"




--- lib/subtitle/subread.c.orig	Tue Oct  5 15:47:53 2004
+++ lib/subtitle/subread.c	Tue Oct  5 15:49:02 2004
@@ -100,12 +100,14 @@
     if (sl->lines < SUBTITLE_MAX_LINES && txt)
     {
 	int n = 0;
-	char* b = trim_spaces(txt);
+	char* b;
+        char* t;
+        b = trim_spaces(txt);
         trim_http(b);
 
 	// skip color and font-style change - not supported right now
 	// {c:$00ffff} {y:i}
-	char* t = strchr(b, '{');
+	t = strchr(b, '{');
 	if (t)
 	{
 	    char u = toupper(t[1]);




--- lib/video/sub_ft.cpp.orig	Wed Mar 17 15:25:55 2004
+++ lib/video/sub_ft.cpp	Wed Mar 17 15:26:49 2004
@@ -6,7 +6,8 @@
 
 #ifdef HAVE_LIBFREETYPE
 
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #if (FREETYPE_MAJOR > 2) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1)
 #define HAVE_FREETYPE21




include/avifile/version.h
include/avifile/videodecoder.h
include/avifile/videoencoder.h
%%AC3_PASS%%lib/avifile/ac3pass.la
%%AC3_PASS%%lib/avifile/ac3pass.so
lib/avifile/audiodec.la
lib/avifile/audiodec.so
%%FFMPEG%%lib/avifile/ffmpeg.la
%%FFMPEG%%lib/avifile/ffmpeg.so
%%MAD%%lib/avifile/mad_audiodec.la
%%MAD%%lib/avifile/mad_audiodec.so
lib/avifile/mjpeg.la
lib/avifile/mjpeg.so
lib/avifile/mp3lame_audioenc.la
lib/avifile/mp3lame_audioenc.so
%%LAME%%lib/avifile/mp3lamebin_audioenc.la
%%LAME%%lib/avifile/mp3lamebin_audioenc.so
lib/avifile/mpeg_audiodec.la
lib/avifile/mpeg_audiodec.so
lib/avifile/osmjpeg.so
%%VIDIX%%lib/avifile/vidix/libgenfb.so
%%VIDIX%%lib/avifile/vidix/libmach64.la
%%VIDIX%%lib/avifile/vidix/libmach64.so
%%VIDIX%%lib/avifile/vidix/libmga.la
%%VIDIX%%lib/avifile/vidix/libmga.so
%%VIDIX%%lib/avifile/vidix/libmga_crtc2.la
%%VIDIX%%lib/avifile/vidix/libmga_crtc2.so
%%VIDIX%%lib/avifile/vidix/libnvidia.la
%%VIDIX%%lib/avifile/vidix/libnvidia.so
%%VIDIX%%lib/avifile/vidix/libpm3.la
%%VIDIX%%lib/avifile/vidix/libpm3.so
%%VIDIX%%lib/avifile/vidix/libradeon.la
%%VIDIX%%lib/avifile/vidix/libradeon.so
%%VIDIX%%lib/avifile/vidix/librage128.la
%%VIDIX%%lib/avifile/vidix/librage128.so
%%VORBIS%%lib/avifile/vorbis_audio.la
%%VORBIS%%lib/avifile/vorbis_audio.so
%%WIN32%%lib/avifile/win32.la
%%WIN32%%lib/avifile/win32.so
%%XVID%%lib/avifile/xvid4.so
%%XVID%%lib/avifile/xvid.so
lib/libaviplay.a
lib/libaviplay.la
lib/libaviplay.so
lib/libaviplay.so.0
lib/libaviplayavformat.so.0
lib/libaviplayavformat.so
lib/libaviplayavformat.a
lib/libaviplayavcodec.so.0
lib/libaviplayavcodec.so
lib/libaviplayavcodec.a
lib/libaviplaydha.so.0
lib/libaviplaydha.so
lib/libaviplaydha.a
lib/libaviplayvidix.so.0
lib/libaviplayvidix.so
lib/libaviplayvidix.a
%%QT%%lib/libqavm.a
%%QT%%lib/libqavm.la
%%QT%%lib/libqavm.so
%%QT%%lib/libqavm.so.0
libdata/pkgconfig/avifile.pc

Return to bug 72363

Lines 6-13 Link Here

(-)/usr/ports/multimedia/avifile/Makefile (-23 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= avifile	8	PORTNAME= avifile
9	PORTVERSION= 0.7.38	9	PORTVERSION= 0.7.41
10	PORTREVISION= 4
11	PORTEPOCH= 2	10	PORTEPOCH= 2
12	CATEGORIES= multimedia	11	CATEGORIES= multimedia
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 23-29 Link Here
23	USE_REINPLACE= yes	22	USE_REINPLACE= yes
24	USE_XLIB= yes	23	USE_XLIB= yes
25	USE_GMAKE= yes	24	USE_GMAKE= yes
26	USE_LIBTOOL_VER=13	25	USE_LIBTOOL_VER=15
27	INSTALLS_SHLIB= yes	26	INSTALLS_SHLIB= yes
28		27
29	LIBTOOLFILES= acinclude.m4	28	LIBTOOLFILES= acinclude.m4
Lines 65-90 Link Here
65		64
66	.include <bsd.port.pre.mk>	65	.include <bsd.port.pre.mk>
67		66
68	# fix compile with gcc-3.4.x
69	.if ${OSVERSION} >= 502126
70	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include::aviplay.h \
71	${FILESDIR}/extra-patch-include::avm_map.h \
72	${FILESDIR}/extra-patch-include::avm_stl.h \
73	${FILESDIR}/extra-patch-lib::aviread::AsfNetworkInputStream.cpp \
74	${FILESDIR}/extra-patch-lib::common::image.cpp \
75	${FILESDIR}/extra-patch-plugins::libvorbis::libvorbis.cpp \
76	${FILESDIR}/extra-patch-ffmpeg::libavcodec::i386::dsputil_mmx.c \
77	${FILESDIR}/extra-patch-ffmpeg::libavcodec::i386::motion_est_mmx.c \
78	${FILESDIR}/extra-patch-ffmpeg::libavcodec::i386::simple_idct_mmx.c \
79	${FILESDIR}/extra-patch-ffmpeg::libavcodec::liba52::resample_mmx.c \
80	${FILESDIR}/extra-patch-plugins::libmp3lame_audioenc::lame3.70::quantize-pvt.c
81	.endif
82
83	WITHOUT_XVID=yes # Does not support xvid 1.0.x
84
85	.if (${ARCH} != "i386") && (${ARCH} != "amd64")	67	.if (${ARCH} != "i386") && (${ARCH} != "amd64")
86	WITHOUT_A52=yes	68	WITHOUT_A52=yes
87	WITHOUT_XVID=yes
88	BROKEN= "Does not compile on !i386"	69	BROKEN= "Does not compile on !i386"
89	.endif	70	.endif
90		71
Lines 112-119 Link Here
112	.if !defined(WITHOUT_A52)	93	.if !defined(WITHOUT_A52)
113	LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52	94	LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
114		95
		96	# --enable-ffmpeg-a52bin breaks build
115	CONFIGURE_ARGS+= --enable-a52 \	97	CONFIGURE_ARGS+= --enable-a52 \
116	--enable-ffmpeg-a52bin \	98	--enable-ffmpeg-a52 \
117	--with-a52-prefix=${LOCALBASE}	99	--with-a52-prefix=${LOCALBASE}
118	PLIST_SUB+= A52=""	100	PLIST_SUB+= A52=""
119	.else	101	.else
Lines 175-181 Link Here
175	# xvid	157	# xvid
176	.if !defined(WITHOUT_XVID)	158	.if !defined(WITHOUT_XVID)
177	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid	159	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
178
179	CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE}	160	CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE}
180	PLIST_SUB+= XVID=""	161	PLIST_SUB+= XVID=""
181	.else	162	.else
Lines 298-303 Link Here
298	@${REINPLACE_CMD} -E \	279	@${REINPLACE_CMD} -E \
299	-e 's\|^subdirs[[:space:]]=.libmad.*$$\|\|' \	280	-e 's\|^subdirs[[:space:]]=.libmad.*$$\|\|' \
300	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	281	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
		282	# int_fast16/32_t are not in 4.x
		283	.if ${OSVERSION} < 500000
		284	@${REINPLACE_CMD} -e 's\|int_fast16_t\|int16_t\|g; \
		285	s\|int_fast32_t\|int32_t\|g' \
		286	${WRKSRC}/ffmpeg/libavcodec/jfdctfst.c \
		287	${WRKSRC}/ffmpeg/libavcodec/jfdctint.c \
		288	${WRKSRC}/ffmpeg/libavcodec/ffv1.c
		289	.endif
301		290
302	post-configure:	291	post-configure:
303	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool	292	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool

Lines 1-13 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-ffmpeg::libavcodec::i386::dsputil_mmx.c (-13 lines)
1	--- ffmpeg/libavcodec/i386/dsputil_mmx.c.orig Fri Aug 6 13:59:15 2004
2	+++ ffmpeg/libavcodec/i386/dsputil_mmx.c Fri Aug 6 14:07:13 2004
3	@@ -29,8 +29,8 @@
4	static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
5	static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
6
7	-static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
8	-static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
9	+static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) __attribute__((used)) = 0x0014001400140014ULL;
10	+static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) __attribute__((used)) = 0x0003000300030003ULL;
11	static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
12	static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
13

Lines 1-13 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-ffmpeg::libavcodec::i386::simple_idct_mmx.c (-13 lines)
1	--- ffmpeg/libavcodec/i386/simple_idct_mmx.c.orig Fri Aug 6 13:59:15 2004
2	+++ ffmpeg/libavcodec/i386/simple_idct_mmx.c Fri Aug 6 14:09:00 2004
3	@@ -45,8 +45,8 @@
4	#define ROW_SHIFT 11
5	#define COL_SHIFT 20 // 6
6
7	-static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
8	-static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
9	+static const uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000ULL;
10	+static const uint64_t __attribute__((aligned(8))) __attribute__((used)) d40000= 0x0000000000040000ULL;
11	static int16_t __attribute__((aligned(8))) temp[64];
12	static int16_t __attribute__((aligned(8))) coeffs[]= {
13	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,

Lines 1-17 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-ffmpeg::libavcodec::liba52::resample_mmx.c (-17 lines)
1	--- ffmpeg/libavcodec/liba52/resample_mmx.c.orig Fri Aug 6 13:59:15 2004
2	+++ ffmpeg/libavcodec/liba52/resample_mmx.c Fri Aug 6 14:09:51 2004
3	@@ -7,10 +7,10 @@
4	and it would mean (C / MMX2 / MMX / 3DNOW) versions
5	*/
6
7	-static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
8	-static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
9	-static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
10	-static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
11	+static uint64_t __attribute__((aligned(8))) __attribute__((used)) magicF2W= 0x43c0000043c00000LL;
12	+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000LL;
13	+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm0101= 0x0000FFFF0000FFFFLL;
14	+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1100= 0xFFFFFFFF00000000LL;
15
16	static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
17	int32_t * f = (int32_t *) _f;

Lines 1-13 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-include::aviplay.h (-13 lines)
1	--- include/aviplay.h.orig Fri Aug 6 12:35:41 2004
2	+++ include/aviplay.h Fri Aug 6 12:36:36 2004
3	@@ -12,8 +12,8 @@
4	#include "image.h"
5	#include "avm_args.h"
6
7	-typedef void (KILLHANDLER)(int, void p = 0);
8	-typedef int (AUDIOFUNC)(void srcdata, unsigned int size, void* p = 0);
9	+typedef void (KILLHANDLER)(int, void p);
10	+typedef int (AUDIOFUNC)(void srcdata, unsigned int size, void* p);
11
12	AVM_BEGIN_NAMESPACE;
13

Lines 1-12 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-include::avm_map.h (-12 lines)
1	--- include/avm_map.h.orig Fri Aug 6 12:35:41 2004
2	+++ include/avm_map.h Fri Aug 6 12:37:10 2004
3	@@ -198,7 +198,8 @@
4	{
5	// cast to the needed type - used to prevent internal compiler error
6	// for old egcc
7	- avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
8	+ //avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
9	+ _Tnode* node = (_Tnode*) n;
10
11	if(node->entry)
12	{

Lines 1-61 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-include::avm_stl.h (-61 lines)
1	--- include/avm_stl.h.orig Fri Aug 6 12:35:41 2004
2	+++ include/avm_stl.h Fri Aug 6 12:41:47 2004
3	@@ -74,6 +74,10 @@
4	m_Type = new Type[m_uiCapacity];
5	}
6	~qring() { delete[] m_Type; }
7	+ qring<Type>(const qring<Type>& t) : m_Type(0)
8	+ {
9	+ operator=(t);
10	+ }
11	qring<Type>& operator=(const qring<Type>& t)
12	{
13	if (this != &t)
14	@@ -149,7 +153,6 @@
15
16	// disabled for now
17	qring<Type>() {}
18	- qring<Type>(const qring<Type>& t) {}
19
20	uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; }
21	uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; }
22	@@ -167,9 +170,21 @@
23	static const uint_t invalid=(uint_t)(~0);
24	typedef Type* iterator;
25	typedef const Type* const_iterator;
26	- vector<Type>(int prealloc = 0);
27	+ vector<Type>()
28	+ :m_Type(0), m_uiCapacity(0), m_uiSize(0)
29	+ {
30	+ }
31	+
32	+ vector<Type>(int prealloc)
33	+ :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc)
34	+ {
35	+ if (m_uiCapacity > 0 )
36	+ m_Type = new Type[m_uiCapacity];
37	+ //printf("vector %p (%d)\n", this, m_uiSize);
38	+ }
39	+
40	// we will not count references - we have to program with this in mind!
41	- vector<Type>(const vector<Type>& t) :m_Type(0), m_uiCapacity(0), m_uiSize(0)
42	+ vector<Type>(const vector<Type>& t) :m_Type(0)
43	{
44	operator=(t);
45	}
46	@@ -270,15 +285,6 @@
47	uint_t m_uiSize;
48	void copy(const Type* in, uint_t size, uint_t alloc);
49	};
50	-
51	-template <class Type>
52	-vector<Type>::vector<Type>(int prealloc)
53	- :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc)
54	-{
55	- if (m_uiCapacity > 0 )
56	- m_Type = new Type[m_uiCapacity];
57	- //printf("vector %p (%d)\n", this, m_uiSize);
58	-}
59
60	template <class Type>
61	void vector<Type>::remove(const Type& t)

Lines 1-39 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-lib::aviread::AsfNetworkInputStream.cpp (-39 lines)
1	--- lib/aviread/AsfNetworkInputStream.cpp.orig Fri Aug 6 12:35:40 2004
2	+++ lib/aviread/AsfNetworkInputStream.cpp Fri Aug 6 12:46:32 2004
3	@@ -793,22 +793,24 @@
4	return -1;
5	}
6
7	-int AsfNetworkInputStream::write(const void* buffer, uint_t size)
8	+int AsfNetworkInputStream::write(const void* b, uint_t size)
9	{
10	+ const char* buffer = (const char*) b;
11	int wsize = size;
12	while (wsize > 0)
13	{
14	int i = ::write(m_iSocket, buffer, wsize);
15	if (i <= 0)
16	return i;
17	- (const char*)buffer += i;
18	+ buffer += i;
19	wsize -= i;
20	}
21	return size;
22	}
23
24	-int AsfNetworkInputStream::dwrite(const void* buffer, uint_t size)
25	+int AsfNetworkInputStream::dwrite(const void* b, uint_t size)
26	{
27	+ const char* buffer = (const char*) b;
28	if (m_lfd < 0)
29	{
30	if (m_lfd == -12345)
31	@@ -843,7 +845,7 @@
32	int i = ::write(m_lfd, buffer, size);
33	if (i < 0)
34	return i;
35	- (const char*)buffer += i;
36	+ buffer += i;
37	size -= i;
38	}
39	fsync(m_lfd);

Lines 1-29 Link Here

(-)/usr/ports/multimedia/avifile/files/extra-patch-plugins::libvorbis::libvorbis.cpp (-29 lines)
1	--- plugins/libvorbis/libvorbis.cpp.orig Fri Aug 6 12:35:41 2004
2	+++ plugins/libvorbis/libvorbis.cpp Fri Aug 6 12:49:27 2004
3	@@ -96,7 +96,7 @@
4	op.packet = NULL;
5	op.b_o_s = 1; /* beginning of stream for first packet */
6	op.bytes = hdrsizes[0];
7	- (const void*) op.packet = vorbishdr;
8	+ op.packet = (unsigned char*) vorbishdr;
9	vorbishdr += op.bytes;
10	if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
11	{
12	@@ -106,7 +106,7 @@
13
14	op.b_o_s = 0;
15	op.bytes = hdrsizes[1];
16	- (const void*) op.packet = vorbishdr;
17	+ op.packet = (unsigned char*) vorbishdr;
18	vorbishdr += op.bytes;
19	if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
20	{
21	@@ -115,7 +115,7 @@
22	}
23
24	op.bytes = hdrsizes[2];
25	- (const void*) op.packet = vorbishdr;
26	+ op.packet = (unsigned char*) vorbishdr;
27	vorbishdr += op.bytes;
28	if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
29	{

Line 0 Link Here

(-)/usr/ports/multimedia/avifile/files/patch-ffmpeg::libavcodec::libpostproc::postprocess_template.c (+20 lines)
	1	--- ffmpeg/libavcodec/libpostproc/postprocess_template.c.orig Tue Oct 5 14:36:15 2004
	2	+++ ffmpeg/libavcodec/libpostproc/postprocess_template.c Tue Oct 5 14:34:29 2004
	3	@@ -49,6 +49,8 @@
	4	"paddb " #a ", " #b " \n\t"
	5	#endif
	6
	7	+int xxx;
	8	+
	9	//FIXME? \|255-0\| = 1 (shouldnt be a problem ...)
	10	#ifdef HAVE_MMX
	11	/**
	12	@@ -2870,7 +2872,7 @@
	13	);
	14
	15	src+= step; // src points to begin of the 8x8 Block
	16	- int xxx = dc_mask & eq_mask;
	17	+ xxx = dc_mask & eq_mask;
	18	asm volatile(
	19	"movq %4, %%mm6 \n\t"
	20	"pcmpeqb %%mm5, %%mm5 \n\t"

Lines 1-18 Link Here

(-)/usr/ports/multimedia/avifile/files/patch-ffmpeg::libavformat::flvenc.c (-18 lines)
1	--- ffmpeg/libavformat/flvenc.c.orig Wed Nov 19 10:06:53 2003
2	+++ ffmpeg/libavformat/flvenc.c Wed Nov 19 10:08:10 2003
3	@@ -226,11 +226,12 @@
4	{
5	ByteIOContext *pb = &s->pb;
6	FLVContext *flv = s->priv_data;
7	-
8	+ int64_t file_size;
9	+ int flags = 0;
10	+
11	Dump(flv,pb,1);
12
13	- int64_t file_size = url_ftell(pb);
14	- int flags = 0;
15	+ file_size = url_ftell(pb);
16	flags \|= flv->hasAudio ? 4 : 0;
17	flags \|= flv->hasVideo ? 1 : 0;
18	url_fseek(pb, 4, SEEK_SET);

Line 0 Link Here

(-)/usr/ports/multimedia/avifile/files/patch-lib::subtitle::subread.c (+19 lines)
	1	--- lib/subtitle/subread.c.orig Tue Oct 5 15:47:53 2004
	2	+++ lib/subtitle/subread.c Tue Oct 5 15:49:02 2004
	3	@@ -100,12 +100,14 @@
	4	if (sl->lines < SUBTITLE_MAX_LINES && txt)
	5	{
	6	int n = 0;
	7	- char* b = trim_spaces(txt);
	8	+ char* b;
	9	+ char* t;
	10	+ b = trim_spaces(txt);
	11	trim_http(b);
	12
	13	// skip color and font-style change - not supported right now
	14	// {c:$00ffff} {y:i}
	15	- char* t = strchr(b, '{');
	16	+ t = strchr(b, '{');
	17	if (t)
	18	{
	19	char u = toupper(t[1]);

Lines 1-12 Link Here

(-)/usr/ports/multimedia/avifile/files/patch-lib::video::sub_ft.cpp (-12 lines)
1	--- lib/video/sub_ft.cpp.orig Wed Mar 17 15:25:55 2004
2	+++ lib/video/sub_ft.cpp Wed Mar 17 15:26:49 2004
3	@@ -6,7 +6,8 @@
4
5	#ifdef HAVE_LIBFREETYPE
6
7	-#include <freetype/freetype.h>
8	+#include <ft2build.h>
9	+#include FT_FREETYPE_H
10
11	#if (FREETYPE_MAJOR > 2) \|\| (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1)
12	#define HAVE_FREETYPE21

Lines 37-86 Link Here

(-)/usr/ports/multimedia/avifile/pkg-plist (-24 / +14 lines)
37	include/avifile/version.h	37	include/avifile/version.h
38	include/avifile/videodecoder.h	38	include/avifile/videodecoder.h
39	include/avifile/videoencoder.h	39	include/avifile/videoencoder.h
40	%%AC3_PASS%%lib/avifile/ac3pass.la
41	%%AC3_PASS%%lib/avifile/ac3pass.so	40	%%AC3_PASS%%lib/avifile/ac3pass.so
42	lib/avifile/audiodec.la
43	lib/avifile/audiodec.so	41	lib/avifile/audiodec.so
44	%%FFMPEG%%lib/avifile/ffmpeg.la
45	%%FFMPEG%%lib/avifile/ffmpeg.so	42	%%FFMPEG%%lib/avifile/ffmpeg.so
46	%%MAD%%lib/avifile/mad_audiodec.la
47	%%MAD%%lib/avifile/mad_audiodec.so	43	%%MAD%%lib/avifile/mad_audiodec.so
48	lib/avifile/mjpeg.la
49	lib/avifile/mjpeg.so
50	lib/avifile/mp3lame_audioenc.la
51	lib/avifile/mp3lame_audioenc.so	44	lib/avifile/mp3lame_audioenc.so
52	%%LAME%%lib/avifile/mp3lamebin_audioenc.la
53	%%LAME%%lib/avifile/mp3lamebin_audioenc.so	45	%%LAME%%lib/avifile/mp3lamebin_audioenc.so
54	lib/avifile/mpeg_audiodec.la
55	lib/avifile/mpeg_audiodec.so	46	lib/avifile/mpeg_audiodec.so
56	%%VIDIX%%lib/avifile/vidix/libgenfb.la	47	lib/avifile/osmjpeg.so
57	%%VIDIX%%lib/avifile/vidix/libgenfb.so	48	%%VIDIX%%lib/avifile/vidix/libgenfb.so
58	%%VIDIX%%lib/avifile/vidix/libmach64.la
59	%%VIDIX%%lib/avifile/vidix/libmach64.so	49	%%VIDIX%%lib/avifile/vidix/libmach64.so
60	%%VIDIX%%lib/avifile/vidix/libmga.la
61	%%VIDIX%%lib/avifile/vidix/libmga.so	50	%%VIDIX%%lib/avifile/vidix/libmga.so
62	%%VIDIX%%lib/avifile/vidix/libmga_crtc2.la
63	%%VIDIX%%lib/avifile/vidix/libmga_crtc2.so	51	%%VIDIX%%lib/avifile/vidix/libmga_crtc2.so
64	%%VIDIX%%lib/avifile/vidix/libnvidia.la
65	%%VIDIX%%lib/avifile/vidix/libnvidia.so
66	%%VIDIX%%lib/avifile/vidix/libpm3.la
67	%%VIDIX%%lib/avifile/vidix/libpm3.so	52	%%VIDIX%%lib/avifile/vidix/libpm3.so
68	%%VIDIX%%lib/avifile/vidix/libradeon.la
69	%%VIDIX%%lib/avifile/vidix/libradeon.so	53	%%VIDIX%%lib/avifile/vidix/libradeon.so
70	%%VIDIX%%lib/avifile/vidix/librage128.la
71	%%VIDIX%%lib/avifile/vidix/librage128.so	54	%%VIDIX%%lib/avifile/vidix/librage128.so
72	%%VORBIS%%lib/avifile/vorbis_audio.la
73	%%VORBIS%%lib/avifile/vorbis_audio.so	55	%%VORBIS%%lib/avifile/vorbis_audio.so
74	%%WIN32%%lib/avifile/win32.la
75	%%WIN32%%lib/avifile/win32.so	56	%%WIN32%%lib/avifile/win32.so
76	%%XVID%%lib/avifile/xvid.la	57	%%XVID%%lib/avifile/xvid4.so
77	%%XVID%%lib/avifile/xvid.so
78	lib/libaviplay.a	58	lib/libaviplay.a
79	lib/libaviplay.la
80	lib/libaviplay.so	59	lib/libaviplay.so
81	lib/libaviplay.so.0	60	lib/libaviplay.so.0
		61	lib/libaviplayavformat.so.0
		62	lib/libaviplayavformat.so
		63	lib/libaviplayavformat.a
		64	lib/libaviplayavcodec.so.0
		65	lib/libaviplayavcodec.so
		66	lib/libaviplayavcodec.a
		67	lib/libaviplaydha.so.0
		68	lib/libaviplaydha.so
		69	lib/libaviplaydha.a
		70	lib/libaviplayvidix.so.0
		71	lib/libaviplayvidix.so
		72	lib/libaviplayvidix.a
82	%%QT%%lib/libqavm.a	73	%%QT%%lib/libqavm.a
83	%%QT%%lib/libqavm.la
84	%%QT%%lib/libqavm.so	74	%%QT%%lib/libqavm.so
85	%%QT%%lib/libqavm.so.0	75	%%QT%%lib/libqavm.so.0
86	libdata/pkgconfig/avifile.pc	76	libdata/pkgconfig/avifile.pc