[Pkg-e-commits] [SCM] Enlightenment DR17 advanced canvas library branch, master, updated. debian/0.9.9.043-1-8-g7e432ce

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit 7e432ce91b4ca9ce80c20e42ee0a7a421024f772
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Sat Oct 18 12:00:17 2008 +0200

    Fix FTBFS on non-x86 architectures by moving MMX-specific symbols in a separate symbols file

diff --git a/debian/changelog b/debian/changelog
index 7ac1fec..c43ec12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+evas (0.9.9.050-2) UNRELEASED; urgency=low
+
+  * Move MMX-specific symbols to debian/libevas0.symbols.{amd64,i386}
+    - Fixes FTBFS on non-x86 architectures (Closes: #502588)
+  * debian/rules: explicitely disable SSE on non-amd64 architectures
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Wed, 05 Nov 2008 00:08:27 +0100
+
 evas (0.9.9.050-1) experimental; urgency=low
 
   [ Albin Tonnerre ]
diff --git a/debian/libevas0.symbols b/debian/libevas0.symbols
index 56a6c32..454ab6b 100644
--- a/debian/libevas0.symbols
+++ b/debian/libevas0.symbols
@@ -230,13 +230,9 @@ libevas.so.0 libevas0 #MINVER#
  evas_common_scale_rgba_in_to_out_clip_sample at Base 0.9.9.042
  evas_common_scale_rgba_in_to_out_clip_smooth at Base 0.9.9.042
  evas_common_scale_rgba_in_to_out_clip_smooth_c at Base 0.9.9.042
- evas_common_scale_rgba_in_to_out_clip_smooth_mmx at Base 0.9.9.042
  evas_common_scale_rgba_mipmap_down_1x2_c at Base 0.9.9.042
- evas_common_scale_rgba_mipmap_down_1x2_mmx at Base 0.9.9.042
  evas_common_scale_rgba_mipmap_down_2x1_c at Base 0.9.9.042
- evas_common_scale_rgba_mipmap_down_2x1_mmx at Base 0.9.9.042
  evas_common_scale_rgba_mipmap_down_2x2_c at Base 0.9.9.042
- evas_common_scale_rgba_mipmap_down_2x2_mmx at Base 0.9.9.042
  evas_common_scale_rgba_span at Base 0.9.9.042
  evas_common_tilebuf_add_motion_vector at Base 0.9.9.042
  evas_common_tilebuf_add_redraw at Base 0.9.9.042
diff --git a/debian/libevas0.symbols.amd64 b/debian/libevas0.symbols.amd64
new file mode 100644
index 0000000..fad296a
--- /dev/null
+++ b/debian/libevas0.symbols.amd64
@@ -0,0 +1,6 @@
+libevas.so.0 libevas0 #MINVER#
+#include "libevas0.symbols"
+ evas_common_scale_rgba_in_to_out_clip_smooth_mmx at Base 0.9.9.042
+ evas_common_scale_rgba_mipmap_down_1x2_mmx at Base 0.9.9.042
+ evas_common_scale_rgba_mipmap_down_2x1_mmx at Base 0.9.9.042
+ evas_common_scale_rgba_mipmap_down_2x2_mmx at Base 0.9.9.042
diff --git a/debian/libevas0.symbols.i386 b/debian/libevas0.symbols.i386
new file mode 100644
index 0000000..fad296a
--- /dev/null
+++ b/debian/libevas0.symbols.i386
@@ -0,0 +1,6 @@
+libevas.so.0 libevas0 #MINVER#
+#include "libevas0.symbols"
+ evas_common_scale_rgba_in_to_out_clip_smooth_mmx at Base 0.9.9.042
+ evas_common_scale_rgba_mipmap_down_1x2_mmx at Base 0.9.9.042
+ evas_common_scale_rgba_mipmap_down_2x1_mmx at Base 0.9.9.042
+ evas_common_scale_rgba_mipmap_down_2x2_mmx at Base 0.9.9.042
diff --git a/debian/rules b/debian/rules
index f275e87..7bb4cc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,15 @@ install/libevas-doc::
 DEB_DH_STRIP_ARGS := --dbg-package=libevas-dbg
 
 ifeq (hppa,$(DEB_HOST_ARCH))
-	pthreads=--disable-pthreads
+	arch_flags += --disable-pthreads
 else
-	pthreads=--enable-pthreads
+	arch_flags += --enable-pthreads
+endif
+
+ifeq (amd64,$(DEB_HOST_ARCH))
+	arch_flags += --enable-cpu-sse
+else
+	arch_flags += --disable-cpu-sse
 endif
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict \
@@ -64,4 +70,4 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict \
 	--enable-convert-32-rgb-rot-180 \
 	--enable-convert-32-rgb-rot-270 \
 	--enable-convert-32-rgb-rot-90 \
-	--disable-rpath $(pthreads)
+	--disable-rpath $(arch_flags)

-- 
Enlightenment DR17 advanced canvas library