Browse Source

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

Waldemar Brodkorb 11 years ago
parent
commit
78350f5d6b
4 changed files with 11 additions and 7 deletions
  1. 6 1
      TODO
  2. 2 2
      package/gpm/Makefile
  3. 3 1
      package/libXrender/Makefile
  4. 0 3
      target/config/Config.in

+ 6 - 1
TODO

@@ -1,7 +1,12 @@
 - move tools to package host infrastructure, resolve dependency handling for host tools
+- finish miniconfig + cleanup
+- qemu-sh serial
+- choice qemu with graphic
+- x32 musl
+- socat openssl flavour + update
+- hash-style=gnu for non-mips and non-musl
 - add misp64 n32/n64 toolchains
 - hash-style=gnu for non-mips and non-musl
-- socat openssl flavour + update
 - add fb full screen logo
 - port opkg with gpg signing
 - restart network (kill wpa_supplicant)

+ 2 - 2
package/gpm/Makefile

@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpm
 PKG_VERSION:=		1.20.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e9a4ba2711753c89b37950aada7aed4a
 PKG_DESCR:=		console mouse support
 PKG_SECTION:=		misc
-PKG_BUILDDEP:=		autotool
+PKG_BUILDDEP:=		autotool bison-host
 PKG_URL:=		http://launchpad.net/gpm
 PKG_SITES:=		http://www.nico.schottelius.org/software/gpm/archives/
 PKG_NOPARALLEL:=	1

+ 3 - 1
package/libXrender/Makefile

@@ -9,7 +9,9 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		b6702e6f56f9d9103dc688f4336529a9
 PKG_DESCR:=		X11 rendering library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		renderproto-host libXrender-host renderproto libX11
+PKG_BUILDDEP:=		renderproto-host xproto-host xextproto-host libXau-host 
+PKG_BUILDDEP+=		xcb-proto-host libpthread-stubs-host libxcb-host kbproto-host
+PKG_BUILDDEP+=		inputproto-host xtrans-host libX11-host libXrender-host renderproto libX11
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxrender
 PKG_OPTS:=		dev

+ 0 - 3
target/config/Config.in

@@ -119,12 +119,10 @@ config ADK_n64
 
 config ADK_TARGET_ABI
 	string
-	default "o32" if ADK_o32
 	default "n32" if ADK_n32
 	default "n64" if ADK_n64
 	default "32" if ADK_32
 	default "x32" if ADK_x32
-	default "64" if ADK_64
 	default "eabi" if ADK_EABI
 	default "eabihf" if ADK_EABIHF
 
@@ -738,7 +736,6 @@ config ADK_TARGET_SUFFIX
 	default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI
 	default "n64" if ADK_n64
 	default "n32" if ADK_n32
-	default "o32" if ADK_o32
 	default "32" if ADK_32
 	default "x32" if ADK_x32
 	default "gnu"