tag 359863 + patch
thanks
On Tue, Jun 13, 2006 at 01:49:59PM +0200, Daniel Kobras wrote:
> On Mon, Jun 12, 2006 at 09:58:52PM +0200, Mark Washeim wrote:
> > Well, I wound up solving this problem by checking out the source and
> > compiling afresh. The above problem seems to be solved in the most
> > recent release published to sourceforge.
> (...)
> > Anyway, it appears that I should close the bug with a note, but that
> > seems silly if the maintainer isn't on it? Since he wrote most of the
> > fixes, I'm not sure what the procedure is?
>
> I'd like to see this issue fixed, but without maintainer feedback I'm
> reluctant to introduce a new upstream version as long as we don't have
> handle on what the problem actually is. Therefore, if it's still
> possible for you, sending in a small sample file for debugging would be
> great. I failed to reproduce the bug so far, but that's possibly due to
> me not having access to a DV source. I got some .movs out of dvgrab
> using raw DV input and the --stdin switch, but those were all NTSC. I
> guess yours are PAL?
Scratch that. I do see what's going wrong here. The generated .movs are
perfectly valid, but the Debian package of libquicktime currently ships
without decoding support for DV: Nowadays, the libdv plugin is only used
for encoding. DV decoding is supposed to be handled by ffmpeg, but this
plugin isn't built in Debian so far. The attached patch adds the
necessary bits and pieces.
Gerd, unless you object, I'd like to upload these changes within the
next days.
Regards,
Daniel.
diff -u libquicktime-0.9.7/configure libquicktime-0.9.7/configure
--- libquicktime-0.9.7/configure
+++ libquicktime-0.9.7/configure
@@ -25678,13 +25678,18 @@
#include <ffmpeg/avcodec.h>
#include <stdio.h>
+ #ifndef STRINGIFY
+ # define STRINGIFY(x) STRINGIFY1(x)
+ # define STRINGIFY1(x) #x
+ #endif
+
int main()
{
FILE * output;
if(LIBAVCODEC_BUILD < $AVCODEC_BUILD )
return -1;
output=fopen("avcodec_version", "w");
- fprintf(output, LIBAVCODEC_VERSION);
+ fprintf(output, STRINGIFY(LIBAVCODEC_VERSION));
fclose(output);
return 0;
}
@@ -25858,13 +25863,18 @@
#include <ffmpeg/avcodec.h>
#include <stdio.h>
+ #ifndef STRINGIFY
+ # define STRINGIFY(x) STRINGIFY1(x)
+ # define STRINGIFY1(x) #x
+ #endif
+
int main()
{
FILE * output;
if(LIBAVCODEC_BUILD < $AVCODEC_BUILD )
return -1;
output=fopen("avcodec_version", "w");
- fprintf(output, LIBAVCODEC_VERSION);
+ fprintf(output, STRINGIFY(LIBAVCODEC_VERSION));
fclose(output);
return 0;
}
@@ -25943,13 +25953,18 @@
#include <ffmpeg/avcodec.h>
#include <stdio.h>
+ #ifndef STRINGIFY
+ # define STRINGIFY(x) STRINGIFY1(x)
+ # define STRINGIFY1(x) #x
+ #endif
+
int main()
{
FILE * output;
if(LIBAVCODEC_BUILD < $AVCODEC_BUILD )
return -1;
output=fopen("avcodec_version", "w");
- fprintf(output, LIBAVCODEC_VERSION);
+ fprintf(output, STRINGIFY(LIBAVCODEC_VERSION));
fclose(output);
return 0;
}
diff -u libquicktime-0.9.7/debian/changelog libquicktime-0.9.7/debian/changelog
--- libquicktime-0.9.7/debian/changelog
+++ libquicktime-0.9.7/debian/changelog
@@ -1,3 +1,12 @@
+libquicktime (1:0.9.7-0.5) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * acinclude.m4, configure: Fix compile error in ffmpeg test program.
+ * debian/control: Build-depend on libavcodec-dev to reinstate DV
+ decoding support. Closes: #359863
+
+ -- Daniel Kobras <[EMAIL PROTECTED]> Tue, 13 Jun 2006 15:36:59 +0200
+
libquicktime (1:0.9.7-0.4) unstable; urgency=medium
* Non-maintainer upload.
diff -u libquicktime-0.9.7/debian/control libquicktime-0.9.7/debian/control
--- libquicktime-0.9.7/debian/control
+++ libquicktime-0.9.7/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Gerd Knorr <[EMAIL PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 3.0), libgtk2.0-dev (> 2.4.0), libpng12-0-dev |
libpng-dev, libjpeg-dev, libraw1394-dev, libavc1394-dev, libvorbis-dev
(>=1.0.1-1), libxaw7-dev, libsdl1.2-dev, libpopt-dev, libdv4-dev, libxv-dev
+Build-Depends: debhelper (>= 3.0), libgtk2.0-dev (> 2.4.0), libpng12-0-dev |
libpng-dev, libjpeg-dev, libraw1394-dev, libavc1394-dev, libvorbis-dev
(>=1.0.1-1), libxaw7-dev, libsdl1.2-dev, libpopt-dev, libdv4-dev, libxv-dev,
libavcodec-dev
Package: libquicktime0
Architecture: any
only in patch2:
unchanged:
--- libquicktime-0.9.7.orig/acinclude.m4
+++ libquicktime-0.9.7/acinclude.m4
@@ -381,13 +381,17 @@
AC_TRY_RUN([
#include <ffmpeg/avcodec.h>
#include <stdio.h>
+ #ifndef STRINGIFY
+ # define STRINGIFY(x) STRINGIFY1(x)
+ # define STRINGIFY1(x) #x
+ #endif
int main()
{
FILE * output;
if(LIBAVCODEC_BUILD < $1)
return -1;
output=fopen("avcodec_version", "w");
- fprintf(output, LIBAVCODEC_VERSION);
+ fprintf(output, STRINGIFY(LIBAVCODEC_VERSION));
fclose(output);
return 0;
}
