diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2010-05-19 08:58:23 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:43:05 +0200 |
| commit | b76270bf9e6dd375e495fec92140a79a79415d27 (patch) | |
| tree | 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/l/libjpeg/jpeg-6b.diff | |
| parent | 5a12e7c134274dba706667107d10d231517d3e05 (diff) | |
| download | current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz | |
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits. The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription. Consider picking up
a copy to help support the project. Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality. :-)
Enjoy!
Diffstat (limited to 'source/l/libjpeg/jpeg-6b.diff')
| -rw-r--r-- | source/l/libjpeg/jpeg-6b.diff | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/source/l/libjpeg/jpeg-6b.diff b/source/l/libjpeg/jpeg-6b.diff deleted file mode 100644 index 8ad8bb5db..000000000 --- a/source/l/libjpeg/jpeg-6b.diff +++ /dev/null @@ -1,59 +0,0 @@ ---- makefile.cfg.orig Sat Mar 21 13:08:57 1998 -+++ makefile.cfg Tue Oct 6 19:15:26 1998 -@@ -21,6 +21,8 @@ - - # The name of your C compiler: - CC= @CC@ -+SONAME=libjpeg.so.62 -+SHLIBNAME=libjpeg.so.62.0.0 - - # You may need to adjust these cc options: - CFLAGS= @CFLAGS@ @CPPFLAGS@ @INCLUDEFLAGS@ -@@ -125,6 +127,7 @@ - jdsample.$(O) jdcolor.$(O) jquant1.$(O) jquant2.$(O) jdmerge.$(O) - # These objectfiles are included in libjpeg.a - LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS) -+SHLIBOBJECTS= $(LIBOBJECTS:%.o=%.so) - # object files for sample applications (excluding library files) - COBJECTS= cjpeg.$(O) rdppm.$(O) rdgif.$(O) rdtarga.$(O) rdrle.$(O) \ - rdbmp.$(O) rdswitch.$(O) cdjpeg.$(O) -@@ -133,7 +136,7 @@ - TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O) - - --all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom -+all: @A2K_DEPS@ libjpeg.$(A) $(SHLIBNAME) cjpeg djpeg jpegtran rdjpgcom wrjpgcom - - # Special compilation rules to support ansi2knr and libtool. - .SUFFIXES: .lo .la -@@ -171,6 +174,11 @@ - $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \ - -rpath $(libdir) -version-info $(JPEG_LIB_VERSION) - -+# shared library -+ -+$(SHLIBNAME): @A2K_DEPS@ $(SHLIBOBJECTS) -+ gcc -o $(SHLIBNAME) -Wl,-soname,$(SONAME) -shared $(SHLIBOBJECTS) -+ - # sample programs: - - cjpeg: $(COBJECTS) libjpeg.$(A) -@@ -214,7 +222,7 @@ - clean: - $(RM) *.o *.lo libjpeg.a libjpeg.la - $(RM) cjpeg djpeg jpegtran rdjpgcom wrjpgcom -- $(RM) ansi2knr core testout* config.log config.status -+ $(RM) ansi2knr core testout* config.log config.status $(SHLIBNAME) - $(RM) -r knr .libs _libs - - distclean: clean -@@ -289,6 +297,9 @@ - jidctfst.$(O): jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h - jidctint.$(O): jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h - jidctred.$(O): jidctred.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h -+ -+%.so : %.c -+ $(CC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $< -o $@ - jquant1.$(O): jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h - jquant2.$(O): jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h - jutils.$(O): jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h |