Skip to contentSkip to conversation

imagemagick: convert to autotargets and bump to 6.6.4

PATCH New Martin Banky 2 participants 5 messages Oct 2, 2010 – Oct 5, 2010

lore
Share & tools
lore
#0 lore raw

cover imagemagick: convert to autotargets and bump to 6.6.4

Both patches are needed for this to work properly.

Martin

[PATCH 1/2] jpeg: bump to 8b
[PATCH 2/2] imagemagick: convert to autotargets and bump to 6.6.4

#1 lore raw

PATCH 1/2 jpeg: bump to 8b

---
 package/jpeg/jpeg-build.patch   |   99 ---------------------------------------
 package/jpeg/jpeg-libtool.patch |   66 --------------------------
 package/jpeg/jpeg.mk            |    7 +--
 3 files changed, 3 insertions(+), 169 deletions(-)
 delete mode 100644 package/jpeg/jpeg-build.patch
 delete mode 100644 package/jpeg/jpeg-libtool.patch
package/jpeg/jpeg-build.patch deleted +0 -99
deleted file mode 100644
index 9f3c5c2..0000000
@@ -1,99 +0,0 @@
-- Respect options from configure (bindir/libdir/etc...)
-- Grab AR from the env instead of hardcoding to 'ar'
-- Fix install to respect $(DESTDIR)
-- Also install jpegint.h #64254
-
---- jpeg/makefile.cfg
-+++ jpeg/makefile.cfg
-@@ -11,13 +11,13 @@
- # 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)/man/man$(manext)
-+mandir = @mandir@/man$(manext)
- 
- # The name of your C compiler:
- CC= @CC@
-@@ -60,7 +60,8 @@
- # directory creation command
- MKDIR= mkdir
- # library (.a) file creation command
--AR= ar rc
-+AR = @AR@
-+ARFLAGS = rc
- # second step in .a creation (use "touch" if not needed)
- AR2= @RANLIB@
- # installation program
-@@ -163,7 +164,7 @@
- # without libtool:
- libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
- 	$(RM) libjpeg.a
--	$(AR) libjpeg.a  $(LIBOBJECTS)
-+	$(AR) $(ARFLAGS) libjpeg.a  $(LIBOBJECTS)
- 	$(AR2) libjpeg.a
- 
- # with libtool:
-@@ -191,25 +191,29 @@
- # 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)
-+	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
-+	$(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)
-+	mkdir -p $(DESTDIR)$(libdir)
-+	$(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
-+	mkdir -p $(DESTDIR)$(includedir)
-+	$(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
-+	$(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.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
- 
- clean:
- 	$(RM) *.o *.lo libjpeg.a libjpeg.la
---- jpeg/configure
-+++ jpeg/configure
-@@ -1777,6 +1777,7 @@
- s%@CPP@%$CPP%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@AR@%${AR-ar}%g
- s%@RANLIB@%$RANLIB%g
- s%@LIBTOOL@%$LIBTOOL%g
- s%@O@%$O%g
package/jpeg/jpeg-libtool.patch deleted +0 -66

66 lines not on this page · raw message

package/jpeg/jpeg.mk +3 -4
index 4f08534..1f408a0 100644
@@ -20,13 +20,12 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
-JPEG_VERSION:=6b
-JPEG_SITE:=ftp://ftp.uu.net/graphics/jpeg/
-JPEG_SOURCE=jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_VERSION = 8b
+JPEG_SITE = http://www.ijg.org/files/
+JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES
 JPEG_INSTALL_TARGET = YES
 JPEG_LIBTOOL_PATCH = NO
-JPEG_CONF_OPT = --without-x --enable-shared --enable-static
 
 define JPEG_REMOVE_USELESS_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
Signature · 1 line
1.7.3.1
#2 lore raw

PATCH 1/2 jpeg: bump to 8b

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Signed-off-by: Martin Banky <[email protected]>
Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 imagemagick: convert to autotargets and bump to 6.6.4

In reply to Martin Banky

program-transform-name='s,,,' is needed, otherwise configure defines it as $(platform)-$(cpu)-. During install, all executables are prepended with this variable.

---
 ....3.4-add-errno-h-if-argz-h-does-not-exist.patch |   11 --
 ....6.4-add-errno-h-if-argz-h-does-not-exist.patch |   11 ++
 package/imagemagick/imagemagick.mk                 |  148 ++------------------
 3 files changed, 25 insertions(+), 145 deletions(-)
 delete mode 100644 package/imagemagick/imagemagick-6.3.4-add-errno-h-if-argz-h-does-not-exist.patch
 create mode 100644 package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch
package/imagemagick/imagemagick-6.3.4-add-errno-h-if-argz-h-does-not-exist.patch deleted +0 -11
deleted file mode 100644
index a11fdd2..0000000
@@ -1,11 +0,0 @@
---- ImageMagick-6.3.4.old/configure	2007-05-12 05:49:25.000000000 +0200
-+++ ImageMagick-6.3.4.new/configure	2007-05-21 16:53:32.000000000 +0200
-@@ -9484,6 +9484,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #if HAVE_ARGZ_H
- #  include <argz.h>
-+#else
-+#  include <errno.h>
- #endif
- 
- typedef error_t ac__type_new_;
package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch new file +11 -0
new file mode 100644
index 0000000..66a6747
@@ -0,0 +1,11 @@
+--- a/configure	2010-09-26 17:05:45.000000000 -0700
++++ b/configure	2010-09-30 23:47:09.000000000 -0700
+@@ -20354,6 +20354,8 @@ done
+ 
+ ac_fn_c_check_type "$LINENO" "error_t" "ac_cv_type_error_t" "#if defined(HAVE_ARGZ_H)
+ #  include <argz.h>
++#else
++#  include <errno.h>
+ #endif
+ "
+ if test "x$ac_cv_type_error_t" = xyes; then :
package/imagemagick/imagemagick.mk +14 -134

165 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#4 lore raw

PATCH 2/2 imagemagick: convert to autotargets and bump to 6.6.4

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> program-transform-name='s,,,' is needed, otherwise configure defines it as Martin> $(platform)-$(cpu)-. During install, all executables are prepended with this Martin> variable.

Martin> Signed-off-by: Martin Banky <[email protected]> Martin> -IMAGEMAGICK_MAJOR:=6.4.8
Martin> -IMAGEMAGICK_VERSION:=$(IMAGEMAGICK_MAJOR)-4
Martin> -IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2 Martin> -IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick Martin> -IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION) Martin> -IMAGEMAGICK_CAT:=$(BZCAT)
Martin> -IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagickCore.so Martin> +IMAGEMAGICK_MAJOR = 6.6.4
Martin> +IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
Martin> +IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2 Martin> +IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick Martin> +IMAGEMAGICK_INSTALL_STAGING = YES

We neee IMAGEMAGICK_LIBTOOL_PATCH = NO

Martin> +define ICU_INSTALL_STAGING_CMDS
Martin> + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install
Martin> +endef

That's wrong/not needed.

Committed with those 2 fixes, thanks.

Signature · 1 line
Bye, Peter Korsgaard