Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Aug 2003 15:03:46 +0200
From:      Simon Barner <barner@in.tum.de>
To:        Kris Kennaway <kris@obsecurity.org>
Cc:        ports@FreeBSD.org
Subject:   Re: [kris@FreeBSD.org: cvs commit: ports/graphics/imlib3d Makefile]
Message-ID:  <20030808130346.GA702@zi025.glhnet.mhn.de>
In-Reply-To: <20030807101327.GG73360@rot13.obsecurity.org>
References:  <20030807101327.GG73360@rot13.obsecurity.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--pvezYHf7grwyp3Bc
Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk"
Content-Disposition: inline


--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

> FYI.  This port will be removed in 3 months if it is still broken.
> See http://bento.freebsd.org for the failure logs.
>=20
> Kris

The attached patches should fix the build error (for both gcc 2.95.4 and
3.3.1). Unfortunately, I could only link the library with gcc 2.95.4, since
I am using -STABLE, and do not want to rebuild all of the dependencies with
gcc 3.3. Perhaps, some 5.x user from this list can verify this for me.

Simon

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-ImLib3D::CppTools.hpp"
Content-Transfer-Encoding: quoted-printable

--- ImLib3D/CppTools.hpp.orig	Wed Aug  7 17:55:37 2002
+++ ImLib3D/CppTools.hpp	Thu Aug  7 16:59:30 2003
@@ -329,9 +329,9 @@
 //@}
=20
 #ifdef __GNUC__=20
-#ifndef HPUX
+#if !defined (HPUX) && !defined (__FreeBSD__)
 #define USE_EXPLICIT_INSTANTIATION
-#endif // HPUX
+#endif // !HPUX && !__FreeBSD__
 #endif // __GNUC__=20
=20
 #ifdef  USE_EXPLICIT_INSTANTIATION

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-ImLib3D::Image3Dlinear.hpp"
Content-Transfer-Encoding: quoted-printable

--- ImLib3D/Image3Dlinear.hpp.orig	Thu Aug  7 17:13:19 2003
+++ ImLib3D/Image3Dlinear.hpp	Thu Aug  7 17:15:33 2003
@@ -64,7 +64,7 @@
 private:
 	typedef Container3D<Im3DValue> _Base;
 public:
-	typedef Im3DValue value_type;
+	//typedef Im3DValue value_type;
 	typedef Image3Dlinear<Im3DValue> ImageType;
 	std_typedefs;
 protected:
@@ -231,7 +231,7 @@
 private:
 	typedef Image3Dlinear<Im3DValue> _Base;
 public:
-	typedef Im3DValue value_type;
+	//typedef Im3DValue value_type;
 	std_typedefs;
=20
 public:

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-ImLib3D::Properties.hpp"
Content-Transfer-Encoding: quoted-printable

--- ImLib3D/Properties.hpp.orig	Thu Aug  7 17:24:02 2003
+++ ImLib3D/Properties.hpp	Thu Aug  7 17:24:26 2003
@@ -194,7 +194,7 @@
 	bool Has(const string &propname) const {return properties.find(propname)!=
=3Dproperties.end();}
=20
 	//! Add a string property instead of a char* property
-	void Add(const string &name,const char * str){Add(name,string(str));}
+	void Add(const string &name,const char * str){Add(name,str);}
=20
 	//! Adds a new property using the automatic PropertyWrapPtr property wrap=
per
 	template<class PType>

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename="patch-ImLib3D::StringArgumentConversion.hpp"
Content-Transfer-Encoding: quoted-printable

--- ImLib3D/StringArgumentConversion.hpp.orig	Fri Aug  8 02:25:49 2003
+++ ImLib3D/StringArgumentConversion.hpp	Fri Aug  8 02:36:01 2003
@@ -38,8 +38,8 @@
 template<> inline void ImProcOutputArgToFile<Vect3Di>(const Vect3Di&arg,co=
nst string &str){cout << "result:" << arg << endl;}
 template<> inline void ImProcOutputArgToFile<Vect3Df>(const Vect3Df&arg,co=
nst string &str){cout << "result:" << arg << endl;}
 template<> inline void ImProcOutputArgToFile<RectZone3Di>(const RectZone3D=
i&arg,const string &str){cout << "result:" << arg << endl;}
-template<> inline void ImProcOutputArgToFile<BitMask3D::BitValue>(const Bi=
tMask3D::BitValue &arg,const string &str) {cout << "result:" << (uint)arg <=
< endl;}
-template<> inline void ImProcOutputArgToFile<BitImage3D<byte,2,byte>::BitV=
alue>(const BitImage3D<byte,2,byte>::BitValue &arg,const string &str) {cout=
 << "result:" << (uint)arg << endl;}
+template<> inline void ImProcOutputArgToFile<BitMask3D::BitValue>(const Bi=
tMask3D::BitValue &arg,const string &str) {cout << "result:" << arg << endl=
;}
+template<> inline void ImProcOutputArgToFile<BitImage3D<byte,2,byte>::BitV=
alue>(const BitImage3D<byte,2,byte>::BitValue &arg,const string &str) {cout=
 << "result:" << arg << endl;}
=20
 template<class T>
 void ImProcOutputArg(T &arg,const string &str,vector<TypeSafeGenericPointe=
r> &alternateArgs,int argNum)

--UugvWAfsgieZRqgk--

--pvezYHf7grwyp3Bc
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)

iD8DBQE/M5+xCkn+/eutqCoRApTlAKCnXH0QSuDv9zm5VS031tFPjA0bzgCeKT6W
XXBjPwWdou1qM6yZUbXiZao=
=QWPe
-----END PGP SIGNATURE-----

--pvezYHf7grwyp3Bc--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030808130346.GA702>