netpbm: 10.52.3 -> 10.56.00
This commit is contained in:
parent
150166afa1
commit
014a83bd56
@ -26,7 +26,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/hdifftopam
|
||||
-rwxr-xr-x root/root usr/bin/hipstopgm
|
||||
-rwxr-xr-x root/root usr/bin/hpcdtoppm
|
||||
-rwxr-xr-x root/root usr/bin/icontopbm
|
||||
lrwxrwxrwx root/root usr/bin/icontopbm -> sunicontopnm
|
||||
-rwxr-xr-x root/root usr/bin/ilbmtoppm
|
||||
-rwxr-xr-x root/root usr/bin/imgtoppm
|
||||
-rwxr-xr-x root/root usr/bin/infotopam
|
||||
@ -57,6 +57,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pamedge
|
||||
-rwxr-xr-x root/root usr/bin/pamendian
|
||||
-rwxr-xr-x root/root usr/bin/pamenlarge
|
||||
-rwxr-xr-x root/root usr/bin/pamexec
|
||||
-rwxr-xr-x root/root usr/bin/pamfile
|
||||
-rwxr-xr-x root/root usr/bin/pamfixtrunc
|
||||
-rwxr-xr-x root/root usr/bin/pamflip
|
||||
@ -66,6 +67,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pamlookup
|
||||
-rwxr-xr-x root/root usr/bin/pammasksharpen
|
||||
-rwxr-xr-x root/root usr/bin/pammixinterlace
|
||||
-rwxr-xr-x root/root usr/bin/pammosaicknit
|
||||
-rwxr-xr-x root/root usr/bin/pamoil
|
||||
-rwxr-xr-x root/root usr/bin/pampaintspill
|
||||
-rwxr-xr-x root/root usr/bin/pamperspective
|
||||
@ -73,6 +75,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pampop9
|
||||
-rwxr-xr-x root/root usr/bin/pamrecolor
|
||||
-rwxr-xr-x root/root usr/bin/pamrgbatopng
|
||||
-rwxr-xr-x root/root usr/bin/pamrubber
|
||||
-rwxr-xr-x root/root usr/bin/pamscale
|
||||
-rwxr-xr-x root/root usr/bin/pamseq
|
||||
-rwxr-xr-x root/root usr/bin/pamsharpmap
|
||||
@ -101,13 +104,14 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pamtopdbimg
|
||||
-rwxr-xr-x root/root usr/bin/pamtopfm
|
||||
-rwxr-xr-x root/root usr/bin/pamtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pamtosrf
|
||||
-rwxr-xr-x root/root usr/bin/pamtosvg
|
||||
-rwxr-xr-x root/root usr/bin/pamtotga
|
||||
-rwxr-xr-x root/root usr/bin/pamtotiff
|
||||
-rwxr-xr-x root/root usr/bin/pamtouil
|
||||
-rwxr-xr-x root/root usr/bin/pamtoxvmini
|
||||
-rwxr-xr-x root/root usr/bin/pamundice
|
||||
-rwxr-xr-x root/root usr/bin/pamx
|
||||
-rwxr-xr-x root/root usr/bin/pamwipeout
|
||||
-rwxr-xr-x root/root usr/bin/pbmclean
|
||||
-rwxr-xr-x root/root usr/bin/pbmlife
|
||||
-rwxr-xr-x root/root usr/bin/pbmmake
|
||||
@ -133,7 +137,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pbmtogem
|
||||
-rwxr-xr-x root/root usr/bin/pbmtogo
|
||||
-rwxr-xr-x root/root usr/bin/pbmtoibm23xx
|
||||
-rwxr-xr-x root/root usr/bin/pbmtoicon
|
||||
lrwxrwxrwx root/root usr/bin/pbmtoicon -> pbmtosunicon
|
||||
-rwxr-xr-x root/root usr/bin/pbmtolj
|
||||
-rwxr-xr-x root/root usr/bin/pbmtoln03
|
||||
-rwxr-xr-x root/root usr/bin/pbmtolps
|
||||
@ -150,6 +154,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
|
||||
-rwxr-xr-x root/root usr/bin/pbmtoppa
|
||||
-rwxr-xr-x root/root usr/bin/pbmtopsg3
|
||||
-rwxr-xr-x root/root usr/bin/pbmtoptx
|
||||
-rwxr-xr-x root/root usr/bin/pbmtosunicon
|
||||
-rwxr-xr-x root/root usr/bin/pbmtowbmp
|
||||
-rwxr-xr-x root/root usr/bin/pbmtox10bm
|
||||
-rwxr-xr-x root/root usr/bin/pbmtoxbm
|
||||
@ -279,6 +284,7 @@ lrwxrwxrwx root/root usr/bin/ppmnorm -> pnmnorm
|
||||
-rwxr-xr-x root/root usr/bin/ppmshift
|
||||
-rwxr-xr-x root/root usr/bin/ppmspread
|
||||
-rwxr-xr-x root/root usr/bin/ppmtoacad
|
||||
-rwxr-xr-x root/root usr/bin/ppmtoapplevol
|
||||
-rwxr-xr-x root/root usr/bin/ppmtoarbtxt
|
||||
-rwxr-xr-x root/root usr/bin/ppmtoascii
|
||||
-rwxr-xr-x root/root usr/bin/ppmtobmp
|
||||
@ -327,6 +333,8 @@ lrwxrwxrwx root/root usr/bin/ppmtouil -> pamtouil
|
||||
-rwxr-xr-x root/root usr/bin/spctoppm
|
||||
-rwxr-xr-x root/root usr/bin/spottopgm
|
||||
-rwxr-xr-x root/root usr/bin/sputoppm
|
||||
-rwxr-xr-x root/root usr/bin/srftopam
|
||||
-rwxr-xr-x root/root usr/bin/sunicontopnm
|
||||
-rwxr-xr-x root/root usr/bin/svgtopam
|
||||
-rwxr-xr-x root/root usr/bin/tgatoppm
|
||||
-rwxr-xr-x root/root usr/bin/thinkjettopbm
|
||||
@ -348,6 +356,7 @@ drwxr-xr-x root/root usr/include/netpbm/
|
||||
-rw-r--r-- root/root usr/include/netpbm/colorname.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/mallocvar.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/pam.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/pamdraw.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/pammap.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/pbm.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/pbmfont.h
|
||||
@ -364,8 +373,10 @@ drwxr-xr-x root/root usr/include/netpbm/
|
||||
-rw-r--r-- root/root usr/include/netpbm/ppmfloyd.h
|
||||
-rw-r--r-- root/root usr/include/netpbm/shhopt.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
lrwxrwxrwx root/root usr/lib/libnetpbm.so.10 -> libnetpbm.so.10.52
|
||||
-rwxr-xr-x root/root usr/lib/libnetpbm.so.10.52
|
||||
-rw-r--r-- root/root usr/lib/libnetpbm.a
|
||||
lrwxrwxrwx root/root usr/lib/libnetpbm.so -> libnetpbm.so.11
|
||||
lrwxrwxrwx root/root usr/lib/libnetpbm.so.11 -> libnetpbm.so.11.56
|
||||
-rwxr-xr-x root/root usr/lib/libnetpbm.so.11.56
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/netpbm/
|
||||
-rw-r--r-- root/root usr/share/netpbm/palmcolor8.map
|
||||
|
@ -1,2 +1,3 @@
|
||||
5aa32e99a1e58adbbd28928d1086183e config.mk
|
||||
d89197447ab1268ee0c50093ff721ebd netpbm-10.52.3.tar.xz
|
||||
6d7f48e8b8f81324ca77a21b5e815cf2 config.mk
|
||||
8d30e2705b372491ba9920d547f09f13 netpbm-10.34-build.patch
|
||||
b4baff6c43afa50688599ea619073ee2 netpbm-10.56.00.tar.bz2
|
||||
|
@ -1,22 +1,31 @@
|
||||
# Maintainer: Antti Nykanen, aon at iki dot fi
|
||||
# Description: A toolkit for manipulation of graphic images
|
||||
# URL: http://netpbm.sf.net
|
||||
# Depends on: ghostscript
|
||||
# Description: A set of utilities for converting to/from the netpbm (and related) formats.
|
||||
# URL: http://netpbm.sourceforge.net/
|
||||
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
|
||||
# Packager: Antti Nykanen, aon at iki dot fi
|
||||
# Depends on: libjpeg libpng libtiff zlib libxml2
|
||||
# Optional: xorg-libx11
|
||||
|
||||
name=netpbm
|
||||
version=10.52.3
|
||||
version=10.56.00
|
||||
release=1
|
||||
source=(http://crux.nu/files/distfiles/$name-$version.tar.xz
|
||||
config.mk)
|
||||
source=(http://www.hvlinux.net/crux/distfiles/$name/$name-$version.tar.bz2
|
||||
config.mk netpbm-10.34-build.patch)
|
||||
|
||||
build() {
|
||||
export MAKEFLAGS="$MAKEFLAGS -j1"
|
||||
cd $name-$version
|
||||
|
||||
unset MAKEFLAGS
|
||||
patch -p 1 -i $SRC/netpbm-10.34-build.patch
|
||||
|
||||
cd netpbm-$version
|
||||
sed -e "s|#CFLAGS#|$CFLAGS|" $SRC/config.mk > config.mk
|
||||
make
|
||||
sed -i -e 's/\(.*\$(SYMLINK) \)\(pnmtopnm\)\(\$(EXE) \)\(pamtopnm\)/\1\4\3\2/' \
|
||||
converter/other/Makefile
|
||||
|
||||
make CC="${CC:-gcc}"
|
||||
make pkgdir=$PKG/usr package
|
||||
mkdir $PKG/usr/share
|
||||
|
||||
install -d $PKG/usr/share
|
||||
mv $PKG/usr/misc $PKG/usr/share/netpbm
|
||||
rm -rf $PKG/usr/{README,VERSION,link,man,config_template,pkginfo,bin/doc.url}
|
||||
|
||||
rm -r $PKG/usr/{README,VERSION,link,man,config_template,pkginfo,bin/doc.url}
|
||||
}
|
||||
|
@ -8,9 +8,9 @@
|
||||
# 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
|
||||
# The distribution contains the file config.mk.in. You edit
|
||||
# config.mk.in in ways relevant to your particular environment
|
||||
# to create config.mk. The "configure" program will do this
|
||||
# for you in simple cases.
|
||||
|
||||
# Some of the variables that the including make file must set for this
|
||||
@ -101,6 +101,7 @@ HAVE_INT64 = Y
|
||||
CC_FOR_BUILD = $(CC)
|
||||
LD_FOR_BUILD = $(LD)
|
||||
CFLAGS_FOR_BUILD = $(CFLAGS)
|
||||
LDFLAGS_FOR_BUILD = $(LDFLAGS)
|
||||
|
||||
# MAKE is set automatically by Make to what was used to invoke Make.
|
||||
|
||||
@ -157,7 +158,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-string -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.
|
||||
@ -252,6 +253,17 @@ LDSHLIB = -shared -Wl,-soname,$(SONAME)
|
||||
#LDSHLIB = -shared
|
||||
#AIX Visual Age C:
|
||||
#LDSHLIB = -qmkshrobj
|
||||
#Mac OSX:
|
||||
# According to experiments done by Peter A Crowley in May 2007, if
|
||||
# libnetpbm goes in a standard place such as /usr/local/lib,
|
||||
# programs need not be built with libnetpbm's location included.
|
||||
# But if it goes elsewhere, the link-editor must include the
|
||||
# location in the executable. It finds the runtime location by
|
||||
# looking inside the library. The information in the library
|
||||
# comes from the install_name option with which the library was
|
||||
# built. It's an alternative to the -rpath option on other systems.
|
||||
#LDSHLIB=-dynamiclib
|
||||
#LDSHLIB=-dynamiclib -install_name $(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
|
||||
|
||||
# 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
|
||||
@ -285,7 +297,7 @@ LDRELOC = NONE
|
||||
# know why -- history seems to be repeating itself. 2005.02.23.
|
||||
|
||||
CFLAGS_SHLIB =
|
||||
# Solaris or SunOS with gcc, and NetBSD:
|
||||
# Gcc:
|
||||
#CFLAGS_SHLIB = -fpic
|
||||
#CFLAGS_SHLIB = -fPIC
|
||||
# Sun compiler:
|
||||
@ -306,7 +318,7 @@ CFLAGS_SHLIB =
|
||||
|
||||
SHLIB_CLIB = -lc
|
||||
# SCO:
|
||||
SHLIB_CLIB =
|
||||
#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
|
||||
@ -416,6 +428,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 =
|
||||
@ -498,10 +518,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.
|
||||
@ -630,20 +646,19 @@ NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
|
||||
|
||||
|
||||
|
||||
####Lines above were copied from Makefile.config.in by 'configure'.
|
||||
####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=y
|
||||
CFLAGS = #CFLAGS#
|
||||
CFLAGS = #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
|
||||
LINKERISCOMPILER = Y
|
||||
CFLAGS_SHLIB += -fPIC
|
||||
TIFFLIB = libtiff.so
|
||||
JPEGLIB = libjpeg.so
|
||||
PNGLIB = libpng.so
|
||||
ZLIB = libz.so
|
||||
X11LIB = /usr/lib/libX11.so
|
||||
NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
|
||||
|
49
netpbm/netpbm-10.34-build.patch
Normal file
49
netpbm/netpbm-10.34-build.patch
Normal file
@ -0,0 +1,49 @@
|
||||
diff -Naur netpbm-10.34.orig/buildtools/libopt.c netpbm-10.34/buildtools/libopt.c
|
||||
--- netpbm-10.34.orig/buildtools/libopt.c 2006-09-01 10:37:09.000000000 +0200
|
||||
+++ netpbm-10.34/buildtools/libopt.c 2006-09-01 10:37:20.000000000 +0200
|
||||
@@ -502,7 +502,7 @@
|
||||
|
||||
strcpy(outputLine, ""); /* initial value */
|
||||
runtime = FALSE; /* initial value */
|
||||
- quiet = FALSE; /* initial value */
|
||||
+ quiet = TRUE; /* initial value */
|
||||
error = FALSE; /* no error yet */
|
||||
for (arg = 1; arg < argc && !error; arg++) {
|
||||
if (strcmp(argv[arg], "-runtime") == 0)
|
||||
diff -Naur netpbm-10.34.orig/GNUmakefile netpbm-10.34/GNUmakefile
|
||||
--- netpbm-10.34.orig/GNUmakefile 2006-09-01 10:37:09.000000000 +0200
|
||||
+++ netpbm-10.34/GNUmakefile 2006-09-01 10:37:20.000000000 +0200
|
||||
@@ -87,6 +87,9 @@
|
||||
.PHONY: nonmerge
|
||||
nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
|
||||
|
||||
+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
|
||||
+converter/all analyzer/all editor/all generator/all other/all: lib/all
|
||||
+
|
||||
OMIT_CONFIG_RULE = 1
|
||||
OMIT_VERSION_H_RULE = 1
|
||||
OMIT_INTTYPES_RULE = 1
|
||||
diff -Naur netpbm-10.34.orig/lib/Makefile netpbm-10.34/lib/Makefile
|
||||
--- netpbm-10.34.orig/lib/Makefile 2006-09-01 10:37:09.000000000 +0200
|
||||
+++ netpbm-10.34/lib/Makefile 2006-09-01 10:37:20.000000000 +0200
|
||||
@@ -244,7 +244,7 @@
|
||||
.PHONY: install.staticlib
|
||||
install.staticlib: $(PKGDIR)/link
|
||||
$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
|
||||
- $(PKGDIR)/link
|
||||
+ $(PKGDIR)/lib
|
||||
|
||||
# Install a shared library stub -- the ".so" file used at link time to
|
||||
# prepare a program for dynamically linking a library at run time
|
||||
@@ -252,9 +252,9 @@
|
||||
install.sharedlibstub: $(PKGDIR)/link
|
||||
ifeq ($(NETPBMLIBTYPE),unixshared)
|
||||
# install the link-time (.so) links to the runtime libraries
|
||||
- cd $(PKGDIR)/link ; \
|
||||
+ cd $(PKGDIR)/lib ; \
|
||||
rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
|
||||
- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
|
||||
+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
|
||||
libnetpbm.$(NETPBMLIBSUFFIX)
|
||||
endif
|
||||
ifeq ($(NETPBMLIBTYPE),dll)
|
Loading…
Reference in New Issue
Block a user