For details see: https://sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/doc/HISTORY

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- config/netpbm/Makefile.config | 587 ------------------------------- config/netpbm/config.mk | 80 +++-- config/rootfiles/packages/netpbm | 40 ++- lfs/netpbm | 12 +- 4 files changed, 100 insertions(+), 619 deletions(-) delete mode 100644 config/netpbm/Makefile.config

diff --git a/config/netpbm/Makefile.config b/config/netpbm/Makefile.config deleted file mode 100644 index dd5ae219a..000000000 --- a/config/netpbm/Makefile.config +++ /dev/null @@ -1,587 +0,0 @@ -####This file was automatically created by 'configure.' -####Many variables are set twice -- a generic setting, then -####a system-specific override at the bottom of the file. -#### -# This is a make file inclusion, to be included in all the Netpbm make -# files. - -# This file is meant to contain variable settings that customize the -# build for a particular target system configuration. - -# The distribution contains the file Makefile.config.in. You edit -# Makefile.config.in in ways relevant to your particular environment -# to create Makefile.config. The "configure" program will do this -# for you in simple cases. - -# Some of the variables that the including make file must set for this -# file to work: -# -# SRCDIR: The directory at the top of the Netpbm source tree. Note that -# this is typically a relative directory, and it must be relative to the -# make file that includes this file. - -DEFAULT_TARGET = nonmerge -#DEFAULT_TARGET = merge - -# Fiasco has some special requirements that make it fail to compile on -# some systems, and since it isn't very important, just set this to "N" -# and skip it on those systems unless you want to debug it and fix it. -# OpenBSD: -#BUILD_FIASCO = N -BUILD_FIASCO = Y - -# The following are commands for the build process to use. These values -# do not get built into anything. - -# The C compiler (including macro preprocessor) -#CC = gcc -# Note that 'cc' is usually an alias for whatever is the main compiler -# on a system, e.g. the GNU Compiler on Linux. -CC = cc - -# The linker. -LD = $(CC) -#LD = ld -#Tru64: -#LD = cc -#LD = gcc - -#If the linker identified above is a compiler that invokes a linker -#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is -#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' -#syntax whereas the actual linker would take '-opt1 val1'. -LINKERISCOMPILER=Y -#If $(LD) is 'ld': -#LINKERISCOMPILER=N - -#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can -#take a library as just another link object argument, as in 'ld -#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a -#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. -#This variable controls how 'libopt' gets built. Note that with some -#linkers, you can specify a shared library explicitly, but then it has -#to live in that exact place at run time. That's not good enough for us. - -LINKER_CAN_DO_EXPLICIT_LIBRARY=N -#GNU: -#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y - -# This is the name of the header file that declares the types -# uint32_t, etc. This name is used as #include $(INTTYPES_H) . -# Set to null if the types come automatically without including anything. -INTTYPES_H = <inttypes.h> -# Linux libc5: -#INTTYPES_H = <types.h> -# Solaris: -#INTTYPES_H = <sys/inttypes.h> -# Others: -#INTTYPES_H = <sys/stdint.h> -#INTTYPES_H = <sys/types.h> -# The automatically generated Netpbm version: -#INTTYPES_H = "inttypes_netpbm.h" - -# CC and LD are for building the Netpbm programs, which are not necessarily -# intended to run on the same system on which Make is running. But when we -# build a build tool such as Libopt, it is meant to run only on the same -# system on which the Make is running. The variables below define programs -# to use to compile and link build tools. -CC_FOR_BUILD = $(CC) -LD_FOR_BUILD = $(LD) - -# MAKE is set automatically by Make to what was used to invoke Make. - -INSTALL = $(SRCDIR)/buildtools/install.sh -#Solaris: -#INSTALL = /usr/ucb/install -#Tru64: -#INSTALL = installbsd -#OSF1: -#INSTALL = $(SRCDIR)/buildtools/installosf -#Red Hat Linux: -#INSTALL = install - -# STRIPFLAG is the option you pass to the above install program to make it -# strip unnecessary information out of binaries. -STRIPFLAG = -s -# If you don't want to strip the binaries, just leave it null: -#STRIPFLAG = - -SYMLINK = ln -s -# At least some Windows environments don't have any concept of symbolic -# links, but direct copies are usually a passable alternative. -#SYMLINK = cp - -#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the -#pointer man pages are installed (ready to nroff, or ready to cat). -#A pointer man pages is just a single-paragraph pages that tells you there is -#no man page for the program, to look at the HTML documentation instead. -MANPAGE_FORMAT = nroff -#MANPAGE_FORMAT = cat - -AR = ar -RANLIB = ranlib -# IRIX, SCO don't have Ranlib: -#RANLIB = true -LEX = flex -# Solaris: -# LEX = flex -e -# Or just skip parts that need Lex: -# LEX = - -# C compiler options - -# gcc: -# -ansi and -Werror should work too, but are not included -# by default because there's no point in daring the build to fail. -# -pedantic isn't a problem because it causes at worst a warning. -#CFLAGS = -O3 -fast-math -pedantic \ -# -Wall -Wno-uninitialized -Wmissing-declarations -# The merged programs have a main_XXX subroutine instead of main(), -# which would cause a warning with -Wmissing-declarations or -# -Wmissing-prototypes. -#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes -# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg, -# but word size-sensitive code was removed from parallel.c in September 2004. -# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In -# theory, you need this if on your system, long is 32 bits and int is not. -# But it may be completely irrelevant today. -#Tru64: -#CFLAGS = -O2 -std1 -DLONG_32 -#CFLAGS = -O2 -std1 -#AIX: -#CFLAGS= -O3 -#HP-UX: -#CFLAGS= -O3 -fPIC -#IRIX: -#CFLAGS= -n32 -O3 -#Amiga with GNU compiler: -#CFLAGS= -m68020-60 -ffast-math -mstackextend -# You can add -noixemul for Amiga and successfully compile most of the -# programs. (Of the remaining ones, if you can supply your own strtod() -# function, most of them will build with -noixemul). So try building -# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build -# everything that failed for lack of the ixemul library in the first step. -# That way, the parts that don't required the ixemul library won't indicate -# a dependency on it. -#OpenBSD: -#CFLAGS = -I/usr/local/include - -# EXE is a suffix that the linker puts on any executable it generates. -# In cygwin, this is .exe and most programs deal with its existence without -# us having to know about it. Some don't though, so set this: - -EXE = -#Cygwin, DJGPP/Windows: -#EXE = .exe - -# linker options. - -# LDFLAGS is often set as an environment variable; A setting here overrides -# it. So either make sure you want to override it, or do a "LDFLAGS +=" here. - -# Eunice users may want to use -noshare so that the executables can -# run standalone: -#LDFLAGS += -noshare -#Tru64: -# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary -# to keep from finding an ancient system libjpeg.so that isn't compatible with -# NetPBM. Michael Long found that /usr/local/lib is not in the default -# search path, or not soon enough, and he was getting an old libjpeg that -# caused all the jpeg symbol references to be unresolved. He had installed -# a new libjpeg in /usr/local/lib. -#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib -#AIX: -#LDFLAGS += -L /usr/pubsw/lib -#HP-UX: -#LDFLAGS += -Wl,+b,/usr/pubsw/lib -#IRIX: -#LDFLAGS += -n32 -#FreeBSD, OpenBSD: -# (04.03.15 This may be a mistake. LDFLAGS may already be set to this as -# an environment variable. We used to override the environment variable -# here with LDFLAGS =, which would mean we had to override with the same -# value it already had. I suspect it will work fine with no LDFLAGS -# setting at all; need to confirm this on real FreeBSD and OpenBSD systems) -#LDFLAGS += -L/usr/local/lib - -# Linker options for created Netpbm shared libraries. - -# Here, $(SONAME) resolves to the soname for the shared library being created. -# The following are gcc options. This works on GNU libc systems. -LDSHLIB = -shared -Wl,-soname,$(SONAME) -# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is -# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc -# documentation and doesn't exist in at least one non-BeOS installation. -# BeOS doesn't have sonames built in. -#LDSHLIB = -nostart -#LDSHLIB = -G -# Solaris, SunOS with GNU Ld, SCO: -# These systems have no soname option. -#LDSHLIB = -shared -# Solaris with Sun Ld: -#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) -#Tru64: -#LDSHLIB = -shared -expect_unresolved "*" -#IRIX: -#LDSHLIB = -shared -n32 -#AIX GNU compiler/linker: -#LDSHLIB = -shared -#AIX Visual Age C: -#LDSHLIB = -qmkshrobj - -# LDRELOC is the command to combine two .o files (relocateable object files) -# into a single .o file that can later be linked into something else. NONE -# means no such command is available. - -LDRELOC = NONE -# GNU Ld: -# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld -# correctly spells it --relocatable. The abbreviation --reloc works on -# both. -#LDRELOC = ld --reloc -#LDRELOC = ld -r - - -# On older systems, you have to make shared libraries out of position -# independent code, so you need -fpic or fPIC here. (The rule is: if -# -fpic works, use it. If it bombs, go to fPIC). On newer systems, -# it isn't necessary, but can save real memory at the expense of -# execution speed. Without position independent code, the library -# loader may have to patch addresses into the executable text. On an -# older system, this would cause a program crash because the loader -# would be writing into read-only shared memory. But on newer -# systems, the system silently creates a private mapping of the page -# or segment being modified (the "copy on write" phenomenon). So it -# needs its own private real page frame. In one experiment, A second -# copy of Pbmtext used 16K less real memory when built with -fpic than -# when built without. 2001.06.02. - -CFLAGS_SHLIB = -# Solaris or SunOS with gcc, and NetBSD: -#CFLAGS_SHLIB = -fpic -#CFLAGS_SHLIB = -fPIC -# Sun compiler: -#CFLAGS_SHLIB = -Kpic -#CFLAGS_SHLIB = -KPIC - -# SHLIB_CLIB is the link option to include the C library in a shared library, -# normally "-lc". On typical systems, this serves no purpose. On some, -# though, it causes information about which C library to use to be recorded -# in the shared library and thus choose the correct library among several or -# avoid using an incompatible one. But on some systems, the link fails. -# On 2002.09.30, "John H. DuBois III" spcecdt@armory.com reports that on -# SCO OpenServer, he gets the following error message with -lc: -# -# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); -# fatal error: relocations remain against allocatable but non-writable -# section: ; .text - -SHLIB_CLIB = -lc -# SCO: -SHLIB_CLIB = - -# On some systems you have to build into an executable the list of -# directories where its dynamically linked libraries can be found at -# run time. This is typically done with a -R or -rpath linker -# option. Even on systems that don't require it, you might prefer to do -# that rather than set up environment variables or configuration files -# to tell the system where the libraries are. A "Y" here means to put -# the directory information in the executable at link time. - -NEED_RUNTIME_PATH = N -# Solaris, SunOS, NetBSD, AIX: -#NEED_RUNTIME_PATH = Y - -# RPATHOPTNAME is the option you use on the link command to specify -# a runtime search path for a shared library. It is meaningless unless -# NEED_RUNTIME_PATH is Y. -RPATHOPTNAME = -rpath - -# The following variables tell where your various libraries on which -# Netpbm depends live. The LIBxxx variable is a full file -# specification of the link library (not necessarily the library used -# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually -# doesn't matter if the library prefix and suffix are right -- you can -# use "lib" and ".so" or ".a" regardless of what your system actually -# uses because these just turn into "-L" and "-l" linker options -# anyway. ".a" implies a static library for some purposes, though. -# If you don't have the library in question, use a value of NONE for -# LIBxxx and the build will simply skip the programs that require that -# library. If the library is in your linker's (or the Netpbm build's) -# default search path, leave off the directory part, e.g. "libpng.so". - -# The xxxHDR_DIR variable is the directory in which the interface -# headers for the library live (e.g. /usr/include). If they are in your -# compiler's default search path, set this variable to null. - -# This is where the Netpbm shared libraries will reside when Netpbm is -# fully installed. In some configurations, the Netpbm builder builds -# this information into the Netpbm executables. This does NOT affect -# where the Netpbm installer installs the libraries. A null value -# means the libraries are in a default search path used by the runtime -# library loader. -NETPBMLIB_RUNTIME_PATH = -#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm - -# The TIFF library. See above. If you want to build the tiff -# converters, you must have the tiff library already installed. - -TIFFLIB = NONE -TIFFHDR_DIR = - -#TIFFLIB = libtiff.so -#TIFFHDR_DIR = /usr/include/libtiff -#NetBSD: -#TIFFLIB = $(LOCALBASE)/lib/libtiff.so -#TIFFHDR_DIR = $(LOCALBASE)/include -# OSF, Tru64: -#TIFFLIB = /usr/local1/DEC/lib/libtiff.so -#TIFFHDR_DIR = /usr/local1/DEC/include - -# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any -# program linked with the TIFF library needs a Jpeg and/or Z library. -# Some TIFF libraries have such library statically linked in, but others -# need it to be dynamically linked at program load time. -# Make this 'N' if youf TIFF library doesn't need such dynamic linking. -# As of 2005.01, the most usual build of the TIFF library appears to require -# both. -TIFFLIB_NEEDS_JPEG = Y -TIFFLIB_NEEDS_Z = Y - -# The JPEG library. See above. If you want to build the jpeg -# converters you must have the jpeg library already installed. - -# Tiff files can use JPEG compression, so the Tiff library can reference -# the JPEG library. If your Tiff library references a dynamic JPEG -# library, you must specify at least JPEGLIB here, or the Tiff -# converters will not build. Note that your Tiff library may have the -# JPEG stuff statically linked in, in which case you won't need -# JPEGLIB in order to build the Tiff converters. - -JPEGLIB = NONE -JPEGHDR_DIR = -#JPEGLIB = libjpeg.so -#JPEGHDR_DIR = /usr/include/jpeg -# Netbsd: -#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so -#JPEGHDR_DIR = ${LOCALBASE}/include -# OSF, Tru64: -#JPEGLIB = /usr/local1/DEC/libjpeg.so -#JPEGHDR_DIR = /usr/local1/DEC/include -# Typical: -#JPEGLIB = /usr/local/lib/libjpeg.so -#JPEGHDR_DIR = /usr/local/include -# Don't build JPEG stuff: -#JPEGLIB = NONE - - -# The PNG library. See above. If you want to build the PNG -# converters you must have the PNG library already installed. - -# The PNG library, by convention starting around April 2002, gets installed -# with names that include a version number, such as libpng10.a and header -# files in /usr/include/libpng10. -# option. -PNGLIB = NONE -PNGHDR_DIR = -PNGVER = -#PNGLIB = libpng$(PNGVER).so -#PNGHDR_DIR = /usr/include/libpng$(PNGVER) -# NetBSD: -#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so -#PNGHDR_DIR = $(LOCALBASE)/include -# OSF/Tru64: -#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so -#PNGHDR_DIR = /usr/local1/DEC/include - -# The zlib compression library. See above. You need it to build -# anything that needs the PNG library (see above). If you selected -# NONE for the PNG library, it doesn't matter what you specify here -- -# it won't get used. - -ZLIB = NONE -ZHDR_DIR = -#ZLIB = libz.so - -# The JBIG lossless image compression library (aka JBIG-KIT): - -JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a -JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig - -# The Jasper JPEG-2000 image compression library (aka JasPer): -JASPERLIB = $(INTERNAL_JASPERLIB) -JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) - -# And the Utah Raster Toolkit (aka URT aka RLE) library: - -URTLIB = $(BUILDDIR)/urt/librle.a -URTHDR_DIR = $(SRCDIR)/urt - -# The Linux SVGA library (Svgalib) is a facility for displaying graphics -# on the Linux console. It is required by Ppmsvgalib. - -LINUXSVGALIB = NONE -LINUXSVGAHDR_DIR = - -#LINUXSVGALIB_DIR = -#LINUXSVGAHDR_DIR = /usr/include/vgalib - -# If you don't want any network functions, set OMIT_NETWORK to "y". -# The only thing that requires network functions is the option in -# ppmtompeg to run it on multiple computers simultaneously. On some -# systems network functions don't work or we haven't figured out how to -# make them work, or they just aren't worth the effort. -OMIT_NETWORK = -#DJGPP/Windows, Tru64: -# (there's some minor header problem that prevents network functions from -# building on Tru64 2000.10.06) -#OMIT_NETWORK = Y - -# These are -l options to link in the network libraries. Often, these are -# built into the standard C library, so this can be null. This is irrelevant -# if OMIT_NETWORK is "y". - -NETWORKLD = -# Solaris, SunOS: -#NETWORKLD = -lsocket -lnsl -# SCO: -#NETWORKLD = -lsocket, -lresolv - -VMS = -#VMS: -#VMS = yes - -# The following variables are used only by 'make install' (and the -# variants of it). Paths here don't, for example, get built into any -# programs. - -# This is where everything goes when you do 'make package', unless you -# override it by setting 'pkgdir' on the Make command line. -PKGDIR_DEFAULT = /tmp/netpbm - -# File permissions for installed files. -# Note that on some systems (e.g. Solaris), 'install' can't use the -# mnemonic permissions - you have to use octal. - -# binaries (pbmmake, etc) -INSTALL_PERM_BIN = 755 # u=rwx,go=rx -# shared libraries (libpbm.so, etc) -INSTALL_PERM_LIBD = 755 # u=rwx,go=rx -# static libraries (libpbm.a, etc) -INSTALL_PERM_LIBS = 644 # u=rw,go=r -# header files (pbm.h, etc) -INSTALL_PERM_HDR = 644 # u=rw,go=r -# man pages (pbmmake.1, etc) -INSTALL_PERM_MAN = 644 # u=rw,go=r -# data files (pnmtopalm color maps, etc) -INSTALL_PERM_DATA = 644 # u=rw,go=r - -# Specify the suffix that want the man pages to have. - -SUFFIXMANUALS1 = 1 -SUFFIXMANUALS3 = 3 -SUFFIXMANUALS5 = 5 - -#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the -#Netpbm library functions. The value is used only in make file tests. -# "unixshared" means a unix-style shared library, typically named like -# libxyz.so.2.3 -NETPBMLIBTYPE = unixshared -# "unixstatic" means a unix-style static library, (like libxyz.a) -#NETPBMLIBTYPE = unixstatic -# "dll" means a Windows DLL shared library -#NETPBMLIBTYPE = dll -# "dylib" means a Darwin/Mac OS shared library -#NETPBMLIBTYPE = dylib - -#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is -#selected above. All this is used for is to construct library names. -#The make files never examine the actual value. -NETPBMLIBSUFFIX = so - -# "a" is the suffix for unix-style static libraries. It is also -# traditionally used for shared libraries on AIX. The Visual Age C -# manual says sometimes .so works on AIX, and GNU software for AIX -# 5.1.0 does indeed use it. In our experiments, it works fine if you -# name the library file explicitly on the link, but isn't in the -l -# search order. If you name the library explicitly on the link, the -# library must live in exactly the same position at run time, so we -# can't use that. Therefore, you cannot build both static and shared -# libraries with AIX. You have to choose. -#NETPBMLIBSUFFIX = a -# For HP-UX shared libraries: -#NETPBMLIBSUFFIX = sl -# Darwin/Mac OS shared library: -#NETPBMLIBSUFFIX = dylib -# Windows shared library: -#NETPBMLIBSUFFIX = dll - -#STATICLIB_TOO is "y" to signify that you want a static library built -#and installed in addition to whatever library type you specified by -#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, -#STATICLIB_TOO simply has no effect. -STATICLIB_TOO = y -#STATICLIB_TOO = n - -#STATICLIBSUFFIX is the suffix that static libraries have. It's -#meaningless if you aren't building static libraries. -STATICLIBSUFFIX = a - -#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename -#of a shared library may have on this system. Traditionally, it's -#just "lib", as in libc or libpbm. On Windows, though, varying -#prefixes are used when multiple alternative forms of a library are -#available. The first prefix in this list is what we use to name the -#Netpbm shared libraries. -# -# This variable controls how 'libopt' gets built. -# -SHLIBPREFIXLIST = lib -#Cygwin: -#SHLIBPREFIXLIST = cyg lib - -NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) - -#DLLVER is used to version the DLLs built on cygwin or other -#windowsish platforms. We can't add this to LIBROOT, or we'd -#version the static libs (which is bad). We can't add this -#at the end of the name (like unix does with so numbers) because -#windows will only load dlls whose name ends in "dll". So, -#we have this variable, which becomes the end of the library "root" name -#for DLLs only. -# -# This variable controls how 'libopt' gets built. -# -DLLVER = -#Cygwin -#DLLVER = $(NETPBM_MAJOR_RELEASE) - -#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. -#This is a directory which contains a file for each Netpbm program, -#library, and file type. E.g. The documentation for jpegtopnm might be in -#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets -#installed in the man pages (which say no more than to read the webpage) -#and in the Webman netpbm.url file. -NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ -#For a system with no web access, but a local copy of the doc: -#NETPBM_DOCURL = file:/usr/doc/netpbm/ - - - - -####Lines above were copied from Makefile.config.in by 'configure'. -####Lines below were added by 'configure' based on the GNU platform. -DEFAULT_TARGET = nonmerge -NETPBMLIBTYPE=unixshared -NETPBMLIBSUFFIX=so -STATICLIB_TOO=y -CFLAGS = -O3 -ffast-math -pedantic -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes -LDRELOC = ld --reloc -LINKER_CAN_DO_EXPLICIT_LIBRARY=Y -LINKERISCOMPILER = Y -TIFFLIB = libtiff.so -JPEGLIB = libjpeg.so -PNGLIB = libpng.so -ZLIB = libz.so -NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ diff --git a/config/netpbm/config.mk b/config/netpbm/config.mk index 9c789b2c8..b1a2cf73d 100644 --- a/config/netpbm/config.mk +++ b/config/netpbm/config.mk @@ -93,6 +93,17 @@ INTTYPES_H = <inttypes.h> HAVE_INT64 = Y #HAVE_INT64 = N

+# WANT_SSE tells whether the build should use SSE instructions, via the the +# standard SSE intrinsics (operators such as '_mm_movemask_epi8'). SSE +# instructions are faster than traditional instructions, but aren't available +# on all CPUs. Also, the standard intrinsics are not available in all +# compilers. Even if you say N here, Netpbm may still be built with some +# SSE exploitation (e.g. SSE floating point) because the compiler will +# do it automatically. You can add a -nomsse or -nomsse2 option to +# CFLAGS or CFLAGS_PERSONAL to stop that. +WANT_SSE = N +#WANT_SSE = Y + # CC and LD are for building the Netpbm programs, which are not necessarily # intended to run on the same system on which Make is running. But when we # build a build tool such as Libopt, it is meant to run only on the same @@ -100,9 +111,13 @@ HAVE_INT64 = Y # to use to compile and link build tools. CC_FOR_BUILD = $(CC) LD_FOR_BUILD = $(LD) -CFLAGS_FOR_BUILD = $(CFLAGS) +CFLAGS_FOR_BUILD = $(CFLAGS_CONFIG) LDFLAGS_FOR_BUILD = $(LDFLAGS)

+# WINDRES is the program that creates a linkable object file from +# a Windows Icon (.ico) file. +WINDRES = windres + # MAKE is set automatically by Make to what was used to invoke Make.

