Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1205

Modified Files:
        libbabl0.0.0-shlibs.info libbabl0.0.0-shlibs.patch 
Log Message:
new version...ugh


Index: libbabl0.0.0-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/libbabl0.0.0-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libbabl0.0.0-shlibs.info    15 Jul 2008 01:41:14 -0000      1.2
+++ libbabl0.0.0-shlibs.info    17 Nov 2008 20:06:51 -0000      1.3
@@ -1,21 +1,21 @@
 Package: libbabl0.0.0-shlibs
-Version: 0.0.20
+Version: 0.0.22
 Revision: 1
 
 Source: ftp://ftp.gtk.org/pub/babl/0.0/babl-%v.tar.bz2
-Source-MD5: dbf67b333b0812dfe0d0f057864b0f9a
+Source-MD5: b821ce696b40feb74552da9d666defad
 
 BuildDepends: <<
        autoconf (>= 2.60),
-       automake1.9,
+       automake1.10,
        libtool14,
        fink (>= 0.28.0-1)
 <<
 
 PatchFile: %n.patch
-PatchFile-MD5: 7b96873aaefe4f422d1d4853a5a90955
+PatchFile-MD5: 57057e5ee3fdbacc8fa2987258460613
 
-ConfigureParams: --disable-dependency-tracking --enable-static
+ConfigureParams: --disable-dependency-tracking --disable-static 
--disable-altivec
 CompileScript: <<
        autoreconf -f -i
        ac_cv_path_INKSCAPE=no ac_cv_path_W3M=no ./configure %c
@@ -24,7 +24,7 @@
 InstallScript: make install DESTDIR=%d
 DocFiles: AUTHORS COPYING* ChangeLog NEWS README
 
-Shlibs: %p/lib/libbabl-0.0.0.dylib 21.0.0 %n (>= 0.0.20-1)
+Shlibs: %p/lib/libbabl-0.0.0.dylib 23.0.0 %n (>= 0.0.22-1)
 
 SplitOff: <<
        Package: libbabl0.0.0-dev
@@ -32,7 +32,7 @@
        BuildDependsOnly: true
        Files: <<
                include
-               lib/libbabl-0.0.{a,dylib,la}
+               lib/libbabl-0.0.{dylib,la}
                lib/pkgconfig
        <<
        DocFiles: AUTHORS COPYING* ChangeLog NEWS README
@@ -47,8 +47,12 @@
        Need to clean up -I flag usage. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=519794
 
