[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 01/01: Only enable sbc plugin on Linux, it's not available elsewhere

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gst-plugins-bad1.0.

commit c337c7cce018e0802bbeaef53800c04fe6bebe26
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Fri Oct 4 10:07:11 2013 +0200

    Only enable sbc plugin on Linux, it's not available elsewhere
---
 debian/build-deps                    |    1 -
 debian/build-deps.in                 |    1 -
 debian/changelog                     |    9 +++++++++
 debian/control                       |    2 +-
 debian/gstreamer-plugins-bad.install |    2 +-
 debian/rules                         |    3 +++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/build-deps b/debian/build-deps
index 3e051a9..9a4176f 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -52,7 +52,6 @@ liborc-0.4-dev (>= 1:0.4.17)
 libpng-dev
 librsvg2-dev (>= 2.36)
 librtmp-dev
-libsbc-dev (>= 1.1)
 libschroedinger-dev (>= 1.0.7)
 libslv2-dev (>= 0.6.6)
 libsndfile1-dev (>= 1.0.16)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index a2a155e..d97ab71 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -67,7 +67,6 @@ libfluidsynth-dev (>= 1.0)
 libsrtp0-dev
 libopencv-dev (>= 2.0.0)
 libopenjpeg-dev
-libsbc-dev (>= 1.1)
 libgnutls-dev (>= 2.11.3)
 libchromaprint-dev
 libwebp-dev (>= 0.2.1)
diff --git a/debian/changelog b/debian/changelog
index 8506af1..d6eba64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gst-plugins-bad1.0 (1.2.0-4) unstable; urgency=low
+
+  * debian/rules,
+    debian/build-deps.in,
+    debian/gstreamer-plugins-bad.install:
+    + Only enable sbc plugin on Linux, it's not available elsewhere.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 04 Oct 2013 10:06:43 +0200
+
 gst-plugins-bad1.0 (1.2.0-3) unstable; urgency=low
 
   * debian/rules,
diff --git a/debian/control b/debian/control
index 9115a05..377ffd9 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends: autoconf (>= 2.62),
                libgudev-1.0-dev (>= 143) [linux-any],
                libusb-1.0-0-dev [linux-any],
                libbluetooth-dev (<< 5) [linux-any],
+               libsbc-dev (>= 1.1) [linux-any],
                libgstreamer1.0-dev (>= 1.2.0),
                gstreamer1.0-doc,
                gstreamer1.0-plugins-base (>= 1.0.0),
@@ -63,7 +64,6 @@ Build-Depends: autoconf (>= 2.62),
                libpng-dev,
                librsvg2-dev (>= 2.36),
                librtmp-dev,
-               libsbc-dev (>= 1.1),
                libschroedinger-dev (>= 1.0.7),
                libslv2-dev (>= 0.6.6),
                libsndfile1-dev (>= 1.0.16),
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index 170e2ee..20ce1d5 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -64,7 +64,7 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstremovesilence.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrfbsrc.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrsvg.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrtmp.so
-debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsbc.so
+ at sbc@
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstschro.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsdpelem.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsegmentclip.so
diff --git a/debian/rules b/debian/rules
index c5dd1f1..6d73ca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,7 @@ gst_extra_build_depends += , libdc1394-22-dev (>= 2.0.0) [linux-any]
 gst_extra_build_depends += , libgudev-1.0-dev (>= 143) [linux-any]
 gst_extra_build_depends += , libusb-1.0-0-dev [linux-any]
 gst_extra_build_depends += , libbluetooth-dev (<< 5) [linux-any]
+gst_extra_build_depends += , libsbc-dev (>= 1.1) [linux-any]
 
 # The plugins are basically the same.
 # Link special names to a template file.
@@ -91,6 +92,7 @@ decklink = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstd
 linsys = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstlinsys.so
 uvch264 = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstuvch264.so
 bluez = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstbluez.so
+sbc = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstsbc.so
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
@@ -134,6 +136,7 @@ pre-build::
 			-e 's, at resindvd@,$(resindvd),g' \
 			-e 's, at uvch264@,$(uvch264),g' \
 			-e 's, at bluez@,$(bluez),g' \
+			-e 's, at sbc@,$(sbc),g' \
 			-e 's/@GST_ABI@/$(gst_abi)/g' \
 			debian/gstreamer-$$p.install \
 			> debian/$(gst_pkgname)-$$p.install; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-bad1.0.git