INSTALL = $(SRCDIR)/buildtools/install.sh @@ -158,7 +173,7 @@ LEX = flex # -pedantic isn't a problem because it causes at worst a warning. #CFLAGS = -O3 -ffast-math -pedantic -fno-common \ # -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \ -# -Wwrite-strings -Wmissing-prototypes -Wundef +# -Wwrite-strings -Wmissing-prototypes -Wundef -Wno-unknown-pragmas # The merged programs have a main_XXX subroutine instead of main(), # which would cause a warning with -Wmissing-declarations or # -Wmissing-prototypes. @@ -379,12 +394,11 @@ TIFFHDR_DIR = #TIFFHDR_DIR = /usr/local1/DEC/include

# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any -# program linked with the TIFF library needs a Jpeg and/or Z library. -# Some TIFF libraries have such library statically linked in, but others -# need it to be dynamically linked at program load time. -# Make this 'N' if youf TIFF library doesn't need such dynamic linking. -# As of 2005.01, the most usual build of the TIFF library appears to require -# both. +# program linked with the TIFF library needs a Jpeg and/or Z library. Some +# TIFF libraries have such library statically linked in, but others need it to +# be linked with the program at link-edit time or dynamically at program load +# time. Make this 'N' if your TIFF library doesn't need such linking. As of +# 2005.01, the most usual build of the TIFF library appears to require both. TIFFLIB_NEEDS_JPEG = Y TIFFLIB_NEEDS_Z = Y

