diff options
| -rw-r--r-- | package/firefox/Makefile | 2 | ||||
| -rw-r--r-- | package/gdk-pixbuf/Makefile | 2 | ||||
| -rw-r--r-- | package/libIDL/Makefile | 2 | ||||
| -rw-r--r-- | package/libvpx/Makefile | 1 | ||||
| -rw-r--r-- | package/yasm/Makefile | 9 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 14 |
6 files changed, 11 insertions, 19 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 3a21a2d80..8eb84d7b1 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -15,7 +15,7 @@ PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf li PKG_DEPENDS+= harfbuzz mesalib libvpx libbz2 ca-certificates libevent PKG_BUILDDEP:= alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme -PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent python2-host +PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent python2-host yasm-host PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ PKG_NOPARALLEL:= 1 diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 719f614ca..66859b04c 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d PKG_DESCR:= GDK pixbuf library PKG_SECTION:= libs -PKG_BUILDDEP:= jpeg libtiff +PKG_BUILDDEP:= libjpeg-turbo libtiff PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/ PKG_NEED_CXX:= 1 PKG_OPTS:= dev diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile index 983d6b865..58a6f7434 100644 --- a/package/libIDL/Makefile +++ b/package/libIDL/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c PKG_DESCR:= libraries for Interface Definition Language files PKG_SECTION:= libs PKG_DEPENDS:= glib -PKG_BUILDDEP:= glib +PKG_BUILDDEP:= glib flex-host bison-host PKG_URL:= http://www.gnome.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/ PKG_LIBNAME:= libidl diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 13796e7d5..98ceb7575 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= f8de058e6ba14555144583a2d031fe19 PKG_DESCR:= VP8/VP9 codec library PKG_SECTION:= libs +PKG_BUILDDEP:= yasm-host PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= http://webm.googlecode.com/files/ PKG_OPTS:= dev diff --git a/package/yasm/Makefile b/package/yasm/Makefile index 7567b5d9b..2e8f8ef01 100644 --- a/package/yasm/Makefile +++ b/package/yasm/Makefile @@ -4,20 +4,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:= yasm -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8392e5f2235c2c2a981e1a633f2698cb +PKG_MD5SUM:= 4cfc0686cf5350dd1305c4d905eb55a6 PKG_DESCR:= Modular Assembler Project PKG_SECTION:= misc PKG_URL:= http://www.tortall.net/projects/yasm/ PKG_SITES:= http://www.tortall.net/projects/yasm/releases/ +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,YASM,yasm,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,YASM,yasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto + yasm-install: $(INSTALL_DIR) $(IDIR_YASM)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/yasm $(IDIR_YASM)/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 2784f6c1c..874ee63a7 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -65,16 +65,11 @@ if [[ -n $ADK_PACKAGE_LIBX11 ]]; then NEED_X11="$NEED_X11 libx11" fi -if [[ -n $ADK_PACKAGE_LIBVPX ]]; then - NEED_YASM="$NEED_YASM libvpx" -fi - if [[ -n $ADK_COMPILE_ORBIT2 ]]; then NEED_LIBIDL="$NEED_LIBIDL orbit2" fi if [[ -n $ADK_PACKAGE_FIREFOX ]]; then - NEED_YASM="$NEED_YASM firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" NEED_ZIP="$NEED_ZIP firefox" fi @@ -365,15 +360,6 @@ if [[ -n $NEED_RPM ]]; then fi fi -if [[ -n $ADK_LINUX_X86 ]]; then - if [[ -n $NEED_YASM ]]; then - if ! which yasm >/dev/null 2>&1; then - echo >&2 You need yasm to build $NEED_YASM - out=1 - fi - fi -fi - if [[ -n $NEED_XSLTPROC ]]; then if ! which xsltproc >/dev/null 2>&1; then echo >&2 You need xsltproc to build $NEED_XSLTPROC |