From 4b08ed462e0a5cd2a5e6bf5bdea85966e3879bb7 Mon Sep 17 00:00:00 2001

From: "Vladimir D. Seleznev" <vseleznv@altlinux.org>

Date: Sun, 17 May 2020 18:32:45 +0300

Subject: [PATCH] DEBIAN: libjpeg

Author: Sergei Golovan

Description: Patch enable dynamic linking to system-wide libjpeg.

 It is a Debian-specific hack and isn't supposed to be forwarded upstream.

Last-Modified: Wed, 31 Jan 2018 11:42:16 +0300

---

 tkimg/libjpeg/Makefile.in    |  4 +--

 tkimg/libjpeg/configure      | 54 ------------------------------------

 tkimg/libjpeg/configure.ac   | 18 ------------

 tkimg/libjpeg/jpegtclDecls.h |  4 +--

 4 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/tkimg/libjpeg/Makefile.in b/tkimg/libjpeg/Makefile.in

index 5c122764..5e3193ff 100755

--- a/tkimg/libjpeg/Makefile.in

+++ b/tkimg/libjpeg/Makefile.in

@@ -158,9 +158,9 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)

 CONFIG_CLEAN_FILES = Makefile

 CPPFLAGS	= @CPPFLAGS@

-LIBS		= @PKG_LIBS@ @LIBS@

+LIBS		= @PKG_LIBS@ @LIBS@ -ljpeg

 AR		= @AR@

-CFLAGS		= @CFLAGS@ -DJPEGTCLAPI=MODULE_SCOPE -I$(srcdir)/../base

+CFLAGS		= @CFLAGS@ -DJPEGTCLAPI=MODULE_SCOPE -I$(srcdir)/../base -DMODULE_SCOPE=extern

 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 .SUFFIXES: .c .$(OBJEXT)

diff --git a/tkimg/libjpeg/configure b/tkimg/libjpeg/configure

index f4d56ddc..d97bde63 100755

--- a/tkimg/libjpeg/configure

+++ b/tkimg/libjpeg/configure

@@ -5622,60 +5622,6 @@ JPEG_CC=$CC

-

-    vars="

-	../compat/libjpeg/jcapimin.c	../compat/libjpeg/jcapistd.c	../compat/libjpeg/jccoefct.c

-	../compat/libjpeg/jccolor.c	../compat/libjpeg/jcdctmgr.c	../compat/libjpeg/jchuff.c

-	../compat/libjpeg/jcinit.c	../compat/libjpeg/jcmainct.c	../compat/libjpeg/jcmarker.c

-	../compat/libjpeg/jcmaster.c	../compat/libjpeg/jcomapi.c	../compat/libjpeg/jcparam.c

-	../compat/libjpeg/jcarith.c	../compat/libjpeg/jcprepct.c	../compat/libjpeg/jcsample.c

-	../compat/libjpeg/jctrans.c	../compat/libjpeg/jdapimin.c	../compat/libjpeg/jdapistd.c

-	../compat/libjpeg/jdatadst.c	../compat/libjpeg/jdatasrc.c	../compat/libjpeg/jdcoefct.c

-	../compat/libjpeg/jdcolor.c	../compat/libjpeg/jddctmgr.c	../compat/libjpeg/jdhuff.c

-	../compat/libjpeg/jdinput.c	../compat/libjpeg/jdmainct.c	../compat/libjpeg/jdmarker.c

-	../compat/libjpeg/jdmaster.c	../compat/libjpeg/jdmerge.c	../compat/libjpeg/jdarith.c

-	../compat/libjpeg/jdpostct.c	../compat/libjpeg/jdsample.c	../compat/libjpeg/jdtrans.c

-	../compat/libjpeg/jerror.c	../compat/libjpeg/jfdctflt.c	../compat/libjpeg/jfdctfst.c

-	../compat/libjpeg/jfdctint.c	../compat/libjpeg/jidctflt.c	../compat/libjpeg/jidctfst.c

-	../compat/libjpeg/jidctint.c	../compat/libjpeg/jaricom.c	../compat/libjpeg/jquant1.c

-	../compat/libjpeg/jquant2.c	../compat/libjpeg/jutils.c	../compat/libjpeg/jmemmgr.c

-	../compat/libjpeg/jmemansi.c

-"

-    for i in $vars; do

-	case $i in

-	    \$*)

-		# allow $-var names

-		PKG_SOURCES="$PKG_SOURCES $i"