@@ -428,6 +442,14 @@ JPEGHDR_DIR = # files will use that program if it exists (must be in the PATH). In that # case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful, # because the make file runs 'libpng$(PNGVER)-config'. +# +# Even more recent versions have the more modern Pkgconfig database entry +# to tell how to link it. The make files will try to use that first. +# +# The normal way to choose the libpng the Netpbm build uses from among multiple +# versions on your system is not to mess with the variables below, but rather +# to mess with PKG_CONFIG_PATH or PATH environment variable so that the version +# you want to use appears first in the search path.

PNGLIB = NONE PNGHDR_DIR = @@ -454,8 +476,8 @@ ZHDR_DIR =

# The JBIG lossless image compression library (aka JBIG-KIT):

-JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a -JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig +JBIGLIB = $(INTERNAL_JBIGLIB) +JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)

# The Jasper JPEG-2000 image compression library (aka JasPer): JASPERLIB = $(INTERNAL_JASPERLIB) @@ -489,7 +511,12 @@ LINUXSVGAHDR_DIR = #LINUXSVGALIB = /usr/lib/libvga.so #LINUXSVGAHDR_DIR = /usr/include/vgalib

-# If you don't want any network functions, set OMIT_NETWORK to "y". +# WINICON_OBJECT is the object file to bind into all Netpbm executables +# to provide the icon for Windows to use for it. Null for none. +WINICON_OBJECT = +#WINICON_OBJECT = $(BUILDDIR)/icon/netpbm.o + +# If you don't want any network functions, set OMIT_NETWORK to "Y". # The only thing that requires network functions is the option in # ppmtompeg to run it on multiple computers simultaneously. On some # systems network functions don't work or we haven't figured out how to @@ -498,11 +525,11 @@ OMIT_NETWORK = #DJGPP/Windows, Tru64: # (there's some minor header problem that prevents network functions from # building on Tru64 2000.10.06) -#OMIT_NETWORK = y +#OMIT_NETWORK = Y

