cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to libuta-0.4.4

Browse Source 
gcc3 patch from espie
This commit is contained in:
pvalchev 2004-01-04 20:32:29 +00:00
parent fd5ad14e58
commit fa0c8e1b78
8 changed files with 95 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/libuta/Makefile
View File

@ -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

6
devel/libuta/distinfo
View File

@ -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

32
devel/libuta/patches/patch-configure
View File

@ -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 <<EOF
#line 4068 "configure"
#line 4463 "configure"
#include "confdefs.h"
@@ -4096,7 +4092,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
@@ -4491,7 +4491,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
#define $ac_tr_lib 1
EOF

12
devel/libuta/patches/patch-demos_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-demos_Makefile_in,v 1.1.1.1 2001/07/28 07:16:23 pvalchev Exp $
--- demos/Makefile.in.orig Mon Jul 23 13:18:02 2001
+++ demos/Makefile.in Mon Jul 23 13:18:11 2001
@@ -106,7 +106,7 @@ INCLUDES = -I../uta
@SMPEG_AVAILABLE_TRUE@PLAYMPEG = plaympeg
@SMPEG_AVAILABLE_FALSE@PLAYMPEG =
-LFLAGS = -L ../uta/.libs -Wl,--rpath -Wl,../uta/.libs
+LFLAGS = -L ../uta/.libs -Wl,-rpath -Wl,../uta/.libs
noinst_PROGRAMS = simple convert lines alpha terrain terrain2 $(PLAYMPEG) $(UMP3)

8
devel/libuta/patches/patch-uta_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-uta_Makefile_in,v 1.1.1.1 2001/07/28 07:16:23 pvalchev Exp $
--- uta/Makefile.in.orig Mon Jul 23 13:25:33 2001
+++ uta/Makefile.in Mon Jul 23 13:25:46 2001
@@ -106,7 +106,7 @@ libutainclude_HEADERS = debug.h color.
$OpenBSD: patch-uta_Makefile_in,v 1.2 2004/01/04 20:32:29 pvalchev Exp $
--- uta/Makefile.in.orig 2004-01-03 10:21:29.000000000 -0700
+++ uta/Makefile.in 2004-01-03 10:21:38.000000000 -0700
@@ -113,7 +113,7 @@ LTNONOPTCXXCOMPILE = $(LIBTOOL) --mode=c
noinst_HEADERS = blitter_macros.h

81
devel/libuta/patches/patch-uta_blitters_cc
View File

@ -1,36 +1,65 @@
$OpenBSD: patch-uta_blitters_cc,v 1.2 2001/09/06 23:23:56 pvalchev Exp $
--- uta/blitters.cc.orig Mon Apr 9 17:25:05 2001
+++ uta/blitters.cc Wed Sep 5 16:45:59 2001
@@ -1,9 +1,12 @@
$OpenBSD: patch-uta_blitters_cc,v 1.3 2004/01/04 20:32:29 pvalchev Exp $
--- uta/blitters.cc.orig 2004-01-04 15:27:06.000000000 +0100
+++ uta/blitters.cc 2004-01-04 15:28:30.000000000 +0100
@@ -20,6 +20,7 @@
#include "blitters.h"
-#include <uta/painter.h>
+#include <painter.h>
#include <painter.h>
+#include <iosfwd>
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

11
devel/libuta/patches/patch-uta_painter_cc Normal file
View File

@ -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 <math.h>
+#include <assert.h>
namespace uta {

4
devel/libuta/pkg/PFRAG.shared
View File

@ -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)