Blame SOURCES/netpbm-jasper.patch

294826
diff -urNp a/config.mk.in b/config.mk.in
294826
--- a/config.mk.in	2018-11-21 12:46:22.044790058 +0100
294826
+++ b/config.mk.in	2018-11-22 13:13:10.260123268 +0100
294826
@@ -128,7 +128,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
294826
 
294826
 # STRIPFLAG is the option you pass to the above install program to make it
294826
 # strip unnecessary information out of binaries.
294826
-STRIPFLAG = -s
294826
+STRIPFLAG =
294826
 # If you don't want to strip the binaries, just leave it null:
294826
 #STRIPFLAG = 
294826
 
294826
@@ -482,12 +482,12 @@ JBIGLIB = $(INTERNAL_JBIGLIB)
294826
 JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)
294826
 
294826
 # The Jasper JPEG-2000 image compression library (aka JasPer):
294826
-JASPERLIB = $(INTERNAL_JASPERLIB)
294826
-JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
294826
+JASPERLIB = "" 
294826
+JASPERHDR_DIR = "/usr/include/jasper"
294826
 # JASPERDEPLIBS is the libraries (-l options or file names) on which
294826
 # The Jasper library depends -- i.e. what you have to link into any
294826
 # executable that links in the Jasper library.
294826
-JASPERDEPLIBS =
294826
+JASPERDEPLIBS = -ljasper
294826
 #JASPERDEPLIBS = -ljpeg
294826
 
294826
 # And the Utah Raster Toolkit (aka URT aka RLE) library:
294826
diff -urNp a/converter/other/jbig/Makefile b/converter/other/jbig/Makefile
294826
--- a/converter/other/jbig/Makefile	2018-11-21 12:46:22.075789920 +0100
294826
+++ b/converter/other/jbig/Makefile	2018-11-22 13:13:40.837969056 +0100
294826
@@ -11,8 +11,9 @@ include $(BUILDDIR)/config.mk
294826
 
294826
 # INTERNAL_JBIGLIB must be relative to the current directory, because it
294826
 # may end up in MERGE_OBJECTS, which must be relative.
294826
-INTERNAL_JBIGLIB = libjbig/libjbig.a
294826
-INTERNAL_JBIGHDR_DIR = $(SRCDIR)/$(SUBDIR)/libjbig/include
294826
+INTERNAL_JBIGLIB = 
294826
+INTERNAL_JBIGHDR_DIR = /usr/include
294826
+#INTERNAL_JBIGHDR_DIR = $(SRCDIR)/$(SUBDIR)/libjbig/include
294826
 
294826
 EXTERN_INCLUDES =
294826
 ifneq ($(JBIGHDR_DIR),NONE)
294826
@@ -35,7 +36,6 @@ SCRIPTS =
294826
 
294826
 ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
294826
   JBIGLIB_DEP = $(JBIGLIB)
294826
-  SUBDIRS += libjbig
294826
 else
294826
   # It's not our internal version; user's on his own to make sure it's built
294826
 endif
294826
@@ -49,10 +49,3 @@ include $(SRCDIR)/common.mk
294826
 
294826
 $(BINARIES): %: %.o $(JBIGLIB_DEP) $(LIBOPT)
294826
 $(BINARIES): LDFLAGS_TARGET = $(shell $(LIBOPT) $(JBIGLIB))
294826
-
294826
-$(INTERNAL_JBIGLIB): $(BUILDDIR)/$(SUBDIR)/libjbig FORCE
294826
-	$(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjbig/Makefile \
294826
-	  -C $(dir $@) $(notdir $@)
294826
-
294826
-.PHONY: FORCE
294826
-FORCE: