# HG changeset patch
# User Volker Grabsch
- Download |
- Changelog
+ Download |
+ Changelog
- Minor bugfixes in several packages.
-
- Almost all packages are updated to their latest version.
-
- Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2.
-
- New packages are supported:
- libass, poco, and t4k_common.
+ Almost all packages were updated to their latest version.
-
+
+ GNU Gettext
+
+
@@ -683,11 +674,11 @@
- GNU Make
≥ 3.81
Debian
+ Debian (GNU/kFreeBSD & GNU/Linux)
aptitude install -R autoconf automake bash bison bzip2 \
- cmake flex g++ intltool make sed \
+ cmake flex gettext g++ intltool make sed \
libtool libltdl-dev openssl libssl-dev \
libxml-parser-perl patch perl \
pkg-config scons unzip wget \
@@ -702,7 +693,7 @@
yum install autoconf automake bash bison bzip2 cmake \
- flex gcc-c++ intltool make sed libtool \
+ flex gcc-c++ gettext intltool make sed libtool \
openssl-devel patch perl pkgconfig scons \
yasm unzip wget xz
@@ -715,7 +706,7 @@
pkg_add -r automake111 autoconf268 bash bison cmake \
- flex gmake gsed intltool libtool openssl \
+ flex gettext gmake gsed intltool libtool openssl \
patch perl p5-XML-Parser pkg-config scons \
unzip wget yasm
@@ -739,7 +730,7 @@
pacman-g2 -S autoconf automake bash bzip2 bison cmake \
- flex gcc intltool make sed libtool openssl \
+ flex gcc gettext intltool make sed libtool openssl \
patch perl perl-xml-parser pkgconfig scons \
unzip wget xz xz-lzma yasm
@@ -754,6 +745,7 @@
emerge sys-devel/autoconf sys-devel/automake \
app-shells/bash sys-devel/bison app-arch/bzip2 \
dev-util/cmake sys-devel/flex sys-devel/gcc \
+ sys-devel/gettext \
dev-util/intltool sys-devel/make sys-apps/sed \
sys-devel/libtool dev-libs/openssl sys-devel/patch \
dev-lang/perl dev-perl/XML-Parser \
@@ -771,7 +763,7 @@
sudo port install autoconf automake bison cmake flex \ - gsed intltool libtool openssl \ + gettext gsed intltool libtool openssl \ p5-xml-parser pkgconfig scons \ wget xz yasm
@@ -797,8 +789,8 @@ On 64-bit openSUSE, install also:
zypper install -R gcc-32bit glibc-devel-32bit \ - libgcc45-32bit libgomp45-32bit \ - libstdc++45-devel-32bit+ libgcc46-32bit libgomp46-32bit \ + libstdc++46-devel-32bit
+ Minor bugfixes in several packages. +
+ ++ Almost all packages are updated to their latest version. +
+ ++ Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2. +
+ ++ New packages are supported: + libass, poco, and t4k_common. +
+
diff -r 695e9fbcb204 -r 6eed977b3bc4 src/agg.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/agg.mk Wed Mar 07 15:44:57 2012 +0100
@@ -0,0 +1,30 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+PKG := agg
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 2.5
+$(PKG)_CHECKSUM := 08f23da64da40b90184a0414369f450115cdb328
+$(PKG)_SUBDIR := agg-$($(PKG)_VERSION)
+$(PKG)_FILE := agg-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE := http://www.antigrain.com
+$(PKG)_URL := http://www.antigrain.com/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc freetype sdl
+
+define $(PKG)_UPDATE
+ wget -q -O- 'http://www.antigrain.com/download/index.html' | \
+ $(SED) -n 's,.* '$(PREFIX)/$(TARGET)/share/config.site'
+
cd '$(1)' && ./configure \
--target='$(TARGET)' \
+ --build="`config.guess`" \
--prefix='$(PREFIX)' \
--with-gcc \
--with-gnu-ld \
diff -r 695e9fbcb204 -r 6eed977b3bc4 src/boost.mk
--- a/src/boost.mk Wed Mar 07 15:44:17 2012 +0100
+++ b/src/boost.mk Wed Mar 07 15:44:57 2012 +0100
@@ -4,8 +4,8 @@
# Boost C++ Library
PKG := boost
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.46.1
-$(PKG)_CHECKSUM := 3ca6e173ec805e5126868d8a03618e587aa26aef
+$(PKG)_VERSION := 1.49.0
+$(PKG)_CHECKSUM := 26a52840e9d12f829e3008589abf0a925ce88524
$(PKG)_SUBDIR := boost_$(subst .,_,$($(PKG)_VERSION))
$(PKG)_FILE := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2
$(PKG)_WEBSITE := http://www.boost.org/
@@ -24,8 +24,8 @@
# make the build script generate .a library files instead of .lib
$(SED) -i 's,
++ false otherwise
++ */
++ static bool isIrb(const byte* pPsData,
++ long sizePsData);
++ /*!
+ @brief Validates all IRBs
+
+ @param pPsData Existing IRB buffer
+Index: trunk/src/psdimage.cpp
+===================================================================
+--- trunk/src/psdimage.cpp (revision 2645)
++++ trunk/src/psdimage.cpp (revision 2646)
+@@ -39,6 +39,7 @@
+ # include "exv_conf.h"
+ #endif
+ #include "psdimage.hpp"
++#include "jpgimage.hpp"
+ #include "image.hpp"
+ #include "basicio.hpp"
+ #include "error.hpp"
+@@ -56,11 +57,9 @@
+ // Extend this helper to a proper class with all required functionality,
+ // then move it here or into a separate file?
+
+-const uint32_t kPhotoshopResourceType = 0x3842494d; // '8BIM'
+-
+ //! @cond IGNORE
+ struct PhotoshopResourceBlock {
+- uint32_t resourceType; // always kPhotoshopResourceType
++ uint32_t resourceType; // one of the markers in Photoshop::irbId_[]
+ uint16_t resourceId;
+ unsigned char resourceName[2]; // Pascal string (length byte + characters), padded to an even size -- this assumes the empty string
+ uint32_t resourceDataSize;
+@@ -215,14 +214,11 @@
+ throw Error(3, "Photoshop");
+ }
+
+- // read resource type and ID
+- uint32_t resourceType = getULong(buf, bigEndian);
+- uint16_t resourceId = getUShort(buf + 4, bigEndian);
+-
+- if (resourceType != kPhotoshopResourceType)
++ if (!Photoshop::isIrb(buf, 4))
+ {
+ break; // bad resource type
+ }
++ uint16_t resourceId = getUShort(buf + 4, bigEndian);
+ uint32_t resourceNameLength = buf[6] & ~1;
+
+ // skip the resource name, plus any padding
+@@ -447,7 +443,8 @@
+ // read resource type and ID
+ uint32_t resourceType = getULong(buf, bigEndian);
+
+- if (resourceType != kPhotoshopResourceType) {
++ if (!Photoshop::isIrb(buf, 4))
++ {
+ throw Error(3, "Photoshop"); // bad resource type
+ }
+ uint16_t resourceId = getUShort(buf + 4, bigEndian);
+@@ -493,11 +490,12 @@
+ && resourceId != kPhotoshopResourceID_ExifInfo
+ && resourceId != kPhotoshopResourceID_XMPPacket) {
+ #ifdef DEBUG
++ std::cerr << std::hex << "copy : resourceType: " << resourceType << "\n";
+ std::cerr << std::hex << "copy : resourceId: " << resourceId << "\n";
+ std::cerr << std::dec;
+ #endif
+ // Copy resource block to new PSD file
+- ul2Data(buf, kPhotoshopResourceType, bigEndian);
++ ul2Data(buf, resourceType, bigEndian);
+ if (outIo.write(buf, 4) != 4) throw Error(21);
+ us2Data(buf, resourceId, bigEndian);
+ if (outIo.write(buf, 2) != 2) throw Error(21);
+@@ -577,8 +575,7 @@
+ std::cerr << std::hex << "write: resourceId: " << kPhotoshopResourceID_IPTC_NAA << "\n";
+ std::cerr << std::dec << "Writing IPTC_NAA: size: " << rawIptc.size_ << "\n";
+ #endif
+- ul2Data(buf, kPhotoshopResourceType, bigEndian);
+- if (out.write(buf, 4) != 4) throw Error(21);
++ if (out.write(reinterpret_cast