summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-08-18 19:12:28 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-08-18 19:12:28 +0000
commit581544e9fcfdec2dd0eecfbbe7906dc1e71bb790 (patch)
treeb0e410e87b0c731b9b723dc562ca5d5430edaea0
parent- Fix buil with apache13 + ipv6 (diff)
- Fix build with gcc 3.4
Reported by: Vaidas Damosevicius <vd@vmunix.lt>
Notes
Notes: svn path=/head/; revision=116628
-rw-r--r--graphics/picturebook/files/patch-ai58
1 files changed, 38 insertions, 20 deletions
diff --git a/graphics/picturebook/files/patch-ai b/graphics/picturebook/files/patch-ai
index 02b64cc0ea0e..752ea2e5cee2 100644
--- a/graphics/picturebook/files/patch-ai
+++ b/graphics/picturebook/files/patch-ai
@@ -1,20 +1,38 @@
-diff -c mchip.c picturebook.fbsd/mchip.c
-*** mchip.c Wed Aug 2 08:15:04 2000
---- picturebook.fbsd/mchip.c Mon Jan 1 06:18:37 2001
-***************
-*** 377,383 ****
-
- delay1(MCHIP_HIC_CMD);
-
-! printf("continuous compressed capture started\n");
- }
-
- /* read one compressed frame from the framebuffer */
---- 377,383 ----
-
- delay1(MCHIP_HIC_CMD);
-
-! fprintf(stderr, "continuous compressed capture started\n");
- }
-
- /* read one compressed frame from the framebuffer */
+--- mchip.c.orig Wed Aug 2 01:15:04 2000
++++ mchip.c Wed Aug 18 21:11:26 2004
+@@ -174,7 +174,7 @@
+ sdelay(1);
+ }
+ if (debug) {
+- printf(__FUNCTION__ " timeout\n");
++ printf("mchip_wait_frame timeout\n");
+ }
+ return 0;
+ }
+@@ -377,7 +377,7 @@
+
+ delay1(MCHIP_HIC_CMD);
+
+- printf("continuous compressed capture started\n");
++ fprintf(stderr, "continuous compressed capture started\n");
+ }
+
+ /* read one compressed frame from the framebuffer */
+@@ -390,7 +390,7 @@
+ void mchip_subsample(int sub)
+ {
+ if (debug) {
+- printf(__FUNCTION__ " sub=%d\n", sub);
++ printf("mchip_subsample sub=%d\n", sub);
+ }
+ subsample = sub;
+ mchip_set(MCHIP_MCC_R_SAMPLING, subsample);
+@@ -399,7 +399,7 @@
+ mchip_set(MCHIP_MCC_B_XRANGE, mchip_hsize());
+ mchip_set(MCHIP_MCC_B_YRANGE, mchip_vsize());
+ if (debug) {
+- printf(__FUNCTION__ " done\n");
++ printf("mchip_subsample done\n");
+ }
+ delay2(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE);
+ }