Petr Gajdos
3859e03247
* lot of bug fixes and features, see HISTORY - modified patches % netpbm-disable-jasper.patch (refreshed) % netpbm-make.patch (refreshed) % netpbm-security-code.patch (refreshed) % netpbm-security-scripts.patch (refreshed) % netpbm-tmpfile.patch (refreshed) % signed-char.patch (refreshed) - deleted patches - netpbm-pbmtonokia-cmdline-txt-null.patch (upstreamed) OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=122
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
Index: netpbm-10.93.0/config.mk.in
|
|
===================================================================
|
|
--- netpbm-10.93.0.orig/config.mk.in 2020-12-29 11:04:16.164846967 +0100
|
|
+++ netpbm-10.93.0/config.mk.in 2020-12-29 11:04:21.900882283 +0100
|
|
@@ -124,7 +124,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.
|
|
@@ -316,7 +316,7 @@ LDRELOC = NONE
|
|
CFLAGS_SHLIB =
|
|
# Gcc:
|
|
#CFLAGS_SHLIB = -fpic
|
|
-#CFLAGS_SHLIB = -fPIC
|
|
+CFLAGS_SHLIB = -fPIC
|
|
# Sun compiler:
|
|
#CFLAGS_SHLIB = -Kpic
|
|
#CFLAGS_SHLIB = -KPIC
|
|
@@ -383,7 +383,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
|
|
@@ -414,7 +414,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
|
|
@@ -472,7 +472,7 @@ PNGVER =
|
|
#
|
|
# If you have 'libpng-config' (see above), these are irrelevant.
|
|
|
|
-ZLIB = NONE
|
|
+ZLIB = libz.so
|
|
ZHDR_DIR =
|
|
#ZLIB = libz.so
|
|
|
|
@@ -482,8 +482,8 @@ JBIGLIB = $(INTERNAL_JBIGLIB)
|
|
JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)
|
|
|
|
# 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.
|