rpms/mkvtoolnix/devel mkvtoolnix-boost-lib64.patch, NONE, 1.1 mkvtoolnix.spec, 1.14, 1.15 mkvtoolnix-ppc64-debug.patch, 1.4, NONE
Dominik Mierzejewski
rathann at fedoraproject.org
Mon Dec 1 20:00:48 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19530
Modified Files:
mkvtoolnix.spec
Added Files:
mkvtoolnix-boost-lib64.patch
Removed Files:
mkvtoolnix-ppc64-debug.patch
Log Message:
* Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-2
- fixed boost detection on ppc64 (and sparc64) (bug #473976)
mkvtoolnix-boost-lib64.patch:
--- NEW FILE mkvtoolnix-boost-lib64.patch ---
diff -up mkvtoolnix-2.4.0/ac/ax_boost_base.m4.ppc64 mkvtoolnix-2.4.0/ac/ax_boost_base.m4
--- mkvtoolnix-2.4.0/ac/ax_boost_base.m4.ppc64 2008-09-25 15:21:31.000000000 +0200
+++ mkvtoolnix-2.4.0/ac/ax_boost_base.m4 2008-12-01 20:40:44.000000000 +0100
@@ -84,20 +84,18 @@ if test "x$want_boost" = "xyes"; then
dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM
if test "$ac_boost_path" != ""; then
- if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path/lib64" ; then
- BOOST_LDFLAGS="-L$ac_boost_path/lib64"
- else
- BOOST_LDFLAGS="-L$ac_boost_path/lib"
- fi
+ case $target in
+ ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+ *) BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
+ esac
BOOST_CPPFLAGS="-I$ac_boost_path/include"
else
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
- if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path_tmp/lib64" ; then
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64"
- else
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
- fi
+ case $target in
+ ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+ *) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
+ esac
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break;
fi
@@ -171,11 +169,10 @@ if test "x$want_boost" = "xyes"; then
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
if test "$ac_boost_lib_path" = ""
then
- if test "`uname -m`" = "x86_64" && test -d "$best_path/lib64" ; then
- BOOST_LDFLAGS="-L$best_path/lib64"
- else
- BOOST_LDFLAGS="-L$best_path/lib"
- fi
+ case $target in
+ ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+ *) BOOST_LDFLAGS="-L$best_path/lib" ;;
+ esac
fi
if test "x$BOOST_ROOT" != "x"; then
diff -up mkvtoolnix-2.4.0/configure.ppc64 mkvtoolnix-2.4.0/configure
--- mkvtoolnix-2.4.0/configure.ppc64 2008-11-30 22:06:00.000000000 +0100
+++ mkvtoolnix-2.4.0/configure 2008-12-01 20:57:26.000000000 +0100
@@ -9947,20 +9947,18 @@ echo $ECHO_N "checking for boostlib >= $
succeeded=no
if test "$ac_boost_path" != ""; then
- if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path/lib64" ; then
- BOOST_LDFLAGS="-L$ac_boost_path/lib64"
- else
- BOOST_LDFLAGS="-L$ac_boost_path/lib"
- fi
+ case $target in
+ ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+ *) BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
+ esac
BOOST_CPPFLAGS="-I$ac_boost_path/include"
else
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
- if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path_tmp/lib64" ; then
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64"
- else
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
- fi
+ case $target in
+ ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+ *) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
+ esac
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break;
fi
@@ -10081,11 +10079,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
if test "$ac_boost_lib_path" = ""
then
- if test "`uname -m`" = "x86_64" && test -d "$best_path/lib64" ; then
- BOOST_LDFLAGS="-L$best_path/lib64"
- else
- BOOST_LDFLAGS="-L$best_path/lib"
- fi
+ case $target in
+ ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+ *) BOOST_LDFLAGS="-L$best_path/lib" ;;
+ esac
fi
if test "x$BOOST_ROOT" != "x"; then
Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mkvtoolnix.spec 1 Dec 2008 18:39:52 -0000 1.14
+++ mkvtoolnix.spec 1 Dec 2008 20:00:18 -0000 1.15
@@ -1,14 +1,14 @@
Summary: Matroska container manipulation utilities
Name: mkvtoolnix
Version: 2.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
Source1: mmg.desktop
Source2: mkvinfo.desktop
Patch0: %{name}-gcc43.patch
-Patch1: %{name}-ppc64-debug.patch
+Patch1: %{name}-boost-lib64.patch
URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -23,8 +23,6 @@
BuildRequires: lzo-devel
BuildRequires: bzip2-devel
BuildRequires: wxGTK-devel
-# https://bugzilla.redhat.com/show_bug.cgi?id=473976
-#ExcludeArch: ppc64
%description
Mkvtoolnix is a set of utilities to mux and demux audio, video and subtitle
@@ -42,9 +40,7 @@
%prep
%setup -q
%patch0 -p1 -b .gcc43
-%ifarch ppc64
-%patch1 -p1 -b .ppc64
-%endif
+%patch1 -p1 -b .lib64
sed -i -e 's/"-O3"/""/' configure*
for file in AUTHORS ChangeLog ; do
iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -119,6 +115,9 @@
%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
%changelog
+* Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-2
+- fixed boost detection on ppc64 (and sparc64) (bug #473976)
+
* Sun Nov 30 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
- updated to 2.4.0
- rebased patch
--- mkvtoolnix-ppc64-debug.patch DELETED ---
More information about the fedora-extras-commits
mailing list