diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2006-06-07 23:55:32 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2006-06-07 23:55:32 +0000 |
| commit | c2d3349c9b32c99767cb0885c2e4fe8182b09e9d (patch) | |
| tree | 229ea920c5cbe019bd0d8a4ce479f77892421010 /media-libs/libpano12 | |
| parent | Stable on hppa (bug #135427). (diff) | |
| download | gentoo-2-c2d3349c9b32c99767cb0885c2e4fe8182b09e9d.tar.gz gentoo-2-c2d3349c9b32c99767cb0885c2e4fe8182b09e9d.tar.bz2 gentoo-2-c2d3349c9b32c99767cb0885c2e4fe8182b09e9d.zip | |
Add patch to fix compilation on amd64; bug #135984
(Portage version: 2.1_rc3-r5)
Diffstat (limited to 'media-libs/libpano12')
| -rw-r--r-- | media-libs/libpano12/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch | 50 | ||||
| -rw-r--r-- | media-libs/libpano12/libpano12-2.8.3.ebuild | 8 |
3 files changed, 62 insertions, 2 deletions
diff --git a/media-libs/libpano12/ChangeLog b/media-libs/libpano12/ChangeLog index 68be9e6a14b2..01e5e811cea8 100644 --- a/media-libs/libpano12/ChangeLog +++ b/media-libs/libpano12/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libpano12 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.13 2006/06/06 01:10:49 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.14 2006/06/07 23:55:32 halcy0n Exp $ + + 07 Jun 2006; Mark Loeser <halcy0n@gentoo.org> + +files/libpano12-2.8.3-insertfilename.patch, libpano12-2.8.3.ebuild: + Add patch to fix compilation on amd64; bug #135984 *libpano12-2.8.3 (06 Jun 2006) diff --git a/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch b/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch new file mode 100644 index 000000000000..d0cd1eec42b4 --- /dev/null +++ b/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch @@ -0,0 +1,50 @@ +--- PTcommon.c 2006/06/04 21:43:30 1.17 ++++ PTcommon.c 2006/06/06 19:55:49 1.18 +@@ -52,6 +52,18 @@ + + int ptQuietFlag = 0; + ++void InsertFileName( fullPath *fp, char *fname ){ ++#ifdef __Mac__ ++ strcpy( (char*)(fp->name), fname ); ++ c2pstr( (char*)(fp->name)); ++#else ++ char *c = strrchr((char*)(fp->name), PATH_SEP); ++ if(c != NULL) c++; ++ else c = fp->name; ++ strcpy( c, fname ); ++#endif ++} ++ + void tiffErrorHandler(const char* module, const char* fmt, va_list ap) + { + PrintError("Error in TIFF file (%s) ", module); +--- ptpicker.c 2005/05/07 15:17:07 1.9 ++++ ptpicker.c 2006/06/06 19:55:49 1.10 +@@ -11,7 +11,6 @@ + int loadProject( fullPath *fspec ); + int writeProject( AlignInfo *g, fullPath *pFile); + int jpathTofullPath( const char* jpath, fullPath *fp ); +-void InsertFileName( fullPath *fp, char *fname ); + void BackUp(); + void Restore(); + void SetAlignInfoDefaults( AlignInfo *a); +@@ -975,18 +974,6 @@ + return result; + } + +-void InsertFileName( fullPath *fp, char *fname ){ +-#ifdef __Mac__ +- strcpy( (char*)(fp->name), fname ); +- c2pstr( (char*)(fp->name)); +-#else +- char *c = strrchr((char*)(fp->name), PATH_SEP); +- if(c != NULL) c++; +- else c = fp->name; +- strcpy( c, fname ); +-#endif +-} +- + void BackUp() + { + int i; diff --git a/media-libs/libpano12/libpano12-2.8.3.ebuild b/media-libs/libpano12/libpano12-2.8.3.ebuild index ce9bad821d7a..f7ed6e9e7691 100644 --- a/media-libs/libpano12/libpano12-2.8.3.ebuild +++ b/media-libs/libpano12/libpano12-2.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/libpano12-2.8.3.ebuild,v 1.1 2006/06/06 01:10:49 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/libpano12-2.8.3.ebuild,v 1.2 2006/06/07 23:55:32 halcy0n Exp $ inherit eutils @@ -19,6 +19,12 @@ DEPEND="media-libs/libpng S="${WORKDIR}/libpano12-${PV}" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-insertfilename.patch +} + src_compile() { local myconf="" use java \ |