rpms/fmio/F-8 fmio-2.0.8-nodirectio.patch, 1.1, 1.2 fmio.spec, 1.3, 1.4

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/fmio/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22600

Modified Files:
	fmio-2.0.8-nodirectio.patch fmio.spec 
Log Message:
Suppress iopl(), ioperm(),  in?() and out?() calls. Do not build utils.

fmio-2.0.8-nodirectio.patch:

Index: fmio-2.0.8-nodirectio.patch
===================================================================
RCS file: /cvs/extras/rpms/fmio/F-8/fmio-2.0.8-nodirectio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fmio-2.0.8-nodirectio.patch	11 Nov 2007 22:30:00 -0000	1.1
+++ fmio-2.0.8-nodirectio.patch	11 Nov 2007 23:44:28 -0000	1.2
@@ -1,6 +1,18 @@
-diff -up fmio-2.0.8/src/radio.c.nox86 fmio-2.0.8/src/radio.c
---- fmio-2.0.8/src/radio.c.nox86	2007-11-11 23:09:04.000000000 +0200
-+++ fmio-2.0.8/src/radio.c	2007-11-11 23:23:05.000000000 +0200
+diff -up fmio-2.0.8/Makefile.nodirectio fmio-2.0.8/Makefile
+--- fmio-2.0.8/Makefile.nodirectio	2007-11-12 01:10:10.000000000 +0200
++++ fmio-2.0.8/Makefile	2007-11-12 01:29:13.000000000 +0200
+@@ -1,4 +1,7 @@
+-SUBDIRS = src utils xsrc
++SUBDIRS = src xsrc
++ifeq ($(WITH_DIRECT_IO),y)
++SUBDIRS += utils
++endif
+ 
+ all:
+ 	for i in $(SUBDIRS); do \
+diff -up fmio-2.0.8/src/radio.c.nodirectio fmio-2.0.8/src/radio.c
+--- fmio-2.0.8/src/radio.c.nodirectio	2007-11-12 01:10:10.000000000 +0200
++++ fmio-2.0.8/src/radio.c	2007-11-12 01:10:10.000000000 +0200
 @@ -46,6 +46,7 @@
  #define MMAX(a,b)	((a) >= (b) ? (a) : (b))
  
@@ -13,16 +25,16 @@
  	export_xtreme,		/* AIMS Lab Highway Xtreme */
  #endif /* BSDBKTR */
  	export_zx		/* Zoltrix RadioPlus */
-+#else /* !USE_DIRECT_IO */
++#else
 +	export_bktr
-+#endif /* !USE_DIRECT_IO */
++#endif /* USE_DIRECT_IO */
  };
  
  struct tuner_drv_t **drv_db;
-diff -up fmio-2.0.8/src/Makefile.nox86 fmio-2.0.8/src/Makefile
---- fmio-2.0.8/src/Makefile.nodirectio	2007-11-12 00:06:03.000000000 +0200
-+++ fmio-2.0.8/src/Makefile	2007-11-12 00:06:53.000000000 +0200
-@@ -23,17 +23,23 @@
+diff -up fmio-2.0.8/src/Makefile.nodirectio fmio-2.0.8/src/Makefile
+--- fmio-2.0.8/src/Makefile.nodirectio	2007-11-12 01:10:10.000000000 +0200
++++ fmio-2.0.8/src/Makefile	2007-11-12 01:10:10.000000000 +0200
+@@ -23,17 +23,23 @@ HDRS= bu2614.h lm700x.h pt2254a.h radio.
  ALLHDRS= $(HDRS) export.h mixer.h ostypes.h pci.h
  OBJS= access.o bu2614.o lm700x.o mixer.o pci.o pt2254a.o radio.o tc921x.o \
  	tea5757.o
@@ -48,7 +60,7 @@
  
  PREFIX?= $(DESTDIR)$(prefix)
  LIBDIR?= $(DESTDIR)$(libdir)
-@@ -89,9 +95,9 @@
+@@ -89,9 +95,9 @@ clean:
  distclean:
  	rm -f $(REMOVABLE) $(CATPAGE)
  
