From 192d96ee05fb8aa253c94a3504cada2d37a94291 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 11:59:52 +0100 Subject: update to latest available upstream version --- package/jpeg/Makefile | 12 +++--------- package/jpeg/patches/jpeg-6b-fix-makefile.patch | 12 ------------ package/jpeg/patches/patch-configure | 8 -------- package/jpeg/patches/patch-ltconfig | 12 ------------ 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/jpeg/patches/jpeg-6b-fix-makefile.patch delete mode 100644 package/jpeg/patches/patch-configure delete mode 100644 package/jpeg/patches/patch-ltconfig (limited to 'package') diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index fab6ed595..972eb44a5 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jpeg -PKG_VERSION:= 6b +PKG_VERSION:= 7 PKG_RELEASE:= 1 -PKG_MD5SUM:= dbd5f3b47ed13132f04c685d608a7547 +PKG_MD5SUM:= 382ef33b339c299b56baf1296cda9785 PKG_DESCR:= The Independent JPEG Groups JPEG runtime library PKG_SECTION:= libs -PKG_URL:= http://sourceforge.net/projects/libjpeg +PKG_URL:= http://www.ijg.org/ PKG_SITES:= http://www.ijg.org/files/ \ ftp://ftp.uu.net/graphics/jpeg/ @@ -26,12 +26,6 @@ $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto -FAKE_FLAGS+= prefix="${WRKINST}/usr" \ - exec_prefix="${WRKINST}/usr" -INSTALL_TARGET:= install-headers install-lib - -pre-build: - mkdir -p ${WRKINST}/usr/{include,lib} post-install: ${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib diff --git a/package/jpeg/patches/jpeg-6b-fix-makefile.patch b/package/jpeg/patches/jpeg-6b-fix-makefile.patch deleted file mode 100644 index 057e576c4..000000000 --- a/package/jpeg/patches/jpeg-6b-fix-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN jpeg-6b-old/makefile.cfg jpeg-6b/makefile.cfg ---- jpeg-6b.orig/makefile.cfg 1998-03-21 20:08:57.000000000 +0100 -+++ jpeg-6b/makefile.cfg 2009-06-12 17:58:24.000000000 +0200 -@@ -168,7 +168,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS) - - # with libtool: - libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS) -- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \ -+ $(LIBTOOL) --mode=link "$(CC)" -o libjpeg.la $(LIBOBJECTS) \ - -rpath $(libdir) -version-info $(JPEG_LIB_VERSION) - - # sample programs: diff --git a/package/jpeg/patches/patch-configure b/package/jpeg/patches/patch-configure deleted file mode 100644 index 3a624b34d..000000000 --- a/package/jpeg/patches/patch-configure +++ /dev/null @@ -1,8 +0,0 @@ ---- jpeg-6b.orig/configure 1998-03-21 20:08:57.000000000 +0100 -+++ jpeg-6b/configure 2009-06-12 18:04:41.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/sh -x - - # Guess values for system-dependent variables and create Makefiles. - # Generated automatically using autoconf version 2.12 diff --git a/package/jpeg/patches/patch-ltconfig b/package/jpeg/patches/patch-ltconfig deleted file mode 100644 index dd6127a63..000000000 --- a/package/jpeg/patches/patch-ltconfig +++ /dev/null @@ -1,12 +0,0 @@ ---- jpeg-6b.orig/ltconfig 1998-03-25 16:25:39.000000000 +0100 -+++ jpeg-6b/ltconfig 2009-06-12 18:17:05.000000000 +0200 -@@ -1104,7 +1104,8 @@ finish_cmds= - finish_eval= - shlibpath_var= - version_type=none --dynamic_linker="$host_os ld.so" -+dynamic_linker="Linux ld.so" -+host_os=linux-gnu - - echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 - case "$host_os" in -- cgit v1.2.3