Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=a4f137893e0811d796f30b6dbc68212bc314f1a5
commit a4f137893e0811d796f30b6dbc68212bc314f1a5 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Wed Jun 18 16:33:07 2008 +0200 exiv2-0.16-2kalgan1-i686 - added SA30519.patch - closes #3135 diff --git a/source/lib-extra/exiv2/FrugalBuild b/source/lib-extra/exiv2/FrugalBuild index 91d60b1..fd803ca 100644 --- a/source/lib-extra/exiv2/FrugalBuild +++ b/source/lib-extra/exiv2/FrugalBuild @@ -3,15 +3,16 @@ pkgname=exiv2 pkgver=0.16 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="Exiv2 is a C++ library and a command line utility to access image metadata." url="http://www.exiv2.org/"; depends=('libstdc++' 'zlib') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.exiv2.org/download.html|grep -m1 '.tar.gz'|sed 's/.*v2-\(.*\).t.*/\1/'" -source=($url/$pkgname-$pkgver.tar.gz) +source=($url/$pkgname-$pkgver.tar.gz SA30519.patch) Fconfopts="$Fconfopts --with-zlib=/usr" -sha1sums=('fd5cdec6b60fd52a15c73c30760e099bbfa3cf50') +sha1sums=('fd5cdec6b60fd52a15c73c30760e099bbfa3cf50' \ + '586dd4c2fb273407cab4eab0182876014dd17e05') # optimization OK diff --git a/source/lib-extra/exiv2/SA30519.patch b/source/lib-extra/exiv2/SA30519.patch new file mode 100644 index 0000000..a104f5d --- /dev/null +++ b/source/lib-extra/exiv2/SA30519.patch @@ -0,0 +1,54 @@ +--- src/nikonmn.cpp 2008/01/29 13:33:51 1385 ++++ src/nikonmn.cpp 2008/03/29 06:14:56 1399 +@@ -931,29 +931,31 @@ + std::ostream& Nikon3MakerNote::print0x0084(std::ostream& os, + const Value& value) + { +- if (value.count() == 4) { +- long len1 = value.toLong(0); +- long len2 = value.toLong(1); +- Rational fno1 = value.toRational(2); +- Rational fno2 = value.toRational(3); +- os << len1; +- if (len2 != len1) { +- os << "-" << len2; +- } +- os << "mm "; +- std::ostringstream oss; +- oss.copyfmt(os); +- os << "F" << std::setprecision(2) +- << static_cast<float>(fno1.first) / fno1.second; +- if (fno2 != fno1) { +- os << "-" << std::setprecision(2) +- << static_cast<float>(fno2.first) / fno2.second; +- } +- os.copyfmt(oss); +- } +- else { ++ if ( value.count() != 4 ++ || value.toRational(0).second == 0 ++ || value.toRational(1).second == 0) { + os << "(" << value << ")"; ++ return os; ++ } ++ long len1 = value.toLong(0); ++ long len2 = value.toLong(1); ++ ++ Rational fno1 = value.toRational(2); ++ Rational fno2 = value.toRational(3); ++ os << len1; ++ if (len2 != len1) { ++ os << "-" << len2; ++ } ++ os << "mm "; ++ std::ostringstream oss; ++ oss.copyfmt(os); ++ os << "F" << std::setprecision(2) ++ << static_cast<float>(fno1.first) / fno1.second; ++ if (fno2 != fno1) { ++ os << "-" << std::setprecision(2) ++ << static_cast<float>(fno2.first) / fno2.second; + } ++ os.copyfmt(oss); + return os; + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
