Date: Sat, 29 Sep 2012 12:52:00 GMT From: Oliver Hartmann <ohartman@zedat.fu-berlin.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172157: x11/babl: Version 0.1.10 avaialble and usable Message-ID: <201209291252.q8TCq0FS069904@red.freebsd.org> Resent-Message-ID: <201209291300.q8TD0JJx067221@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172157 >Category: ports >Synopsis: x11/babl: Version 0.1.10 avaialble and usable >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 29 13:00:19 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Oliver Hartmann >Release: FreeBSD 10.0-CURRENT/amd64 CLANG & FreeBSD 9.1-PRE/amd64 CLANG >Organization: FU Berlin >Environment: >Description: More modern libraries like GEGL 0.2.0 require more modern libraries like x11/babl version 0.1.10. FreeBSD ports contain the outdated 0.1.6. I was able to compile (CLANG 3.2 and GCC 4.6) and use 0.1.10 with Gimp. More testing with other on x11/babl dependend ports necessary. >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # ./babl # ./babl/files # ./babl/files/patch-sse-fixups.c # ./babl/files/patch-docs-Makefile.in # ./babl/files/patch-babl-babl-palette.c # ./babl/distinfo # ./babl/pkg-descr # ./babl/pkg-plist # ./babl/Makefile # echo c - ./babl mkdir -p ./babl > /dev/null 2>&1 echo c - ./babl/files mkdir -p ./babl/files > /dev/null 2>&1 echo x - ./babl/files/patch-sse-fixups.c sed 's/^X//' >./babl/files/patch-sse-fixups.c << '5b2f04ffdc8fd3f3d24bec6bb971ea84' X--- extensions/sse-fixups.c~ X+++ extensions/sse-fixups.c X@@ -23,6 +23,8 @@ X X #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) X X+#include <xmmintrin.h> X+ X #include <stdint.h> X #include <stdlib.h> X X@@ -40,11 +42,11 @@ typedef int g2int __attribute__ ((ve X #define g4float_zero g4float_all(0.0) X #define g4float_ff g4float_all(255.0) X X-#define g4float_max(a,b) __builtin_ia32_maxps(a, b) X-#define g4float_min(a,b) __builtin_ia32_minps(a, b) X-#define g4float_cvt2pi(a) __builtin_ia32_cvtps2pi(a) X-#define g4float_movhl(a,b) __builtin_ia32_movhlps(a, b) X-#define g4float_emms __builtin_ia32_emms X+#define g4float_max(a,b) _mm_max_ps(a, b) X+#define g4float_min(a,b) _mm_min_ps(a, b) X+#define g4float_cvt2pi(a) _mm_cvtps_pi32(a) X+#define g4float_movhl(a,b) _mm_movehl_ps(a, b) X+#define g4float_emms _mm_empty X X X static INLINE long 5b2f04ffdc8fd3f3d24bec6bb971ea84 echo x - ./babl/files/patch-docs-Makefile.in sed 's/^X//' >./babl/files/patch-docs-Makefile.in << '9d3d7f377ccad94b812efb22e50dc870' X--- docs/Makefile.in.orig 2010-02-23 09:03:35.000000000 +0100 X+++ docs/Makefile.in 2010-02-23 09:04:01.000000000 +0100 X@@ -637,7 +637,7 @@ X Makefile.am X echo -n "HTML: $@" X cp $< $@ X- (which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\ X+ (which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp -t babl` || TMPFILE="/tmp/babl_build_tempfile" ;\ X export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $(babl_html_dump) > $$TMPFILE;\ X $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ X rm -f $$TMPFILE ) 9d3d7f377ccad94b812efb22e50dc870 echo x - ./babl/files/patch-babl-babl-palette.c sed 's/^X//' >./babl/files/patch-babl-babl-palette.c << '0e6b44de671f8d2092da204a1e34b8e5' X--- babl/babl-palette.c.orig 2012-09-29 14:28:52.000000000 +0200 X+++ babl/babl-palette.c 2012-09-29 14:29:08.000000000 +0200 X@@ -19,7 +19,7 @@ X #include <stdlib.h> X #include <string.h> X #include <stdio.h> X-#include <values.h> X+#include <limits.h> X #include <assert.h> X #include "config.h" X #include "babl-internal.h" 0e6b44de671f8d2092da204a1e34b8e5 echo x - ./babl/distinfo sed 's/^X//' >./babl/distinfo << 'b36886a1d87573942d394eb0ddd9b7d8' XSHA256 (babl-0.1.10.tar.bz2) = 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 XSIZE (babl-0.1.10.tar.bz2) = 449537 b36886a1d87573942d394eb0ddd9b7d8 echo x - ./babl/pkg-descr sed 's/^X//' >./babl/pkg-descr << '7fa7c51320f1e9ebf3185ff0686175ee' XBabl is a dynamic, any to any, pixel format conversion library. It Xprovides conversions between the myriad of buffer types images can be Xstored in. Babl doesn't only help with existing pixel formats, but also Xfacilitates creation of new and uncommon ones. X XWWW: http://www.gegl.org/babl/ 7fa7c51320f1e9ebf3185ff0686175ee echo x - ./babl/pkg-plist sed 's/^X//' >./babl/pkg-plist << '4ee42826e9b00103b55711926028d6b1' Xinclude/babl-0.1/babl/babl-macros.h Xinclude/babl-0.1/babl/babl-types.h Xinclude/babl-0.1/babl/babl-version.h Xinclude/babl-0.1/babl/babl.h Xlib/babl-0.1/CIE.a Xlib/babl-0.1/CIE.la Xlib/babl-0.1/CIE.so Xlib/babl-0.1/gegl-fixups.a Xlib/babl-0.1/gegl-fixups.la Xlib/babl-0.1/gegl-fixups.so Xlib/babl-0.1/gggl-lies.a Xlib/babl-0.1/gggl-lies.la Xlib/babl-0.1/gggl-lies.so Xlib/babl-0.1/gggl.a Xlib/babl-0.1/gggl.la Xlib/babl-0.1/gggl.so Xlib/babl-0.1/gimp-8bit.a Xlib/babl-0.1/gimp-8bit.la Xlib/babl-0.1/gimp-8bit.so Xlib/babl-0.1/naive-CMYK.a Xlib/babl-0.1/naive-CMYK.la Xlib/babl-0.1/naive-CMYK.so Xlib/babl-0.1/sse-fixups.a Xlib/babl-0.1/sse-fixups.la Xlib/babl-0.1/sse-fixups.so Xlib/girepository-1.0/Babl-0.1.typelib Xlib/libbabl-0.1.a Xlib/libbabl-0.1.la Xlib/libbabl-0.1.so Xlib/libbabl-0.1.so.0 Xlibdata/pkgconfig/babl.pc Xshare/gir-1.0/Babl-0.1.gir X@dirrmtry share/gir-1.0 X@dirrmtry lib/girepository-1.0 X@dirrm lib/babl-0.1 X@dirrm include/babl-0.1/babl X@dirrm include/babl-0.1 4ee42826e9b00103b55711926028d6b1 echo x - ./babl/Makefile sed 's/^X//' >./babl/Makefile << '8b2a9a32165310322432806e6a3f57bb' X# New ports collection makefile for: babl X# Date created: 2008-04-14 X# Whom: Michael Johnson <ahze@FreeBSD.org> X# X# $FreeBSD: head/x11/babl/Makefile 300897 2012-07-14 14:29:18Z beat $ X# X XPORTNAME= babl XPORTVERSION= 0.1.10 XCATEGORIES= x11 XMASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ X http://gimp.mirrors.hoobly.com/%SUBDIR%/ \ X http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \ X ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \ X ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \ X http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ X ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,} XMASTER_SITE_SUBDIR= babl/${PORTVERSION:R} X XMAINTAINER= gnome@FreeBSD.org XCOMMENT= Dynamic pixel format conversion library X XBUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection X XUSE_LDCONFIG= yes XUSE_BZIP2= yes XUSE_AUTOTOOLS= libtool XUSE_GNOME= pkgconfig gnomehack ltverhack XUSE_GMAKE= yes X XOPTIONS= SIMD "Use cpu-specific optimizations if available" off X X.include <bsd.port.pre.mk> X X.if defined(WITHOUT_SIMD) XCONFIGURE_ARGS+=--disable-mmx \ X --disable-sse \ X --disable-altivec X.endif X Xpost-patch: X @${REINPLACE_CMD} -e 's|x86_64|amd64|g' \ X ${WRKSRC}/configure X X.include <bsd.port.post.mk> 8b2a9a32165310322432806e6a3f57bb exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209291252.q8TCq0FS069904>