[csw-devel] SF.net SVN: gar:[20486] csw/mgar/pkg/imlib2/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Mar 20 13:54:07 CET 2013 

Revision: 20486
          http://gar.svn.sourceforge.net/gar/?rev=20486&view=rev
Author:   dmichelsen
Date:     2013-03-20 12:54:06 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
imlib2/trunk: Update to 1.4.5, split package

Modified Paths:
--------------
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch

Modified: csw/mgar/pkg/imlib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2/trunk/Makefile	2013-03-20 09:45:08 UTC (rev 20485)
+++ csw/mgar/pkg/imlib2/trunk/Makefile	2013-03-20 12:54:06 UTC (rev 20486)
@@ -1,5 +1,5 @@
 NAME = imlib2
-VERSION = 1.4.4
+VERSION = 1.4.5
 GARTYPE = v2
 
 DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library
@@ -12,33 +12,55 @@
 
 SF_PROJECT = enlightenment
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += $(NAME)-$(VERSION).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PATCHFILES += 0001-Make-sure-we-have-XK_q.patch
 
-RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag
-RUNTIME_DEP_PKGS += CSWpng CSWtiff CSWzlib
+BUILD_DEP_PKGS += CSWlibbz2-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibid3-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWlibtiff-dev
+BUILD_DEP_PKGS += CSWlibjpeg-dev
+BUILD_DEP_PKGS += CSWlibgif-dev
 
-BUILD64_LIBS_ONLY = 1
+PACKAGES += CSWlibimlib2-1
+SPKG_DESC_CSWlibimlib2-1 = A powerful graphics library, libImlib2.so.1
+PKGFILES_CSWlibimlib2-1 += $(call pkgfiles_lib,libImlib2.so.1)
+PKGFILES_CSWlibimlib2-1 += $(call baseisadirs,$(libdir),imlib2/.*)
+PKGFILES_CSWlibimlib2-1 += $(sharedstatedir)/imlib2/.*
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibid3tag
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibgif4
+
+# This path is in addition to the correct /usr/openwin/lib/X11/rgb.txt
+CHECKPKG_OVERRIDES_CSWlibimlib2-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/imlib2/loaders/xpm.so
+CHECKPKG_OVERRIDES_CSWlibimlib2-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/imlib2/loaders/xpm.so
+CHECKPKG_OVERRIDES_CSWlibimlib2-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/imlib2/loaders/xpm.so
+
+PACKAGES += CSWlibimlib2-dev
+SPKG_DESC_CSWlibimlib2-dev = Development files for libImlib2.so.1
+PKGFILES_CSWlibimlib2-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibimlib2-dev += CSWlibimlib2-1
+
+PACKAGES += CSWimlib2
+SPKG_DESC_CSWimlib2 = Imlib2 tools
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWimlib2 += CSWlibimlib2-1
+
+BUILD64 = 1
+ISAEXEC = 1
+
+# giflib needs this for stdbool.h
+#EXTRA_CFLAGS += -xc99
+EXTRA_CPPFLAGS += -xc99
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bmp.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/tiff.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bz2.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/jpeg.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/pnm.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/zlib.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/lbm.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/xpm.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/gif.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libImlib2.so.1.4.4
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/tga.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/png.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/argb.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/filters/colormod.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/filters/bumpmap.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/filters/testfilter.so
-CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/id3.so
-
 include gar/category.mk

Modified: csw/mgar/pkg/imlib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/imlib2/trunk/checksums	2013-03-20 09:45:08 UTC (rev 20485)
+++ csw/mgar/pkg/imlib2/trunk/checksums	2013-03-20 12:54:06 UTC (rev 20486)
@@ -1 +1 @@
-b6de51879502e857d5b1f7622267a030  imlib2-1.4.4.tar.bz2
+859e5fede51ec819f4314eee11da3ea5  imlib2-1.4.5.tar.bz2

Added: csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch
===================================================================
--- csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch	                        (rev 0)
+++ csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch	2013-03-20 12:54:06 UTC (rev 20486)
@@ -0,0 +1,25 @@
+From cc3650373623cda65498902e964aa985e128eaad Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 20 Mar 2013 10:51:03 +0100
+Subject: [PATCH] Make sure we have XK_q
+
+---
+ src/bin/imlib2_view.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
+index 7a84211..ded57f8 100644
+--- a/src/bin/imlib2_view.c
++++ b/src/bin/imlib2_view.c
+@@ -5,6 +5,8 @@
+ #include <X11/extensions/shape.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xos.h>
++#define XK_LATIN1 1
++#include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list