[csw-devel] SF.net SVN: gar:[19861] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile

[guengel at users.sourceforge.net]

Revision: 19861
          http://gar.svn.sourceforge.net/gar/?rev=19861&view=rev
Author:   guengel
Date:     2012-12-09 09:51:18 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
gdk-pixbuf/trunk: Bumped to 2.24.1. Updated dependencies.

Modified Paths:
--------------
    csw/mgar/pkg/gdk-pixbuf/trunk/Makefile

Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2012-12-08 21:32:50 UTC (rev 19860)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2012-12-09 09:51:18 UTC (rev 19861)
@@ -24,19 +24,14 @@
 # To retain backwards compatibility with gdk pixbuf package 0.22
 CATALOGNAME_CSWgdkpixbuf = gdk_pixbuf
 SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION)
-PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call pkgfiles_lib,gdk-pixbuf-2.0/.*)
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf2-0-0
-# RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0
+RUNTIME_DEP_PKGS_CSWgdkpixbuf  = CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0
-
+RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng15-15
 # I assume if one installs CSWgdkpixbuf, one wants all the stuff
 # except -dev
 CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0
@@ -52,34 +47,25 @@
 
 PACKAGES += CSWlibgdk-pixbuf2-0-0
 SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0
-PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call baseisadirs,$(libdir),libgdk_pixbuf-2\.0\.so\.0(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0  = CSWlibgio2-0-0
+PKGFILES_CSWlibgdk-pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0  = CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibpng12-0
 
 PACKAGES += CSWlibgdk-pixbuf-xlib2-0-0
 SPKG_DESC_CSWlibgdk-pixbuf-xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0
 PKGFILES_CSWlibgdk-pixbuf-xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0  = CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibglib2-0-0
 
 PACKAGES += CSWlibgdk-pixbuf-dev
 SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION)
 PKGFILES_CSWlibgdk-pixbuf-dev = $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev = CSWgdkpixbuf
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0
+# CSWgdkpixbuf is supposed to pull in all deps.
+CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev = missing-dependency|CSWlibgdk-pixbuf2-0-0
 
+
 BUILD_DEP_PKGS  = CSWggettext-dev
 BUILD_DEP_PKGS += CSWjbigkit
 BUILD_DEP_PKGS += CSWlibglib2-dev
@@ -91,10 +77,12 @@
 
 BUILD64 = 1
 
+# We need the binaries to query 64 bit modules
+MERGE_DIRS_isa-extra = $(bindir) $(libdir)
+
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-x11
-# CONFIGURE_ARGS += --with-libiconv-prefix
-# CONFIGURE_ARGS += --with-libintl-prefix
+CONFIGURE_ARGS += --with-libiconv-prefix
+CONFIGURE_ARGS += --with-libintl-prefix
 
 include gar/category.mk
 

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