Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 15 years ago
parent
commit
00ba3e5ce0
4 changed files with 11 additions and 4 deletions
  1. 1 1
      mk/kernel-build.mk
  2. 7 0
      package/Config.in
  3. 1 1
      package/mpd/Makefile
  4. 2 2
      package/mplayer/Makefile

+ 1 - 1
mk/kernel-build.mk

@@ -53,7 +53,7 @@ compile: $(LINUX_DIR)/vmlinux
 install: compile
 ifneq ($(strip $(INSTALL_TARGETS)),)
 	$(TRACE) target/${ADK_TARGET}-modules-install
-	$(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE)
+	$(foreach pkg,$(INSTALL_TARGETS),$(shell $(PKG_INSTALL) $(pkg)))
 endif
 
 clean:

+ 7 - 0
package/Config.in

@@ -441,6 +441,7 @@ source "package/gmp/Config.in.lib"
 source "package/gnutls/Config.in"
 source "package/gnutls/Config.in.lib"
 source "package/libgpg-error/Config.in"
+source "package/libgpg-error/Config.in.lib"
 source "package/gsm/Config.in"
 source "package/gsm/Config.in.lib"
 source "package/libiconv/Config.in"
@@ -503,11 +504,17 @@ source "package/librpcsecgss/Config.in"
 source "package/libshout/Config.in"
 source "package/libshout/Config.in.lib"
 source "package/libsigc++/Config.in"
+source "package/libsigc++/Config.in.lib"
 source "package/libstdcxx/Config.in"
+source "package/libstdcxx/Config.in.lib"
 source "package/libtasn1/Config.in"
+source "package/libtasn1/Config.in.lib"
 source "package/libtiff/Config.in"
+source "package/libtiff/Config.in.lib"
 source "package/libtirpc/Config.in"
+source "package/libtirpc/Config.in.lib"
 source "package/libtorrent/Config.in"
+source "package/libtorrent/Config.in.lib"
 source "package/libupnp/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb/Config.in.lib"

+ 1 - 1
package/mpd/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c78b8933e4902c5dc407d59925f8b10e
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		net
-PKG_DEPENDS:=		glib
+PKG_DEPENDS:=		glib libstdcxx
 PKG_BUILDDEP+=		glib
 ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
 PKG_BUILDDEP+=		alsa-lib

+ 2 - 2
package/mplayer/Makefile

@@ -10,12 +10,12 @@ PKG_MD5SUM:=		416fa6a247987305d74572d03dc6dde7
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		video
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses libogg libpng libpthread libvorbis
-PKG_DEPENDS+=		libx11 libxext libxv zlib 
+PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib 
 PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng libXext
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu
+PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle
 
 include ${TOPDIR}/mk/package.mk