Le mercredi 06 décembre 2006 à 21:48 +0100, Loïc Minier a écrit : > On Wed, Dec 06, 2006, Josselin Mouette wrote: > > Maybe it is also not too late to rework the gstreamer0.10-ffmpeg package > > to link against the Debian libavcodec/libavformat packages. This would > > save a lot of trouble to the security team. > > This is a separate issue, and the short status on the subject is that > upstream thinks this is not possible, but they would accept help on > this topic: > <http://bugzilla.gnome.org/show_bug.cgi?id=363363>
The attached patch should be at least enough for Debian. Finally working h264 videos with totem-gstreamer, hear hear! That's just a hack, and for upstream, this requires of course some integration in the configure script, but that's definitely not impossible. -- Josselin Mouette /\./\ "Do you have any more insane proposals for me?"
diff -u gstreamer0.10-ffmpeg-0.10.1/debian/control gstreamer0.10-ffmpeg-0.10.1/debian/control
--- gstreamer0.10-ffmpeg-0.10.1/debian/control
+++ gstreamer0.10-ffmpeg-0.10.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Maintainers of GStreamer packages <[EMAIL PROTECTED]>
Uploaders: David I. Lehn <[EMAIL PROTECTED]>, Loic Minier <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8), autotools-dev, zlib1g-dev, libglib2.0-dev (>= 2.4.0), pkg-config (>= 0.11.0), libgstreamer0.10-dev (>= 0.10.0), libgstreamer-plugins-base0.10-dev (>= 0.10.0)
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8), autotools-dev, zlib1g-dev, libglib2.0-dev (>= 2.4.0), pkg-config (>= 0.11.0), libgstreamer0.10-dev (>= 0.10.0), libgstreamer-plugins-base0.10-dev (>= 0.10.0), libavformat-dev
Standards-Version: 3.6.2
Package: gstreamer0.10-ffmpeg
diff -u gstreamer0.10-ffmpeg-0.10.1/debian/changelog gstreamer0.10-ffmpeg-0.10.1/debian/changelog
--- gstreamer0.10-ffmpeg-0.10.1/debian/changelog
+++ gstreamer0.10-ffmpeg-0.10.1/debian/changelog
@@ -1,3 +1,12 @@
+gstreamer0.10-ffmpeg (0.10.1-2.1) UNRELEASED; urgency=low
+
+ * Non-maintainer test build.
+ * 03_use_debian_ffmpeg.patch: link with debian's libavformat instead
+ of using the included one.
+ * Build-depend on libavformat-dev.
+
+ -- Josselin Mouette <[EMAIL PROTECTED]> Wed, 6 Dec 2006 21:54:39 +0100
+
gstreamer0.10-ffmpeg (0.10.1-2) unstable; urgency=low
[ Loic Minier ]
only in patch2:
unchanged:
--- gstreamer0.10-ffmpeg-0.10.1.orig/debian/patches/03_use_debian_ffmpeg.patch
+++ gstreamer0.10-ffmpeg-0.10.1/debian/patches/03_use_debian_ffmpeg.patch
@@ -0,0 +1,119 @@
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/Makefile.am gstreamer0.10-ffmpeg-0.10.1.new/Makefile.am
+--- gstreamer0.10-ffmpeg-0.10.1/Makefile.am 2006-03-28 20:43:51.000000000 +0200
++++ gstreamer0.10-ffmpeg-0.10.1.new/Makefile.am 2006-12-06 21:44:45.000000000 +0100
+@@ -1,6 +1,6 @@
+ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+-SUBDIRS = gst-libs ext docs common
++SUBDIRS = ext docs common
+ EXTRA_DIST = \
+ gst-ffmpeg.spec depcomp \
+ AUTHORS COPYING NEWS README ChangeLog
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/Makefile.in gstreamer0.10-ffmpeg-0.10.1.new/Makefile.in
+--- gstreamer0.10-ffmpeg-0.10.1/Makefile.in 2006-03-31 12:51:48.000000000 +0200
++++ gstreamer0.10-ffmpeg-0.10.1.new/Makefile.in 2006-12-06 21:45:05.000000000 +0100
+@@ -251,7 +251,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-SUBDIRS = gst-libs ext docs common
++SUBDIRS = ext docs common
+ EXTRA_DIST = \
+ gst-ffmpeg.spec depcomp \
+ AUTHORS COPYING NEWS README ChangeLog
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/gstffmpegcodecmap.c gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/gstffmpegcodecmap.c
+--- gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/gstffmpegcodecmap.c 2006-12-06 22:02:26.000000000 +0100
++++ gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/gstffmpegcodecmap.c 2006-12-06 22:02:58.000000000 +0100
+@@ -491,7 +491,6 @@
+ break;
+
+ case CODEC_ID_WMV3:
+- case CODEC_ID_VC9:
+ caps = GST_FF_VID_CAPS_NEW ("video/x-wmv",
+ "wmvversion", G_TYPE_INT, 3, NULL);
+ break;
+@@ -2118,9 +2117,6 @@
+ case CODEC_ID_WMV3:
+ name = "Windows Media Video v9";
+ break;
+- case CODEC_ID_VC9:
+- name = "Microsoft Video Codec v1";
+- break;
+ case CODEC_ID_H263P:
+ name = "H.263 (P) video";
+ break;
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/gstffmpegdec.c gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/gstffmpegdec.c
+--- gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/gstffmpegdec.c 2006-12-06 22:02:26.000000000 +0100
++++ gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/gstffmpegdec.c 2006-12-06 22:02:58.000000000 +0100
+@@ -1435,7 +1435,6 @@
+ rank = GST_RANK_MARGINAL;
+ break;
+ case CODEC_ID_WMV3:
+- case CODEC_ID_VC9:
+ /* what's that? */
+ case CODEC_ID_SP5X:
+ /* MP3 and MPEG2 have better alternatives and
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/Makefile.am gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/Makefile.am
+--- gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/Makefile.am 2006-03-28 20:43:52.000000000 +0200
++++ gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/Makefile.am 2006-12-06 21:49:06.000000000 +0100
+@@ -11,13 +11,10 @@
+ # gstffmpegmux.c
+
+ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+- -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
+- -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \
+- -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec
++ `pkg-config --cflags libavformat`
+ libgstffmpeg_la_LIBADD = \
+- $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \
+ $(GST_BASE_LIBS)
+-libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) `pkg-config --libs libavformat`
+
+ noinst_HEADERS = \
+ gstffmpeg.h \
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/Makefile.in gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/Makefile.in
+--- gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/Makefile.in 2006-03-31 12:51:47.000000000 +0200
++++ gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/Makefile.in 2006-12-06 21:50:40.000000000 +0100
+@@ -66,8 +66,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgstffmpeg_la_DEPENDENCIES = $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \
+- $(am__DEPENDENCIES_1)
++libgstffmpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libgstffmpeg_la_OBJECTS = libgstffmpeg_la-gstffmpeg.lo \
+ libgstffmpeg_la-gstffmpegprotocol.lo \
+ libgstffmpeg_la-gstffmpegcodecmap.lo \
+@@ -271,15 +270,12 @@
+
+ # gstffmpegmux.c
+ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+- -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
+- -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \
+- -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec
++ `pkg-config --cflags libavformat`
+
+ libgstffmpeg_la_LIBADD = \
+- $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \
+ $(GST_BASE_LIBS)
+
+-libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) `pkg-config --libs libavformat`
+ noinst_HEADERS = \
+ gstffmpeg.h \
+ gstffmpegcodecmap.h
+diff -PruN gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/gstffmpegdemux.c gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/gstffmpegdemux.c
+--- gstreamer0.10-ffmpeg-0.10.1/ext/ffmpeg/gstffmpegdemux.c 2006-12-06 22:02:26.000000000 +0100
++++ gstreamer0.10-ffmpeg-0.10.1.new/ext/ffmpeg/gstffmpegdemux.c 2006-12-06 22:02:58.000000000 +0100
+@@ -25,10 +25,8 @@
+ #include <string.h>
+ #ifdef HAVE_FFMPEG_UNINSTALLED
+ #include <avformat.h>
+-#include <avi.h>
+ #else
+ #include <ffmpeg/avformat.h>
+-#include <ffmpeg/avi.h>
+ #endif
+
+ #include <gst/gst.h>
signature.asc
Description: Ceci est une partie de message numériquement signée
