Media Hub

Merge lp:~vorlon/media-hub/explicit-gcc-version into lp:media-hub

  1. explicit-gcc-version
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Approved by: Thomas Voß
Approved revision: 41
Merged at revision: 44
Proposed branch: lp:~vorlon/media-hub/explicit-gcc-version
Merge into: lp:media-hub
Diff against target: 211 lines (+23/-50)
5 files modified
CMakeLists.txt (+2/-2)
debian/control (+9/-5)
debian/libmedia-hub-common1.symbols (+1/-8)
debian/rules (+10/-0)
src/core/media/gstreamer/bus.h (+1/-35)
To merge this branch: bzr merge lp:~vorlon/media-hub/explicit-gcc-version
Reviewer Review Type Date Requested Status
Thomas Voß (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Colin Watson Pending
Matthias Klose Pending
Review via email: mp+226567@code.launchpad.net

Commit message

Bump major revision and so name to account for toolchain update.

Description of the change

Bump major revision and so name to account for toolchain update.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/media-hub-ci/77/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/77/rebuild

review: Needs Fixing (continuous-integration)
lp:~vorlon/media-hub/explicit-gcc-version updated
40. By Steve Langasek

No manual changelog entry

Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/media-hub-ci/78/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/78/rebuild

review: Needs Fixing (continuous-integration)
lp:~vorlon/media-hub/explicit-gcc-version updated
41. By Steve Langasek

Fix handling of GstMessageType enum values.

gstreamer 1.4.0 has introduced new message types. Rather than
constantly enumerating all possible values for the enum, thus rendering
the code incompatible with both older versions of gstreamer that don't
declare the newer enum values and with future versions of gstreamer that
introduce new ones, use a "default" case for all values that we don't
explicitly care about handling.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/media-hub-ci/79/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/79/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-04-04 14:31:43 +0000
3+++ CMakeLists.txt 2014-07-21 23:24:44 +0000
4@@ -2,9 +2,9 @@
5
6 project(ubuntu-media-hub)
7
8-set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 0)
9+set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 1)
10 set(UBUNTU_MEDIA_HUB_VERSION_MINOR 0)
11-set(UBUNTU_MEDIA_HUB_VERSION_PATCH 1)
12+set(UBUNTU_MEDIA_HUB_VERSION_PATCH 0)
13
14 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fPIC -pthread")
15 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC -pthread")
16
17=== modified file 'debian/control'
18--- debian/control 2014-05-06 18:48:44 +0000
19+++ debian/control 2014-07-21 23:24:44 +0000
20@@ -11,12 +11,16 @@
21 graphviz,
22 gstreamer1.0-plugins-good,
23 gstreamer1.0-fluendo-mp3,
24+# We rely on C++11 features, and to prevent from ABI breaks
25+# in libstdc++ causing us issues, we explicitly select a G++
26+# version.
27+ g++-4.9,
28 libboost-dev (>=1.53),
29 libboost-filesystem-dev (>=1.53),
30 libboost-program-options-dev (>=1.53),
31 libboost-system-dev (>=1.53),
32 libdbus-1-dev,
33- libdbus-cpp-dev (>= 3.0.0),
34+ libdbus-cpp-dev (>= 4.0.0),
35 libgoogle-glog-dev,
36 libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu13),
37 libprocess-cpp-dev,
38@@ -35,8 +39,8 @@
39 Architecture: any
40 Multi-Arch: same
41 Pre-Depends: dpkg (>= 1.15.6~)
42-Depends: libmedia-hub-common0 (= ${binary:Version}),
43- libmedia-hub-client0 (= ${binary:Version}),
44+Depends: libmedia-hub-common1 (= ${binary:Version}),
45+ libmedia-hub-client1 (= ${binary:Version}),
46 ${misc:Depends},
47 libproperties-cpp-dev,
48 Suggests: libmedia-hub-doc
49@@ -58,7 +62,7 @@
50 .
51 This package contains the runtime.
52
53-Package: libmedia-hub-common0
54+Package: libmedia-hub-common1
55 Architecture: any
56 Multi-Arch: same
57 Pre-Depends: dpkg (>= 1.15.6~)
58@@ -70,7 +74,7 @@
59 .
60 This package contains the common libraries.
61
62-Package: libmedia-hub-client0
63+Package: libmedia-hub-client1
64 Architecture: any
65 Multi-Arch: same
66 Pre-Depends: dpkg (>= 1.15.6~)
67
68=== renamed file 'debian/libmedia-hub-client0.install' => 'debian/libmedia-hub-client1.install'
69=== renamed file 'debian/libmedia-hub-common0.install' => 'debian/libmedia-hub-common1.install'
70=== renamed file 'debian/libmedia-hub-common0.symbols' => 'debian/libmedia-hub-common1.symbols'
71--- debian/libmedia-hub-common0.symbols 2014-03-26 16:13:02 +0000
72+++ debian/libmedia-hub-common1.symbols 2014-07-21 23:24:44 +0000
73@@ -1,19 +1,12 @@
74-libmedia-hub-common.so.0 libmedia-hub-common0 #MINVER#
75+libmedia-hub-common.so.1 libmedia-hub-common1 #MINVER#
76 (c++)"the_session_bus()@Base" 0.0.1
77 (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1
78- (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1
79- (c++)"std::shared_ptr<core::dbus::Executor>::~shared_ptr()@Base" 0.0.1
80 (c++)"std::shared_ptr<core::dbus::Executor>::~shared_ptr()@Base" 0.0.1
81 (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0.0.1
82- (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1
83- (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1
84- (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1
85 (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0.0.1
86 (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 0.0.1
87 (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::_M_get_deleter(std::type_info const&)@Base" 0.0.1
88 (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr_inplace()@Base" 0.0.1
89- (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr_inplace()@Base" 0.0.1
90- (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr_inplace()@Base" 0.0.1
91 (c++)"typeinfo for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
92 (c++)"typeinfo for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
93 (c++)"typeinfo for std::_Sp_make_shared_tag@Base" 0.0.1
94
95=== modified file 'debian/rules'
96--- debian/rules 2014-05-06 09:13:43 +0000
97+++ debian/rules 2014-07-21 23:24:44 +0000
98@@ -6,9 +6,19 @@
99
100 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
101
102+include /usr/share/dpkg/default.mk
103+
104+# Explicitly selecting a G{CC,++}-version here to avoid accidental
105+# ABI breaks introduced by toolchain updates.
106+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
107+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
108+
109 %:
110 dh $@ --fail-missing -- -B build
111
112+override_dh_auto_configure:
113+ dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
114+
115 override_dh_auto_test:
116 env -u LD_PRELOAD dh_auto_test
117
118
119=== modified file 'src/core/media/gstreamer/bus.h'
120--- src/core/media/gstreamer/bus.h 2014-02-12 15:53:57 +0000
121+++ src/core/media/gstreamer/bus.h 2014-07-21 23:24:44 +0000
122@@ -52,8 +52,6 @@
123 case GST_MESSAGE_UNKNOWN:
124 throw std::runtime_error("Cannot construct message for type unknown");
125 break;
126- case GST_MESSAGE_EOS:
127- break;
128 case GST_MESSAGE_ERROR:
129 {
130 gst_message_parse_error(
131@@ -78,7 +76,6 @@
132 g_free(detail.error_warning_info.debug);
133 };
134 break;
135- break;
136 case GST_MESSAGE_INFO:
137 gst_message_parse_info(
138 msg,
139@@ -90,7 +87,6 @@
140 g_free(detail.error_warning_info.debug);
141 };
142 break;
143- break;
144 case GST_MESSAGE_TAG:
145 gst_message_parse_tag(
146 msg,
147@@ -112,8 +108,6 @@
148 &detail.state_changed.new_state,
149 &detail.state_changed.pending_state);
150 break;
151- case GST_MESSAGE_STATE_DIRTY:
152- break;
153 case GST_MESSAGE_STEP_DONE:
154 gst_message_parse_step_done(
155 msg,
156@@ -142,14 +136,6 @@
157 msg,
158 &detail.clock_new.clock);
159 break;
160- case GST_MESSAGE_STRUCTURE_CHANGE:
161- break;
162- case GST_MESSAGE_STREAM_STATUS:
163- break;
164- case GST_MESSAGE_APPLICATION:
165- break;
166- case GST_MESSAGE_ELEMENT:
167- break;
168 case GST_MESSAGE_SEGMENT_START:
169 gst_message_parse_segment_start(
170 msg,
171@@ -162,19 +148,11 @@
172 &detail.segment_done.format,
173 &detail.segment_done.position);
174 break;
175- case GST_MESSAGE_DURATION_CHANGED:
176- break;
177- case GST_MESSAGE_LATENCY:
178- break;
179- case GST_MESSAGE_ASYNC_START:
180- break;
181 case GST_MESSAGE_ASYNC_DONE:
182 gst_message_parse_async_done(
183 msg,
184 &detail.async_done.running_time);
185 break;
186- case GST_MESSAGE_REQUEST_STATE:
187- break;
188 case GST_MESSAGE_STEP_START:
189 gst_message_parse_step_start(
190 msg,
191@@ -194,19 +172,7 @@
192 &detail.qos.timestamp,
193 &detail.qos.duration);
194 break;
195- case GST_MESSAGE_PROGRESS:
196- break;
197- case GST_MESSAGE_TOC:
198- break;
199- case GST_MESSAGE_RESET_TIME:
200- break;
201- case GST_MESSAGE_STREAM_START:
202- break;
203- case GST_MESSAGE_NEED_CONTEXT:
204- break;
205- case GST_MESSAGE_HAVE_CONTEXT:
206- break;
207- case GST_MESSAGE_ANY:
208+ default:
209 break;
210 }
211 }

Subscribers

People subscribed via source and target branches