-       Remove un-needed -ldl. See:
-       http://bugzilla.gnome.org/show_bug.cgi?id=519796
+       Fix non-portable Makefile constructs. See:
+
+       Disable altivec for portability. Otherwise have to fix missing
+       typedef in babl-cpuaccel.c. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=561270
+       NB: i86 asm code untested
 <<
 DescPackaging: <<
        Uses a subdir for the plugin interface version (of which

Index: libbabl0.0.0-shlibs.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/libbabl0.0.0-shlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libbabl0.0.0-shlibs.patch   15 Jul 2008 01:41:14 -0000      1.2
+++ libbabl0.0.0-shlibs.patch   17 Nov 2008 20:06:51 -0000      1.3
@@ -1,17 +1,7 @@
-diff -Nurd babl-0.0.20.orig/babl/Makefile.am babl-0.0.20/babl/Makefile.am
---- babl-0.0.20.orig/babl/Makefile.am  2008-01-17 16:47:18.000000000 -0500
-+++ babl-0.0.20/babl/Makefile.am       2008-03-02 23:27:10.000000000 -0500
-@@ -54,5 +54,5 @@
-       @LTLIBOBJS@
- 
- [EMAIL PROTECTED]@_la_LDFLAGS=                \
--      ${no_undefined} ${DL_LIB} $(MATH_LIB)   \
-+      ${no_undefined} $(MATH_LIB)     \
-       -version-info $(BABL_LIBRARY_VERSION)
-diff -Nurd babl-0.0.20.orig/babl/babl-extension.c 
babl-0.0.20/babl/babl-extension.c
---- babl-0.0.20.orig/babl/babl-extension.c     2008-02-15 16:11:44.000000000 
-0500
-+++ babl-0.0.20/babl/babl-extension.c  2008-03-02 22:54:05.000000000 -0500
-@@ -235,7 +235,7 @@
+diff -Nurd -x'*~' babl-0.0.22.orig/babl/babl-extension.c 
babl-0.0.22/babl/babl-extension.c
+--- babl-0.0.22.orig/babl/babl-extension.c     2008-04-15 17:10:07.000000000 
-0400
++++ babl-0.0.22/babl/babl-extension.c  2008-11-17 13:14:34.000000000 -0500
+@@ -238,7 +238,7 @@
                stat (path, &st);
  
                if ((extension = strrchr (dentry->d_name, '.')) != NULL &&
@@ -20,20 +10,22 @@
                  {
                    babl_extension_load (path);
                  }
-diff -Nurd babl-0.0.20.orig/babl.pc.in babl-0.0.20/babl.pc.in
---- babl-0.0.20.orig/babl.pc.in        2007-11-10 08:48:08.000000000 -0500
-+++ babl-0.0.20/babl.pc.in     2008-03-03 00:04:18.000000000 -0500
-@@ -7,5 +7,5 @@
- Description: Dynamic, any to any, pixel format conversion library
- Version: @BABL_REAL_VERSION@
- Cflags: -I${includedir}/@[EMAIL PROTECTED]@BABL_API_VERSION@
--Libs: -L${libdir} [EMAIL PROTECTED]@[EMAIL PROTECTED]@ @DL_LIB@ @MATH_LIB@
-+Libs: -L${libdir} [EMAIL PROTECTED]@[EMAIL PROTECTED]@ @MATH_LIB@
+diff -Nurd -x'*~' babl-0.0.22.orig/babl/base/Makefile.am 
babl-0.0.22/babl/base/Makefile.am
+--- babl-0.0.22.orig/babl/base/Makefile.am     2007-11-10 08:48:07.000000000 
-0500
++++ babl-0.0.22/babl/base/Makefile.am  2008-11-17 14:30:07.000000000 -0500
+@@ -18,7 +18,7 @@
+ noinst_LTLIBRARIES= libbase.la
+ libbase_la_SOURCES= $(h_sources) $(c_sources) 
  
-diff -Nurd babl-0.0.20.orig/configure.ac babl-0.0.20/configure.ac
---- babl-0.0.20.orig/configure.ac      2008-02-27 06:15:22.000000000 -0500
-+++ babl-0.0.20/configure.ac   2008-03-02 22:48:43.000000000 -0500
-@@ -158,30 +158,9 @@
+-EXTRA_DIST :=                 \
++EXTRA_DIST =          \
+       rgb-constants.h \
+       util.h
+ 
+diff -Nurd -x'*~' babl-0.0.22.orig/configure.ac babl-0.0.22/configure.ac
+--- babl-0.0.22.orig/configure.ac      2008-06-12 14:54:21.000000000 -0400
++++ babl-0.0.22/configure.ac   2008-11-17 13:14:34.000000000 -0500
+@@ -178,30 +178,9 @@
  ####################################################
  # Check how to generate plug-ins (with gcc at least)
  ####################################################
@@ -66,17 +58,7 @@
  
  dnl 
===========================================================================
  
-@@ -226,8 +205,7 @@
- 
- dnl 
===========================================================================
- 
--AC_CHECK_LIB([dl], [dlopen], [DL_LIB="-ldl"])
--AC_SUBST(DL_LIB)
-+AC_SEARCH_LIBS([dlopen], [dl])
- 
- AC_REPLACE_FUNCS(gettimeofday)
- 
-@@ -237,7 +215,7 @@
+@@ -377,7 +356,7 @@
  AC_DEFINE_UNQUOTED(BABL_DIR_SEPARATOR, "$DIR_SEP", [separator between 
directories in BABL_PATH])
  
  AC_DEFINE_UNQUOTED(BABL_LIBRARY, "$PACKAGE_NAME-$BABL_API_VERSION", [name of 
BABL library])
@@ -85,10 +67,22 @@
  
  
  dnl 
===========================================================================
-diff -Nurd babl-0.0.20.orig/extensions/Makefile.am 
babl-0.0.20/extensions/Makefile.am
---- babl-0.0.20.orig/extensions/Makefile.am    2008-02-26 21:23:45.000000000 
-0500
-+++ babl-0.0.20/extensions/Makefile.am 2008-03-03 00:43:46.000000000 -0500
-@@ -1,57 +1,49 @@
+diff -Nurd -x'*~' babl-0.0.22.orig/docs/graphics/Makefile.am 
babl-0.0.22/docs/graphics/Makefile.am
+--- babl-0.0.22.orig/docs/graphics/Makefile.am 2007-11-10 08:48:08.000000000 
-0500
++++ babl-0.0.22/docs/graphics/Makefile.am      2008-11-17 14:31:43.000000000 
-0500
+@@ -31,7 +31,7 @@
+ if HAVE_INKSCAPE
+ dist-check-inkscape:
+ 
+-%.png: %.svg
++.svg.png:
+       $(INKSCAPE_CMD)
+ #-e $@ $< 2>/dev/null
+ 
+diff -Nurd -x'*~' babl-0.0.22.orig/extensions/Makefile.am 
babl-0.0.22/extensions/Makefile.am
+--- babl-0.0.22.orig/extensions/Makefile.am    2008-05-23 10:37:21.000000000 
-0400
++++ babl-0.0.22/extensions/Makefile.am 2008-11-17 14:27:02.000000000 -0500
+@@ -1,60 +1,48 @@
  # General minimalistic compile file for self contained single
  # file babl_extensions
  
@@ -105,28 +99,21 @@
 -all-local: $(SOBJS)
 -
 -CFLAGS += \
--      -I $(top_builddir)              \
--      -I $(top_srcdir)                \
--      -I $(top_srcdir)/babl           \
--      -I $(top_srcdir)/extensions     \
--      -fPIC
 +INCLUDES = \
-+      -I$(top_builddir)               \
-+      -I$(top_srcdir)                 \
-+      -I$(top_srcdir)/babl            \
-+      -I$(top_srcdir)/extensions
+       -I $(top_builddir)              \
+       -I $(top_srcdir)                \
+       -I $(top_srcdir)/babl           \
+       -I $(top_srcdir)/extensions     \
+       -fPIC
  
 -LDFLAGS += $(DYNAMICLIB)
-+LIBADD = $(top_builddir)/babl/libbabl-$(BABL_API_VERSION).la $(MATH_LIB)
- 
-+AM_LDFLAGS = -module -avoid-version
- if OS_WIN32
+-
+-if OS_WIN32
 -LDADD    = $(no-undefined) $(libbabldlla) $(MATH_LIB)
 -else
 -LDADD    = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION)$(SHREXT) 
$(MATH_LIB)
-+AM_LDFLAGS += -no-undefined
- endif
- 
+-endif
+-
 -%$(SHREXT): %.c
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 -
@@ -137,6 +124,9 @@
 -
 -CIE-Lab$(SHREXT): CIE-Lab.c
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+-
+-sse-fixups$(SHREXT): sse-fixups.c
+-      $(CC) $(CFLAGS) $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) $(LDFLAGS) -o 
$@ $< $(LDADD)
 -#lcms$(SHREXT): lcms.c
 -#     $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags 