# These are -l options to link in the network libraries. Often, these are # built into the standard C library, so this can be null. This is irrelevant -# if OMIT_NETWORK is "y". +# if OMIT_NETWORK is "Y".

NETWORKLD = # Solaris, SunOS: @@ -510,10 +537,6 @@ NETWORKLD = # SCO: #NETWORKLD = -lsocket, -lresolv

-VMS = -#VMS: -#VMS = yes - # DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual # Unix process management stuff - fork, wait, etc. N for a regular Unix # system. @@ -527,6 +550,10 @@ DONT_HAVE_PROCESS_MGMT = N # override it by setting 'pkgdir' on the Make command line. PKGDIR_DEFAULT = /tmp/netpbm

+# This is where test results are written when you do 'make check', unless +# you override it by setting 'resultdir' on the Make command line. +RESULTDIR_DEFAULT = /tmp/netpbm-test + # Subdirectory of the package directory ($(pkgdir)) in which man pages # go. PKGMANDIR = share/man @@ -588,12 +615,12 @@ NETPBMLIBSUFFIX = so # Windows shared library: #NETPBMLIBSUFFIX = dll

-#STATICLIB_TOO is "y" to signify that you want a static library built +#STATICLIB_TOO is "Y" to signify that you want a static library built #and installed in addition to whatever library type you specified by #NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, #STATICLIB_TOO simply has no effect. -STATICLIB_TOO = y -#STATICLIB_TOO = n +STATICLIB_TOO = Y +#STATICLIB_TOO = N

