[packages] imagemagick: remove carriage returns

git-svn-id: svn://svn.openwrt.org/openwrt/packages@25252 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2011-01-30 01:25:17 +00:00
parent b838faf06b
commit 784bcfa34d

View File

@ -1,115 +1,115 @@
# #
# Copyright (C) 2010 OpenWrt.org # Copyright (C) 2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=imagemagick PKG_NAME:=imagemagick
PKG_VERSION:=6.6.7 PKG_VERSION:=6.6.7
PKG_REVISION:=3 PKG_REVISION:=3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/ImageMagick-$(PKG_VERSION)-$(PKG_REVISION) PKG_BUILD_DIR:=$(BUILD_DIR)/ImageMagick-$(PKG_VERSION)-$(PKG_REVISION)
PKG_SOURCE:=ImageMagick-$(PKG_VERSION)-$(PKG_REVISION).tar.bz2 PKG_SOURCE:=ImageMagick-$(PKG_VERSION)-$(PKG_REVISION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.fifi.org/pub/ImageMagick/ PKG_SOURCE_URL:=ftp://ftp.fifi.org/pub/ImageMagick/
PKG_MD5SUM:= PKG_MD5SUM:=
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4 PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
PKG_INSTALL=1 PKG_INSTALL=1
define Package/imagemagick/Default define Package/imagemagick/Default
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia
TITLE:=imagemagick TITLE:=imagemagick
URL:=http://image_magick.veidrodis.com/ URL:=http://image_magick.veidrodis.com/
endef endef
define Package/imagemagick define Package/imagemagick
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
endef endef
define Package/imagemagick/description define Package/imagemagick/description
An image manipulation library. An image manipulation library.
endef endef
define Package/imagemagick-jpeg define Package/imagemagick-jpeg
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
TITLE+= (jpeg) TITLE+= (jpeg)
DEPENDS:=+imagemagick +libjpeg +zlib DEPENDS:=+imagemagick +libjpeg +zlib
endef endef
define Package/imagemagick-jpeg/description define Package/imagemagick-jpeg/description
imagemagick JPEG module imagemagick JPEG module
endef endef
define Package/imagemagick-png define Package/imagemagick-png
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
TITLE+= (png) TITLE+= (png)
DEPENDS:=+imagemagick +libpng +zlib DEPENDS:=+imagemagick +libpng +zlib
endef endef
define Package/imagemagick-png/description define Package/imagemagick-png/description
imagemagick PNG module imagemagick PNG module
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-modules \ --with-modules \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--without-xml \ --without-xml \
--without-x --without-x
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux -I$(PKG_BUILD_DIR)/include" CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux -I$(PKG_BUILD_DIR)/include"
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/magick $(INSTALL_DIR) $(1)/usr/include/magick
$(INSTALL_DIR) $(1)/usr/include/Magick++ $(INSTALL_DIR) $(1)/usr/include/Magick++
$(INSTALL_DIR) $(1)/usr/include/wand $(INSTALL_DIR) $(1)/usr/include/wand
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/* \ $(PKG_INSTALL_DIR)/usr/include/* \
$(1)/usr/include/ $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
$(1)/usr/lib/pkgconfig/ $(1)/usr/lib/pkgconfig/
endef endef
define Package/imagemagick/install define Package/imagemagick/install
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \
$(1)/usr/lib/ $(1)/usr/lib/
endef endef
define BuildPlugin define BuildPlugin
define Package/imagemagick-$(1)/install define Package/imagemagick-$(1)/install
$(INSTALL_DIR) $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders $(INSTALL_DIR) $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).so \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).so \
$$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders
endef endef
$$(eval $$(call BuildPackage,imagemagick-$(1))) $$(eval $$(call BuildPackage,imagemagick-$(1)))
endef endef
$(eval $(call BuildPackage,imagemagick)) $(eval $(call BuildPackage,imagemagick))
$(eval $(call BuildPlugin,jpeg)) $(eval $(call BuildPlugin,jpeg))
$(eval $(call BuildPlugin,png)) $(eval $(call BuildPlugin,png))