--libs`
 -#############################################################################
@@ -145,26 +135,36 @@
 -      rm -f $(SOBJS)
 -
 -ext_dir = $(DESTDIR)$(libdir)/[EMAIL PROTECTED]@
-+extensionsdir = $(libdir)/[EMAIL PROTECTED]@
++LIBADD = $(top_builddir)/babl/libbabl-$(BABL_API_VERSION).la
++AM_LDFLAGS = -module -avoid-version -no-undefined
  
 -install-exec-local: all-local
 -      $(INSTALL) -d $(ext_dir)
 -      $(INSTALL) $(SOBJS) $(ext_dir)
++extdir = $(libdir)/[EMAIL PROTECTED]@
+ 
+-uninstall-local:
+-      rm -f $(INSTALLED_ITEMS)
 +# each plugin is listed in extensions_LTLIBRARIES with a .la extension
 +# (will be replaced by the platform-dependent extension by libtool)
-+extensions_LTLIBRARIES =      \
++ext_LTLIBRARIES =     \
 +      CIE-Lab.la      \
 +      gegl-fixups.la  \
 +      gggl-lies.la    \
 +      gggl.la         \
 +      gimp-8bit.la    \
-+      naive-CMYK.la
++      naive-CMYK.la   \
++      sse-fixups.la
  
--uninstall-local:
--      rm -f $(INSTALLED_ITEMS)
+-check-local: all-local
 +# the source file(s) for each extensions_LTLIBRARIES are listed here
 +# (periods and hyphens in an extensions_LTLIBRARIES entry are
 +# converted to underscores for the *_SOURCES variable-name)
++# INCLUDES is an implicit default for all extensions. If special flags
++# are needed for a certain foo.la extension, it can be over-ridden,
++# and also other libraries can be added as needed:
++# foo_la_CPPFLAGS = -Isomedir $(INCLUDES)
++# foo_la_LIBADD = -lsomelib $(LIBADD)
 +CIE_Lab_la_SOURCES = CIE-Lab.c
 +CIE_Lab_la_LIBADD = $(LIBADD)
 +gegl_fixups_la_SOURCES = gegl-fixups.c
@@ -177,26 +177,5 @@
 +gimp_8bit_la_LIBADD = $(LIBADD)
 +naive_CMYK_la_SOURCES = naive-CMYK.c
 +naive_CMYK_la_LIBADD = $(LIBADD)
- 
--check-local: all-local
-+# INCLUDES is an implicit default for all extensions. If special flags
-+# are needed for a certain foo.la extension, it can be over-ridden,
-+# and also other libraries can be added as needed:
-+# foo_la_CPPFLAGS = -Isomedir $(INCLUDES)
-+# foo_la_LIBADD = -lsomelib $(LIBADD)
-diff -Nurd babl-0.0.20.orig/tests/Makefile.am babl-0.0.20/tests/Makefile.am
---- babl-0.0.20.orig/tests/Makefile.am 2007-11-10 08:48:07.000000000 -0500
-+++ babl-0.0.20/tests/Makefile.am      2008-03-01 15:27:52.000000000 -0500
-@@ -23,10 +23,10 @@
- models_SOURCES              = models.c
- 
- 
--AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
- 
- LDADD = $(top_builddir)/babl/[EMAIL PROTECTED]@.la \
--      $(DL_LIB) $(MATH_LIB)
-+      $(MATH_LIB)
- 
- noinst_PROGRAMS =             \
-       introspect              \
++sse_fixups_la_SOURCES = sse-fixups.c
++sse_fixups_la_LIBADD = $(LIBADD)


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to