#STATICLIBSUFFIX is the suffix that static libraries have. It's #meaningless if you aren't building static libraries. @@ -633,19 +660,25 @@ DLLVER = #library, and file type. E.g. The documentation for jpegtopnm might be in #http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets #installed in the man pages (which say no more than to read the webpage) -#and in the Webman netpbm.url file. +#and in the Manweb netpbm.url file. NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ #For a system with no web access, but a local copy of the doc: #NETPBM_DOCURL = file:/usr/doc/netpbm/

+# RGB_DB_PATH is where Netpbm looks for the color database when the RGBDEF +# environment variable is not set. See pm_config_in.h for details. +RGB_DB_PATH = /usr/share/netpbm/rgb.txt:/usr/lib/X11/rgb.txt:/usr/share/X11/rgb.txt:/usr/X11R6/lib/X11/rgb.txt + + +

####Lines above were copied from config.mk.in by 'configure'. ####Lines below were added by 'configure' based on the GNU platform. DEFAULT_TARGET = nonmerge NETPBMLIBTYPE=unixshared NETPBMLIBSUFFIX=so -STATICLIB_TOO=n -CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef +STATICLIB_TOO=N +CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef -Wno-unknown-pragmas CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes LDRELOC = ld --reloc LINKER_CAN_DO_EXPLICIT_LIBRARY=Y @@ -655,3 +688,4 @@ TIFFLIB = libtiff.so JPEGLIB = libjpeg.so ZLIB = libz.so NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ +WANT_SSE = Y diff --git a/config/rootfiles/packages/netpbm b/config/rootfiles/packages/netpbm index b4d169365..e3e13fa36 100644 --- a/config/rootfiles/packages/netpbm +++ b/config/rootfiles/packages/netpbm @@ -2,11 +2,13 @@ #usr/bin/anytopnm #usr/bin/asciitopgm #usr/bin/atktopbm +#usr/bin/avstopam #usr/bin/bioradtopgm #usr/bin/bmptopnm #usr/bin/bmptoppm #usr/bin/brushtopbm #usr/bin/cameratopam +#usr/bin/cistopbm #usr/bin/cmuwmtopbm #usr/bin/ddbugtopbm #usr/bin/doc.url @@ -46,6 +48,7 @@ #usr/bin/pambayer #usr/bin/pamchannel #usr/bin/pamcomp +#usr/bin/pamcrater #usr/bin/pamcut #usr/bin/pamdeinterlace #usr/bin/pamdepth @@ -54,7 +57,9 @@ #usr/bin/pamedge #usr/bin/pamendian #usr/bin/pamenlarge +#usr/bin/pamexec #usr/bin/pamfile +#usr/bin/pamfix #usr/bin/pamfixtrunc #usr/bin/pamflip #usr/bin/pamfunc @@ -63,13 +68,18 @@ #usr/bin/pamlookup #usr/bin/pammasksharpen #usr/bin/pammixinterlace +#usr/bin/pammosaicknit #usr/bin/pamoil +#usr/bin/pampaintspill #usr/bin/pamperspective #usr/bin/pampick #usr/bin/pampop9 +#usr/bin/pamrecolor #usr/bin/pamrgbatopng +#usr/bin/pamrubber #usr/bin/pamscale #usr/bin/pamseq +#usr/bin/pamshadedrelief #usr/bin/pamsharpmap #usr/bin/pamsharpness #usr/bin/pamsistoaglyph @@ -83,6 +93,7 @@ #usr/bin/pamsummcol #usr/bin/pamthreshold #usr/bin/pamtilt +#usr/bin/pamtoavs #usr/bin/pamtodjvurle #usr/bin/pamtofits #usr/bin/pamtogif @@ -92,14 +103,21 @@ #usr/bin/pamtompfont #usr/bin/pamtooctaveimg #usr/bin/pamtopam +#usr/bin/pamtopdbimg #usr/bin/pamtopfm +#usr/bin/pamtopng #usr/bin/pamtopnm +#usr/bin/pamtosrf #usr/bin/pamtosvg #usr/bin/pamtotga #usr/bin/pamtotiff #usr/bin/pamtouil +#usr/bin/pamtowinicon #usr/bin/pamtoxvmini #usr/bin/pamundice +#usr/bin/pamunlookup +#usr/bin/pamvalidate +#usr/bin/pamwipeout #usr/bin/pbmclean #usr/bin/pbmlife #usr/bin/pbmmake @@ -115,6 +133,7 @@ #usr/bin/pbmtoascii #usr/bin/pbmtoatk #usr/bin/pbmtobbnbg +#usr/bin/pbmtocis #usr/bin/pbmtocmuwm #usr/bin/pbmtodjvurle #usr/bin/pbmtoepsi @@ -141,6 +160,7 @@ #usr/bin/pbmtoppa #usr/bin/pbmtopsg3 #usr/bin/pbmtoptx +#usr/bin/pbmtosunicon #usr/bin/pbmtowbmp #usr/bin/pbmtox10bm #usr/bin/pbmtoxbm @@ -150,6 +170,7 @@ #usr/bin/pc1toppm #usr/bin/pcdovtoppm #usr/bin/pcxtoppm +#usr/bin/pdbimgtopam #usr/bin/pfmtopam #usr/bin/pgmabel #usr/bin/pgmbentley @@ -174,6 +195,8 @@ #usr/bin/pgmtopbm #usr/bin/pgmtopgm #usr/bin/pgmtoppm +#usr/bin/pgmtosbig +#usr/bin/pgmtost4 #usr/bin/pi1toppm #usr/bin/pi3topbm #usr/bin/picttoppm @@ -200,6 +223,7 @@ #usr/bin/pnminterp #usr/bin/pnminvert #usr/bin/pnmmargin +#usr/bin/pnmmercator #usr/bin/pnmmontage #usr/bin/pnmnlfilt #usr/bin/pnmnoraw @@ -208,6 +232,7 @@ #usr/bin/pnmpaste #usr/bin/pnmpsnr #usr/bin/pnmquant +#usr/bin/pnmquantall #usr/bin/pnmremap #usr/bin/pnmrotate #usr/bin/pnmscale @@ -268,7 +293,9 @@ usr/bin/pnmtotiff #usr/bin/ppmshift #usr/bin/ppmspread #usr/bin/ppmtoacad +#usr/bin/ppmtoapplevol #usr/bin/ppmtoarbtxt +#usr/bin/ppmtoascii #usr/bin/ppmtobmp #usr/bin/ppmtoeyuv #usr/bin/ppmtogif @@ -291,6 +318,7 @@ usr/bin/pnmtotiff #usr/bin/ppmtopuzz #usr/bin/ppmtorgb3 #usr/bin/ppmtosixel +#usr/bin/ppmtospu #usr/bin/ppmtoterm #usr/bin/ppmtotga #usr/bin/ppmtouil @@ -316,11 +344,15 @@ usr/bin/pnmtotiff #usr/bin/spctoppm #usr/bin/spottopgm #usr/bin/sputoppm +#usr/bin/srftopam +#usr/bin/st4topgm +#usr/bin/sunicontopnm #usr/bin/svgtopam #usr/bin/tgatoppm #usr/bin/thinkjettopbm #usr/bin/tifftopnm #usr/bin/wbmptopbm +#usr/bin/winicontopam #usr/bin/winicontoppm #usr/bin/xbmtopbm #usr/bin/ximtoppm @@ -330,12 +362,13 @@ usr/bin/pnmtotiff #usr/bin/ybmtopbm #usr/bin/yuvsplittoppm #usr/bin/yuvtoppm +#usr/bin/yuy2topam #usr/bin/zeisstopnm #usr/include/netpbm -#usr/include/netpbm/bitio.h #usr/include/netpbm/colorname.h #usr/include/netpbm/mallocvar.h #usr/include/netpbm/pam.h +#usr/include/netpbm/pamdraw.h #usr/include/netpbm/pammap.h #usr/include/netpbm/pbm.h #usr/include/netpbm/pbmfont.h @@ -350,10 +383,11 @@ usr/bin/pnmtotiff #usr/include/netpbm/ppmdfont.h #usr/include/netpbm/ppmdraw.h #usr/include/netpbm/ppmfloyd.h +#usr/include/netpbm/runlength.h #usr/include/netpbm/shhopt.h usr/lib/libnetpbm.so -usr/lib/libnetpbm.so.10 -usr/lib/libnetpbm.so.10.47 +usr/lib/libnetpbm.so.11 +usr/lib/libnetpbm.so.11.73 #usr/share/netpbm usr/share/netpbm/palmcolor8.map usr/share/netpbm/palmgray1.map diff --git a/lfs/netpbm b/lfs/netpbm index 25de86bce..fb0a5b294 100644 --- a/lfs/netpbm +++ b/lfs/netpbm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 10.47.61 +VER = 10.73.31

THISAPP = netpbm-$(VER) DL_FILE = $(THISAPP).tgz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netpbm -PAK_VER = 2 +PAK_VER = 3

DEPS =

@@ -46,7 +46,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a5d2ec8acc99f60e5b92a720ed292c3e +$(DL_FILE)_MD5 = 02b2383af38501a3012bdd85aa03bd02

install : $(TARGET)

@@ -83,13 +83,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/config/netpbm/config.mk $(DIR_APP) cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" #The build of this version cannot be parallelized cd $(DIR_APP) && make package PKGDIR=/usr/netpbm - mkdir -pv /usr/include/netpbm + mkdir -pv /usr/include/netpbm mkdir -pv /usr/share/netpbm mv -fv /usr/netpbm/include/netpbm/* /usr/include/netpbm mv -fv /usr/netpbm/lib/* /usr/lib mv -fv /usr/netpbm/bin/* /usr/bin mv -fv /usr/netpbm/misc/* /usr/share/netpbm rm -Rfv /usr/netpbm/ - cd /usr/lib && ln -sfv libnetpbm.so.10.47 libnetpbm.so + cd /usr/lib && ln -sfv libnetpbm.so.11.73 libnetpbm.so @rm -rf $(DIR_APP) @$(POSTBUILD)