diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-07-15 13:34:26 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 16:00:54 +0100 |
commit | b8b678f01099d40f1412386957b2fe457dd9c0ae (patch) | |
tree | 8deecda0737801ba23fcec95a012c58cf8fa928e /meta/packages/jpeg/jpeg-6b/paths.patch | |
parent | 37eb35995f3d4d75ef57987d5d924b23c40e83e2 (diff) | |
download | openembedded-core-b8b678f01099d40f1412386957b2fe457dd9c0ae.tar.gz openembedded-core-b8b678f01099d40f1412386957b2fe457dd9c0ae.tar.bz2 openembedded-core-b8b678f01099d40f1412386957b2fe457dd9c0ae.tar.xz openembedded-core-b8b678f01099d40f1412386957b2fe457dd9c0ae.zip |
jpeg: Update to 8b
Original patch status:
ldflags.patch:
paths.patch:
libtool_tweak.patch:
Dropped as the issues got fixed in 8b
debian.patch:
This patch comes from debian distro. Original version can't apply, so
replace it by latest version
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/packages/jpeg/jpeg-6b/paths.patch')
-rw-r--r-- | meta/packages/jpeg/jpeg-6b/paths.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/meta/packages/jpeg/jpeg-6b/paths.patch b/meta/packages/jpeg/jpeg-6b/paths.patch deleted file mode 100644 index 014bf4ec0..000000000 --- a/meta/packages/jpeg/jpeg-6b/paths.patch +++ /dev/null @@ -1,77 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- jpeg-6b/makefile.cfg~paths.patch -+++ jpeg-6b/makefile.cfg -@@ -7,17 +7,18 @@ - # For compiling with source and object files in different directories. - srcdir = @srcdir@ - VPATH = @srcdir@ -+DESTDIR = @DESTDIR@ - - # Where to install the programs and man pages. - prefix = @prefix@ - exec_prefix = @exec_prefix@ --bindir = $(exec_prefix)/bin --libdir = $(exec_prefix)/lib --includedir = $(prefix)/include -+bindir = @bindir@ -+libdir = @libdir@ -+includedir = @includedir@ - binprefix = - manprefix = - manext = 1 --mandir = $(prefix)/share/man/man$(manext) -+mandir = @mandir@/man$(manext) - - # The name of your C compiler: - CC= @CC@ -@@ -191,30 +192,30 @@ - # Installation rules: - - install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ -- $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg -- $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg -- $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran -- $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom -- $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom -- $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext) -- $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext) -- $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext) -- $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext) -- $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext) -+ $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg -+ $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg -+ $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran -+ $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom -+ $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom -+ $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext) -+ $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext) -+ $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext) -+ $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext) -+ $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext) - - install-lib: libjpeg.$(A) install-headers -- $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A) -+ $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A) - - install-headers: jconfig.h -- $(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h -- $(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h -- $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h -- $(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h -+ $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h -+ $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h -+ $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h -+ $(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h - #<ballombe@debian.org>:mjpegtools require this file to build and header say: - # * These declarations are considered internal to the JPEG library; most - # * applications using the library shouldn't need to include this file. - # So it is not forbidden to use it, therefore it must be installed. -- $(INSTALL_DATA) $(srcdir)/jpegint.h $(includedir)/jpegint.h -+ $(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h - - clean: - $(RM) *.o *.lo libjpeg.a libjpeg.la |