Disable build of GObject Introspection, fix cross compile Not trivial in a cross setting as BUILD and HOST dev packages must be installed side by side and the upstream debian ones doesn't support it. Confirmed that upstream python-gst-1.0, that depends on gir1.2-gstreamer-1.0, can be installed and used alongside our binary debs so we're not losing language bindings. Change-Id: Ia77d8bfd5c201d074faea40ad657e8dbebdc6e12
diff --git a/debian/build-deps b/debian/build-deps index 2f2b7f6..d6fbb43 100644 --- a/debian/build-deps +++ b/debian/build-deps
@@ -9,7 +9,6 @@ cdbs (>= 0.4.93~) debhelper (>= 9) gnome-pkg-tools (>= 0.7) -gtk-doc-tools (>= 1.12) pkg-config (>= 0.11.0) libxv-dev (>= 6.8.2.dfsg.1-3) libxt-dev (>= 6.8.2.dfsg.1-3) @@ -23,11 +22,5 @@ libvisual-0.4-dev (>= 0.4.0) dpkg-dev (>= 1.15.1) iso-codes -libglib2.0-doc -libgirepository1.0-dev (>= 0.9.12-4~) -gobject-introspection (>= 0.9.12-4~) -gir1.2-glib-2.0 -gir1.2-freedesktop -gir1.2-gstreamer-@GST_ABI@ zlib1g-dev libopus-dev (>= 0.9.4)
diff --git a/debian/control b/debian/control index 3bc4890..74116a7 100644 --- a/debian/control +++ b/debian/control
@@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: AIY Projects <support-aiyprojects@google.com> -Build-Depends: libgstreamer1.0-dev (>= 1.12.0), libasound2-dev (>= 0.9.0) [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], autotools-dev, automake (>= 1.14), autoconf (>= 2.69), libtool (>= 2.2.6), dh-autoreconf, autopoint (>= 0.17), cdbs (>= 0.4.93~), debhelper (>= 10), gnome-pkg-tools (>= 0.7), gtk-doc-tools (>= 1.12), pkg-config (>= 0.11.0), libxv-dev (>= 6.8.2.dfsg.1-3), libxt-dev (>= 6.8.2.dfsg.1-3), libvorbis-dev (>= 1.0.0-2), libcdparanoia-dev (>= 3.10.2) [!hurd-i386], liborc-0.4-dev (>= 1:0.4.24), libpango1.0-dev (>= 1.16.0), libtheora-dev (>= 1.1), libglib2.0-dev (>= 2.40), zlib1g-dev (>= 1:1.1.4), libvisual-0.4-dev (>= 0.4.0), dpkg-dev (>= 1.15.1), iso-codes, libglib2.0-doc, libgirepository1.0-dev (>= 0.9.12-4~), gobject-introspection (>= 0.9.12-4~), gir1.2-glib-2.0, gir1.2-freedesktop, gir1.2-gstreamer-1.0, zlib1g-dev, libopus-dev (>= 0.9.4) +Build-Depends: libgstreamer1.0-dev (>= 1.12.0), libasound2-dev (>= 0.9.0) [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], autotools-dev, automake (>= 1.14), autoconf (>= 2.69), libtool (>= 2.2.6), dh-autoreconf, autopoint (>= 0.17), cdbs (>= 0.4.93~), debhelper (>= 10), gnome-pkg-tools (>= 0.7), pkg-config (>= 0.11.0), libxv-dev (>= 6.8.2.dfsg.1-3), libxt-dev (>= 6.8.2.dfsg.1-3), libvorbis-dev (>= 1.0.0-2), libcdparanoia-dev (>= 3.10.2) [!hurd-i386], liborc-0.4-dev (>= 1:0.4.24), libpango1.0-dev (>= 1.16.0), libtheora-dev (>= 1.1), libglib2.0-dev (>= 2.40), zlib1g-dev (>= 1:1.1.4), libvisual-0.4-dev (>= 0.4.0), dpkg-dev (>= 1.15.1), iso-codes, zlib1g-dev, libopus-dev (>= 0.9.4) Standards-Version: 3.9.3 Homepage: http://gstreamer.freedesktop.org/modules/gst-plugins-base.html @@ -58,7 +58,6 @@ libgstreamer1.0-dev (>= 1.12.0), libglib2.0-dev, libxml2-dev, - gir1.2-gst-plugins-base-1.0 (= ${binary:Version}) Description: GStreamer development files for libraries from the "base" set GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do @@ -175,23 +174,3 @@ for standard Xlib support and for the Xv extension, as well as the plugin for Pango-based text rendering and overlay. -Package: gir1.2-gst-plugins-base-1.0 -Section: introspection -Architecture: any -Depends: ${gir:Depends}, - ${shlibs:Depends}, - ${misc:Depends} -Description: GObject introspection data for the GStreamer Plugins Base library - This package contains introspection data for the GStreamer Plugins Base library. - . - GStreamer is a streaming media framework, based on graphs of filters - which operate on media data. Applications using this library can do - anything from real-time sound processing to playing videos, and just - about anything else media-related. Its plugin-based architecture means - that new data types or processing capabilities can be added simply by - installing new plug-ins. - . - It can be used by packages using the GIRepository format to generate - dynamic bindings. - -
diff --git a/debian/gir1.2-gst-plugins-base.install b/debian/gir1.2-gst-plugins-base.install deleted file mode 100644 index f99f8f4..0000000 --- a/debian/gir1.2-gst-plugins-base.install +++ /dev/null
@@ -1,2 +0,0 @@ -debian/tmp/usr/lib/*/girepository-* /usr/lib -
diff --git a/debian/libgstreamer-plugins-base-dev.install b/debian/libgstreamer-plugins-base-dev.install index 1a3578f..e3cd6bd 100644 --- a/debian/libgstreamer-plugins-base-dev.install +++ b/debian/libgstreamer-plugins-base-dev.install
@@ -1,4 +1,3 @@ debian/tmp/usr/include/gstreamer-@GST_ABI@/gst/*/*.h debian/tmp/usr/lib/*/*.so debian/tmp/usr/lib/*/pkgconfig/*.pc -debian/tmp/usr/share/gir-*
diff --git a/debian/rules b/debian/rules index 30358e9..ee381c1 100755 --- a/debian/rules +++ b/debian/rules
@@ -85,9 +85,6 @@ sed 's/@GST_ABI@/$(gst_abi)/g' debian/gstreamer-$$f \ >debian/$(gst_pkgname)-$$f; \ done - rm -f debian/gir1.2-gst-plugins-base-$(gst_abi).install - cp debian/gir1.2-gst-plugins-base.install \ - debian/gir1.2-gst-plugins-base-$(gst_abi).install rm -f debian/libgstreamer-plugins-base$(gst_deb_abi).install sed 's/@GST_ABI@/$(gst_abi)/g' \ debian/libgstreamer-plugins-base.install \ @@ -113,11 +110,6 @@ --with-package-name=$(GST_PACKAGE_NAME) \ --with-install-plugins-helper="/usr/bin/gstreamer-codec-install" -# only build the docs if gtk-doc-tools is installed, i.e. binary-indep is called -#ifeq ($(shell test "`dpkg -l gtk-doc-tools | grep ^ii`" && echo binary-indep),binary-indep) -#DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc -#endif - clean:: # get rid of the symlinks for i in $(PLUGINS); do \ @@ -127,7 +119,6 @@ for f in $(VERSIONIZE); do \ rm -f debian/$(gst_pkgname)-$$f; \ done - rm -f debian/gir1.2-gst-plugins-base-$(gst_abi).install rm -f debian/libgstreamer-plugins-base$(gst_deb_abi).install rm -f debian/libgstreamer-plugins-base$(gst_deb_abi).symbols rm -f debian/libgstreamer-plugins-base$(gst_abi)-dev.install