Petr Gajdos
ab3fe00e48
- updated to 10.59.2:
* transition super-stable --> advanced branch
* builds with libpng15
* patches summary:
-> dropped unneeded or upstreamed patches:
- fixes.patch
- libpng14.patch
- manpages.patch
- pamscale.patch
- pnmtopng-CAN-2978.patch
-> left patches
# make.patch (suse specific)
# no-build-time.patch (suse specific)
# missing-file-close.patch (should be upstreamed in newer
versions)
# tmpfile.patch (rewritten)
# security-code.patch (taken from fedora, replacement of
former security.patch)
# security-scripts.patch (taken from fedora, replacement of
former security2.patch)
OBS-URL: https://build.opensuse.org/request/show/134223
OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=39
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
Index: config.mk.in
|
|
===================================================================
|
|
--- config.mk.in.orig
|
|
+++ config.mk.in
|
|
@@ -109,7 +109,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
|
|
#OSF1:
|
|
#INSTALL = $(SRCDIR)/buildtools/installosf
|
|
#Red Hat Linux:
|
|
-#INSTALL = install
|
|
+INSTALL = install
|
|
|
|
# STRIPFLAG is the option you pass to the above install program to make it
|
|
# strip unnecessary information out of binaries.
|
|
@@ -295,7 +295,7 @@ LDRELOC = NONE
|
|
CFLAGS_SHLIB =
|
|
# Gcc:
|
|
#CFLAGS_SHLIB = -fpic
|
|
-#CFLAGS_SHLIB = -fPIC
|
|
+CFLAGS_SHLIB = -fPIC
|
|
# Sun compiler:
|
|
#CFLAGS_SHLIB = -Kpic
|
|
#CFLAGS_SHLIB = -KPIC
|
|
@@ -362,7 +362,7 @@ NETPBMLIB_RUNTIME_PATH =
|
|
# The TIFF library. See above. If you want to build the tiff
|
|
# converters, you must have the tiff library already installed.
|
|
|
|
-TIFFLIB = NONE
|
|
+TIFFLIB = libtiff.so
|
|
TIFFHDR_DIR =
|
|
|
|
#TIFFLIB = libtiff.so
|
|
@@ -393,7 +393,7 @@ TIFFLIB_NEEDS_Z = Y
|
|
# JPEG stuff statically linked in, in which case you won't need
|
|
# JPEGLIB in order to build the Tiff converters.
|
|
|
|
-JPEGLIB = NONE
|
|
+JPEGLIB = libjpeg.so
|
|
JPEGHDR_DIR =
|
|
#JPEGLIB = libjpeg.so
|
|
#JPEGHDR_DIR = /usr/include/jpeg
|
|
@@ -451,7 +451,7 @@ PNGVER =
|
|
#
|
|
# If you have 'libpng-config' (see above), these are irrelevant.
|
|
|
|
-ZLIB = NONE
|
|
+ZLIB = libz.so
|
|
ZHDR_DIR =
|
|
#ZLIB = libz.so
|
|
|
|
@@ -461,8 +461,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
|
|
JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
|
|
|
|
# The Jasper JPEG-2000 image compression library (aka JasPer):
|
|
-JASPERLIB = $(INTERNAL_JASPERLIB)
|
|
-JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
|
|
+JASPERLIB = -ljasper
|
|
+JASPERHDR_DIR = /usr/include/jasper
|
|
# JASPERDEPLIBS is the libraries (-l options or file names) on which
|
|
# The Jasper library depends -- i.e. what you have to link into any
|
|
# executable that links in the Jasper library.
|