diff options
| -rw-r--r-- | package/atftp/Makefile | 1 | ||||
| -rw-r--r-- | package/e2fsprogs/Makefile | 10 | ||||
| -rw-r--r-- | package/giflib/Makefile | 4 | ||||
| -rw-r--r-- | package/mplayer/Makefile | 8 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/xfsprogs/Makefile | 6 |
6 files changed, 10 insertions, 30 deletions
diff --git a/package/atftp/Makefile b/package/atftp/Makefile index e7d759066..598f58a06 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -23,6 +23,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-libpcre MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -Wall -D_REENTRANT -fno-inline" atftp-install: diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index b0094b9dc..f198e74f5 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -98,16 +98,6 @@ resize2fs-install: ${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin -libblkid-install: - ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib - ${CP} ${WRKINST}/usr/lib/libblkid.so* \ - ${IDIR_LIBBLKID}/usr/lib - -libblkid-dev-install: - ${INSTALL_DIR} ${IDIR_LIBBLKID_DEV}/usr/include/blkid - ${CP} ${WRKINST}/usr/include/blkid/*.h \ - ${IDIR_LIBBLKID_DEV}/usr/include/blkid - libcom-err-install: ${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib ${CP} ${WRKINST}/usr/lib/libcom_err.so* \ diff --git a/package/giflib/Makefile b/package/giflib/Makefile index 2187e05ae..dd3c02ac7 100644 --- a/package/giflib/Makefile +++ b/package/giflib/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= giflib PKG_VERSION:= 4.1.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 4ff2ecec336b9724c5190f06e8a40f9e PKG_DESCR:= GIF graphics library PKG_SECTION:= libs @@ -22,7 +22,7 @@ $(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},$ giflib-install: $(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \ + $(CP) $(WRKINST)/usr/lib/libgif.so* \ $(IDIR_GIFLIB)/usr/lib giflib-dev-install: diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index e46d63f0f..336f43e38 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.0-32749 -PKG_RELEASE:= 4 -PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5 +PKG_VERSION:= 1.0-34809 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d128a711c453b828faf623b981c39afe PKG_DESCR:= popular video player PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses @@ -144,7 +144,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ ${CONFIGURE_DIRECTFB} XAKE_FLAGS+= AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" -TARGET_LDFLAGS+= -lxvidcore +TARGET_LDFLAGS+= -lxvidcore -lX11 -lXext -lvorbis post-install: ${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure deleted file mode 100644 index eb33a8720..000000000 --- a/package/mplayer/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayer-1.0-32749.orig/configure 2011-01-03 11:27:11.000000000 +0100 -+++ mplayer-1.0-32749/configure 2011-01-09 00:35:20.000000000 +0100 -@@ -2554,7 +2554,7 @@ else - fi - - cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" --cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" -+cflag_check -MD -MP && DEPFLAGS="-MD -MP" - - - if test -n "$LDFLAGS" ; then diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 1cc5c9756..690b2fb84 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xfsprogs PKG_VERSION:= 3.1.5 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= b1db37749e2b4149a0dd178abff956be PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs -PKG_BUILDDEP:= e2fsprogs -PKG_DEPENDS:= libuuid libpthread +PKG_BUILDDEP:= e2fsprogs util-linux +PKG_DEPENDS:= libuuid libpthread libblkid PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ |