* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
@ 2007-07-23 12:26 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 12:26 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 05:26:49 -0700 (Mon, 23 Jul 2007)
New Revision: 19227
Log:
Cleanup imagemagick package
Modified:
trunk/buildroot/package/imagemagick/imagemagick.mk
Changeset:
Modified: trunk/buildroot/package/imagemagick/imagemagick.mk
===================================================================
--- trunk/buildroot/package/imagemagick/imagemagick.mk 2007-07-23 12:22:37 UTC (rev 19226)
+++ trunk/buildroot/package/imagemagick/imagemagick.mk 2007-07-23 12:26:49 UTC (rev 19227)
@@ -3,10 +3,10 @@
# imagemagick
#
#############################################################
-IMAGEMAGICK_VER:=6.3.4
+IMAGEMAGICK_VERSION:=6.3.4
IMAGEMAGICK_SOURCE:=ImageMagick.tar.bz2
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
-IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VER)
+IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
IMAGEMAGICK_CAT:=$(BZCAT)
IMAGEMAGICK_BINARY:=convert
IMAGEMAGICK_TARGET_BINARY:=usr/bin/$(IMAGEMAGICK_BINARY)
@@ -16,15 +16,14 @@
$(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
$(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-$(IMAGEMAGICK_VER)\*.patch\*
+ toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-$(IMAGEMAGICK_VERSION)\*.patch\*
$(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config
- @touch $@
+ touch $@
$(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked
(cd $(IMAGEMAGICK_DIR); \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(TARGET_CONFIGURE_ARGS) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -46,22 +45,22 @@
--without-freetype \
--without-x \
);
- @touch $@
+ touch $@
$(IMAGEMAGICK_DIR)/.compiled: $(IMAGEMAGICK_DIR)/.configured
$(MAKE) -C $(IMAGEMAGICK_DIR)
- @touch $@
+ touch $@
$(STAGING_DIR)/usr/lib/libMagick.a: $(IMAGEMAGICK_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(IMAGEMAGICK_DIR) install
- @touch -c $@
+ touch -c $@
$(TARGET_DIR)/usr/lib/libMagick.so: $(STAGING_DIR)/usr/lib/libMagick.a
cp -dpf $(STAGING_DIR)/usr/lib/libMagick.so* $(TARGET_DIR)/usr/lib/
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libMagick.so*
cp -dpf $(STAGING_DIR)/usr/lib/libWand.so* $(TARGET_DIR)/usr/lib/
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libWand.so*
- @touch -c $@
+ touch -c $@
$(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY): $(TARGET_DIR)/usr/lib/libMagick.so
cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate
@@ -82,9 +81,9 @@
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/mogrify
cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-montage $(TARGET_DIR)/usr/bin/montage
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/montage
- mkdir -p $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VER)
- cp -dpfr $(STAGING_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VER) $(TARGET_DIR)/usr/lib
- @touch -c $@
+ mkdir -p $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION)
+ cp -dpfr $(STAGING_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION) $(TARGET_DIR)/usr/lib
+ touch -c $@
imagemagick: uclibc jpeg tiff $(TARGET_DIR)/usr/lib/libMagick.so $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY)
@@ -99,8 +98,8 @@
rm -f $(TARGET_DIR)/usr/bin/import
rm -f $(TARGET_DIR)/usr/bin/mogrify
rm -f $(TARGET_DIR)/usr/bin/montage
- rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VER)
- rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VER)
+ rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION)
+ rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION)
-$(MAKE) -C $(IMAGEMAGICK_DIR) clean
imagemagick-dirclean:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
@ 2007-07-24 14:08 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-07-24 14:08 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-24 07:08:02 -0700 (Tue, 24 Jul 2007)
New Revision: 19247
Log:
Bump ImageMagick version
Modified:
trunk/buildroot/package/imagemagick/imagemagick.mk
Changeset:
Modified: trunk/buildroot/package/imagemagick/imagemagick.mk
===================================================================
--- trunk/buildroot/package/imagemagick/imagemagick.mk 2007-07-24 14:06:13 UTC (rev 19246)
+++ trunk/buildroot/package/imagemagick/imagemagick.mk 2007-07-24 14:08:02 UTC (rev 19247)
@@ -3,7 +3,7 @@
# imagemagick
#
#############################################################
-IMAGEMAGICK_VERSION:=6.3.4
+IMAGEMAGICK_VERSION:=6.3.5
IMAGEMAGICK_SOURCE:=ImageMagick.tar.bz2
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
@@ -16,7 +16,7 @@
$(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
$(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-$(IMAGEMAGICK_VERSION)\*.patch\*
+ toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-\*.patch\*
$(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config
touch $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
@ 2007-07-27 7:48 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-07-27 7:48 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-27 00:48:56 -0700 (Fri, 27 Jul 2007)
New Revision: 19270
Log:
Ensure each target is copied, run libtool --finish
Modified:
trunk/buildroot/package/imagemagick/imagemagick.mk
Changeset:
Modified: trunk/buildroot/package/imagemagick/imagemagick.mk
===================================================================
--- trunk/buildroot/package/imagemagick/imagemagick.mk 2007-07-27 07:38:48 UTC (rev 19269)
+++ trunk/buildroot/package/imagemagick/imagemagick.mk 2007-07-27 07:48:56 UTC (rev 19270)
@@ -8,9 +8,21 @@
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
IMAGEMAGICK_CAT:=$(BZCAT)
-IMAGEMAGICK_BINARY:=convert
-IMAGEMAGICK_TARGET_BINARY:=usr/bin/$(IMAGEMAGICK_BINARY)
+#IMAGEMAGICK_BINARY:=convert
+#IMAGEMAGICK_TARGET_BINARY:=usr/bin/$(IMAGEMAGICK_BINARY)
+IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagick.so
+IMAGEMAGICK_TARGET_BINARIES:=$(TARGET_DIR)/usr/bin/animate
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/compare
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/composite
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/conjure
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/display
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/import
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/mogrify
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/montage
+IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/convert
+
+IMAGEMAGICK_COPY:=cp -df --preserve=mode,ownership
$(DL_DIR)/$(IMAGEMAGICK_SOURCE):
$(WGET) -P $(DL_DIR) $(IMAGEMAGICK_SITE)/$(IMAGEMAGICK_SOURCE)
@@ -55,38 +67,70 @@
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(IMAGEMAGICK_DIR) install
touch -c $@
-$(TARGET_DIR)/usr/lib/libMagick.so: $(STAGING_DIR)/usr/lib/libMagick.a
- cp -dpf $(STAGING_DIR)/usr/lib/libMagick.so* $(TARGET_DIR)/usr/lib/
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libMagick.so*
- cp -dpf $(STAGING_DIR)/usr/lib/libWand.so* $(TARGET_DIR)/usr/lib/
+$(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagick.a
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/lib/libWand.so* $(TARGET_DIR)/usr/lib/
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libWand.so*
+ mkdir -p $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION)
+ $(IMAGEMAGICK_COPY) -r $(STAGING_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION) $(TARGET_DIR)/usr/lib
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/lib/libMagick.so* $(TARGET_DIR)/usr/lib/
+ -$(STRIP) --strip-unneeded $(IMAGEMAGICK_LIB)*
touch -c $@
-$(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY): $(TARGET_DIR)/usr/lib/libMagick.so
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate
+$(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB)
+ libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-6.3.5/modules-Q16/coders
+ libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-6.3.5/modules-Q16/filters
+ touch $@
+
+$(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB)
+ ls -l $(IMAGEMAGICK_LIB) >> datefile
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/animate
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-compare $(TARGET_DIR)/usr/bin/compare
+ touch $@
+
+$(TARGET_DIR)/usr/bin/compare: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-compare $(TARGET_DIR)/usr/bin/compare
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/compare
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-composite $(TARGET_DIR)/usr/bin/composite
+ touch $@
+
+$(TARGET_DIR)/usr/bin/composite: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-composite $(TARGET_DIR)/usr/bin/composite
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/composite
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-conjure $(TARGET_DIR)/usr/bin/conjure
+ touch $@
+
+$(TARGET_DIR)/usr/bin/conjure: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-conjure $(TARGET_DIR)/usr/bin/conjure
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/conjure
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-convert $(TARGET_DIR)/usr/bin/convert
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/convert
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-display $(TARGET_DIR)/usr/bin/display
+ touch $@
+
+$(TARGET_DIR)/usr/bin/display: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-display $(TARGET_DIR)/usr/bin/display
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/display
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-import $(TARGET_DIR)/usr/bin/import
+ touch $@
+
+$(TARGET_DIR)/usr/bin/import: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-import $(TARGET_DIR)/usr/bin/import
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/import
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-mogrify $(TARGET_DIR)/usr/bin/mogrify
+ touch $@
+
+$(TARGET_DIR)/usr/bin/mogrify: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-mogrify $(TARGET_DIR)/usr/bin/mogrify
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/mogrify
- cp -dpf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-montage $(TARGET_DIR)/usr/bin/montage
+ touch $@
+
+$(TARGET_DIR)/usr/bin/montage: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-montage $(TARGET_DIR)/usr/bin/montage
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/montage
- mkdir -p $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION)
- cp -dpfr $(STAGING_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION) $(TARGET_DIR)/usr/lib
- touch -c $@
+ touch $@
-imagemagick: uclibc jpeg tiff $(TARGET_DIR)/usr/lib/libMagick.so $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY)
+$(TARGET_DIR)/usr/bin/convert: $(IMAGEMAGICK_LIB)
+ $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-convert $(TARGET_DIR)/usr/bin/convert
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/convert
+ touch $@
+imagemagick: uclibc jpeg tiff $(IMAGEMAGICK_LIB) \
+ $(IMAGEMAGICK_DIR)/.libinstall \
+ $(IMAGEMAGICK_TARGET_BINARIES)
+
imagemagick-clean:
rm -f $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY)
rm -f $(TARGET_DIR)/usr/bin/animate
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
@ 2007-11-23 7:40 ulf at uclibc.org
2007-11-23 9:14 ` Hebbar
0 siblings, 1 reply; 7+ messages in thread
From: ulf at uclibc.org @ 2007-11-23 7:40 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-22 23:40:15 -0800 (Thu, 22 Nov 2007)
New Revision: 20487
Log:
Bump ImageMagick to v 6.3.7
Modified:
trunk/buildroot/package/imagemagick/imagemagick.mk
Changeset:
Modified: trunk/buildroot/package/imagemagick/imagemagick.mk
===================================================================
--- trunk/buildroot/package/imagemagick/imagemagick.mk 2007-11-23 07:26:15 UTC (rev 20486)
+++ trunk/buildroot/package/imagemagick/imagemagick.mk 2007-11-23 07:40:15 UTC (rev 20487)
@@ -3,7 +3,7 @@
# imagemagick
#
#############################################################
-IMAGEMAGICK_VERSION:=6.3.5
+IMAGEMAGICK_VERSION:=6.3.7
IMAGEMAGICK_SOURCE:=ImageMagick.tar.bz2
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
2007-11-23 7:40 ulf at uclibc.org
@ 2007-11-23 9:14 ` Hebbar
2007-11-23 13:24 ` Ulf Samuelsson
0 siblings, 1 reply; 7+ messages in thread
From: Hebbar @ 2007-11-23 9:14 UTC (permalink / raw)
To: buildroot
Hi ulf,
Can u help me to solve another problem with ImageMagick. While building
ImageMagick , it checks for jpeg & tiff's Library from OS root folder 1st
then from $(STAGING_DIR)/lib/ folder. Because of this i was getting below
errors with both Jpeg and tiff when building ImageMagick.
/usr/lib/libtiff.so: could not read symbols: File in wrong format
collect2: ld returned 1 exit status
make[1]: *** [magick/libMagick.la] Error 1
/usr/lib/libjpeg.so: could not read symbols: File in wrong format
collect2: ld returned 1 exit status
make[1]: *** [magick/libMagick.la] Error 1
When i tried to move the respective libs for Jpeg and tiff from OS root
folder, then ImageMagick properly took libs from $(STAGING_DIR)/lib/ folder
and was successfully built.
Kindly help me to fix this. Thanks in advance
Regards
Gururaja
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-imagemagick-tf4860117.html#a13909016
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
2007-11-23 9:14 ` Hebbar
@ 2007-11-23 13:24 ` Ulf Samuelsson
0 siblings, 0 replies; 7+ messages in thread
From: Ulf Samuelsson @ 2007-11-23 13:24 UTC (permalink / raw)
To: buildroot
>
> Hi ulf,
>
> Can u help me to solve another problem with ImageMagick. While building
> ImageMagick , it checks for jpeg & tiff's Library from OS root folder 1st
> then from $(STAGING_DIR)/lib/ folder. Because of this i was getting below
> errors with both Jpeg and tiff when building ImageMagick.
>
> /usr/lib/libtiff.so: could not read symbols: File in wrong format
> collect2: ld returned 1 exit status
> make[1]: *** [magick/libMagick.la] Error 1
>
> /usr/lib/libjpeg.so: could not read symbols: File in wrong format
> collect2: ld returned 1 exit status
> make[1]: *** [magick/libMagick.la] Error 1
>
> When i tried to move the respective libs for Jpeg and tiff from OS root
> folder, then ImageMagick properly took libs from $(STAGING_DIR)/lib/ folder
> and was successfully built.
>
> Kindly help me to fix this. Thanks in advance
>
> Regards
> Gururaja
This is a collaborative project.
I.E: you are expected to fix problems you find,
not ask anyone else to fix it.
Please modify the package/imagemagick/imagemagick.mk
and test it so it works and send in a patch.
Best Regards
Ulf Samuelsson ulf at atmel.com
Atmel Nordic AB
Mail: Box 2033, 174 02 Sundbyberg, Sweden
Visit: Kavalleriv?gen 24, 174 58 Sundbyberg, Sweden
Phone +46 (8) 441 54 22 Fax +46 (8) 441 54 29
GSM +46 (706) 22 44 57
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/imagemagick
@ 2009-01-12 7:42 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2009-01-12 7:42 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-12 07:42:09 +0000 (Mon, 12 Jan 2009)
New Revision: 24781
Log:
Bump version of ImageMagick which does not work, use versioned patches, needs further work to complete build
Modified:
trunk/buildroot/package/imagemagick/imagemagick.mk
Changeset:
Modified: trunk/buildroot/package/imagemagick/imagemagick.mk
===================================================================
--- trunk/buildroot/package/imagemagick/imagemagick.mk 2009-01-12 07:40:08 UTC (rev 24780)
+++ trunk/buildroot/package/imagemagick/imagemagick.mk 2009-01-12 07:42:09 UTC (rev 24781)
@@ -3,8 +3,8 @@
# imagemagick
#
#############################################################
-IMAGEMAGICK_VERSION:=6.3.7
-IMAGEMAGICK_SOURCE:=ImageMagick.tar.bz2
+IMAGEMAGICK_VERSION:=6.4.8-4
+IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
IMAGEMAGICK_CAT:=$(BZCAT)
@@ -28,7 +28,7 @@
$(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
$(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-\*.patch\*
+ toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-$(IMAGEMAGICK_VERSION)\*.patch\*
$(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config
touch $@
@@ -133,6 +133,8 @@
imagemagick-source: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
+imagemagick-unpacked:$(IMAGEMAGICK_DIR)/.unpacked
+
imagemagick-clean:
rm -f $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY)
rm -f $(TARGET_DIR)/usr/bin/animate
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-01-12 7:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-24 14:08 [Buildroot] svn commit: trunk/buildroot/package/imagemagick ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-12 7:42 ulf at uclibc.org
2007-11-23 7:40 ulf at uclibc.org
2007-11-23 9:14 ` Hebbar
2007-11-23 13:24 ` Ulf Samuelsson
2007-07-27 7:48 ulf at uclibc.org
2007-07-23 12:26 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox