From fa0c8e1b78da2f76d1545587497d66fc243087fb Mon Sep 17 00:00:00 2001 From: pvalchev Date: Sun, 4 Jan 2004 20:32:29 +0000 Subject: [PATCH] update to libuta-0.4.4 gcc3 patch from espie --- devel/libuta/Makefile | 9 ++- devel/libuta/distinfo | 6 +- devel/libuta/patches/patch-configure | 32 ++++---- devel/libuta/patches/patch-demos_Makefile_in | 12 --- devel/libuta/patches/patch-uta_Makefile_in | 8 +- devel/libuta/patches/patch-uta_blitters_cc | 81 +++++++++++++------- devel/libuta/patches/patch-uta_painter_cc | 11 +++ devel/libuta/pkg/PFRAG.shared | 4 +- 8 files changed, 95 insertions(+), 68 deletions(-) delete mode 100644 devel/libuta/patches/patch-demos_Makefile_in create mode 100644 devel/libuta/patches/patch-uta_painter_cc diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile index 2480945e4db..22ddd9e925e 100644 --- a/devel/libuta/Makefile +++ b/devel/libuta/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2003/04/19 13:30:47 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2004/01/04 20:32:29 pvalchev Exp $ COMMENT= "graphical user interface library for C++" -VERSION= 0.3.40 +VERSION= 0.4.4 DISTNAME= libuta-${VERSION} CATEGORIES= devel @@ -17,8 +17,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libuta/} -PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \ - ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \ +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \ patch-* LIB_DEPENDS= smpeg.1.3::devel/smpeg \ @@ -33,6 +33,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include/libpng" \ LDFLAGS="-L${LOCALBASE}/lib" +MAKE_FLAGS= libuta_la_LDFLAGS="-version-info 41:0:0" VMEM_WARNING= Yes diff --git a/devel/libuta/distinfo b/devel/libuta/distinfo index 40dbd39678e..43fd5140189 100644 --- a/devel/libuta/distinfo +++ b/devel/libuta/distinfo @@ -1,3 +1,3 @@ -MD5 (libuta-0.3.40.tar.gz) = 9bee842ac5d81b44ee58a3000f3136ad -RMD160 (libuta-0.3.40.tar.gz) = e2047cd3442168441705b99777da107b3606ea79 -SHA1 (libuta-0.3.40.tar.gz) = 3b5fbac69baa781199503786f050b5deb5652661 +MD5 (libuta-0.4.4.tar.gz) = 1326c9f4a9de768289b9cb5f18a54cdc +RMD160 (libuta-0.4.4.tar.gz) = a27897dc493d10b987e800f0170b7f7d520e6ead +SHA1 (libuta-0.4.4.tar.gz) = 9ec1234558979cffa82f277e98ec195c2ec08769 diff --git a/devel/libuta/patches/patch-configure b/devel/libuta/patches/patch-configure index e6f5cb99792..6fbfe60d0af 100644 --- a/devel/libuta/patches/patch-configure +++ b/devel/libuta/patches/patch-configure @@ -1,27 +1,25 @@ -$OpenBSD: patch-configure,v 1.3 2002/05/27 02:50:14 brad Exp $ ---- configure.orig Sat Jul 28 09:50:41 2001 -+++ configure Sun May 26 22:36:44 2002 -@@ -3569,10 +3569,6 @@ cross_compiling=$ac_cv_prog_cc_cross - - - --CFLAGS= --CXXFLAGS= --CPPFLAGS=-Wall -- - case $win32 in - true) - -@@ -4062,7 +4058,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a +$OpenBSD: patch-configure,v 1.4 2004/01/04 20:32:29 pvalchev Exp $ +--- configure.orig 2004-01-03 10:20:49.000000000 -0700 ++++ configure 2004-01-03 10:20:55.000000000 -0700 +@@ -4450,14 +4450,14 @@ fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:4455: checking for pthread_create in -lc_r" >&5 ++ echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6 ++echo "configure:4455: checking for pthread_create in -pthread" >&5 + ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lc_r $LIBS" +LIBS="-pthread $LIBS" cat > conftest.$ac_ext < -+#include + #include ++#include namespace uta { --#ifndef X86_ASSEMBLER -+#ifdef __OpenBSD__ -+#undef X86_ASSEMBLER -+#endif -+#if !defined(X86_ASSEMBLER) +@@ -35,7 +36,7 @@ void gammablit_RGBA8888_RGBA8888(Surface + char g, + const Rect& srcRect, const Point& dstPoint) + { +- cerr << "processor seems not to be MMX capable, sorry. " << endl; ++ std::cerr << "processor seems not to be MMX capable, sorry. " << std::endl; + } + + /** Convert RGBA8888 to RGB565 and apply const gamma value. +@@ -45,7 +46,7 @@ void gammablit_RGBA8888_RGB565(Surface* + char g, + const Rect& srcRect, const Point& dstPoint) + { +- cerr << "processor seems not to be MMX capable, sorry. " << endl; ++ std::cerr << "processor seems not to be MMX capable, sorry. " << std::endl; + } /** Apply const gamma value. - Blit just copies alpha value of the source to the destination surface. -@@ -1599,7 +1602,7 @@ void gammablit(Surface* dst, const Surfa - gammablit_C(dst,src,g,srcRect,dstPoint); - } - #else -- gammablit_C(dst,src,g,srcRect,dstPoint) -+ gammablit_C(dst,src,g,srcRect,dstPoint); - #endif +@@ -54,7 +55,7 @@ void gammablit_RGB565_RGB565(Surface* ds + char g, + const Rect& srcRect, const Point& dstPoint) + { +- cerr << "processor seems not to be MMX capable, sorry. " << endl; ++ std::cerr << "processor seems not to be MMX capable, sorry. " << std::endl; } -@@ -1626,7 +1629,7 @@ void gammablit(Surface* dst, const Surfa - gammablit_C(dst,src,func,srcRect,dstPoint); - } - #else -- gammablit_C(dst,src,func,srcRect,dstPoint) -+ gammablit_C(dst,src,func,srcRect,dstPoint); - #endif + /** Apply per pixel gamma value. +@@ -64,7 +65,7 @@ void gammablit_RGBA8888_RGBA8888(Surface + GammaFunction* func, + const Rect& srcRect, const Point& dstPoint) + { +- cerr << "processor seems not to be MMX capable, sorry. " << endl; ++ std::cerr << "processor seems not to be MMX capable, sorry. " << std::endl; } + /** Convert RGBA8888 to RGB565 and apply per pixel gamma value. +@@ -74,7 +75,7 @@ void gammablit_RGBA8888_RGB565(Surface* + GammaFunction* func, + const Rect& srcRect, const Point& dstPoint) + { +- cerr << "processor seems not to be MMX capable, sorry. " << endl; ++ std::cerr << "processor seems not to be MMX capable, sorry. " << std::endl; + } + + /** Apply per pixel gamma value. +@@ -83,7 +84,7 @@ void gammablit_RGB565_RGB565(Surface* ds + GammaFunction* func, + const Rect& srcRect, const Point& dstPoint) + { +- cerr << "processor seems not to be MMX capable, sorry. " << endl; ++ std::cerr << "processor seems not to be MMX capable, sorry. " << std::endl; + } + + #else // ! X86_ASSEMBLER diff --git a/devel/libuta/patches/patch-uta_painter_cc b/devel/libuta/patches/patch-uta_painter_cc new file mode 100644 index 00000000000..18e43c36489 --- /dev/null +++ b/devel/libuta/patches/patch-uta_painter_cc @@ -0,0 +1,11 @@ +$OpenBSD: patch-uta_painter_cc,v 1.1 2004/01/04 20:32:29 pvalchev Exp $ +--- uta/painter.cc.orig 2004-01-04 15:23:44.000000000 +0100 ++++ uta/painter.cc 2004-01-04 15:23:52.000000000 +0100 +@@ -27,6 +27,7 @@ + #include "debug.h" + + #include ++#include + + namespace uta { + diff --git a/devel/libuta/pkg/PFRAG.shared b/devel/libuta/pkg/PFRAG.shared index d69fae35d68..6514cbe788d 100644 --- a/devel/libuta/pkg/PFRAG.shared +++ b/devel/libuta/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2001/08/20 06:40:52 pvalchev Exp $ -lib/libuta.so.40.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2004/01/04 20:32:30 pvalchev Exp $ +lib/libuta.so.41.0 DYNLIBDIR(%B)