@@ -60,3 +72,60 @@
  
  fmio.0: $(MANPAGE)
  	@echo "groff -Tascii -mandoc $(MANPAGE) > $@"
+diff -up fmio-2.0.8/src/radio_drv.h.nodirectio fmio-2.0.8/src/radio_drv.h
+--- fmio-2.0.8/src/radio_drv.h.nodirectio	2003-05-13 18:08:44.000000000 +0300
++++ fmio-2.0.8/src/radio_drv.h	2007-11-12 01:10:10.000000000 +0200
+@@ -32,7 +32,16 @@
+ #include <sys/ioctl.h>
+ 
+ #ifdef linux
++#ifdef USE_DIRECT_IO
+ #include <sys/io.h>
++#else
++#define inl(a)		0x00
++#define inw(a)		0x00
++#define inb(a)		0x00
++#define outl(a, b)
++#define outw(a, b)
++#define outb(a, b)
++#endif
+ #include <linux/videodev.h>
+ #elif defined __FreeBSD__
+ #include <machine/ioctl_bt848.h>
+diff -up fmio-2.0.8/src/access.c.nodirectio fmio-2.0.8/src/access.c
+--- fmio-2.0.8/src/access.c.nodirectio	2003-05-13 18:08:44.000000000 +0300
++++ fmio-2.0.8/src/access.c	2007-11-12 01:10:10.000000000 +0200
+@@ -52,7 +52,7 @@ const char *radio_device_1 = "/dev/radio
+ const char *radio_device_2 = "/dev/radio0";
+ #endif /* linux */
+ 
+-#ifdef __FreeBSD__
++#if defined __FreeBSD__ && defined USE_DIRECT_IO
+ const char *devio = "/dev/io";
+ static int fd = -1;
+ 
+@@ -75,13 +75,13 @@ fbsd_release_ioperms(void) {
+ 
+ 	return 0;
+ }
+-#elif defined __QNXNTO__
++#elif defined __QNXNTO__ && defined USE_DIRECT_IO
+ int
+ qnx_iopl_acquire() {
+ 	ThreadCtl(_NTO_TCTL_IO, 0);
+ 	return 0;
+ }
+-#elif defined linux
++#elif defined linux && defined USE_DIRECT_IO
+ int
+ os_iopl(int v) {
+ 	if (iopl(v) < 0) {
+@@ -100,7 +100,7 @@ os_ioperms(u_int32_t port, int no, int v
+ 
+ 	return 0;
+ }
+-#elif defined __OpenBSD__ || defined __NetBSD__
++#elif (defined __OpenBSD__ || defined __NetBSD__) && defined USE_DIRECT_IO
+ int
+ os_iopl(int v) {
+ 	struct i386_iopl_args iopls;


Index: fmio.spec
===================================================================
RCS file: /cvs/extras/rpms/fmio/F-8/fmio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fmio.spec	11 Nov 2007 22:30:00 -0000	1.3
+++ fmio.spec	11 Nov 2007 23:44:28 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	FM radio card manipulation utility
 Name:		fmio
 Version:	2.0.8
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	BSD
 Group:		Applications/Multimedia
 URL:		http://jumbo.narod.ru/fmio.html
@@ -110,8 +110,10 @@
 %{_bindir}/fmio-wrapper.py
 %exclude %{_bindir}/fmio-wrapper.py[co]
 %{_mandir}/man1/fmio.1*
+%if 0%{?_with_direct_io}
 %{_bindir}/bktrctl
 %{_bindir}/fmrinit
+%endif
 %doc Changelog README doc/FAQ
 %doc README.fedora
 %doc LICENSE
@@ -129,7 +131,7 @@
 %config(noreplace) %{_sysconfdir}/wmfmiorc
 
 %changelog
-* Sun Nov 11 2007 Andy Shevchenko <andy at smile.org.ua> 2.0.8-9
+* Sun Nov 11 2007 Andy Shevchenko <andy at smile.org.ua> 2.0.8-10
 - do not require WindowMaker for GUI part (#222758)
 - do not build drivers with direct I/O (#205721)