[SCM] tango branch, master, updated. debian/7.2.6+dfsg-7-3-gc7e26c2
Picca Frédéric-Emma?==?UTF-8?Q?nuel
picca at debian.org
Sun Jul 31 10:13:21 UTC 2011
The following commit has been merged in the master branch:
commit 37c7b466cfb795b91a695a23908ada9ba7fcac83
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Jul 31 10:44:22 2011 +0200
do not activate the mmx code on the i386 arch
diff --git a/debian/changelog b/debian/changelog
index 6337383..7f1713a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tango (7.2.6+dfsg-8) unstable; urgency=low
+
+ * do not activate the mmx code on the i386 arch
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 31 Jul 2011 00:07:30 +0200
+
tango (7.2.6+dfsg-7) unstable; urgency=low
* debian/*.symbols
diff --git a/debian/control b/debian/control
index 4c9832a..a5db9a8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,7 @@ Section: science
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
-Build-Depends: debhelper (>= 8),
- po-debconf,
- autotools-dev, autoconf, automake, libtool,
- libcos4-dev (>= 4.1.3),
- libmysqlclient-dev
+Build-Depends: debhelper (>= 8), po-debconf, dh-autoreconf, libcos4-dev (>= 4.1.3), libmysqlclient-dev
Build-Depends-Indep: doxygen
Standards-Version: 3.9.2
Homepage: http://www.tango-controls.org
diff --git a/debian/libtango7.symbols b/debian/libtango7.symbols
index 71bc0f2..52ffbbc 100644
--- a/debian/libtango7.symbols
+++ b/debian/libtango7.symbols
@@ -1,9 +1,6 @@
libtango.so.7 libtango7 #MINVER#
- _128mm at Base 7.2.6+dfsg
(c++)"free_all_16()@Base" 7.2.6+dfsg
(c++)"jpeg_decode(int, unsigned char*, int*, int*, int*, unsigned char**)@Base" 7.2.6+dfsg
- (c++)"jpeg_fdct_mmx(short*)@Base" 7.2.6+dfsg
- (c++)"jpeg_idct_mmx(short*, unsigned char*)@Base" 7.2.6+dfsg
(c++)"jpeg_y_to_gray(unsigned char*, int, unsigned char*)@Base" 7.2.6+dfsg
(c++)"jpeg_gray8_to_y(int, int, int, int, unsigned char*, short*)@Base" 7.2.6+dfsg
(c++)"jpeg_init_color()@Base" 7.2.6+dfsg
@@ -28,11 +25,6 @@ libtango.so.7 libtango7 #MINVER#
(c++)"jpeg_read_dri_marker(JPGDECODER*, InputBitStream*)@Base" 7.2.6+dfsg
(c++)"jpeg_read_sof_marker(JPGDECODER*, InputBitStream*)@Base" 7.2.6+dfsg
(c++)"jpeg_read_sos_marker(JPGDECODER*, InputBitStream*)@Base" 7.2.6+dfsg
- (c++)"conv_block_GRAY8Y_mmx(long, unsigned char*, short*)@Base" 7.2.6+dfsg
- (c++)"jpeg_yh1v1_to_rgb32_mmx(unsigned char*, long, unsigned char*)@Base" 7.2.6+dfsg
- (c++)"jpeg_yh2v2_to_rgb32_mmx(unsigned char*, long, unsigned char*)@Base" 7.2.6+dfsg
- (c++)"conv_block_RGB24H2V2_mmx(long, unsigned char*, short*, short*, short*)@Base" 7.2.6+dfsg
- (c++)"conv_block_RGB32H2V2_mmx(long, unsigned char*, short*, short*, short*)@Base" 7.2.6+dfsg
(c++)"jpeg_read_restart_marker(JPGDECODER*, InputBitStream*)@Base" 7.2.6+dfsg
(c++)"free_16(void*)@Base" 7.2.6+dfsg
(c++)"_msize_16(void*)@Base" 7.2.6+dfsg
@@ -4518,29 +4510,6 @@ libtango.so.7 libtango7 #MINVER#
(c++)"operator>>=(CORBA::Any const&, Tango::DevInfo_3*&)@Base" 7.2.6+dfsg
(c++)"operator>>=(long, cdrStream&)@Base" 7.2.6+dfsg
(c++)"operator>>=(unsigned long, cdrStream&)@Base" 7.2.6+dfsg
- __jpmm_cos_4_16 at Base 7.2.6+dfsg
- __jpmm_ocos_4_16 at Base 7.2.6+dfsg
- __jpmm_offset128 at Base 7.2.6+dfsg
- __jpmm_one_corr at Base 7.2.6+dfsg
- __jpmm_round_frw_row at Base 7.2.6+dfsg
- __jpmm_rounder at Base 7.2.6+dfsg
- __jpmm_row_tab_frw at Base 7.2.6+dfsg
- __jpmm_row_tabs at Base 7.2.6+dfsg
- __jpmm_tg_1_16 at Base 7.2.6+dfsg
- __jpmm_tg_2_16 at Base 7.2.6+dfsg
- __jpmm_tg_3_16 at Base 7.2.6+dfsg
- _bcbcrmm at Base 7.2.6+dfsg
- _bymm at Base 7.2.6+dfsg
- _cbbmm at Base 7.2.6+dfsg
- _cbgmm at Base 7.2.6+dfsg
- _crgmm at Base 7.2.6+dfsg
- _crrmm at Base 7.2.6+dfsg
- _gcbcrmm at Base 7.2.6+dfsg
- _gymm at Base 7.2.6+dfsg
- _offymm at Base 7.2.6+dfsg
- _rcbcrmm at Base 7.2.6+dfsg
- _rcmm at Base 7.2.6+dfsg
- _rymm at Base 7.2.6+dfsg
client_leavefunc at Base 7.2.6+dfsg
jpgZag at Base 7.2.6+dfsg
key_py_data at Base 7.2.6+dfsg
diff --git a/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch b/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch
new file mode 100644
index 0000000..5236e7b
--- /dev/null
+++ b/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch
@@ -0,0 +1,100 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 31 Jul 2011 10:01:27 +0200
+Subject: feature add jpegmmx option to configure script
+
+---
+ configure.in | 52 ++++++++++++++--------------------------
+ lib/cpp/log4tango/Makefile.am | 4 ++-
+ 2 files changed, 21 insertions(+), 35 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e3dd53a..e412d36 100644
+--- a/configure.in
++++ b/configure.in
+@@ -323,46 +323,30 @@ dnl
+ dnl Build the jpeg library compilation option
+ dnl
+
+-JPEG_LIB_CXXFLAGS=-D_TANGO_LIB
++AC_ARG_ENABLE([jpegmmx],
++ [AS_HELP_STRING([--disable-jpegmmx],
++ [disable jpeg mmx optimization])],
++ [],
++ [enable_jpegmmx=yes])
++
++JPEG_LIB_CXXFLAGS="-D_TANGO_LIB"
++JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
++
++if test "x$enable_jpegmmx" != xno; then
+ case $host_cpu in
+- *86 )
+- JPEG_LIB_CXXFLAGS="$JPEG_LIB_CXXFLAGS -DJPG_USE_ASM"
++ i*86 | x86_64 )
++ JPEG_LIB_CXXFLAGS+=" -DJPG_USE_ASM"
++ JPEG_MMX_LIB_CXXFLAGS+=" -mmmx -DJPG_USE_ASM"
+ ;;
+-dnl case $host_cpu in
+-dnl *64 )
+-dnl if test $enable_shared = no; then
+-dnl JPEG_LIB_CXXFLAGS="$JPEG_LIB_CXXFLAGS -D_64BITS"
+-dnl else
+-dnl JPEG_LIB_CXXFLAGS="-D_TANGO_LIB -D_64BITS"
+-dnl fi
+-dnl ;;
+-dnl esac
+- * )
+- JPEG_LIB_CXXFLAGS="-D_TANGO_LIB -D_64BITS"
+- ;;
+ esac
+
+-JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
+ case $host_cpu in
+- *86 )
+- JPEG_MMX_LIB_CXXFLAGS="$JPEG_MMX_LIB_CXXFLAGS -mmmx -DJPG_USE_ASM"
+- ;;
+-dnl case $host_cpu in
+-dnl *64 )
+-dnl if test $enable_shared = no; then
+-dnl JPEG_MMX_LIB_CXXFLAGS="$JPEG_MMX_LIB_CXXFLAGS -D_64BITS"
+-dnl else
+-dnl JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB -mmmx -D_64BITS"
+-dnl fi
+-dnl ;;
+-dnl esac
+- powerpc )
+- JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
+- ;;
+- * )
+- JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB -D_64BITS"
+- ;;
++ *64 )
++ JPEG_LIB_CXXFLAGS+=" -D_64BITS"
++ JPEG_MMX_LIB_CXXFLAGS+=" -D_64BITS"
++ ;;
+ esac
++fi
+
+ AC_SUBST(JPEG_LIB_CXXFLAGS)
+ AC_SUBST(JPEG_MMX_LIB_CXXFLAGS)
+diff --git a/lib/cpp/log4tango/Makefile.am b/lib/cpp/log4tango/Makefile.am
+index e0231d5..3d0ea84 100644
+--- a/lib/cpp/log4tango/Makefile.am
++++ b/lib/cpp/log4tango/Makefile.am
+@@ -1,5 +1,7 @@
+ SUBDIRS = config src include tests
+
++ACLOCAL_AMFLAGS = -I m4
++
+ if DOC
+ SUBDIRS += doc
+ endif
+@@ -20,7 +22,7 @@ EXTRA_DIST = log4tango.pc.in \
+ m4/PETI_PEDANTIC_GCC.m4 \
+ m4/AC_FUNC_SNPRINTF.m4 \
+ m4/AC_C_INT64_T.m4
+-
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = log4tango.pc
+
+--
diff --git a/debian/patches/series b/debian/patches/series
index 3db3960..650ac33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-upstream-fix-bug3213730.patch
0006-feature-forwarded-upstream-pkg-config-small-fixes.patch
0007-upstream-fix-tango-db-start-during-init.patch
+0008-feature-add-jpegmmx-option-to-configure-script.patch
diff --git a/debian/rules b/debian/rules
index 9d45529..74b5fea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ BUILDROOT=build
PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
get-orig-source:
uscan --verbose --force-download --download-current-version
@@ -14,7 +15,11 @@ get-orig-source:
ln -fs $(PACKAGE)-$(VERSION)+dfsg.tar.gz ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz
override_dh_auto_configure:
+ifeq ($(DEB_HOST_ARCH),i386)
+ dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
+else
dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen
+endif
override_dh_auto_install:
dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
@@ -48,7 +53,7 @@ override_dh_installinit:
dh_installinit -a -Ntango-accesscontrol -Ntango-starter
%:
- dh $@ --builddirectory=$(BUILDROOT)
+ dh $@ --builddirectory=$(BUILDROOT) --with autoreconf
.PHONY: get-orig-source
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list