kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix picturebook the same way I fixed sjog. Make myself maintainer as well.

Browse source 
Approved by:    portmgr(will)
This commit is contained in:
Ollivier Robert 2003-03-09 17:41:51 +00:00
parent 6b466daea7
commit bf4093374e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=77077
4 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/picturebook/Makefile
View file

@ -13,7 +13,7 @@ MASTER_SITES= http://samba.org/picturebook/
DISTNAME= capture DISTNAME= capture
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tgz
MAINTAINER= alan@clegg.com MAINTAINER= roberto@FreeBSD.org
COMMENT= SONY VAIO camera capture utility COMMENT= SONY VAIO camera capture utility
WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}

15
graphics/picturebook/files/patch-ac
View file

@ -1,6 +1,12 @@
--- ../picturebook.old/capture.h Mon Dec 25 19:01:43 2000 --- capture.h.orig Thu Jul 27 02:15:05 2000
+++ capture.h Mon Dec 25 19:03:17 2000 +++ capture.h Sun Mar 9 18:18:21 2003
@@ -21,15 +21,28 @@ @@ -16,20 +16,34 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define _XOPEN_SOURCE 500
+#define __BSD_VISIBLE 1
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
@ -20,7 +26,7 @@
+#endif +#endif
+#ifdef LINUX +#ifdef LINUX
#include <linux/pci.h> #include <linux/pci.h>
+#else ifdef __FreeBSD__ +#else
+#include <sys/pciio.h> +#include <sys/pciio.h>
+#include "pci.h" /*This is taken from Linux kernel*/ +#include "pci.h" /*This is taken from Linux kernel*/
+#define O_SYNC O_FSYNC +#define O_SYNC O_FSYNC
@ -28,3 +34,4 @@
+#endif +#endif
#include <sys/time.h> #include <sys/time.h>
#include "mchip.h" #include "mchip.h"

12
graphics/picturebook/files/patch-ba
View file

@ -1,6 +1,10 @@
--- setbrightness.c.orig Tue Dec 12 09:42:20 2000 --- setbrightness.c.orig Tue Dec 12 01:42:20 2000
+++ setbrightness.c Mon Jul 30 14:29:54 2001 +++ setbrightness.c Sun Mar 9 18:20:58 2003
@@ -4,17 +4,47 @@ @@ -1,20 +1,51 @@
#define _XOPEN_SOURCE 500
+#define __BSD_VISIBLE 1
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
@ -48,7 +52,7 @@
#define DATA_REG 0x62 #define DATA_REG 0x62
#define CST_REG 0x66 #define CST_REG 0x66
@@ -24,28 +54,35 @@ @@ -24,28 +55,35 @@
static void ecr_set(u16 addr, u16 value) static void ecr_set(u16 addr, u16 value)
{ {
while (inw(CST_REG) & 3) usleep(1); while (inw(CST_REG) & 3) usleep(1);

12
graphics/picturebook/files/patch-bb
View file

@ -1,6 +1,10 @@
--- vaiobat.c Tue Dec 12 09:42:20 2000 --- vaiobat.c.orig Thu Feb 8 09:15:07 2001
+++ vaiobat.c Wed Mar 21 20:16:59 2001 +++ vaiobat.c Sun Mar 9 18:22:57 2003
@@ -4,18 +4,50 @@ @@ -1,21 +1,54 @@
#define _XOPEN_SOURCE 500
+#define __BSD_VISIBLE 1
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
@ -51,7 +55,7 @@
#define DATA_REG 0x62 #define DATA_REG 0x62
#define CST_REG 0x66 #define CST_REG 0x66
@@ -25,20 +57,20 @@ @@ -25,20 +58,20 @@
static void ecr_set(u8 addr, u8 value) static void ecr_set(u8 addr, u8 value)
{ {
while (inb(CST_REG) & 3) usleep(1); while (inb(CST_REG) & 3) usleep(1);