Package: scenic
Version: 0.6.3-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
This Ubuntu bug shows a build failure in scenic due to a module having
been removed from gstreamer:
https://bugs.launchpad.net/ubuntu/+source/scenic/+bug/756010
I worked on this and found a succession of other build failures behind
it. I hope you don't mind me attaching a patch for the whole lot in a
single bug report.
Whether to disable error options is probably a matter of opinion, but
-pedantic definitely had to go because the file that's breaking it is a
header file outside scenic's control. As for the rest, my feeling is
that -Werror belongs in maintainer-only test builds and not in release
builds.
* Make v4lsrc optional; it's gone, and v4l2src will do (LP: #756010).
* Drop -pedantic -Wfatal-errors -Werror; the header
fails -pedantic, and we also run into deprecations in libjack.
* Fix link order to list libraries after other libraries that depend on
them.
diff -Nru scenic-0.6.3/debian/patches/2002_optional_v4lsrc.patch
scenic-0.6.3/debian/patches/2002_optional_v4lsrc.patch
--- scenic-0.6.3/debian/patches/2002_optional_v4lsrc.patch 1970-01-01
01:00:00.0 +0100
+++ scenic-0.6.3/debian/patches/2002_optional_v4lsrc.patch 2011-09-14
11:35:55.0 +0100
@@ -0,0 +1,19 @@
+Description: Make v4lsrc optional; it's gone, and v4l2src will do
+Author: Colin Watson
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/756010
+Forwarded: no
+Last-Update: 2011-09-14
+
+Index: b/utils/gst_check.py
+===
+--- a/utils/gst_check.py
b/utils/gst_check.py
+@@ -91,7 +91,7 @@
+ except:
+ pass
+
+-optional_plugins = ["dc1394src", "dv1394src", "dvdemux", "dvdec", "alsasrc",
"alsasink", "pulsesrc", "pulsesink", "glimagesink", "theoraenc", "theoradec",
"lamemp3enc", "mp3parse", "mad", "x264enc", "ffenc_mpeg4", "ffenc_h263p",
"celtenc", "celtdec"]
++optional_plugins = ["dc1394src", "dv1394src", "dvdemux", "dvdec", "alsasrc",
"alsasink", "pulsesrc", "pulsesink", "glimagesink", "theoraenc", "theoradec",
"lamemp3enc", "mp3parse", "mad", "x264enc", "ffenc_mpeg4", "ffenc_h263p",
"celtenc", "celtdec", "v4lsrc"]
+
+ for plugin in gst_plugins:
+ if gst.element_factory_find(plugin) is None:
diff -Nru scenic-0.6.3/debian/patches/2003_no_pedantic.patch
scenic-0.6.3/debian/patches/2003_no_pedantic.patch
--- scenic-0.6.3/debian/patches/2003_no_pedantic.patch 1970-01-01
01:00:00.0 +0100
+++ scenic-0.6.3/debian/patches/2003_no_pedantic.patch 2011-09-14
12:05:04.0 +0100
@@ -0,0 +1,33 @@
+Description: Drop -pedantic -Wfatal-errors -Werror
+ The header fails -pedantic, and we also run into
+ deprecations in libjack.
+Author: Colin Watson
+Forwarded: no
+Last-Update: 2011-09-14
+
+Index: b/configure
+===
+--- a/configure
b/configure
+@@ -21307,7 +21307,7 @@
+
+ $as_echo "#define CONFIG_DEBUG_LOCAL /**/" >>confdefs.h
+
+-CFLAGS="-O2 -Wextra -pedantic -Wfatal-errors -Werror -Wall -Wno-long-long
-Wno-variadic-macros -Wshadow"
++CFLAGS="-O2 -Wextra -Wall -Wno-long-long -Wno-variadic-macros -Wshadow"
+ CXXFLAGS="-Weffc++ "
+ CXXFLAGS+=$CFLAGS
+ fi
+Index: b/configure.ac
+===
+--- a/configure.ac
b/configure.ac
+@@ -212,7 +212,7 @@
+
+ if test "x${enable_debug}" = "xyes" ; then
+ AC_DEFINE(CONFIG_DEBUG_LOCAL,[],[Debug define from configure])
+-CFLAGS="-O2 -Wextra -pedantic -Wfatal-errors -Werror -Wall -Wno-long-long
-Wno-variadic-macros -Wshadow"
++CFLAGS="-O2 -Wextra -Wall -Wno-long-long -Wno-variadic-macros -Wshadow"
+ CXXFLAGS="-Weffc++ "
+ CXXFLAGS+=$CFLAGS
+ fi
diff -Nru scenic-0.6.3/debian/patches/2004_link_order.patch
scenic-0.6.3/debian/patches/2004_link_order.patch
--- scenic-0.6.3/debian/patches/2004_link_order.patch 1970-01-01
01:00:00.0 +0100
+++ scenic-0.6.3/debian/patches/2004_link_order.patch 2011-09-14
11:35:51.0 +0100
@@ -0,0 +1,59 @@
+Description: List libraries after other libraries that depend on them
+Author: Colin Watson
+Forwarded: no
+Last-Update: 2011-09-14
+
+Index: b/src/main/Makefile.am
+===
+--- a/src/main/Makefile.am
b/src/main/Makefile.am
+@@ -13,16 +13,17 @@
+ milhouse_CPPFLAGS += -D SVNVERSION=\"$(shell svnversion)\"
+ endif
+
+-milhouse_LDADD = $(ALL_GST_LIBS) $(JACK_LIBS) \
+- $(GTK_LIBS) $(LIBAVC1394_LIBS) $(GL_LIBS) $(GLU_LIBS)
$(BOOST_ASIO_LIB) \
+- $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(LIBDC1394_LIBS)
\
+-$(BOOST_THREAD_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) \
++milhouse_LDADD = \
+ $(top_builddir)/src/gst/libgst.la \
+ $(top_builddir)/src/caps/libcaps.la \
+ $(top_builddir)/src/
