diff options
Diffstat (limited to 'package/libXpm')
| -rw-r--r-- | package/libXpm/Makefile | 32 | ||||
| -rw-r--r-- | package/libXpm/patches/patch-ltmain_sh | 11 |
2 files changed, 12 insertions, 31 deletions
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index 34c64d534..c3acfd7ed 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -1,25 +1,24 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libXpm -PKG_VERSION:= 3.5.9 +PKG_VERSION:= 3.5.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= d6d4b0f76248a6b346eb42dfcdaa72a6 -PKG_DESCR:= common operation for the XPM pixmap format -PKG_BUILDDEP:= libX11 +PKG_HASH:= 53ddf924441b7ed2de994d4934358c13d9abf4828b1b16e1255ade5032b31df7 +PKG_DESCR:= common operation for the xpm pixmap format +PKG_BUILDDEP:= libX11 libXt PKG_SECTION:= x11/libs -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/lib/ +PKG_LIBNAME:= libxpm +PKG_OPTS:= dev -PKG_SUBPKGS:= LIBXPM LIBXPM_DEV -PKGSD_LIBXPM_DEV:= XPM pixmap format headers -PKGSC_LIBXPM_DEV:= x11/devel +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -include $(TOPDIR)/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBXPM_DEV,libxpm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXPM_DEV},${PKGSC_LIBXPM_DEV})) +$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ENV+= ac_cv_search_gettext=no @@ -27,11 +26,4 @@ libxpm-install: ${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib ${CP} ${WRKINST}/usr/lib/libXpm.so* ${IDIR_LIBXPM}/usr/lib -libxpm-dev-install: - ${INSTALL_DIR} ${IDIR_LIBXPM_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXPM_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_LIBXPM_DEV}/usr/lib/pkgconfig - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_LIBXPM_DEV}/usr/lib/pkgconfig - -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXpm/patches/patch-ltmain_sh b/package/libXpm/patches/patch-ltmain_sh deleted file mode 100644 index 2dda1fabf..000000000 --- a/package/libXpm/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libXpm-3.5.9.orig/ltmain.sh 2010-10-30 02:29:56.000000000 +0200 -+++ libXpm-3.5.9/ltmain.sh 2011-01-24 18:41:08.000000000 +0100 -@@ -5091,7 +5091,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |