[packages/mkvtoolnix] - fix boost detection on x32

baggins baggins at pld-linux.org
Thu Jun 18 21:09:10 CEST 2015


commit d553176b3bac2f35a5c725f39d55d49b3234dbe1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jun 18 21:08:59 2015 +0200

    - fix boost detection on x32

 mkvtoolnix.spec |  3 +++
 x32.patch       | 11 +++++++++++
 2 files changed, 14 insertions(+)
---
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 7b4e110..972a57f 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -17,8 +17,10 @@ Group:		Applications/Multimedia
 Source0:	http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.xz
 # Source0-md5:	b73789734f7ca3041473ad905c89143f
 Patch0:		%{name}-init_locales.patch
+Patch1:		x32.patch
 URL:		http://www.bunkus.org/videotools/mkvtoolnix/
 %{?with_qt:BuildRequires:	Qt5Gui-devel}
+BuildRequires:	autoconf
 BuildRequires:	boost-devel >= 1.36
 BuildRequires:	bzip2-devel
 BuildRequires:	expat-devel
@@ -52,6 +54,7 @@ Narzędzia do filmów w formacie Matroska.
 %patch0 -p1
 
 %build
+%{__autoconf}
 %configure \
 	--docdir=%{_datadir}/%{name} \
 	--enable-gui \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..a51be18
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- mkvtoolnix-7.9.0/ac/ax_boost_base.m4~	2015-05-10 11:04:26.000000000 +0200
++++ mkvtoolnix-7.9.0/ac/ax_boost_base.m4	2015-06-18 21:08:07.846272020 +0200
+@@ -94,7 +94,7 @@
+       *)    libsubdirs="lib/${host_cpu}-${host_os}" ;;
+     esac
+     if test $host_cpu = x86_64 -o $host_cpu = ppc64 -o $host_cpu = s390x -o $host_cpu = sparc64; then
+-        libsubdirs="$libsubdirs lib64"
++        libsubdirs="$libsubdirs lib64 libx32"
+     fi
+     libsubdirs="$libsubdirs lib"
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mkvtoolnix.git/commitdiff/d553176b3bac2f35a5c725f39d55d49b3234dbe1



More information about the pld-cvs-commit mailing list