summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-electronics/xoscope
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-electronics/xoscope')
-rw-r--r--sci-electronics/xoscope/Manifest1
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch32
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch29
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch11
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch205
-rw-r--r--sci-electronics/xoscope/metadata.xml12
-rw-r--r--sci-electronics/xoscope/xoscope-2.0.ebuild38
7 files changed, 328 insertions, 0 deletions
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
new file mode 100644
index 00000000000..20e837e9a8a
--- /dev/null
+++ b/sci-electronics/xoscope/Manifest
@@ -0,0 +1 @@
+DIST xoscope-2.0.tgz 334875 SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70 WHIRLPOOL 4afd660cb05a9a70ce49a5553c4f08d5877f32a85adcf86ada1014d7d90c358817cdb6da7f4b2d08edfb406375848434f679ea976c15ad16bf3ca2b8691a944c
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 00000000000..75d3820dad8
--- /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 00000000000..473243f2ec1
--- /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 00000000000..5cba9546e91
--- /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 00000000000..3ae541011b3
--- /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 00000000000..87e1ee6b49a
--- /dev/null
+++ b/sci-electronics/xoscope/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-electronics</herd>
+ <maintainer>
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">xoscope</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-electronics/xoscope/xoscope-2.0.ebuild b/sci-electronics/xoscope/xoscope-2.0.ebuild
new file mode 100644
index 00000000000..321c231b589
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils 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}
+ virtual/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 \
+ "${FILESDIR}"/${P}-man_no_-Tutf8.patch \
+ "${FILESDIR}"/${P}-implicit_decls.patch \
+ "${FILESDIR}"/${P}-comedi_compile.patch
+
+ eautoreconf
+}
+
+src_compile() {
+ emake -j1
+}