-		PKG_OBJECTS="$PKG_OBJECTS $i"

-		;;

-	    *)

-		# check for existence - allows for generic/win/unix VPATH

-		# To add more dirs here (like 'src'), you have to update VPATH

-		# in Makefile.in as well

-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \

-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \

-		    -a ! -f "${srcdir}/macosx/$i" \

-		    ; then

-		    as_fn_error $? "could not find source file '$i'" "$LINENO" 5

-		fi

-		PKG_SOURCES="$PKG_SOURCES $i"

-		# this assumes it is in a VPATH dir

-		i=`basename $i`

-		# handle user calling this before or after TEA_SETUP_COMPILER

-		if test x"${OBJEXT}" != x ; then

-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"

-		else

-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"

-		fi

-		PKG_OBJECTS="$PKG_OBJECTS $j"

-		;;

-	esac

-    done

-

-

-

-

-

     vars="jpegtcl.h jpegtclDecls.h"

     for i in $vars; do

 	# check for existence, be strict because it is installed

diff --git a/tkimg/libjpeg/configure.ac b/tkimg/libjpeg/configure.ac

index a9a8b9e7..afb02fad 100755

--- a/tkimg/libjpeg/configure.ac

+++ b/tkimg/libjpeg/configure.ac

@@ -53,24 +53,6 @@ JPEG_CC=$CC

 TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c])

-TEA_ADD_SOURCES([

-	../compat/libjpeg/jcapimin.c	../compat/libjpeg/jcapistd.c	../compat/libjpeg/jccoefct.c

-	../compat/libjpeg/jccolor.c	../compat/libjpeg/jcdctmgr.c	../compat/libjpeg/jchuff.c

-	../compat/libjpeg/jcinit.c	../compat/libjpeg/jcmainct.c	../compat/libjpeg/jcmarker.c

-	../compat/libjpeg/jcmaster.c	../compat/libjpeg/jcomapi.c	../compat/libjpeg/jcparam.c

-	../compat/libjpeg/jcarith.c	../compat/libjpeg/jcprepct.c	../compat/libjpeg/jcsample.c

-	../compat/libjpeg/jctrans.c	../compat/libjpeg/jdapimin.c	../compat/libjpeg/jdapistd.c

-	../compat/libjpeg/jdatadst.c	../compat/libjpeg/jdatasrc.c	../compat/libjpeg/jdcoefct.c

-	../compat/libjpeg/jdcolor.c	../compat/libjpeg/jddctmgr.c	../compat/libjpeg/jdhuff.c

-	../compat/libjpeg/jdinput.c	../compat/libjpeg/jdmainct.c	../compat/libjpeg/jdmarker.c

-	../compat/libjpeg/jdmaster.c	../compat/libjpeg/jdmerge.c	../compat/libjpeg/jdarith.c

-	../compat/libjpeg/jdpostct.c	../compat/libjpeg/jdsample.c	../compat/libjpeg/jdtrans.c

-	../compat/libjpeg/jerror.c	../compat/libjpeg/jfdctflt.c	../compat/libjpeg/jfdctfst.c

-	../compat/libjpeg/jfdctint.c	../compat/libjpeg/jidctflt.c	../compat/libjpeg/jidctfst.c

-	../compat/libjpeg/jidctint.c	../compat/libjpeg/jaricom.c	../compat/libjpeg/jquant1.c

-	../compat/libjpeg/jquant2.c	../compat/libjpeg/jutils.c	../compat/libjpeg/jmemmgr.c

-	../compat/libjpeg/jmemansi.c

-])

 TEA_ADD_HEADERS([jpegtcl.h jpegtclDecls.h])

diff --git a/tkimg/libjpeg/jpegtclDecls.h b/tkimg/libjpeg/jpegtclDecls.h

index bd8decb7..3367252a 100755

--- a/tkimg/libjpeg/jpegtclDecls.h

+++ b/tkimg/libjpeg/jpegtclDecls.h

@@ -30,8 +30,8 @@ EXTERN int Jpegtcl_SafeInit(Tcl_Interp *interp);

 /* undef Tcl macros that conflict with libjpeg stuff (sigh) */

 #undef EXTERN

-#include "../compat/libjpeg/jpeglib.h"

-#include "../compat/libjpeg/jerror.h"

+#include "/usr/include/jpeglib.h"

+#include "/usr/include/jerror.h"

 /* !BEGIN!: Do not edit below this line. */

-- 

2.33.7