From 6cadd68681db86ee13cf800a2977cbef501d5839 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 30 Dec 2009 23:47:39 +0100 Subject: [PATCH] imlib2: update to 1.4.2, converted to subpkgs. --HG-- extra : convert_revision : 7dbd1ebba14458a807f34550b07548171b0e9028 --- srcpkgs/imlib2-devel | 1 + srcpkgs/imlib2/depends | 2 ++ srcpkgs/imlib2/imlib2-devel.template | 36 +++++++++++++++++++++ srcpkgs/imlib2/patches/bufferoverflow.patch | 13 ++++++++ srcpkgs/imlib2/template | 31 ++++++++++++++++-- 5 files changed, 80 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/imlib2-devel create mode 100644 srcpkgs/imlib2/depends create mode 100644 srcpkgs/imlib2/imlib2-devel.template create mode 100644 srcpkgs/imlib2/patches/bufferoverflow.patch diff --git a/srcpkgs/imlib2-devel b/srcpkgs/imlib2-devel new file mode 120000 index 0000000000..1c681089c9 --- /dev/null +++ b/srcpkgs/imlib2-devel @@ -0,0 +1 @@ +imlib2 \ No newline at end of file diff --git a/srcpkgs/imlib2/depends b/srcpkgs/imlib2/depends new file mode 100644 index 0000000000..d4db4c87cf --- /dev/null +++ b/srcpkgs/imlib2/depends @@ -0,0 +1,2 @@ +abi_depends=">=1.4.2" +api_depends="${abi_depends}" diff --git a/srcpkgs/imlib2/imlib2-devel.template b/srcpkgs/imlib2/imlib2-devel.template new file mode 100644 index 0000000000..29793c3c38 --- /dev/null +++ b/srcpkgs/imlib2/imlib2-devel.template @@ -0,0 +1,36 @@ +# Template file for 'imlib2-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run pkg-config +Add_dependency run zlib-devel +Add_dependency run bzip2-devel +Add_dependency run freetype-devel +Add_dependency run jpeg-devel +Add_dependency run libpng-devel +Add_dependency run tiff-devel +Add_dependency run libid3tag-devel +Add_dependency run giflib-devel +Add_dependency run libX11-devel +Add_dependency run libXext-devel +Add_dependency run imlib2 + +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/*.so ${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 +} diff --git a/srcpkgs/imlib2/patches/bufferoverflow.patch b/srcpkgs/imlib2/patches/bufferoverflow.patch new file mode 100644 index 0000000000..397b43fb8c --- /dev/null +++ b/srcpkgs/imlib2/patches/bufferoverflow.patch @@ -0,0 +1,13 @@ +--- 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/template b/srcpkgs/imlib2/template index 9c4df84ce5..b8647c59df 100644 --- a/srcpkgs/imlib2/template +++ b/srcpkgs/imlib2/template @@ -1,11 +1,12 @@ # Template build file for 'imlib2'. pkgname=imlib2 -version=1.4.0 -distfiles="$SOURCEFORGE_SITE/enlightenment/$pkgname-$version.tar.gz" +version=1.4.2 +distfiles="${SOURCEFORGE_SITE}/enlightenment/$pkgname-$version.tar.gz" build_style=gnu_configure +configure_args="--sysconfdir=/etc/imlib2 --enable-visibility-hiding" short_desc="Image manipulation library" maintainer="Juan RP " -checksum=5b663a420e1008ddc047665912cad473323803da +checksum=9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a 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 @@ -29,3 +30,27 @@ 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" +Add_dependency run glibc +Add_dependency run zlib +Add_dependency run bzip2 +Add_dependency run freetype +Add_dependency run jpeg +Add_dependency run libpng +Add_dependency run tiff +Add_dependency run libid3tag +Add_dependency run giflib +Add_dependency run libX11 +Add_dependency run libXext +Add_dependency build pkg-config +Add_dependency build zlib-devel +Add_dependency build bzip2-devel +Add_dependency build freetype-devel +Add_dependency build jpeg-devel +Add_dependency build libpng-devel +Add_dependency build tiff-devel +Add_dependency build libid3tag-devel +Add_dependency build giflib-devel +Add_dependency build libX11-devel +Add_dependency build libXext-devel