summaryrefslogtreecommitdiff
path: root/packages/logic-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'packages/logic-analyzer')
-rw-r--r--packages/logic-analyzer/files/scrolling-capture-dialog.patch21
-rw-r--r--packages/logic-analyzer/logic-analyzer_0.8.bb11
2 files changed, 30 insertions, 2 deletions
diff --git a/packages/logic-analyzer/files/scrolling-capture-dialog.patch b/packages/logic-analyzer/files/scrolling-capture-dialog.patch
new file mode 100644
index 0000000000..91e9ce0766
--- /dev/null
+++ b/packages/logic-analyzer/files/scrolling-capture-dialog.patch
@@ -0,0 +1,21 @@
+Index: LogicAnalyzer/client/org/sump/analyzer/DeviceController.java
+===================================================================
+--- LogicAnalyzer.orig/client/org/sump/analyzer/DeviceController.java 2008-02-11 23:34:01.000000000 +0100
++++ LogicAnalyzer/client/org/sump/analyzer/DeviceController.java 2008-02-11 23:35:17.000000000 +0100
+@@ -43,6 +43,7 @@
+ import javax.swing.JProgressBar;
+ import javax.swing.JTabbedPane;
+ import javax.swing.JTextField;
++import javax.swing.JScrollPane;
+ import javax.swing.Timer;
+
+ import org.sump.util.Properties;
+@@ -312,7 +313,7 @@
+ // if no valid dialog exists, create one
+ if (dialog == null) {
+ dialog = new JDialog(frame, "Capture", true);
+- dialog.getContentPane().add(this);
++ dialog.getContentPane().add(new JScrollPane(this));
+ dialog.setResizable(false);
+ dialog.setSize(this.getPreferredSize());
+ // dialog.pack();
diff --git a/packages/logic-analyzer/logic-analyzer_0.8.bb b/packages/logic-analyzer/logic-analyzer_0.8.bb
index f66752ad31..73e8f8ba84 100644
--- a/packages/logic-analyzer/logic-analyzer_0.8.bb
+++ b/packages/logic-analyzer/logic-analyzer_0.8.bb
@@ -2,15 +2,18 @@ DESCRIPTION = "A Java-based logical analyzer for home use."
LICENSE = "GPL"
HOMEPAGE = "http://sump.org/projects/analyzer/"
+PR = "r2"
+
inherit java
DEPENDS = "rxtx"
-RDEPENDS = "librxtx-java"
+RDEPENDS = "java2-runtime classpath-awt librxtx-java"
SRC_URI = "\
http://sump.org/projects/analyzer/downloads/la-src-${PV}.tar.bz2 \
file://cp-run-fix.patch;patch=1 \
file://client-makefile.patch;patch=1 \
+ file://scrolling-capture-dialog.patch;patch=1 \
"
S = "${WORKDIR}/LogicAnalyzer"
@@ -18,8 +21,12 @@ S = "${WORKDIR}/LogicAnalyzer"
do_compile() {
oe_runmake -C client all jar \
+ JAR=gjar \
+ JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" \
+ JAVAINCLUDEDIR=${STAGING_INCDIR}/classpath \
+ JAVAC="javac -d \$(TOP)/ -O -source 1.3 -target 1.3" \
JAVAC_FLAGS="-sourcepath . -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip -classpath ${STAGING_DATADIR}/java/RXTXcomm.jar"
-
+
oe_java_simple_wrapper org.sump.analyzer.Loader analyzer.jar RXTXcomm.jar
}