OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 12-Mar-2009 23:06:58 Branch: HEAD Handle: 2009031222065800 Modified files: openpkg-src/openjpeg openjpeg.patch openjpeg.spec Log: modifying package: openjpeg-1.3 20090224 -> 20090312 Summary: Revision Changes Path 1.2 +10 -4 openpkg-src/openjpeg/openjpeg.patch 1.2 +1 -1 openpkg-src/openjpeg/openjpeg.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openjpeg/openjpeg.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 openjpeg.patch --- openpkg-src/openjpeg/openjpeg.patch 24 Feb 2009 13:56:11 -0000 1.1 +++ openpkg-src/openjpeg/openjpeg.patch 12 Mar 2009 22:06:58 -0000 1.2 @@ -1,12 +1,18 @@ Index: libopenjpeg/opj_malloc.h --- libopenjpeg/opj_malloc.h.orig 2007-12-21 11:19:01 +0100 -+++ libopenjpeg/opj_malloc.h 2009-02-24 14:47:54 +0100 -@@ -77,7 +77,7 @@ ++++ libopenjpeg/opj_malloc.h 2009-03-12 23:03:18 +0100 +@@ -75,11 +75,11 @@ + #else /* Not WIN32 */ + #if defined(__sun) #define HAVE_MEMALIGN - #elif defined(__GNUC__) +- #elif defined(__GNUC__) ++ #elif defined(__linux__) && defined(__GNUC__) #define HAVE_MEMALIGN - #include <malloc.h> + #include <stdlib.h> /* Linux x86_64 and OSX always align allocations to 16 bytes */ - #elif !defined(__amd64__) && !defined(__APPLE__) +- #elif !defined(__amd64__) && !defined(__APPLE__) ++ #elif defined(__linux__) && !defined(__amd64__) && !defined(__APPLE__) /* FIXME: Yes, this is a big assumption */ + #define HAVE_POSIX_MEMALIGN + #endif @@ . patch -p0 <<'@@ .' Index: openpkg-src/openjpeg/openjpeg.spec ============================================================================ $ cvs diff -u -r1.1 -r1.2 openjpeg.spec --- openpkg-src/openjpeg/openjpeg.spec 24 Feb 2009 13:56:11 -0000 1.1 +++ openpkg-src/openjpeg/openjpeg.spec 12 Mar 2009 22:06:58 -0000 1.2 @@ -36,7 +36,7 @@ Group: Graphics License: BSD Version: %{V_opkg} -Release: 20090224 +Release: 20090312 # list of sources Source0: http://www.openjpeg.org/openjpeg_v%{V_dist}.tar.gz @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org