commit 69787766b4bb224c41a2c589630d518c0dfd0dee
Author: Jan Rękorajski <[email protected]>
Date: Thu Mar 12 20:55:42 2015 +0100
- fix build on x32
- rel 2
alsa-tools.spec | 4 +++-
x32.patch | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/alsa-tools.spec b/alsa-tools.spec
index a6fe465..e1d6871 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -6,7 +6,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) - tools
Summary(pl.UTF-8): Advanced Linux Sound Architecture (ALSA) - narzędzia
Name: alsa-tools
Version: 1.0.29
-Release: 1
+Release: 2
License: GPL v2+
Group: Applications/Sound
Source0: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Source0:
ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2
Patch0: %{name}-desktop.patch
Patch1: %{name}-sh.patch
Patch2: %{name}-csp.patch
+Patch3: x32.patch
URL: http://www.alsa-project.org/
BuildRequires: alsa-lib-devel >= 1.0.24
BuildRequires: autoconf
@@ -219,6 +220,7 @@ Statyczna biblioteka liblo10k1.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# don't BR gtk+ 1.2
echo 'AC_DEFUN([AM_PATH_GTK],[])' > echomixer/acinclude.m4
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..fb6ff5b
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,17 @@
+--- alsa-tools-1.0.29/qlo10k1/acinclude.m4~ 2015-03-12 20:44:19.000000000
+0100
++++ alsa-tools-1.0.29/qlo10k1/acinclude.m4 2015-03-12 20:49:11.196554255
+0100
+@@ -100,9 +100,13 @@
+ if test x$QT_IS_STATIC = xno ; then
+ QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 2> /dev/null`
+ QT_IS_DYNAMIC64=`ls $QTDIR/lib64/libqt*.so 2> /dev/null`
+- if test "x$QT_IS_DYNAMIC" = x && test "x$QT_IS_DYNAMIC64" = x;
then
++ QT_IS_DYNAMICX32=`ls $QTDIR/libx32/libqt*.so 2> /dev/null`
++ if test "x$QT_IS_DYNAMIC" = x && test "x$QT_IS_DYNAMIC64" = x &&
test "x$QT_IS_DYNAMICX32" = x; then
+ AC_MSG_ERROR([*** Couldn't find any Qt libraries])
+ fi
++ if test "x$QT_IS_DYNAMICX32" != x; then
++ QT_LIB_DIR="libx32"
++ fi
+ if test "$QTFORCE32" = "no" && test "x$QT_IS_DYNAMIC64" != x;
then
+ QT_LIB_DIR="lib64"
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/alsa-tools.git/commitdiff/69787766b4bb224c41a2c589630d518c0dfd0dee
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
