From 83e34ec6d040075e81a382e035945bfac6b04c36 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Jun 2012 10:21:02 +0200
Subject: [PATCH] imlib2: update to 1.4.5.
---
common/shlibs | 2 +-
srcpkgs/imlib2/imlib2-devel.template | 25 ++++++-------------
srcpkgs/imlib2/imlib2.rshlibs | 2 +-
srcpkgs/imlib2/patches/bufferoverflow.patch | 13 ----------
.../src_modules_filters_libmath_symbols.patch | 18 -------------
srcpkgs/imlib2/template | 12 ++++-----
6 files changed, 14 insertions(+), 58 deletions(-)
delete mode 100644 srcpkgs/imlib2/patches/bufferoverflow.patch
delete mode 100644 srcpkgs/imlib2/patches/src_modules_filters_libmath_symbols.patch
diff --git a/common/shlibs b/common/shlibs
index 4a1f65f71e..cfc4121264 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -358,7 +358,7 @@ libmp4av.so libmp4v2-1.9.1_1
libmpeg4ip_gnu.so libmp4v2-1.9.1_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
-libid3tag.so.0 libid3tag-0.15.1b
+libid3tag.so.0 libid3tag-0.15.1b_1
libgif.so.4 giflib-4.1.6_1
libungif.so.4 giflib-4.1.6_1
libImlib2.so.1 imlib2-1.4.2_1
diff --git a/srcpkgs/imlib2/imlib2-devel.template b/srcpkgs/imlib2/imlib2-devel.template
index c84d2968fb..21c7529548 100644
--- a/srcpkgs/imlib2/imlib2-devel.template
+++ b/srcpkgs/imlib2/imlib2-devel.template
@@ -1,26 +1,15 @@
# Template file for 'imlib2-devel'.
#
-depends="pkg-config zlib-devel bzip2-devel freetype-devel jpeg-devel libpng-devel tiff-devel libid3tag-devel giflib-devel libX11-devel libXext-devel"
+depends="imlib2>=$version"
short_desc="${short_desc} (development files)"
long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib/imlib2/loaders
- mkdir -p ${DESTDIR}/usr/lib/imlib2/filters
-
- mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/imlib2/loaders/*.a \
- ${DESTDIR}/usr/lib/imlib2/loaders
- mv ${SRCPKGDESTDIR}/usr/lib/imlib2/filters/*.a \
- ${DESTDIR}/usr/lib/imlib2/filters
- mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+do_install() {
+ vmove usr/bin usr
+ vmove usr/include usr
+ vmove usr/share usr
+ vmove usr/lib/pkgconfig usr/lib
+ vmove "usr/lib/*.a" usr/lib
}
diff --git a/srcpkgs/imlib2/imlib2.rshlibs b/srcpkgs/imlib2/imlib2.rshlibs
index d39ebf6dbc..d79c319fed 100644
--- a/srcpkgs/imlib2/imlib2.rshlibs
+++ b/srcpkgs/imlib2/imlib2.rshlibs
@@ -7,7 +7,7 @@ libdl.so.2
libm.so.6
libc.so.6
libjpeg.so.8
-libpng14.so.14
libgif.so.4
libid3tag.so.0
libtiff.so.5
+libpng15.so.15
diff --git a/srcpkgs/imlib2/patches/bufferoverflow.patch b/srcpkgs/imlib2/patches/bufferoverflow.patch
deleted file mode 100644
index 397b43fb8c..0000000000
--- a/srcpkgs/imlib2/patches/bufferoverflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c.new
-@@ -246,8 +246,8 @@
- return 0;
- }
- ptr = im->data;
-- end = ptr + (sizeof(DATA32) * w * h);
- pixels = w * h;
-+ end = ptr + pixels;
- }
- else
- {
-
diff --git a/srcpkgs/imlib2/patches/src_modules_filters_libmath_symbols.patch b/srcpkgs/imlib2/patches/src_modules_filters_libmath_symbols.patch
deleted file mode 100644
index 6d508cb9bf..0000000000
--- a/srcpkgs/imlib2/patches/src_modules_filters_libmath_symbols.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-bumpmap: uses sqrt(3).
-colomod: uses pow(3).
-
---- src/modules/filters/Makefile.in.orig 2008-10-21 05:02:00.000000000 +0200
-+++ src/modules/filters/Makefile.in 2012-01-14 16:24:41.858233130 +0100
-@@ -225,10 +225,10 @@ testfilter_la_LDFLAGS = -module -avoid-v
- testfilter_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
- bumpmap_la_SOURCES = filter_bumpmap.c
- bumpmap_la_LDFLAGS = -module -avoid-version
--bumpmap_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-+bumpmap_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la -lm
- colormod_la_SOURCES = filter_colormod.c
- colormod_la_LDFLAGS = -module -avoid-version
--colormod_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-+colormod_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la -lm
- all: all-am
-
- .SUFFIXES:
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index b096a0d0b0..e832c41f15 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,14 +1,15 @@
# Template build file for 'imlib2'.
pkgname=imlib2
-version=1.4.2
-revision=5
+version=1.4.5
+revision=1
distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
build_style=gnu-configure
configure_args="--sysconfdir=/etc/imlib2 --enable-visibility-hiding"
-makedepends="pkg-config zlib-devel freetype-devel jpeg-devel libpng-devel tiff-devel libid3tag-devel giflib-devel libX11-devel libXext-devel"
+makedepends="pkg-config freetype-devel jpeg-devel libpng-devel>=1.5.10 tiff-devel libid3tag-devel giflib-devel libXext-devel"
+subpackages="imlib2-devel"
short_desc="Image manipulation library"
maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a
+checksum=6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0
long_desc="
Imlib 2 is the successor to Imlib. It is NOT a newer version - it is a
completely new library. Imlib 2 can be installed alongside Imlib 1.x
@@ -32,6 +33,3 @@ long_desc="
* Provide plug-in filter interface
* Provide on-the-fly runtime plug-in image loading and saving interface
* Fastest image compositing, rendering and manipulation library for X"
-
-subpackages="$pkgname-devel"
-