mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-05 22:43:24 +00:00
Code Issues Releases Activity
fd1463531e
freebsd-ports/graphics/xv/files/patch-ad

92 lines
2.5 KiB
Plaintext
Raw Normal View History

Eliminate warnings on systems not equipped for Japanese characters. The Japanese or multilingual functionality will be in japanese/xv and graphics/xv-m17n when those are committed. PR: 8185 Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
1998-10-07 21:17:42 +00:00
--- Imakefile.orig Wed Oct 7 22:24:59 1998
+++ Imakefile Wed Oct 7 22:27:00 1998
Link with -lgnumalloc. Silence <malloc.h> warning along the way. Original idea is ---------------- From: Kai Vorma <vode@snakemail.hut.fi> To: Lars Gerhard Kuehl <lars@elbe.desy.de> Cc: FreeBSD-hackers@freefall.cdrom.com Subject: Re: dlmalloc : Okay, not faster, but it used memory better. Try xv with standard malloc, then dlmalloc and finally GNU-malloc. With standard malloc xv grows until it hits datasize limit (16MB) and dies (usually after 10 or so big jpegs). With dlmalloc xv's VZS was about 15MB after last picture of that particular set and with GNU malloc it was about 11MB. :
1995-07-05 11:43:08 +00:00
@@ -6,13 +6,15 @@
/* if, for whatever reason, you're unable to get the JPEG library to compile
* on your machine, *COMMENT OUT* the following line
*/
-#define HaveJpeg
+/* #define HaveJpeg */
+#define UseInstalledJpeg
/* if, for whatever reason, you're unable to get the TIFF library to compile
* on your machine, *COMMENT OUT* the following line
*/
-#define HaveTiff
+/* #define HaveTiff */
+#define UseInstalledTiff
/* if, for whatever reason, you're unable to get the PDS/VICAR support
Make Shigeyuki FUKUSHIMA the new maintainer (was ports@freebsd.org). Add Japanese enhancements (including some Japanese file formats). Update or add various patches, including PNG, multi-page TIFF, and PDF. PR: 7751 Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
1998-08-27 18:27:45 +00:00
@@ -124,16 +126,30 @@
Link with -lgnumalloc. Silence <malloc.h> warning along the way. Original idea is ---------------- From: Kai Vorma <vode@snakemail.hut.fi> To: Lars Gerhard Kuehl <lars@elbe.desy.de> Cc: FreeBSD-hackers@freefall.cdrom.com Subject: Re: dlmalloc : Okay, not faster, but it used memory better. Try xv with standard malloc, then dlmalloc and finally GNU-malloc. With standard malloc xv grows until it hits datasize limit (16MB) and dies (usually after 10 or so big jpegs). With dlmalloc xv's VZS was about 15MB after last picture of that particular set and with GNU malloc it was about 11MB. :
1995-07-05 11:43:08 +00:00
JPEG = -DDOJPEG
JPEGDIR = jpeg
LIBJPEG = $(JPEGDIR)/libjpeg.a
+DEPLIBJPEG = $(LIBJPEG)
JPEGINCLUDE = -I$(JPEGDIR)
#endif
+#ifdef UseInstalledJpeg
+JPEG = -DDOJPEG
Fix make PREFIX=/somewhere problem. Substitute /usr/local in patch-* for ${LOCALBASE}.
1999-06-24 16:00:06 +00:00
+LIBJPEG = -L${LOCALBASE}/lib -ljpeg
+JPEGINCLUDE = -I${LOCALBASE}/include
Link with -lgnumalloc. Silence <malloc.h> warning along the way. Original idea is ---------------- From: Kai Vorma <vode@snakemail.hut.fi> To: Lars Gerhard Kuehl <lars@elbe.desy.de> Cc: FreeBSD-hackers@freefall.cdrom.com Subject: Re: dlmalloc : Okay, not faster, but it used memory better. Try xv with standard malloc, then dlmalloc and finally GNU-malloc. With standard malloc xv grows until it hits datasize limit (16MB) and dies (usually after 10 or so big jpegs). With dlmalloc xv's VZS was about 15MB after last picture of that particular set and with GNU malloc it was about 11MB. :
1995-07-05 11:43:08 +00:00
+#endif
+
#ifdef HaveTiff
TIFF = -DDOTIFF
TIFFDIR = tiff
LIBTIFF = $(TIFFDIR)/libtiff.a
+DEPLIBTIFF = $(LIBTIFF)
TIFFINCLUDE = -I$(TIFFDIR)
#endif
+#ifdef UseInstalledTiff
+TIFF = -DDOTIFF
Fix make PREFIX=/somewhere problem. Substitute /usr/local in patch-* for ${LOCALBASE}.
1999-06-24 16:00:06 +00:00
+LIBTIFF = -L${LOCALBASE}/lib -ltiff
+TIFFINCLUDE = -I${LOCALBASE}/include
Link with -lgnumalloc. Silence <malloc.h> warning along the way. Original idea is ---------------- From: Kai Vorma <vode@snakemail.hut.fi> To: Lars Gerhard Kuehl <lars@elbe.desy.de> Cc: FreeBSD-hackers@freefall.cdrom.com Subject: Re: dlmalloc : Okay, not faster, but it used memory better. Try xv with standard malloc, then dlmalloc and finally GNU-malloc. With standard malloc xv grows until it hits datasize limit (16MB) and dies (usually after 10 or so big jpegs). With dlmalloc xv's VZS was about 15MB after last picture of that particular set and with GNU malloc it was about 11MB. :
1995-07-05 11:43:08 +00:00
+#endif
+
#ifdef HavePDS
PDS = -DDOPDS
#endif
Eliminate warnings on systems not equipped for Japanese characters. The Japanese or multilingual functionality will be in japanese/xv and graphics/xv-m17n when those are committed. PR: 8185 Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
1998-10-07 21:17:42 +00:00
@@ -149,12 +165,12 @@
Link with -lgnumalloc. Silence <malloc.h> warning along the way. Original idea is ---------------- From: Kai Vorma <vode@snakemail.hut.fi> To: Lars Gerhard Kuehl <lars@elbe.desy.de> Cc: FreeBSD-hackers@freefall.cdrom.com Subject: Re: dlmalloc : Okay, not faster, but it used memory better. Try xv with standard malloc, then dlmalloc and finally GNU-malloc. With standard malloc xv grows until it hits datasize limit (16MB) and dies (usually after 10 or so big jpegs). With dlmalloc xv's VZS was about 15MB after last picture of that particular set and with GNU malloc it was about 11MB. :
1995-07-05 11:43:08 +00:00
#endif
-DEPLIBS = $(LIBJPEG) $(LIBTIFF)
-LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS)
+DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF)
Don't use gnumalloc, we've got a better malloc in libc now.
1996-08-28 06:59:13 +00:00
+LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF)
Link with -lgnumalloc. Silence <malloc.h> warning along the way. Original idea is ---------------- From: Kai Vorma <vode@snakemail.hut.fi> To: Lars Gerhard Kuehl <lars@elbe.desy.de> Cc: FreeBSD-hackers@freefall.cdrom.com Subject: Re: dlmalloc : Okay, not faster, but it used memory better. Try xv with standard malloc, then dlmalloc and finally GNU-malloc. With standard malloc xv grows until it hits datasize limit (16MB) and dies (usually after 10 or so big jpegs). With dlmalloc xv's VZS was about 15MB after last picture of that particular set and with GNU malloc it was about 11MB. :
1995-07-05 11:43:08 +00:00
DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
Eliminate warnings on systems not equipped for Japanese characters. The Japanese or multilingual functionality will be in japanese/xv and graphics/xv-m17n when those are committed. PR: 8185 Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
1998-10-07 21:17:42 +00:00
- $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
+ $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX) $(LOCALE_EXTENSION)
INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)
Make Shigeyuki FUKUSHIMA the new maintainer (was ports@freebsd.org). Add Japanese enhancements (including some Japanese file formats). Update or add various patches, including PNG, multi-page TIFF, and PDF. PR: 7751 Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
1998-08-27 18:27:45 +00:00
@@ -254,10 +270,10 @@
#endif
-NormalProgramTarget(xv,$(OBJS1),$(DEPLIBS),$(LOCAL_LIBRARIES),)
-NormalProgramTarget(bggen,$(OBJS2),$(DEPLIBS),$(LOCAL_LIBRARIES),)
-NormalProgramTarget(xcmap,$(OBJS4),$(DEPLIBS),$(LOCAL_LIBRARIES),)
-NormalProgramTarget(xvpictoppm,$(OBJS5),$(DEPLIBS),$(LOCAL_LIBRARIES),)
+NormalProgramTarget(xv,$(OBJS1),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4)
+NormalProgramTarget(bggen,$(OBJS2),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4)
+NormalProgramTarget(xcmap,$(OBJS4),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4)
+NormalProgramTarget(xvpictoppm,$(OBJS5),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4)
InstallProgram(xv,$(BINDIR))
@@ -266,7 +282,7 @@
InstallProgram(xvpictoppm,$(BINDIR))
#ifdef HavePDS
-NormalProgramTarget(vdcomp,$(OBJS3),$(DEPLIBS),$(LOCAL_LIBRARIES),)
+NormalProgramTarget(vdcomp,$(OBJS3),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4)
InstallProgram(vdcomp,$(BINDIR))
#endif
Reference in New Issue Copy Permalink