GNOME Bugzilla – Bug 129961
gst-plugins-0.73 does not build well against mjpegtools-1.6.1.92
Last modified: 2004-12-22 21:47:04 UTC
This is just a heads up patch to demonstrate changes that might be necessary. It also includes diffs that I posted on bug 127951. diff -ru gst-plugins-0.7.3.orig/ext/mad/gstid3tag.c gst-plugins-0.7.3/ext/mad/gstid3tag.c --- gst-plugins-0.7.3.orig/ext/mad/gstid3tag.c 2003-12-15 00:45:09.000000000 -0800 +++ gst-plugins-0.7.3/ext/mad/gstid3tag.c 2003-12-23 16:43:35.000000000 -0800 @@ -474,8 +474,9 @@ tmp = strtoul (utf8, &check, 10); if (*check != '\0') break; if (strcmp (tag_name, GST_TAG_DATE) == 0) { + GDate *d; if (tmp == 0) break; - GDate *d = g_date_new_dmy (1, 1, tmp); + d = g_date_new_dmy (1, 1, tmp); tmp = g_date_get_julian (d); g_date_free (d); } diff -ru gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encoder.cc gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encoder.cc --- gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encoder.cc 2003-12-11 13:07:25.000000000 -0800 +++ gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encoder.cc 2003-12-23 22:19:31.000000000 -0800 @@ -24,10 +24,11 @@ #endif #include <mpegconsts.h> -#include <quantize.hh> -#include <ratectl.hh> -#include <seqencoder.hh> -#include <mpeg2coder.hh> +#include <mpeg2enc/quantize.hh> +#include <mpeg2enc/ratectl.hh> +#include <mpeg2enc/elemstrmwriter.hh> +#include <mpeg2enc/seqencoder.hh> +#include <mpeg2enc/mpeg2coder.hh> #include "gstmpeg2encoder.hh" diff -ru gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encoder.hh gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encoder.hh --- gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encoder.hh 2003-12-11 13:07:25.000000000 -0800 +++ gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encoder.hh 2003-12-23 17:57:25.000000000 -0800 @@ -22,7 +22,7 @@ #ifndef __GST_MPEG2ENCODER_H__ #define __GST_MPEG2ENCODER_H__ -#include <mpeg2encoder.hh> +#include <mpeg2enc/mpeg2encoder.hh> #include "gstmpeg2encoptions.hh" #include "gstmpeg2encpicturereader.hh" #include "gstmpeg2encstreamwriter.hh" diff -ru gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encoptions.hh gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encoptions.hh --- gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encoptions.hh 2003-12-11 13:07:25.000000000 -0800 +++ gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encoptions.hh 2003-12-23 17:40:46.000000000 -0800 @@ -23,7 +23,7 @@ #define __GST_MPEG2ENCOPTIONS_H__ #include <glib-object.h> -#include <mpeg2encoptions.hh> +#include <mpeg2enc/mpeg2encoptions.hh> class GstMpeg2EncOptions : public MPEG2EncOptions { public: diff -ru gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encpicturereader.cc gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encpicturereader.cc --- gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encpicturereader.cc 2003-12-11 13:07:25.000000000 -0800 +++ gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encpicturereader.cc 2003-12-23 22:20:34.000000000 -0800 @@ -23,7 +23,7 @@ #include "config.h" #endif -#include <encoderparams.hh> +#include <mpeg2enc/encoderparams.hh> #include "gstmpeg2encpicturereader.hh" diff -ru gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encpicturereader.hh gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encpicturereader.hh --- gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encpicturereader.hh 2003-12-11 13:07:25.000000000 -0800 +++ gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encpicturereader.hh 2003-12-23 20:44:53.000000000 -0800 @@ -24,7 +24,7 @@ #include <gst/gst.h> -#include <picturereader.hh> +#include <mpeg2enc/picturereader.hh> #include "gstmpeg2encoptions.hh" class GstMpeg2EncPictureReader : public PictureReader { diff -ru gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encstreamwriter.hh gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encstreamwriter.hh --- gst-plugins-0.7.3.orig/ext/mpeg2enc/gstmpeg2encstreamwriter.hh 2003-12-11 13:07:25.000000000 -0800 +++ gst-plugins-0.7.3/ext/mpeg2enc/gstmpeg2encstreamwriter.hh 2003-12-23 17:54:06.000000000 -0800 @@ -24,7 +24,7 @@ #include <gst/gst.h> -#include <elemstrmwriter.hh> +#include <mpeg2enc/elemstrmwriter.hh> class GstMpeg2EncStreamWriter : public ElemStrmWriter { public: diff -ru gst-plugins-0.7.3.orig/ext/sdl/Makefile.in gst-plugins-0.7.3/ext/sdl/Makefile.in --- gst-plugins-0.7.3.orig/ext/sdl/Makefile.in 2003-12-19 08:07:46.000000000 -0800 +++ gst-plugins-0.7.3/ext/sdl/Makefile.in 2003-12-23 13:18:47.000000000 -0800 @@ -489,7 +489,7 @@ am_libgstsdlvideosink_la_OBJECTS = libgstsdlvideosink_la-sdlvideosink.lo libgstsdlvideosink_la_OBJECTS = $(am_libgstsdlvideosink_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) $(X_CFLAGS) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = \ diff -ru gst-plugins-0.7.3.orig/gst-libs/gst/xoverlay/Makefile.in gst-plugins-0.7.3/gst-libs/gst/xoverlay/Makefile.in --- gst-plugins-0.7.3.orig/gst-libs/gst/xoverlay/Makefile.in 2003-12-19 08:07:55.000000000 -0800 +++ gst-plugins-0.7.3/gst-libs/gst/xoverlay/Makefile.in 2003-12-23 13:18:47.000000000 -0800 @@ -488,7 +488,7 @@ am_libgstxoverlay_la_OBJECTS = libgstxoverlay_la-xoverlay.lo libgstxoverlay_la_OBJECTS = $(am_libgstxoverlay_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) $(X_CFLAGS) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libgstxoverlay_la-xoverlay.Plo diff -ru gst-plugins-0.7.3.orig/sys/v4l/Makefile.in gst-plugins-0.7.3/sys/v4l/Makefile.in --- gst-plugins-0.7.3.orig/sys/v4l/Makefile.in 2003-12-19 08:08:18.000000000 -0800 +++ gst-plugins-0.7.3/sys/v4l/Makefile.in 2003-12-23 13:18:47.000000000 -0800 @@ -517,7 +517,7 @@ libgstvideo4linux_la-gstv4lcolorbalance.lo libgstvideo4linux_la_OBJECTS = $(am_libgstvideo4linux_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) $(X_CFLAGS) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libgstvideo4linux_la-gstv4l.Plo \
The mpeg2enc includes aren't wrong, the pkg-config file in 1.6.1.92 was buggered. This is fixed in mjpegtools CVS.
I fixed this by requiring 1.6.1.93, which has the correct .pc file includes.