[Pkg-voip-commits] r5819 - in /speex/trunk/debian: changelog rules

[ron at alioth.debian.org]

Author: ron
Date: Tue Jun  3 16:30:13 2008
New Revision: 5819

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5819
Log:
Update for the 1.2~beta4-1 release

Modified:
    speex/trunk/debian/changelog
    speex/trunk/debian/rules

Modified: speex/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/changelog?rev=5819&op=diff
==============================================================================
--- speex/trunk/debian/changelog (original)
+++ speex/trunk/debian/changelog Tue Jun  3 16:30:13 2008
@@ -1,3 +1,12 @@
+speex (1.2~beta4-1) unstable; urgency=low
+
+  * Upstream snapshot release.
+  * Fixes a speexdec regression causing all files to be decoded by as stereo
+  * Better support for arch specific optimisations.  We build for both sse and
+    487 on x86, and for fixed point with v4 asm for ARM.
+
+ -- Ron Lee <ron at debian.org>  Wed, 04 Jun 2008 00:40:14 +0930
+
 speex (1.2~beta3.2-1) unstable; urgency=low
 
   * New upstream snapshot.  Reverts an accidental API change in beta3.1

Modified: speex/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/rules?rev=5819&op=diff
==============================================================================
--- speex/trunk/debian/rules (original)
+++ speex/trunk/debian/rules Tue Jun  3 16:30:13 2008
@@ -18,38 +18,55 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Check for amd64 and enable sse
 DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-EXTRA_CONFIG_FLAGS = --enable-sse
+
+objdir            = objs
+objdir_sse        = objs-sse
+objdir_fixedpoint = objs-fixed-point
+
+all_objs  = $(objdir) $(objdir_sse) $(objdir_fixedpoint)
+arch_objs = $(objdir)
+
+ifeq ($(DEB_HOST_ARCH_CPU),arm)
+objdir             = $(objdir_fixedpoint)
+EXTRA_CONFIG_FLAGS = --enable-arm4-asm
 endif
 
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+arch_objs += $(objdir_sse)
+endif
 
-objdir := objs
 
 clean:
 	dh_testdir
 	dh_testroot
 	$(RM) *-stamp
-	$(RM) -r $(objdir) doc/{html,man,latex}
+	$(RM) -r $(all_objs) doc/{html,man,latex}
 	dh_clean
 
 
-$(objdir)/config.status: configure
+# This first empty one is equivalent to declaring it .SECONDARY while we have
+# no target specific variables to set.  We don't want it removed by default as
+# an unnamed intermediate file when the build target is completed.
+$(objdir)/config.status:
+$(objdir_sse)/config.status:        EXTRA_CONFIG_FLAGS += --enable-sse
+$(objdir_fixedpoint)/config.status: EXTRA_CONFIG_FLAGS += --enable-fixed-point
+
+%/config.status: configure
 	dh_testdir
-	mkdir -p $(objdir)
-	cd $(objdir) &&	../configure --host=$(DEB_HOST_GNU_TYPE)	\
-				     --build=$(DEB_BUILD_GNU_TYPE)	\
-				     --prefix=/usr			\
-				     $(EXTRA_CONFIG_FLAGS)
+	mkdir -p $*
+	cd $* && ../configure --host=$(DEB_HOST_GNU_TYPE)	\
+			      --build=$(DEB_BUILD_GNU_TYPE)	\
+			      --prefix=/usr			\
+			      $(EXTRA_CONFIG_FLAGS)
 
 build: build-arch
 
-build-arch: build-arch-stamp
-build-arch-stamp: $(objdir)/config.status
+build-arch: $(foreach d,$(arch_objs),build-target-$(d)-stamp)
+build-target-%-stamp : %/config.status
 	dh_testdir
-	cd $(objdir) && $(MAKE)
+	cd $* && $(MAKE)
 	touch $@
 
 build-indep: build-indep-stamp
@@ -65,6 +82,10 @@
 install-arch-stamp:
 	dh_testdir
 	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	if [ -d "$(objdir_sse)" ]; then								 \
+	    dh_install -plibspeex1    $(objdir_sse)/libspeex/.libs/libspeex.so.*    usr/lib/sse; \
+	    dh_install -plibspeexdsp1 $(objdir_sse)/libspeex/.libs/libspeexdsp.so.* usr/lib/sse; \
+	fi
 	touch $@
 
 install-indep: