add alsamixergui and docker packages

7 files changed, 107 insertions, 7 deletions

diff --git a/package/Config.in b/package/Config.in
index d5ca37476..fde014284 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -383,6 +383,7 @@ source "package/openmotif/Config.in"
 source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
 source "package/tslib/Config.in"
+source "package/webkit/Config.in"
 
 comment "X Window managers"
 source "package/matchbox/Config.in"
@@ -390,20 +391,21 @@ source "package/metacity/Config.in"
 source "package/blackbox/Config.in"
 
 comment "X applications"
+source "package/alsamixergui/Config.in"
 source "package/dillo/Config.in"
+source "package/docker/Config.in"
+source "package/gqview/Config.in"
+source "package/leafpad/Config.in"
 source "package/midori/Config.in"
-source "package/webkit/Config.in"
+source "package/pcmanfm/Config.in"
 source "package/rdesktop/Config.in"
 source "package/rxvt/Config.in"
+source "package/sylpheed/Config.in"
 source "package/synergy/Config.in"
-source "package/gqview/Config.in"
-source "package/leafpad/Config.in"
 source "package/torsmo/Config.in"
-source "package/pcmanfm/Config.in"
-source "package/xstroke/Config.in"
-source "package/sylpheed/Config.in"
-source "package/xpdf/Config.in"
 source "package/x11vnc/Config.in"
+source "package/xpdf/Config.in"
+source "package/xstroke/Config.in"
 source "package/xvkbd/Config.in"
 
 comment "Video libraries/codecs and applications"
diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
new file mode 100644
index 000000000..201403d7e
--- /dev/null
+++ b/package/alsamixergui/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ALSAMIXERGUI
+	bool "alsamixergui"
+	default n
+	help
+	  A nice GUI mixer for Alsa using fltk
+
+	  http://snapshot.debian.net/archive/2008/03/19/debian/pool/main/a/alsamixergui
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
new file mode 100644
index 000000000..acf973b28
--- /dev/null
+++ b/package/alsamixergui/alsamixergui.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# alsamixergui
+#
+#############################################################
+ALSAMIXERGUI_VERSION = 0.9.0rc2-1
+ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
+ALSAMIXERGUI_SITE = http://snapshot.debian.net/archive/2008/03/19/debian/pool/main/a/alsamixergui
+ALSAMIXERGUI_AUTORECONF = YES
+ALSAMIXERGUI_INSTALL_STAGING = NO
+ALSAMIXERGUI_INSTALL_TARGET = YES
+
+ALSAMIXERGUI_CONF_OPT = LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/avr32-linux-uclibc/lib -lstdc++"
+
+ALSAMIXERGUI_DEPENDENCIES = uclibc fltk
+
+$(eval $(call AUTOTARGETS,package,alsamixergui))
+
diff --git a/package/alsamixergui/alsamixergui_0.9.0rc2-1-7.patch b/package/alsamixergui/alsamixergui_0.9.0rc2-1-7.patch
new file mode 100644
index 000000000..6b498dadf
--- /dev/null
+++ b/package/alsamixergui/alsamixergui_0.9.0rc2-1-7.patch
@@ -0,0 +1,40 @@
+--- a/configure.in
++++ b/configure.in
+@@ -11,7 +11,10 @@
+ AC_PROG_LN_S
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(fltk,numericsort,,AC_MSG_ERROR("missing fltk"))
++AC_CHECK_LIB(fltk,numericsort,,
++AC_CHECK_LIB(fltk,fl_numericsort,,
++AC_MSG_ERROR("missing fltk"))
++)
+ AM_PATH_ALSA(0.9.0)
+ 
+ dnl Checks for header files.
+--- a/src/alsamixer.cxx	2007-10-21 12:39:11.000000000 -0400
++++ b/src/alsamixer.cxx	2007-10-21 12:49:10.000000000 -0400
+@@ -2081,8 +2081,8 @@ static void
+ mixer_signal_handler (int signal)
+ {
+   if (signal != SIGSEGV)
+-    mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
+-  else
++  //  mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
++  //else
+     {
+       fprintf (stderr, "\nSegmentation fault.\n");
+       _exit (11);
+--- a/src/alsamixer.cxx	2006-01-16 12:41:54.000000000 -0600
++++ b/src/alsamixer.cxx	2006-01-16 12:45:44.000000000 -0600
+@@ -653,8 +653,8 @@
+     if (vleft >= 0 && vright >= 0) {
+       if (joined) {
+ #ifdef ALSAMIXER_GUI
+-	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
+-	snd_mixer_selem_channel_id_t(int(chn)++))
++	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST;
++	snd_mixer_selem_channel_id_t(int(chn)+1))
+ #else
+ 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
+ #endif
diff --git a/package/docker/Config.in b/package/docker/Config.in
new file mode 100644
index 000000000..b75b2ce8a
--- /dev/null
+++ b/package/docker/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_DOCKER
+	bool "docker"
+	default n
+	help
+	  a system tray dock for X
+
+	  http://icculus.org/openbox/2/docker
diff --git a/package/docker/docker-1.5-skip-configure.patch b/package/docker/docker-1.5-skip-configure.patch
new file mode 100644
index 000000000..441f9b05e
--- /dev/null
+++ b/package/docker/docker-1.5-skip-configure.patch
@@ -0,0 +1,4 @@
+--- a/.stamp_configured	2008-03-19 03:34:24.425005162 -0400
++++ b/.stamp_configured	2008-03-19 14:25:33.000000000 -0400
+@@ -0,0 +1 @@
++ 
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
new file mode 100644
index 000000000..4152d43ab
--- /dev/null
+++ b/package/docker/docker.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# docker
+#
+#############################################################
+DOCKER_VERSION = 1.5
+DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
+DOCKER_SITE = http://icculus.org/openbox/2/docker
+DOCKER_AUTORECONF = NO
+DOCKER_INSTALL_STAGING = NO
+DOCKER_INSTALL_TARGET = YES
+
+DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
+					CFLAGS="-I$(STAGING_DIR)/usr/include" \
+					LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+
+DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
+
+DOCKER_DEPENDENCIES = uclibc 
+
+$(eval $(call AUTOTARGETS,package,docker))
+