+++ /dev/null
-diff -urN avifile-0.6.org/configure.in avifile-0.6/configure.in
---- avifile-0.6.org/configure.in Mon Apr 2 15:57:50 2001
-+++ avifile-0.6/configure.in Mon Apr 2 15:58:07 2001
-@@ -372,7 +372,7 @@
- AC3_CFLAGS=-I$withval
- AC3_LDADD=-L$withval/libac3
- AC3_LIBS=-lac3
-- AC3_LIBADD=ac3.o
-+ AC3_LIBADD=
- HAVE_AC3=1)
- dnl AC_SUBST(HAVE_AC3)
- AC_SUBST(AC3_PATH)
-diff -urN avifile-0.6.org/plugins/libaudiodec/ac3.h avifile-0.6/plugins/libaudiodec/ac3.h
---- avifile-0.6.org/plugins/libaudiodec/ac3.h Mon Apr 2 15:57:50 2001
-+++ avifile-0.6/plugins/libaudiodec/ac3.h Mon Apr 2 15:57:57 2001
-@@ -1,6 +1,6 @@
- #include <audiodecoder.h>
- extern "C" {
--#include "libac3/ac3.h"
-+#include "ac3/ac3.h"
- }
-
- class AC3_Decoder : public IAudioDecoder
+++ /dev/null
-diff -urN avifile0.6-20011220.orig/configure.in avifile0.6-20011220/configure.in
---- avifile0.6-20011220.orig/configure.in Sun Jan 20 17:15:14 2002
-+++ avifile0.6-20011220/configure.in Sun Jan 20 17:17:59 2002
-@@ -83,6 +83,7 @@
- dnl automatic updating of libtool configuration files
- dnl not needed with automake AC_SUBST(LIBTOOL_DEPS)
- dnl using rather hack for .lo creation AM_PROG_AS
-+AM_PROG_AS
-
-
- dnl
-diff -urN avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am avifile0.6-20011220/plugins/libwin32/loader/Makefile.am
---- avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am Sun Jan 20 17:15:14 2002
-+++ avifile0.6-20011220/plugins/libwin32/loader/Makefile.am Sun Jan 20 17:19:21 2002
-@@ -1,7 +1,7 @@
- SUBDIRS = dshow wine
- noinst_LTLIBRARIES = libloader.la
- libloader_la_SOURCES = afl.c driver.c elfdll.c ext.c module.c \
-- pe_image.c pe_resource.c registry.c resource.c win32.c ldt_keeper.c
-+ pe_image.c pe_resource.c registry.c resource.c win32.c ldt_keeper.c stubs.s
-
- # ldt_keeper.c is not used here !! this is not a bug
- # it's used in lib/common/ldt_keeper.cpp
---- avifile0.7-20020412/acinclude.m4.orig Thu Apr 11 20:59:08 2002
-+++ avifile0.7-20020412/acinclude.m4 Sun Apr 21 15:35:25 2002
-@@ -1444,18 +1444,6 @@
-
-
-
--# as.m4
--# Figure out how to run the assembler.
--
--# AM_PROG_AS
--AC_DEFUN([AM_PROG_AS],
--[# By default we simply use the C compiler to build assembly code.
--AC_REQUIRE([AC_PROG_CC])
--: ${AS='$(CC)'}
--# Set ASFLAGS if not already set.
--: ${ASFLAGS='$(CFLAGS)'}
--AC_SUBST(AS)
--AC_SUBST(ASFLAGS)])
-
-
-
---- avifile0.7-20020412/lib/aviplay/Makefile.am.orig Mon Jan 7 23:24:48 2002
-+++ avifile0.7-20020412/lib/aviplay/Makefile.am Sun Apr 21 15:37:56 2002
-@@ -38,7 +38,8 @@
-
- # just for testing speed
- check_PROGRAMS = hqtest res
--hqtest_SOURCES = AudioFpHQResampler.cpp hqtest.cpp
-+hqtest_SOURCES = hqtest.cpp
-+hqtest_LDADD = AudioFpHQResampler.lo
- hqtest_LDFLAGS = ../libaviplay.la $(SDL_LDADD)
-
- res_SOURCES = ResampleSinc.cpp
---- avifile0.7-20020412/plugins/libac3pass/Makefile.am.orig Sun Apr 21 15:35:45 2002
-+++ avifile0.7-20020412/plugins/libac3pass/Makefile.am Sun Apr 21 15:39:18 2002
-@@ -9,7 +9,8 @@
- EXTRA_DIST = Makefile.emu README.avifile
-
- check_PROGRAMS = play_ac3
--play_ac3_SOURCES = play-ac3.c ac3-iec958.c
-+play_ac3_SOURCES = play-ac3.c
-+play_ac3_LDADD = ac3-iec958.lo
-
- LINE1=Digital L
- LINE2=Digital R
---- avifile0.7-20020412/plugins/libmad/libmad/configure.in.orig Sat Oct 27 03:28:47 2001
-+++ avifile0.7-20020412/plugins/libmad/libmad/configure.in Sun Apr 21 15:41:42 2002
-@@ -352,7 +352,5 @@
- test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
- test -n "$profile" && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
-
--LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
--AC_SUBST(LTLIBOBJS)
-
- AC_OUTPUT(Makefile)
+++ /dev/null
-diff -urN avifile0.6-20011220.orig/plugins/libac3pass/Makefile.am avifile0.6-20011220/plugins/libac3pass/Makefile.am
---- avifile0.6-20011220.orig/plugins/libac3pass/Makefile.am Fri Jan 4 11:40:17 2002
-+++ avifile0.6-20011220/plugins/libac3pass/Makefile.am Sun Jan 20 17:00:57 2002
-@@ -2,6 +2,7 @@
- noinst_HEADERS = ac3-iec958.h fillplugins.h
-
- libac3pass_la_SOURCES = ac3-iec958.c libac3pass.cpp
-+libac3pass_la_LIBADD = ../../lib/libaviplay.la -lstdc++
- libac3pass_la_LDFLAGS = -module -avoid-version
- #-release $(LT_RELEASE)
-
-diff -urN avifile0.6-20011220.orig/plugins/libaudiodec/Makefile.am avifile0.6-20011220/plugins/libaudiodec/Makefile.am
---- avifile0.6-20011220.orig/plugins/libaudiodec/Makefile.am Fri Jan 4 11:40:15 2002
-+++ avifile0.6-20011220/plugins/libaudiodec/Makefile.am Sun Jan 20 17:07:16 2002
-@@ -3,7 +3,7 @@
- gsm61dec.cpp pcm.cpp aulaw.cpp xa_gsm.c
- noinst_HEADERS = ac3.h adpcm.h adpcm_impl.h gsm61dec.h pcm.h xa_gsm.h \
- xa_gsm_state.h aulaw.h fillplugins.h
--libaudiodec_la_LIBADD = $(AC3_LIBADD)
-+libaudiodec_la_LIBADD = $(AC3_LIBADD) ../../lib/libaviplay.la -lstdc++
- libaudiodec_la_LDFLAGS = $(AC3_LIBS) $(AC3_LDADD) -module -avoid-version
- #-release $(LT_RELEASE)
-
-diff -urN avifile0.6-20011220.orig/plugins/libdivx4/Makefile.am avifile0.6-20011220/plugins/libdivx4/Makefile.am
---- avifile0.6-20011220.orig/plugins/libdivx4/Makefile.am Fri Jan 4 11:40:16 2002
-+++ avifile0.6-20011220/plugins/libdivx4/Makefile.am Sun Jan 20 17:08:20 2002
-@@ -3,7 +3,7 @@
- DIVX4LIBS = -L/usr/local/lib -ldivxdecore -ldivxencore
-
- libdivx4_la_SOURCES = divx4.cpp
--libdivx4_la_LIBADD = $(DIVX4LIBS)
-+libdivx4_la_LIBADD = $(DIVX4LIBS) ../../lib/libaviplay.la -lstdc++
- libdivx4_la_LDFLAGS = -module -avoid-version
- AM_CXXFLAGS = -DLINUX
- noinst_HEADERS = fillplugins.h
-diff -urN avifile0.6-20011220.orig/plugins/libffmpeg/Makefile.am avifile0.6-20011220/plugins/libffmpeg/Makefile.am
---- avifile0.6-20011220.orig/plugins/libffmpeg/Makefile.am Fri Jan 4 11:40:16 2002
-+++ avifile0.6-20011220/plugins/libffmpeg/Makefile.am Sun Jan 20 17:09:09 2002
-@@ -4,7 +4,7 @@
- noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h fillplugins.h bswap.h
- libffmpeg_la_SOURCES = libffmpeg.cpp FFAudioDecoder.cpp FFVideoDecoder.cpp
- #\ FFVideoEncoder.cpp
--libffmpeg_la_LIBADD = libavcodec/libavcodec.la
-+libffmpeg_la_LIBADD = libavcodec/libavcodec.la ../../lib/libaviplay.la -lstdc++
- libffmpeg_la_LDFLAGS = -module -avoid-version
- #-release $(LT_RELEASE)
-
-diff -urN avifile0.6-20011220.orig/plugins/libmp3lame_audioenc/Makefile.am avifile0.6-20011220/plugins/libmp3lame_audioenc/Makefile.am
---- avifile0.6-20011220.orig/plugins/libmp3lame_audioenc/Makefile.am Fri Jan 4 11:40:17 2002
-+++ avifile0.6-20011220/plugins/libmp3lame_audioenc/Makefile.am Sun Jan 20 17:10:38 2002
-@@ -2,7 +2,7 @@
- pkglib_LTLIBRARIES = libmp3lame_audioenc.la
- noinst_HEADERS = mp3encoder.h fillplugins.h
- libmp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp
--libmp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la
-+libmp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la ../../lib/libaviplay.la -lstdc++
- libmp3lame_audioenc_la_LDFLAGS = -module -avoid-version
- #-release $(LT_RELEASE)
- MAINTAINERCLEANFILES = Makefile.in
-diff -urN avifile0.6-20011220.orig/plugins/libmp3lamebin_audioenc/Makefile.am avifile0.6-20011220/plugins/libmp3lamebin_audioenc/Makefile.am
---- avifile0.6-20011220.orig/plugins/libmp3lamebin_audioenc/Makefile.am Fri Jan 4 11:40:17 2002
-+++ avifile0.6-20011220/plugins/libmp3lamebin_audioenc/Makefile.am Sun Jan 20 17:11:17 2002
-@@ -4,6 +4,7 @@
- libmp3lamebin_audioenc_la_LDFLAGS = -module -avoid-version
- MAINTAINERCLEANFILES = Makefile.in
-
-+libmp3lamebin_audioenc_la_LIBADD = ../../lib/libaviplay.la -lstdc++
- #
- # only lame.h header from the whole LAME project is here
- #
-diff -urN avifile0.6-20011220.orig/plugins/libmpeg_audiodec/Makefile.am avifile0.6-20011220/plugins/libmpeg_audiodec/Makefile.am
---- avifile0.6-20011220.orig/plugins/libmpeg_audiodec/Makefile.am Fri Jan 4 11:40:16 2002
-+++ avifile0.6-20011220/plugins/libmpeg_audiodec/Makefile.am Sun Jan 20 17:12:59 2002
-@@ -3,12 +3,12 @@
- huffmantable.cpp mpeglayer1.cpp mpeglayer2.cpp mpeglayer3.cpp \
- mpegtable.cpp mpegtoraw.cpp
- libmpeg_audiodec_la_LDFLAGS = -module -avoid-version
-+libmpeg_audiodec_la_LIBADD = ../../lib/libaviplay.la -lstdc++
- #-release $(LT_RELEASE)
- noinst_HEADERS = mpegsound.h mpegsound_locals.h fillplugins.h
-
- # currently it has to be compiled with optimalizations (inline has to work)
--OPTFLG = -O2 -ffast-math -fomit-frame-pointer -funroll-loops
- #-D__NO_STRING_INLINES -DDEBUG
- # -finline-functions
--AM_CXXFLAGS = $(OPTFLG)
-+AM_CXXFLAGS = @CXXFLAGS@
- MAINTAINERCLEANFILES = Makefile.in
-diff -urN avifile0.6-20011220.orig/plugins/libvorbis/Makefile.am avifile0.6-20011220/plugins/libvorbis/Makefile.am
---- avifile0.6-20011220.orig/plugins/libvorbis/Makefile.am Fri Jan 4 11:40:17 2002
-+++ avifile0.6-20011220/plugins/libvorbis/Makefile.am Sun Jan 20 17:13:34 2002
-@@ -1,6 +1,6 @@
- pkglib_LTLIBRARIES = libvorbis_audio.la
- noinst_HEADERS = fillplugins.h
- libvorbis_audio_la_SOURCES = libvorbis.cpp
--libvorbis_audio_la_LIBADD = -lvorbisfile -lvorbis
-+libvorbis_audio_la_LIBADD = -lvorbisfile -lvorbis ../../lib/libaviplay.la -lstdc++
- libvorbis_audio_la_LDFLAGS = -module -avoid-version
- MAINTAINERCLEANFILES = Makefile.in
-diff -urN avifile0.6-20011220.orig/plugins/libwin32/Makefile.am avifile0.6-20011220/plugins/libwin32/Makefile.am
---- avifile0.6-20011220.orig/plugins/libwin32/Makefile.am Fri Jan 4 11:40:16 2002
-+++ avifile0.6-20011220/plugins/libwin32/Makefile.am Sun Jan 20 17:14:10 2002
-@@ -7,7 +7,7 @@
- libwin32_la_LIBADD = \
- audiodec/libaudiodec.la \
- loader/libloader.la \
-- videocodec/libvideocodec.la
-+ videocodec/libvideocodec.la ../../lib/libaviplay.la -lstdc++
-
- libwin32_la_LDFLAGS = -module -avoid-version
-
+++ /dev/null
---- avifile-0.6/plugins/libaudiodec/ac3.h~ Mon Jul 30 16:18:42 2001
-+++ avifile-0.6/plugins/libaudiodec/ac3.h Mon Jul 30 16:25:01 2001
-@@ -14,8 +14,8 @@
- static const int CHUNK_SIZE;
- public:
- AC3_Decoder(const CodecInfo&, WAVEFORMATEX*);
-- int GetMinSize() { return CHUNK_SIZE; }
-- int Convert( unsigned char* in_data, unsigned in_size,
-- unsigned char* out_data, unsigned out_size,
-- unsigned* size_read, unsigned* size_written );
-+ size_t GetMinSize() { return CHUNK_SIZE; }
-+ int Convert( const void* in_data, size_t in_size,
-+ void* out_data, size_t out_size,
-+ size_t* size_read, size_t* size_written );
- };
+++ /dev/null
-diff -ur avifile0.7-20020412/include/fourcc.h avifile0.7-20020412.xvid/include/fourcc.h
---- avifile0.7-20020412/include/fourcc.h Tue Apr 2 11:24:58 2002
-+++ avifile0.7-20020412.xvid/include/fourcc.h Tue Jun 11 01:10:21 2002
-@@ -104,7 +104,8 @@
- #define RIFFINFO_ASV2 mmioFOURCC('A', 'S', 'V', '2')
-
- /* let's give some FCC to Xvid */
--#define RIFFINFO_XVID mmioFOURCC('X', 'v', 'i', 'D')
-+#define RIFFINFO_XviD mmioFOURCC('X', 'v', 'i', 'D')
-+#define RIFFINFO_XVID mmioFOURCC('X', 'V', 'I', 'D')
-
- /* Microsoft video */
- #define RIFFINFO_CRAM mmioFOURCC('C', 'R', 'A', 'M')
-@@ -235,6 +236,7 @@
- #define fccMJPG RIFFINFO_MJPG
- #define fccmjpg RIFFINFO_mjpg
- #define fccHFYU RIFFINFO_HFYU
-+#define fccXviD RIFFINFO_XviD
- #define fccXVID RIFFINFO_XVID
- #define fccCVID RIFFINFO_CVID
- #define fcccvid RIFFINFO_cvid
-diff -ur avifile0.7-20020412/plugins/libwin32/fillplugins.h avifile0.7-20020412.xvid/plugins/libwin32/fillplugins.h
---- avifile0.7-20020412/plugins/libwin32/fillplugins.h Mon Apr 8 09:47:50 2002
-+++ avifile0.7-20020412.xvid/plugins/libwin32/fillplugins.h Tue Jun 11 01:11:41 2002
-@@ -401,6 +401,7 @@
- "http://www.geocities.com/avihpit/xvid/post.html";
- static const fourcc_t xvid_codecs[] =
- {
-+ fccXviD,
- fccXVID,
- fccDIVX, fccdivx, 0
- };
-diff -ur avifile0.7-20020412/plugins/libwin32/libwin32.cpp avifile0.7-20020412.xvid/plugins/libwin32/libwin32.cpp
---- avifile0.7-20020412/plugins/libwin32/libwin32.cpp Thu Apr 4 22:16:07 2002
-+++ avifile0.7-20020412.xvid/plugins/libwin32/libwin32.cpp Tue Jun 11 01:12:17 2002
-@@ -284,6 +284,7 @@
- || strcmp(attribute, "strSettings") == 0)
- return GetRegValue(vp31name, attribute, 0, &value, 0);
- break;
-+ case fccXviD:
- case fccXVID:
- return GetRegValue(xvidname, attribute, 0, &value, 0);
- case fccMJPG:
-@@ -370,6 +371,7 @@
- || strcmp(attribute, "strSettings") == 0)
- return SetRegValue(vp31name, attribute, value, 0);
- break;
-+ case fccXviD:
- case fccXVID:
- return SetRegValue(xvidname, attribute, value, 0);
- case fccMJPG:
-diff -ur avifile0.7-20020412/plugins/libwin32/videocodec/VideoDecoder.cpp avifile0.7-20020412.xvid/plugins/libwin32/videocodec/VideoDecoder.cpp
---- avifile0.7-20020412/plugins/libwin32/videocodec/VideoDecoder.cpp Mon Apr 8 09:47:51 2002
-+++ avifile0.7-20020412.xvid/plugins/libwin32/videocodec/VideoDecoder.cpp Tue Jun 11 01:12:36 2002
-@@ -402,6 +402,7 @@
-
- switch (m_Info.fourcc)
- {
-+ case fccXviD:
- case fccXVID:
- if (m_bitrick.biCompression == 0 || m_bitrick.biCompression == 3)
- break;
-diff -ur avifile0.7-20020412/plugins/libxvid/fillplugins.h avifile0.7-20020412.xvid/plugins/libxvid/fillplugins.h
---- avifile0.7-20020412/plugins/libxvid/fillplugins.h Mon Apr 8 09:47:51 2002
-+++ avifile0.7-20020412.xvid/plugins/libxvid/fillplugins.h Tue Jun 11 01:11:15 2002
-@@ -11,6 +11,7 @@
- static char xvid_about[] = "XviD Linux codec";
- static const fourcc_t xvid_codecs[] =
- {
-+ fccXviD,
- fccXVID,
- fccDIVX, fccdivx, 0
- };
# It's sick.
-
+#
# Conditional build:
-# _without_qt - disables QT support
-
+# _without_qt - disables QT support
+# _without_divx4 - disables divx4linux support
+#
+%ifnarch %{ix86}
+%define _without_divx4 1
+%endif
%define _snapver 20020816
%define _snap %{_snapver}
%define _ver 0.7.15
Summary(pl): Biblioteka do odtwarzania plików AVI
Name: avifile
Version: %{_ver}
-Release: 0.%{_snap}.1
+Release: 0.%{_snap}.2
Epoch: 3
License: GPL
Group: X11/Libraries
Source0: http://avifile.sourceforge.net/%{name}-%{version}-%{_snap}.tgz
Source1: %{name}.desktop
-URL: http://avifile.sourceforge.net/
Patch0: %{name}-shareware.patch
-Patch1: %{name}-deplib.patch
-Patch2: %{name}-ac3.patch
-Patch3: %{name}-size_t.patch
-Patch4: %{name}-amfix.patch
-Patch5: %{name}-xvid.patch
+URL: http://avifile.sourceforge.net/
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: XFree86-devel
-BuildRequires: ac3dec-devel >= 0.6.1
+BuildRequires: a52dec-libs-devel
BuildRequires: audiofile-devel
BuildRequires: autoconf
BuildRequires: automake
-%ifarch %{ix86}
-BuildRequires: divx4linux-devel
-%endif
+%{!?_without_divx4:BuildRequires: divx4linux-devel}
BuildRequires: lame-libs-devel
BuildRequires: libjpeg-devel
BuildRequires: libogg-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 0:1.4.2-9
BuildRequires: libvorbis-devel >= 1:1.0
BuildRequires: nas-devel
%{?!_without_qt:BuildRequires: qt-devel >= 3.0.5}
%prep
%setup -q -n avifile0.7-%{_ver}
%patch0 -p1
-# was broken and need fixing; without this xmms and avi plugin is broken
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
%build
rm -f missing aclocal.m4
aclocal
autoheader
%{__autoconf}
-automake -a -c --foreign
+%{__automake}
cd plugins/libmad/libmad
- %{__autoconf}
+%{__autoconf}
cd ../../..
cd libmmxnow
- %{__autoconf}
+%{__autoconf}
cd ..
# This is The WRONG Way (tm)
GEN_MOC="`grep -Rl '^ *Q_OBJECT$' *`"
for f in $GEN_MOC; do moc -o "${f%.[!.]*}.moc" "$f"; done
-%configure CPPFLAGS="-I/usr/include/divx" AS="%{__cc}" \
+%configure \
+ CPPFLAGS="-I/usr/include/divx" AS="%{__cc}" \
+ FFMPEG_CFLAGS="%{rpmcflags} -ffast-math %{!?debug:-fomit-frame-pointer}" \
--with-qt-includes=%{_includedir}/qt \
- --with-libac3-path=%{_prefix} \
+ --with-qt-libraries=%{_libdir} \
+ --enable-a52 \
--enable-release \
--enable-ffmpeg \
- --disable-x86opt \
+ --enable-ffmpeg-a52 \
+ %{?_without_divx4:--disable-divx4} \
+%ifarch i586 i686 athlon
+ --enable-x86opt \
+%endif
%{?_without_qt:--without-qt}
touch lib/dummy.cpp
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/usr/lib/win32,%{_pixmapsdir},%{_applnkdir}/Multimedia}
-# avoid relinking
-for f in plugins/*/*.la ; do
- sed -e '/^relink_command/d' $f > $f.new
- mv -f $f.new $f
-done
-
%{__make} install \
- DESTDIR="$RPM_BUILD_ROOT"
+ DESTDIR="$RPM_BUILD_ROOT" \
+ m4datadir="%{_aclocaldir}"
cp -f include/fourcc.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
%defattr(644,root,root,755)
%doc README doc/{CREDITS,EXCEPTIONS,KNOWN_BUGS,LICENSING}
%doc doc/{README-DEVEL,TODO,VIDEO-PERFORMANCE,WARNINGS}
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
%dir %{_libdir}/avifile*
%attr(755,root,root) %{_libdir}/avifile*/audiodec.so*
%attr(755,root,root) %{_libdir}/avifile*/audiodec.la
%attr(755,root,root) %{_libdir}/lib*.la
%{_libdir}/lib*.so
%{_includedir}/%{name}
+%{_includedir}/*.h
+%{_aclocaldir}/*.m4
-%{?!_without_qt:%files aviplay}
-%{?!_without_qt:%defattr(644,root,root,755)}
-%{?!_without_qt:%attr(755,root,root) %{_bindir}/aviplay}
-%{?!_without_qt:%{_datadir}/%{name}*}
-%{?!_without_qt:%{_applnkdir}/Multimedia/*}
-%{?!_without_qt:%{_pixmapsdir}/*}
+%if %{?_without_qt:0}%{!?_without_qt:1}
+%files aviplay
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/aviplay
+%{_datadir}/%{name}*
+%{_applnkdir}/Multimedia/*
+%{_pixmapsdir}/*
-%{?!_without_qt:%files utils}
-%{?!_without_qt:%defattr(644,root,root,755)}
-%{?!_without_qt:%attr(755,root,root) %{_bindir}/avi[bcmrt]*}
-%{?!_without_qt:%attr(755,root,root) %{_bindir}/kv4lsetup}
+%files utils
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/avi[bcmrt]*
+%attr(755,root,root) %{_bindir}/kv4lsetup
+%endif
%ifarch %{ix86}
%files win32
%attr(755,root,root) %{_libdir}/avifile*/ffmpeg.so*
%attr(755,root,root) %{_libdir}/avifile*/ffmpeg.la
-%ifarch %{ix86}
+%if %{?_without_divx4:0}%{!?_without_divx4:1}
%files divx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/avifile*/divx*.so*