Browse Source

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

Waldemar Brodkorb 11 years ago
parent
commit
1a3b09a9da

+ 1 - 1
package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		62
+PKG_RELEASE:=		63
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host

+ 1 - 3
package/base-files/src/etc/init.d/boot

@@ -10,12 +10,10 @@ touch /var/log/lastlog
 touch /var/log/wtmp
 ln -s /tmp /var/tmp
 
-echo 0 > /proc/sys/kernel/printk
-
 HOSTNAME=
 [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)
 HOSTNAME=${HOSTNAME%%.*}
-echo ${HOSTNAME:=linux} >/proc/sys/kernel/hostname
+echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname
 
 chown 0:0 /tmp; chmod 1777 /tmp
 

+ 1 - 0
package/base-files/src/init

@@ -3,6 +3,7 @@ echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
 mount -nt proc proc /proc
+echo 0 > /proc/sys/kernel/printk
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
   size=$(cat /etc/tmpfs 2>/dev/null)

+ 1 - 1
package/eudev/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
 PKG_DESCR:=		udev device manager
 PKG_SECTION:=		utils
-PKG_BUILDDEP:=		glib
+PKG_BUILDDEP:=		gperf-host glib
 PKG_DEPENDS:=		glib
 PKG_URL:=		http://www.gentoo.org/proj/en/eudev/
 PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/

+ 3 - 3
package/libupnp/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libupnp
-PKG_VERSION:=		1.6.6
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		8918dcf7428cd119d0c8275765ff2833
+PKG_VERSION:=		1.6.19
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ee16e5d33a3ea7506f38d71facc057dd
 PKG_DESCR:=		The Universal Plug and Play (UPnP) SDK library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		autotool

+ 1 - 1
package/mt-daapd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		67bef9fb14d487693b0dfb792c3f1b05
 PKG_DESCR:=		a multi-threaded DAAP daemon
 PKG_SECTION:=		multimedia

+ 10 - 0
package/mt-daapd/patches/patch-src_mp3-scanner_c

@@ -0,0 +1,10 @@
+--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c	2008-04-19 21:17:23.000000000 +0200
++++ mt-daapd-0.2.4.2/src/mp3-scanner.c	2014-01-20 12:19:42.000000000 +0100
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ 
+ #include <netinet/in.h>  /* htons and friends */
+ #include <sys/stat.h>

+ 3 - 0
package/pulseaudio/Makefile

@@ -19,12 +19,15 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 CONFIGURE_ARGS+=	--disable-systemd \
 			--disable-manpages \
 			--disable-neon-opt \

+ 1 - 1
package/qingy/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qingy
 PKG_VERSION:=		1.0.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1e0912655e240adfd0ce5ced30bbc685
 PKG_DESCR:=		a DirectFB getty replacement
 PKG_SECTION:=		misc

+ 10 - 0
package/qingy/patches/patch-src_libraries_misc_h

@@ -0,0 +1,10 @@
+--- qingy-1.0.0.orig/src/libraries/misc.h	2008-11-27 10:29:01.000000000 +0100
++++ qingy-1.0.0/src/libraries/misc.h	2014-01-20 07:38:44.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <time.h>
+ #include "qingy_constants.h"
+ 
+ /* Computes the integer part of the base 10 log */

+ 39 - 0
package/qingy/patches/patch-src_libraries_vt_c

@@ -0,0 +1,39 @@
+--- qingy-1.0.0.orig/src/libraries/vt.c	2008-11-25 12:21:28.000000000 +0100
++++ qingy-1.0.0/src/libraries/vt.c	2014-01-20 07:53:43.000000000 +0100
+@@ -98,14 +98,15 @@ static int getfd()
+ int switch_to_tty(int tty)
+ {
+   char *ttyname = create_tty_name(tty);
++  FILE *_stdin, *_stdout, *_stderr;
+   
+   if (!ttyname) return 0;
+   /* we set stdin, stdout and stderr to the new tty */
+-  stdin  = freopen(ttyname, "r", stdin);
+-  stdout = freopen(ttyname, "w", stdout);
+-  stderr = freopen(ttyname, "w", stderr);
++  _stdin  = freopen(ttyname, "r", stdin);
++  _stdout = freopen(ttyname, "w", stdout);
++  _stderr = freopen(ttyname, "w", stderr);
+   free(ttyname);
+-  if (!stdin || !stdout || !stderr) return 0;
++  if (!_stdin || !_stdout || !_stderr) return 0;
+ 
+   return 1;
+ }
+@@ -197,6 +198,7 @@ void stderr_disable(void)
+ void stderr_enable(int *vt)
+ {
+   char *ttyname;
++  FILE *_stderr;
+ 
+ 	if (!vt)
+ 		ttyname = create_tty_name(get_active_tty());
+@@ -205,7 +207,7 @@ void stderr_enable(int *vt)
+   
+   if (!ttyname) return;
+ 
+-	stderr = fopen(ttyname, "w");
++	_stderr = freopen(ttyname, "w", stderr);
+   free(ttyname);
+ }
+ 

+ 1 - 1
package/tcl/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tcl
 PKG_VERSION:=		8.5.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8512d8db3233041dd68a81476906012a
 PKG_DESCR:=		TCL scripting language
 PKG_SECTION:=		lang

+ 11 - 0
package/tcl/patches/patch-generic_tcl_h

@@ -0,0 +1,11 @@
+--- tcl8.5.9.orig/generic/tcl.h	2010-08-04 19:02:39.000000000 +0200
++++ tcl8.5.9/generic/tcl.h	2014-01-20 11:18:37.000000000 +0100
+@@ -19,6 +19,8 @@
+ #ifndef _TCL
+ #define _TCL
+ 
++#include <sys/stat.h>
++
+ /*
+  * For C++ compilers, use extern "C"
+  */

+ 3 - 3
package/tcl/patches/patch-unix_Makefile_in

@@ -1,5 +1,5 @@
---- tcl8.5.8.orig/unix/Makefile.in	2009-11-13 19:38:45.000000000 +0100
-+++ tcl8.5.8/unix/Makefile.in	2009-11-20 21:59:51.000000000 +0100
+--- tcl8.5.9.orig/unix/Makefile.in	2010-09-08 19:40:48.000000000 +0200
++++ tcl8.5.9/unix/Makefile.in	2014-01-20 11:13:05.000000000 +0100
 @@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
@@ -10,7 +10,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -745,7 +746,7 @@ install-binaries: binaries
+@@ -737,7 +738,7 @@ install-binaries: binaries
  	fi
  	@EXTRA_INSTALL_BINARIES@
  

+ 5 - 5
package/tcl/patches/patch-unix_configure

@@ -1,6 +1,6 @@
---- tcl8.5.8.orig/unix/configure	2009-11-13 19:38:45.000000000 +0100
-+++ tcl8.5.8/unix/configure	2011-01-13 16:22:59.000000000 +0100
-@@ -7968,9 +7968,6 @@ fi
+--- tcl8.5.9.orig/unix/configure	2010-09-08 19:40:48.000000000 +0200
++++ tcl8.5.9/unix/configure	2014-01-20 11:13:05.000000000 +0100
+@@ -7983,9 +7983,6 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
  
@@ -10,7 +10,7 @@
  
  	    PLAT_OBJS='${MAC_OSX_OBJS}'
  	    PLAT_SRCS='${MAC_OSX_SRCS}'
-@@ -17646,11 +17643,6 @@ _ACEOF
+@@ -17578,11 +17575,6 @@ _ACEOF
  
  
  cat >>confdefs.h <<\_ACEOF
@@ -22,7 +22,7 @@
  #define TCL_WIDE_CLICKS 1
  _ACEOF
  
-@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html'
+@@ -18749,7 +18741,7 @@ HTML_DIR='$(DISTDIR)/html'
  # AIX remembers this path and will attempt to use it at run-time to look
  # up the Tcl library.