[Pkg-gstreamer-commits] [gst-fluendo-mp3] 02/02: Build for both GStreamer 0.10 and 1.0.

[Loïc Minier]

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

lool pushed a commit to branch master
in repository gst-fluendo-mp3.

commit ca3d31b84abf127d7ed286eaa966ab2786ab8a14
Author: Loïc Minier <lool at debian.org>
Date:   Thu Sep 5 22:49:05 2013 +0200

    Build for both GStreamer 0.10 and 1.0.
---
 debian/changelog                         |    4 ++++
 debian/control                           |   24 ++++++++++++++++++++++--
 debian/gstreamer0.10-fluendo-mp3.install |    1 +
 debian/gstreamer1.0-fluendo-mp3.install  |    1 +
 debian/rules                             |   22 ++++++++++++++++++----
 5 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ad7a14..6c63efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ gst-fluendo-mp3 (0.10.23.debian-3) UNRELEASED; urgency=low
     changes are:
     - One less dep as LDFLAGS from dpkg-buildflags are properly passed.
     - Some useless doc files not being installed (TODO, README, changelog).
+  * Build for both GStreamer 0.10 and 1.0.
+    - Force --with-gstreamer-api= for each build.
+    - Add new gstreamer1.0 package in control.
+    - Install via dh_install and hence drop the removals of .la and .a files.
 
  -- Loïc Minier <lool at debian.org>  Thu, 05 Sep 2013 21:34:35 +0200
 
diff --git a/debian/control b/debian/control
index 54fce56..4407543 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Build-Depends: debhelper (>= 9~),
                pkg-config (>= 0.11.0),
                libgstreamer0.10-dev (>= 0.10.35.2-2~),
                libgstreamer-plugins-base0.10-dev (>= 0.10.35.2-1~),
+               libgstreamer1.0-dev,
+               libgstreamer-plugins-base1.0-dev,
                gstreamer-tools (>= 0.10.14),
                liboil0.3-dev (>= 0.3.7)
 Standards-Version: 3.9.4
@@ -25,8 +27,26 @@ XB-GStreamer-URI-Sources: ${gstreamer:URISources}
 XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
 XB-GStreamer-Encoders: ${gstreamer:Encoders}
 XB-GStreamer-Decoders: ${gstreamer:Decoders}
-Description: Fluendo mp3 decoder GStreamer plugin
- This GStreamer plugin permits decoding of MPEG 1 audio layer III
+Description: Fluendo mp3 decoder GStreamer 0.10 plugin
+ This GStreamer 0.10 plugin permits decoding of MPEG 1 audio layer III
+ streams.  It is derived from the ISO MPEG dist10 reference package.
+ .
+ This plugin differs from the GStreamer MAD plugin in that it doesn't
+ depend on a GPL library.
+
+Package: gstreamer1.0-fluendo-mp3
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+XB-GStreamer-Version: ${gstreamer:Version}
+XB-GStreamer-Elements: ${gstreamer:Elements}
+XB-GStreamer-URI-Sources: ${gstreamer:URISources}
+XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
+XB-GStreamer-Encoders: ${gstreamer:Encoders}
+XB-GStreamer-Decoders: ${gstreamer:Decoders}
+Description: Fluendo mp3 decoder GStreamer 1.0 plugin
+ This GStreamer 1.0 plugin permits decoding of MPEG 1 audio layer III
  streams.  It is derived from the ISO MPEG dist10 reference package.
  .
  This plugin differs from the GStreamer MAD plugin in that it doesn't
diff --git a/debian/gstreamer0.10-fluendo-mp3.install b/debian/gstreamer0.10-fluendo-mp3.install
new file mode 100644
index 0000000..83280ed
--- /dev/null
+++ b/debian/gstreamer0.10-fluendo-mp3.install
@@ -0,0 +1 @@
+usr/lib/*/gstreamer-0.10/libgstflump3dec.so
diff --git a/debian/gstreamer1.0-fluendo-mp3.install b/debian/gstreamer1.0-fluendo-mp3.install
new file mode 100644
index 0000000..e6489ad
--- /dev/null
+++ b/debian/gstreamer1.0-fluendo-mp3.install
@@ -0,0 +1 @@
+usr/lib/*/gstreamer-1.0/libgstflump3dec.so
diff --git a/debian/rules b/debian/rules
index 84bab72..823db09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,31 @@
 #!/usr/bin/make -f
 
+CONFIGURE_FLAGS := --with-liboil --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-liboil \
-	    --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -Bbuild-0.10 -- --with-gstreamer-api=0.10 \
+	    $(CONFIGURE_FLAGS)
+	dh_auto_configure -Bbuild-1.0  -- --with-gstreamer-api=1.0  \
+	    $(CONFIGURE_FLAGS)
+
+override_dh_auto_build:
+	dh_auto_build -Bbuild-0.10
+	dh_auto_build -Bbuild-1.0
+
+override_dh_auto_install:
+	dh_auto_install -Bbuild-0.10
+	dh_auto_install -Bbuild-1.0
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build-0.10 build-1.0
 
 override_dh_install:
 	dh_install
 	mkdir -p $(CURDIR)/fake-home
 	GST_REGISTRY=$(CURDIR)/fake-home/registry.xml dh_gstscancodecs
 	rm -rf $(CURDIR)/fake-home
-	rm -f debian/gstreamer0.10-fluendo-mp3/usr/lib/*/gstreamer-0.10/libgstflump3dec.la
-	rm -f debian/gstreamer0.10-fluendo-mp3/usr/lib/*/gstreamer-0.10/libgstflump3dec.a
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-fluendo-mp3.git