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>
This commit is contained in:
Zhai Edwin
Richard Purdie
parent
37eb35995f
commit
b8b678f010
File diff suppressed because it is too large
Load Diff
|
|
@ -1,16 +0,0 @@
|
|||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- jpeg-6b/makefile.cfg~ldflags
|
||||
+++ jpeg-6b/makefile.cfg
|
||||
@@ -169,7 +169,7 @@
|
||||
# with libtool:
|
||||
libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
|
||||
$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
|
||||
- -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
|
||||
+ -rpath $(libdir) -version-info $(JPEG_LIB_VERSION) $(LDFLAGS)
|
||||
|
||||
# sample programs:
|
||||
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
Index: jpeg-6b/configure
|
||||
===================================================================
|
||||
--- jpeg-6b.orig/configure 2008-05-07 15:53:15.000000000 +0100
|
||||
+++ jpeg-6b/configure 2008-05-07 15:54:40.000000000 +0100
|
||||
@@ -1532,7 +1532,7 @@
|
||||
LIBTOOL="./libtool"
|
||||
O="lo"
|
||||
A="la"
|
||||
- LN='$(LIBTOOL) --mode=link $(CC)'
|
||||
+ LN='$(LIBTOOL) --tag=CC --mode=link $(CC)'
|
||||
INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
|
||||
INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
|
||||
else
|
||||
@@ -1559,7 +1559,6 @@
|
||||
if test "x$LTSTATIC" = xno; then
|
||||
disable_static="--disable-static"
|
||||
fi
|
||||
- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
|
||||
fi
|
||||
|
||||
# Select memory manager depending on user input.
|
||||
Index: jpeg-6b/makefile.cfg
|
||||
===================================================================
|
||||
--- jpeg-6b.orig/makefile.cfg 2008-05-07 15:53:24.000000000 +0100
|
||||
+++ jpeg-6b/makefile.cfg 2008-05-07 15:56:22.000000000 +0100
|
||||
@@ -141,7 +141,7 @@
|
||||
|
||||
# How to compile with libtool.
|
||||
@COM_LT@.c.lo:
|
||||
-@COM_LT@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c
|
||||
+@COM_LT@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c
|
||||
|
||||
# How to use ansi2knr, when not using libtool.
|
||||
@COM_A2K@.c.o:
|
||||
@@ -152,7 +152,7 @@
|
||||
# How to use ansi2knr AND libtool.
|
||||
@COM_A2K@.c.lo:
|
||||
@COM_A2K@ ./ansi2knr $(srcdir)/$*.c knr/$*.c
|
||||
-@COM_A2K@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c knr/$*.c
|
||||
+@COM_A2K@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c knr/$*.c
|
||||
@COM_A2K@ $(RM) knr/$*.c
|
||||
|
||||
ansi2knr: ansi2knr.c
|
||||
@@ -169,7 +169,7 @@
|
||||
|
||||
# with libtool:
|
||||
libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
|
||||
- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
|
||||
+ $(LIBTOOL) --tag=CC --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
|
||||
-rpath $(libdir) -version-info $(JPEG_LIB_VERSION) $(LDFLAGS)
|
||||
|
||||
# sample programs:
|
||||
|
|
@ -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
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,6 +3,9 @@ HOMEPAGE = "http://www.ijg.org/"
|
|||
BUGTRACKER = ""
|
||||
|
||||
LICENSE ="jpeg"
|
||||
LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe21d \
|
||||
file://jpeglib.h;endline=14;md5=dd06b5575519f735ec2565ed36ce62e7 \
|
||||
file://djpeg.c;endline=13;md5=ca89254925da06fef47e4b6468233432"
|
||||
|
||||
SECTION = "libs"
|
||||
PRIORITY = "required"
|
||||
|
|
@ -10,13 +13,10 @@ PRIORITY = "required"
|
|||
DEPENDS = "libtool-cross"
|
||||
DEPENDS_virtclass-native = "libtool-native"
|
||||
|
||||
PR = "r9"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
|
||||
file://debian.patch;patch=1 \
|
||||
file://ldflags.patch;patch=1 \
|
||||
file://paths.patch;patch=1 \
|
||||
file://libtool_tweak.patch;patch=1"
|
||||
file://debian-libjpeg7_7-1.diff;patch=1"
|
||||
|
||||
inherit autotools
|
||||
|
||||
Loading…
Reference in New Issue