Initial import (bug 141462).

(Portage version: 2.1.10.49/cvs/Linux x86_64)

8 files changed, 344 insertions, 0 deletions

diff --git a/sci-electronics/xoscope/ChangeLog b/sci-electronics/xoscope/ChangeLog
new file mode 100644
index 000000000000..8a6427a1f255
--- /dev/null
+++ b/sci-electronics/xoscope/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for sci-electronics/xoscope
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xoscope/ChangeLog,v 1.1 2012/04/13 00:16:01 xmw Exp $
+
+*xoscope-2.0 (13 Apr 2012)
+
+  13 Apr 2012; Michael Weber <xmw@gentoo.org> +xoscope-2.0.ebuild,
+  +files/xoscope-2.0-comedi_compile.patch,
+  +files/xoscope-2.0-implicit_decls.patch,
+  +files/xoscope-2.0-man_no_-Tutf8.patch,
+  +files/xoscope-2.0-remove_bundled_gtkdatabox.patch, +metadata.xml:
+  Initial import (bug 141462).
+
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
new file mode 100644
index 000000000000..13a96e03dcf9
--- /dev/null
+++ b/sci-electronics/xoscope/Manifest
@@ -0,0 +1,8 @@
+AUX xoscope-2.0-comedi_compile.patch 1068 RMD160 9225bf674c4c6b112c96b37c672ba20b98c74623 SHA1 43a770e951e99f74cb46632f0f124be8cf29b4c5 SHA256 9130d6575f4c62981033f9be8ff55820ddbf20d2b495aab192fb27fc8ac3fe04
+AUX xoscope-2.0-implicit_decls.patch 687 RMD160 e05c123652c87e6f220da9815dd654af468a3230 SHA1 4613c8baeae19e160a3fe780472f8af5b0c4f713 SHA256 957295eed4d31d331636b73360767e4c25b1f6fae0b23ebc4500d5b5286f84d3
+AUX xoscope-2.0-man_no_-Tutf8.patch 369 RMD160 758cd062efb6718fbff4f0b06ef95430ee4153b7 SHA1 d7a101fb10bd0519169a7109a22e4dc64924e3c4 SHA256 b8d77bc99d37c7f5afdca3338bc41f9b8f3d8f169552ff74775e81713976340e
+AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 RMD160 1cb48da847a7823b66ebea7017d16e983050e637 SHA1 32d44a7748b05c0e5843bf448f7768cc74fdad41 SHA256 2aa2284506ade1b21abe98ca86fd3d818ecd291105a49fdc12c7827133e89eb0
+DIST xoscope-2.0.tgz 334875 RMD160 65d0e128e3d0c12bd12a424a621d7acf9237ee96 SHA1 3f38afa9220c2682b7fe57689261aa60789b830a SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403
+EBUILD xoscope-2.0.ebuild 817 RMD160 9752b0bb44ccb33d80b6fde965357f39010f57a7 SHA1 1ada76b3e0ac485b96c0df0bbab7a403f0147526 SHA256 1cf53af4ef5a2324197148556656547c4a156aa9b6f0c0e0dbf9a8241c8e21cc
+MISC ChangeLog 448 RMD160 367b902046ab1a0791c538ee269295dcdbef1d2a SHA1 d71ec6600f73c66d5c675b3420c23232e13a0465 SHA256 e328bbf338e32fcdf3464a2c9ebd27582e1f61be5332fd89527fbc61c9118e0c
+MISC metadata.xml 223 RMD160 ece0d9320b4ad1fdb29d1dec4f85e84ffda0d863 SHA1 325a16f4c96d533e8642c26ab395b06ab42f51b5 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
new file mode 100644
index 000000000000..75d3820dad81
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
@@ -0,0 +1,32 @@
+--- xoscope-2.0/comedi.c
++++ xoscope-2.0/comedi.c
+@@ -27,7 +27,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/poll.h>
+-#include <asm/page.h>
++//#include <asm/page.h>
+ #include <comedilib.h>
+ #include "oscope.h"		/* program defaults */
+ #include "func.h"
+@@ -184,7 +184,9 @@
+      * avoid the bug.  This is the only reason we need <asm/page.h> in
+      * our include list.
+      */
+-    comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
++    //comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
++    comedi_bufsize = (comedi_bufsize + sysconf(_SC_PAGE_SIZE) - 1) &
++    (sysconf(_SC_PAGE_SIZE) - 1);
+     ret = comedi_set_buffer_size(comedi_dev, comedi_subdevice, comedi_bufsize);
+     if (ret < 0) {
+       comedi_error = comedi_errno();
+@@ -505,7 +507,7 @@
+     unsigned int chan;
+     int ret;
+ 
+-    ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0);
++    ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0, 1);
+ 
+     if (ret >= 0) {
+       chan = CR_PACK(4,0,AREF_DIFF);
+
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
new file mode 100644
index 000000000000..473243f2ec15
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
@@ -0,0 +1,29 @@
+--- xoscope-2.0/proscope.c
++++ xoscope-2.0/proscope.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include "proscope.h"
+ #include "oscope.h"
+--- xoscope-2.0/oscope.c
++++ xoscope-2.0/oscope.c
+@@ -408,7 +408,15 @@
+    */
+ 
+   displayed_samples = p->signal ? samples(p->signal->rate) : 0;
+-  max_samples = p->signal ? max(samples(p->signal->rate), p->signal->num) : 0;
++  if ( p->signal ) {
++    if ( samples(p->signal->rate) > p->signal->num ) {
++      max_samples = samples(p->signal->rate);
++    } else {
++      max_samples = p->signal->num;
++    }
++  } else {
++    max_samples = 0;
++  }
+ 
+   if (c >= 'A' && c <= 'Z') {
+     if (p->signal) {
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
new file mode 100644
index 000000000000..5cba9546e91d
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- xoscope-2.0/acconfig.h
++++ xoscope-2.0/acconfig.h
+@@ -61,7 +61,7 @@
+    interactive response time as the X server becomes too busy */
+ 
+ /* bourne shell command for X11 Help ("man -Tutf8 xoscope 2>&1") */
+-#define HELPCOMMAND	"man -Tutf8 xoscope 2>&1"
++#define HELPCOMMAND	"man xoscope 2>&1"
+ 
+ /* default file name ("oscope.dat") */
+ #define FILENAME	"oscope.dat"
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch b/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
new file mode 100644
index 000000000000..3ae541011b3b
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
@@ -0,0 +1,205 @@
+--- xoscope-2.0/configure.in
++++ xoscope-2.0/configure.in
+@@ -17,7 +17,7 @@
+ 
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
+ 
+-#PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
++PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
+ #AC_CONFIG_SUBDIRS(gtkdatabox-0.6.0.0)
+ 
+ dnl Set PACKAGE_DATA_DIR in config.h.
+@@ -106,5 +106,4 @@
+ AC_OUTPUT([
+ operl
+ Makefile
+-gtkdatabox-0.6.0.0/gtk/Makefile
+ ])
+--- xoscope-2.0/Makefile.am
++++ xoscope-2.0/Makefile.am
+@@ -40,9 +40,6 @@
+ comedisrc =
+ endif
+ 
+-GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
+-GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
+-
+ # Some bit of explaination is needed here for GUI_LIB.  automake won't
+ # let us include source files in a subdirectory on a _SOURCES line,
+ # and we do want all the auto-magically generated glade stuff confined
+@@ -52,7 +49,6 @@
+ # trick used in things like comedi.c (see comments there) won't work
+ # for a library.  So we put .o files in.
+ 
+-SUBDIRS = gtkdatabox-0.6.0.0/gtk
+ INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
+ GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
+ 
+--- xoscope-2.0/Makefile.in
++++ xoscope-2.0/Makefile.in
+@@ -232,8 +232,6 @@
+ 
+ @COMEDI_FALSE@comedisrc = 
+ @COMEDI_TRUE@comedisrc = comedi.c
+-GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
+-GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
+ 
+ # Some bit of explaination is needed here for GUI_LIB.  automake won't
+ # let us include source files in a subdirectory on a _SOURCES line,
+@@ -243,7 +241,6 @@
+ # they get built as one, because then the weak attribute override
+ # trick used in things like comedi.c (see comments there) won't work
+ # for a library.  So we put .o files in.
+-SUBDIRS = gtkdatabox-0.6.0.0/gtk
+ INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
+ INCLUDES = @GTK_CFLAGS@
+ GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
+--- xoscope-2.0/display.c
++++ xoscope-2.0/display.c
+@@ -27,7 +27,7 @@
+ #include <gtkdatabox_points.h>
+ #include <gtkdatabox_lines.h>
+ #include <gtkdatabox_grid.h>
+-#include <gtkdatabox_marker.h>
++#include <gtkdatabox_markers.h>
+ 
+ extern GtkWidget *databox;
+ 
+--- xoscope-2.0/display.c
++++ xoscope-2.0/display.c
+@@ -56,7 +56,7 @@
+ gboolean clear_message_callback(gpointer ignored)
+ {
+   gtk_databox_graph_remove (GTK_DATABOX(databox), databox_message);
+-  gtk_databox_redraw (GTK_DATABOX (databox));
++  gtk_widget_queue_draw (databox);
+   return FALSE;
+ }
+ 
+@@ -66,15 +66,15 @@
+   if (databox_message == NULL) {
+     GdkColor gcolor;
+     gcolor.red = gcolor.green = gcolor.blue = 65535;
+-    databox_message = gtk_databox_marker_new(1, &databox_message_X,
++    databox_message = gtk_databox_markers_new(1, &databox_message_X,
+ 					     &databox_message_Y, &gcolor, 0,
+-					     GTK_DATABOX_MARKER_NONE);
++					     GTK_DATABOX_MARKERS_NONE);
+   }
+ 
+-  gtk_databox_marker_set_label(GTK_DATABOX_MARKER(databox_message), 0,
+-			       GTK_DATABOX_TEXT_N, message, FALSE);
++  gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(databox_message), 0,
++			       GTK_DATABOX_MARKERS_TEXT_N, message, FALSE);
+   gtk_databox_graph_add (GTK_DATABOX(databox), databox_message);
+-  gtk_databox_redraw (GTK_DATABOX (databox));
++  gtk_widget_queue_draw (databox);
+ 
+   g_timeout_add (2000, clear_message_callback, NULL);
+ }
+@@ -620,10 +620,10 @@
+   graticule_minor_graph = gtk_databox_grid_new (9, 9, &gcolor, 1);
+   graticule_major_graph = gtk_databox_grid_new (1, 1, &gcolor, 1);
+ 
+-  gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
+-				  GTK_DATABOX_GRID_SOLID_LINES);
+-  gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
+-				  GTK_DATABOX_GRID_DOTTED_LINES);
++  //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
++  //				  GTK_DATABOX_GRID_SOLID_LINES);
++  //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
++  //				  GTK_DATABOX_GRID_DOTTED_LINES);
+ 
+   recompute_graticule();
+ }
+@@ -675,7 +675,7 @@
+ 
+ void configure_databox(void)
+ {
+-   GtkDataboxValue topleft, bottomright;
++   GtkDataboxValueRectangle rect;
+    gfloat upper_time_limit;
+    int j;
+ 
+@@ -723,24 +723,26 @@
+ 
+    /* Now set the total canvas size of the databox */
+ 
+-   topleft.x = 0;
+-   topleft.y = 1;
++   rect.x1 = 0;
++   rect.y1 = 1;
+ 
+-   bottomright.x = total_horizontal_divisions
++   rect.x2 = total_horizontal_divisions
+      * 0.001 * (gfloat) scope.div / scope.scale;
+-   bottomright.y = -1;
++   rect.y2 = -1;
+ 
+-   gtk_databox_set_canvas(GTK_DATABOX(databox), topleft, bottomright);
++   gtk_databox_set_total_limits(GTK_DATABOX(databox), 
++     rect.x1, rect.x2, rect.y1, rect.y2);
+ 
+    /* A slight adjustment gets us our visible area.  Note that this
+     * call also resets the databox viewport to its left most position.
+     */
+ 
+-   bottomright.x = 10 * 0.001 * (gfloat) scope.div / scope.scale;
+-   gtk_databox_set_visible_canvas(GTK_DATABOX(databox), topleft, bottomright);
++   rect.x2 = 10 * 0.001 * (gfloat) scope.div / scope.scale;
++   gtk_databox_set_visible_limits(GTK_DATABOX(databox), 
++     rect.x1, rect.x2, rect.y1, rect.y2);
+ 
+    /* Temporary message is always centered on screen */
+-   databox_message_X = bottomright.x / 2;
++   databox_message_X = rect.x2 / 2;
+ 
+    /* Decide if we need a scrollbar or not */
+ 
+@@ -1208,7 +1210,7 @@
+     draw_graticule();
+   }
+ 
+-  gtk_databox_redraw (GTK_DATABOX (databox));
++  gtk_widget_queue_draw (databox);
+ }
+ 
+ /* animate() - get and plot some data
+--- xoscope-2.0/gr_gtk.c
++++ xoscope-2.0/gr_gtk.c
+@@ -1049,7 +1049,7 @@
+   l = p->signal->delay * num / 10000;
+ 
+   if (scope.curs) {
+-#if 1
++#if 0
+     GtkDataboxCoord coord;
+     GtkDataboxValue value;
+     coord.x = event->x;
+@@ -1057,7 +1057,7 @@
+     value = gtk_databox_value_from_coord (GTK_DATABOX(databox), coord);
+     x = value.x;
+ #else
+-    x = gtk_databox_pixel_to_value_x (databox, event->x);
++    x = gtk_databox_pixel_to_value_x (GTK_DATABOX(databox), event->x);
+ #endif
+     cursor = rintf((x - l) / num) + 1;
+ #if 0
+@@ -1205,7 +1205,7 @@
+ 
+   glade_window = create_main_window();
+ 
+-  setup_help_text(glade_window);
++  //setup_help_text(glade_window);
+ 
+ #if 0
+   gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+@@ -1217,7 +1217,7 @@
+   gtk_box_reorder_child(GTK_BOX(LU("vbox1")), menubar, 0);
+   gtk_widget_show(menubar);
+ 
+-  gtk_databox_set_hadjustment (GTK_DATABOX (databox),
++  gtk_databox_set_adjustment_x (GTK_DATABOX (databox),
+ 			       gtk_range_get_adjustment (GTK_RANGE (LU("databox_hscrollbar"))));
+ 
+   gtk_widget_show(glade_window);
diff --git a/sci-electronics/xoscope/metadata.xml b/sci-electronics/xoscope/metadata.xml
new file mode 100644
index 000000000000..5b80fb94c393
--- /dev/null
+++ b/sci-electronics/xoscope/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sci-electronics/xoscope/xoscope-2.0.ebuild b/sci-electronics/xoscope/xoscope-2.0.ebuild
new file mode 100644
index 000000000000..de8f3b33e481
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xoscope/xoscope-2.0.ebuild,v 1.1 2012/04/13 00:16:01 xmw Exp $
+
+EAPI=4
+
+inherit autotools linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtkdatabox
+	virtual/man"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp"
+
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-remove_bundled_gtkdatabox.patch
+	epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+	epatch "${FILESDIR}"/${P}-implicit_decls.patch
+	epatch "${FILESDIR}"/${P}-comedi_compile.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1
+}