Package: avifile
Version: 1:0.7.43.20050224-1
Severity: grave
The avifile library need to be renamed and rebuild according to the
C++ transition. More info on the C++ transition is available from
<URL:http://lists.debian.org/debian-devel-announce/2005/07/msg00001.html>
and <URL:http://people.debian.org/~mfurr/gxx/>.
Ubuntu already applied patches to do this, as well as getting the
library to build with gcc4. I attach the patch from ubuntu.
Applying this patch and rebuilding will close #321550, #324848,
#327932, #300179, #318233 and #325435. I'll consider NMUing the
package if it isn't fixed in a few days.
diff -ru avifile-0.7.43.20050224-debian/debian/changelog avifile-0.7.43.20050224-ubuntu/debian/changelog
--- avifile-0.7.43.20050224-debian/debian/changelog 2005-02-24 13:25:02.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/debian/changelog 2005-08-25 14:37:06.000000000 +0200
@@ -1,3 +1,41 @@
+avifile (1:0.7.43.20050224-1ubuntu6) breezy; urgency=low
+
+ * Fixed the conflicts...
+
+ -- Sebastian Dröge <[EMAIL PROTECTED]> Thu, 25 Aug 2005 00:21:54 +0200
+
+avifile (1:0.7.43.20050224-1ubuntu5) breezy; urgency=low
+
+ * Rebuild for slang2 transition
+
+ -- Sebastian Dröge <[EMAIL PROTECTED]> Wed, 24 Aug 2005 19:28:36 +0200
+
+avifile (1:0.7.43.20050224-1ubuntu4) breezy; urgency=low
+
+ * Rebuild for CXX Transition
+
+ -- Charles Majola <[EMAIL PROTECTED]> Tue, 31 May 2005 13:02:55 +0000
+
+avifile (1:0.7.43.20050224-1ubuntu3) breezy; urgency=low
+
+ * Make conflicts unconditional
+
+ -- Charles Majola <[EMAIL PROTECTED]> Thu, 19 May 2005 13:49:02 +0000
+
+avifile (1:0.7.43.20050224-1ubuntu2) breezy; urgency=low
+
+ * CXX transition:
+ - Renamed libavifile-0.7c102 to libavifile-0.7
+ * Fixed build-deps: depend on new C++ ABI libraries
+
+ -- Charles Majola <[EMAIL PROTECTED]> Wed, 18 May 2005 13:05:35 +0000
+
+avifile (1:0.7.43.20050224-1ubuntu1) breezy; urgency=low
+
+ * Applied gcc-4.0 FTBFS patch from Andreas Jochens
+
+ -- Charles Majola <[EMAIL PROTECTED]> Mon, 9 May 2005 15:54:47 +0200
+
avifile (1:0.7.43.20050224-1) unstable; urgency=low
* updated to latest ffmpeg
* fix packaging (Closes: 252982, 259417, 295486)
diff -ru avifile-0.7.43.20050224-debian/debian/control avifile-0.7.43.20050224-ubuntu/debian/control
--- avifile-0.7.43.20050224-debian/debian/control 2005-02-24 13:46:22.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/debian/control 2005-08-25 14:37:06.000000000 +0200
@@ -3,15 +3,15 @@
Priority: optional
Maintainer: Zdenek Kabelac <[EMAIL PROTECTED]>
Standards-Version: 3.5.8
-Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.1.1-2), libsdl1.2-dev | libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev, libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, autoconf (>= 2.13-1), automake (>= 1.4-1) | automake1.7 | automake1.8 | automake1.4 , libtool, gettext, patch, netpbm | pnmtopng
+Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.3.3-7ubuntu4), libsdl1.2-dev | libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev, libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, autoconf (>= 2.13-1), automake (>= 1.4-1) | automake1.7 | automake1.8 | automake1.4 , libtool, gettext, patch, netpbm | pnmtopng
-Package: libavifile-0.7c102
+Package: libavifile-0.7
Architecture: any
Section: libs
Suggests: avifile-player, avifile-utils, avifile-mad-plugin, avifile-mjpeg-plugin, avifile-vorbis-plugin, avifile-win32-plugin, avifile-xvid-plugin, avifile-divx-plugin
Depends: ${shlibs:Depends}
-Replaces: libavifile0.7, libavifile0.7c102
-Conflicts: libavifile0.7, libavifile0.7c102
+Replaces: libavifile0.7, libavifile0.7c102, libavifile-0.7c102
+Conflicts: libavifile0.7, libavifile0.7c102, libavifile-0.7c102
Description: shared libraries for AVI read/writing
Library that allows programs to read and write compressed
AVI files (Indeo Video, DivX :-), etc.) under x86 Linux.
@@ -24,9 +24,9 @@
Package: libavifile-0.7-dev
Architecture: any
Section: devel
-Depends: libavifile-0.7c102 (= ${Source-Version}), libxft-dev, libxrender-dev
+Depends: libavifile-0.7 (= ${Source-Version}), libxft-dev, libxrender-dev
Replaces: libaviplay, libavifile-dev, libavifile0.6-dev, libavifile0.7-dev
-Conflicts: libavifile-0.7c102 (<= 1:0.7.42.20050215-1), libavifile-dev, libavifile0.6, libavifile-0.6-dev, libavifile0.7-dev
+Conflicts: libavifile-0.7c102 (<= 1:0.7.42.20050215-1), libavifile0.7, libavifile-dev, libavifile0.6, libavifile-0.6-dev, libavifile0.7-dev
Description: development header files for libavifile
Contains the symlinks, headers and object files needed to compile
and link programs which use aviplay library.
Kun i avifile-0.7.43.20050224-debian/debian: libavifile-0.7c102.lintian
Kun i avifile-0.7.43.20050224-ubuntu/debian: libavifile-0.7.lintian
diff -ru avifile-0.7.43.20050224-debian/debian/rules avifile-0.7.43.20050224-ubuntu/debian/rules
--- avifile-0.7.43.20050224-debian/debian/rules 2005-02-24 14:11:30.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/debian/rules 2005-05-18 10:38:38.000000000 +0200
@@ -26,7 +26,7 @@
package = avifile
version = -0.7
aviversion = $(package)$(version)
-libraries = lib$(aviversion)c102
+libraries = lib$(aviversion)
#DH2 using normal name
#tmp
devel = lib$(aviversion)-dev
@@ -218,7 +218,7 @@
# trick to allow build empty packages
# avoid problem with trailing ','
@for i in $(allplugins) ; do if test ! -e debian/$$i.substvars ; then \
- echo "shlibs:Depends=libavifile-0.7c102 (>= 1:0.7.43.20050224-1), libc6" > debian/$$i.substvars ; \
+ echo "shlibs:Depends=libavifile-0.7 (>= 1:0.7.43.20050224-1), libc6" > debian/$$i.substvars ; \
fi ; done
dh_shlibdeps -Xxvid4 -Xdivx4 -ldebian/$(libraries)/usr/lib:debian/$(player)/usr/lib
diff -ru avifile-0.7.43.20050224-debian/ffmpeg/libavcodec/avcodec.h avifile-0.7.43.20050224-ubuntu/ffmpeg/libavcodec/avcodec.h
--- avifile-0.7.43.20050224-debian/ffmpeg/libavcodec/avcodec.h 2005-02-24 12:31:10.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/ffmpeg/libavcodec/avcodec.h 2005-05-09 15:54:40.000000000 +0200
@@ -1813,6 +1813,14 @@
#define FF_OPT_MAX_DEPTH 10
} AVOption;
+#ifdef HAVE_MMX
+extern const struct AVOption avoptions_common[3 + 5];
+#else
+extern const struct AVOption avoptions_common[3];
+#endif
+extern const struct AVOption avoptions_workaround_bug[11];
+
+
/**
* Parse option(s) and sets fields in passed structure
* @param strct structure where the parsed results will be written
diff -ru avifile-0.7.43.20050224-debian/ffmpeg/libavcodec/common.h avifile-0.7.43.20050224-ubuntu/ffmpeg/libavcodec/common.h
--- avifile-0.7.43.20050224-debian/ffmpeg/libavcodec/common.h 2005-02-15 13:33:33.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/ffmpeg/libavcodec/common.h 2005-05-09 15:54:40.000000000 +0200
@@ -53,15 +53,6 @@
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }
#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
#define AVOPTION_END() AVOPTION_SUB(NULL)
-
-struct AVOption;
-#ifdef HAVE_MMX
-extern const struct AVOption avoptions_common[3 + 5];
-#else
-extern const struct AVOption avoptions_common[3];
-#endif
-extern const struct AVOption avoptions_workaround_bug[11];
-
#endif /* HAVE_AV_CONFIG_H */
/* Suppress restrict if it was not defined in config.h. */
diff -ru avifile-0.7.43.20050224-debian/ffmpeg/libavcodec/dsputil.h avifile-0.7.43.20050224-ubuntu/ffmpeg/libavcodec/dsputil.h
--- avifile-0.7.43.20050224-debian/ffmpeg/libavcodec/dsputil.h 2005-02-15 13:33:34.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/ffmpeg/libavcodec/dsputil.h 2005-05-09 15:54:40.000000000 +0200
@@ -604,33 +604,6 @@
return score;\
}
-#ifndef HAVE_LRINTF
-/* XXX: add ISOC specific test to avoid specific BSD testing. */
-/* better than nothing implementation. */
-/* btw, rintf() is existing on fbsd too -- alex */
-static always_inline long int lrintf(float x)
-{
-#ifdef CONFIG_WIN32
-# ifdef ARCH_X86
- int32_t i;
- asm volatile(
- "fistpl %0\n\t"
- : "=m" (i) : "t" (x) : "st"
- );
- return i;
-# else
- /* XXX: incorrect, but make it compile */
- return (int)(x + (x < 0 ? -0.5 : 0.5));
-# endif
-#else
- return (int)(rint(x));
-#endif
-}
-#else
-#ifndef _ISOC9X_SOURCE
-#define _ISOC9X_SOURCE
-#endif
#include <math.h>
-#endif
#endif
diff -ru avifile-0.7.43.20050224-debian/lib/aviplay/AudioQueue.h avifile-0.7.43.20050224-ubuntu/lib/aviplay/AudioQueue.h
--- avifile-0.7.43.20050224-debian/lib/aviplay/AudioQueue.h 2004-08-25 18:29:06.000000000 +0200
+++ avifile-0.7.43.20050224-ubuntu/lib/aviplay/AudioQueue.h 2005-05-09 15:54:40.000000000 +0200
@@ -16,10 +16,11 @@
virtual int Mix(void* data, const void* src, uint_t n) const = 0;
};
+#define MAX_BUFFER_TIME 1.0;
+
class AudioQueue
{
public:
- static const double MAX_BUFFER_TIME = 1.0;
AudioQueue(WAVEFORMATEX& Iwf, WAVEFORMATEX& Owf);
~AudioQueue();
diff -ru avifile-0.7.43.20050224-debian/lib/aviplay/aviplay_impl.h avifile-0.7.43.20050224-ubuntu/lib/aviplay/aviplay_impl.h
--- avifile-0.7.43.20050224-debian/lib/aviplay/aviplay_impl.h 2003-12-17 21:37:54.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/lib/aviplay/aviplay_impl.h 2005-05-09 15:54:40.000000000 +0200
@@ -136,8 +136,6 @@
void createAudioRenderer();
int restartVideoStreaming(const char* codec = 0);
- static const float m_fDropLimit = -0.015;
-
mutable int AviPlayer::propertyRead[LAST_PROPERTY]; // have we read at least once from Registry::
avm::vector<IVideoRenderer*> m_VideoRenderers; // we could draw image to more places
diff -ru avifile-0.7.43.20050224-debian/lib/aviplay/aviplayth.cpp avifile-0.7.43.20050224-ubuntu/lib/aviplay/aviplayth.cpp
--- avifile-0.7.43.20050224-debian/lib/aviplay/aviplayth.cpp 2004-10-25 12:27:42.000000000 +0200
+++ avifile-0.7.43.20050224-ubuntu/lib/aviplay/aviplayth.cpp 2005-05-09 15:54:40.000000000 +0200
@@ -31,6 +31,7 @@
// preffer video playing thread
static const int PRIORITY_ADD_VIDEO = 0;
static const int PRIORITY_ADD_AUDIO = 0;
+static const float m_fDropLimit = -0.015;
float AviPlayer::getVideoAsync()
{
diff -ru avifile-0.7.43.20050224-debian/lib/aviread/ReadFile.cpp avifile-0.7.43.20050224-ubuntu/lib/aviread/ReadFile.cpp
--- avifile-0.7.43.20050224-debian/lib/aviread/ReadFile.cpp 2004-03-10 18:00:09.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/lib/aviread/ReadFile.cpp 2005-05-09 15:54:40.000000000 +0200
@@ -125,7 +125,7 @@
};
-avm::IReadFile* avm::CreateReadFile(const char* name, unsigned int flags)
+IReadFile* CreateReadFile(const char* name, unsigned int flags)
{
ReadFile* r = new ReadFile(name, flags);
return r;
diff -ru avifile-0.7.43.20050224-debian/samples/qtvidcap/kv4lsetup.cpp avifile-0.7.43.20050224-ubuntu/samples/qtvidcap/kv4lsetup.cpp
--- avifile-0.7.43.20050224-debian/samples/qtvidcap/kv4lsetup.cpp 2004-11-04 14:43:49.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/samples/qtvidcap/kv4lsetup.cpp 2005-05-09 15:54:40.000000000 +0200
@@ -311,7 +311,7 @@
fbuf.depth = set_bpp;
fbuf.bytesperline = set_bpl;
if (set_base != NULL)
- fbuf.base = (void*)((unsigned int)set_base+(unsigned int)shift);
+ fbuf.base = (void*)((unsigned long)set_base+(unsigned long)shift);
/* XXX bttv confuses color depth and bits/pixel */
#ifndef X_DISPLAY_MISSING
diff -ru avifile-0.7.43.20050224-debian/samples/qtvidcap/v4lxif.cpp avifile-0.7.43.20050224-ubuntu/samples/qtvidcap/v4lxif.cpp
--- avifile-0.7.43.20050224-debian/samples/qtvidcap/v4lxif.cpp 2004-11-04 14:43:50.000000000 +0100
+++ avifile-0.7.43.20050224-ubuntu/samples/qtvidcap/v4lxif.cpp 2005-05-09 15:54:40.000000000 +0200
@@ -1118,7 +1118,7 @@
XF86DGAGetVideoLL(disp, DefaultScreen(disp), (int *)&base, &width, &bank, &ram );
if (!base)
avml(AVML_WARN,
- "v4l1: can not allocate frame buffer base: 0x%x\n",(int)base);
+ "v4l1: can not allocate frame buffer base: 0x%lx\n",(long)base);
}
}
}
