rpms/libraw1394/devel .cvsignore, 1.8, 1.9 libraw1394-juju.patch, 1.6, 1.7 libraw1394.spec, 1.35, 1.36 sources, 1.9, 1.10 libraw1394-underquoted.patch, 1.1, NONE

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Fri Oct 19 13:36:51 UTC 2007 

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1206

Modified Files:
	.cvsignore libraw1394-juju.patch libraw1394.spec sources 
Removed Files:
	libraw1394-underquoted.patch 
Log Message:
libraw1394 v1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Mar 2007 23:08:01 -0000	1.8
+++ .cvsignore	19 Oct 2007 13:36:16 -0000	1.9
@@ -1,3 +1,4 @@
 libraw1394-1.2.0.tar.gz
 libraw1394-1.2.1.tar.gz
 fw-device-cdev.h
+libraw1394-1.3.0.tar.gz

libraw1394-juju.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 libraw1394-juju.patch
Index: libraw1394-juju.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394-juju.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libraw1394-juju.patch	18 Apr 2007 00:59:15 -0000	1.6
+++ libraw1394-juju.patch	19 Oct 2007 13:36:16 -0000	1.7
@@ -1,49 +1,36 @@
-diff --git a/Makefile.am b/Makefile.am
-index 04ed38a..21df527 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,7 @@
- # process this file with automake to create a Makefile.in
- 
--SUBDIRS = src tools doc debian
-+SUBDIRS = $(LIB_SUBDIR) tools doc debian
-+DIST_SUBDIRS = src juju
- 
- pkgconfigdir = @libdir@/pkgconfig
- pkgconfig_DATA = libraw1394.pc
-diff --git a/configure.ac b/configure.ac
-index fe23ca8..7e5dd66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,6 +24,27 @@ AC_SUBST(lt_major)
+diff -Naurp libraw1394-1.3.0.orig/configure.ac libraw1394-1.3.0/configure.ac
+--- libraw1394-1.3.0.orig/configure.ac	2007-05-30 01:32:37.000000000 -0400
++++ libraw1394-1.3.0/configure.ac	2007-10-18 22:21:34.000000000 -0400
+@@ -24,6 +24,28 @@ AC_SUBST(lt_major)
  AC_SUBST(lt_revision)
  AC_SUBST(lt_age)
  
 +AC_ARG_WITH(juju-dir,[  --with-juju-dir=<dir>  Path to juju include files])
 +if ! test -z "$with_juju_dir" ; then
-+   JUJU_DIR="$with_juju_dir"
-+   LIB_SUBDIR=juju
-+   AC_SUBST(JUJU_DIR)
++    JUJU_DIR="$with_juju_dir"
++    LIB_SUBDIR=juju
++    AC_SUBST(JUJU_DIR)
 +else
-+   LIB_SUBDIR=src
++    LIB_SUBDIR=src
 +fi
 +AC_SUBST(LIB_SUBDIR)
 +
 +AC_ARG_WITH(fw-device-prefix,
-+	[  --with-fw-device-prefix=<prefix>  Prefix of firewire device file names (default "fw").],
-+	[FW_DEVICE_PREFIX="\"$withval\""], [FW_DEVICE_PREFIX="\"fw\""])
++    [  --with-fw-device-prefix=<prefix>  Prefix of firewire device file names (default "fw").],
++    [FW_DEVICE_PREFIX="\"$withval\""], [FW_DEVICE_PREFIX="\"fw\""])
 +AC_ARG_WITH(fw-device-dir,
-+	[  --with-fw-device-dir=<dir>  Directory to watch for firewire device files (default "/dev").],
-+	[FW_DEVICE_DIR="\"$withval\""], [FW_DEVICE_DIR="\"/dev\""])
++    [  --with-fw-device-dir=<dir>  Directory to watch for firewire device files (default "/dev").],
++    [FW_DEVICE_DIR="\"$withval\""], [FW_DEVICE_DIR="\"/dev\""])
 +
 +AC_DEFINE_UNQUOTED(FW_DEVICE_PREFIX, $FW_DEVICE_PREFIX,
-+	[Prefix of firewire device file names.])
++    [Prefix of firewire device file names.])
 +AC_DEFINE_UNQUOTED(FW_DEVICE_DIR, $FW_DEVICE_DIR,
-+	[Directory to watch for firewire device files.])
- 
- #CFLAGS=${CFLAGS:-"-Wall"}
- AC_OUTPUT([
-@@ -31,6 +52,7 @@ Makefile
++    [Directory to watch for firewire device files.])
++
+ dnl Check to see if valgrind is available
+ AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind],[compile with valgrind support]))
+ if test x$with_valgrind = xyes ; then
+@@ -36,6 +58,7 @@ Makefile
  libraw1394.pc
  libraw1394.spec
  src/Makefile
@@ -51,25 +38,9 @@
  tools/Makefile
  doc/Makefile
  doc/testlibraw.1
-diff --git a/juju/Makefile.am b/juju/Makefile.am
-new file mode 100644
-index 0000000..6fd6a5e
---- /dev/null
-+++ b/juju/Makefile.am
-@@ -0,0 +1,8 @@
-+lib_LTLIBRARIES = libraw1394.la
-+
-+INCLUDES = -I$(JUJU_DIR)
-+libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
-+
-+libraw1394_la_SOURCES = raw1394.c raw1394-iso.c juju.h
-+
-+pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h
-diff --git a/juju/juju.h b/juju/juju.h
-new file mode 100644
-index 0000000..c7a2ebd
---- /dev/null
-+++ b/juju/juju.h
+diff -Naurp libraw1394-1.3.0.orig/juju/juju.h libraw1394-1.3.0/juju/juju.h
+--- libraw1394-1.3.0.orig/juju/juju.h	1969-12-31 19:00:00.000000000 -0500
++++ libraw1394-1.3.0/juju/juju.h	2007-10-18 22:18:46.000000000 -0400
 @@ -0,0 +1,143 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
@@ -214,15 +185,25 @@
 +};
 +
 +#endif
-diff --git a/juju/raw1394-iso.c b/juju/raw1394-iso.c
-new file mode 100644
-index 0000000..5e18dab
---- /dev/null
-+++ b/juju/raw1394-iso.c
-@@ -0,0 +1,522 @@
+diff -Naurp libraw1394-1.3.0.orig/juju/Makefile.am libraw1394-1.3.0/juju/Makefile.am
+--- libraw1394-1.3.0.orig/juju/Makefile.am	1969-12-31 19:00:00.000000000 -0500
++++ libraw1394-1.3.0/juju/Makefile.am	2007-10-18 22:18:46.000000000 -0400
+@@ -0,0 +1,8 @@
++lib_LTLIBRARIES = libraw1394.la
++
++INCLUDES = -I$(JUJU_DIR)
++libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
++
++libraw1394_la_SOURCES = raw1394.c raw1394-iso.c juju.h
++
++pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h
+diff -Naurp libraw1394-1.3.0.orig/juju/raw1394.c libraw1394-1.3.0/juju/raw1394.c
+--- libraw1394-1.3.0.orig/juju/raw1394.c	1969-12-31 19:00:00.000000000 -0500
++++ libraw1394-1.3.0/juju/raw1394.c	2007-10-18 22:18:46.000000000 -0400
+@@ -0,0 +1,1441 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
-+ * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack
++ * raw1394.c -- Emulation of the raw1394 API on the juju stack
 + *
 + * Copyright (C) 2007  Kristian Hoegsberg <krh at bitplanet.net>
 + *
@@ -241,1968 +222,1976 @@
 + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 + */
 +
++#include <stdlib.h>
 +#include <string.h>
-+#include <sys/mman.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <fcntl.h>
 +#include <stdio.h>
-+#include <sys/epoll.h>
++#include <dirent.h>
 +#include <sys/ioctl.h>
++#include <sys/epoll.h>
++#include <sys/inotify.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <errno.h>
++#include <arpa/inet.h> /* for ntohl and htonl */
 +
 +#include "juju.h"
 +
-+static int
-+queue_packet(raw1394handle_t handle,
-+	     unsigned int length, unsigned int header_length,
-+	     unsigned char tag, unsigned char sy)
++raw1394_errcode_t
++raw1394_get_errcode(raw1394handle_t handle)
 +{
-+	struct fw_cdev_queue_iso queue_iso;
-+	struct fw_cdev_iso_packet *p;
-+	int err;
-+
-+	p = &handle->iso.packets[handle->iso.packet_index];
-+	p->payload_length = length;
-+	p->interrupt =
-+		handle->iso.packet_phase == handle->iso.irq_interval - 1;
-+	p->skip = 0;
-+	p->tag = tag;
-+	p->sy = sy;
-+	p->header_length = header_length;
-+
-+	handle->iso.head += length;
-+	handle->iso.packet_count++;
-+	handle->iso.packet_phase++;
-+	handle->iso.packet_index++;
-+
-+	if (handle->iso.packet_phase == handle->iso.irq_interval)
-+		handle->iso.packet_phase = 0;
++	return handle->err;
++}
 +
-+	if (handle->iso.head + handle->iso.max_packet_size > handle->iso.buffer_end)
-+		handle->iso.head = handle->iso.buffer;
++int
++raw1394_errcode_to_errno(raw1394_errcode_t errcode)
++{
++	switch (errcode) {
 +
-+	/* Queue the packets in the kernel if we filled up the packets
[...3208 lines suppressed...]
++int raw1394_iso_recv_listen_channel(raw1394handle_t handle,
++				    unsigned char channel)
 +{
-+	struct fw_cdev_get_info get_info;
-+	int err;
-+
-+	get_info.version = FW_CDEV_VERSION;
-+	get_info.rom = ptr_to_u64(buffer);
-+	get_info.rom_length = buffersize;
-+	get_info.bus_reset = 0;
-+
-+	err = ioctl(handle->local_fd, FW_CDEV_IOC_GET_INFO, &get_info);
-+	if (err)
-+		return err;
-+
-+	*rom_size = get_info.rom_length;
-+	*rom_version = 0;
-+
-+	return 0;
++	/* FIXME: multichannel */
++	errno = ENOSYS;
++	return -1;
 +}
 +
-+#define MAXIMUM_BANDWIDTH 4915
-+
-+int
-+raw1394_bandwidth_modify (raw1394handle_t handle,
-+			  unsigned int bandwidth,
-+			  enum raw1394_modify_mode mode)
++int raw1394_iso_recv_unlisten_channel(raw1394handle_t handle,
++				      unsigned char channel)
 +{
-+        quadlet_t buffer, compare, swap;
-+	nodeaddr_t addr;
-+        int result;
-+
-+        if (bandwidth == 0)
-+                return 0;
-+        
-+	addr = CSR_REGISTER_BASE + CSR_BANDWIDTH_AVAILABLE;
-+        /* Read current bandwidth usage from IRM. */
-+        result = raw1394_read (handle, raw1394_get_irm_id (handle), addr,
-+			       sizeof buffer, &buffer);
-+        if (result < 0)
-+                return -1;
-+
-+        compare = ntohl (buffer);
-+	switch (mode) {
-+	case RAW1394_MODIFY_ALLOC:
-+		swap = compare - bandwidth;
-+		if (swap < 0)
-+			return -1;
-+		break;
-+
-+	case RAW1394_MODIFY_FREE:
-+		swap = compare + bandwidth;
-+		if (swap > MAXIMUM_BANDWIDTH)
-+			swap = MAXIMUM_BANDWIDTH;
-+		break;
-+
-+	default:
-+		return -1;
-+	}
++	/* FIXME: multichannel */
++	errno = ENOSYS;
++	return -1;
++}
 +
-+	result = raw1394_lock(handle, raw1394_get_irm_id (handle), addr,
-+			      RAW1394_EXTCODE_COMPARE_SWAP,
-+			      htonl(swap), htonl(compare), &buffer);
-+	if (result < 0 || ntohl(buffer) != compare)
-+		return -1;
-+  
-+        return 0;
++int raw1394_iso_recv_set_channel_mask(raw1394handle_t handle, u_int64_t mask)
++{
++	/* FIXME: multichannel */
++	errno = ENOSYS;
++	return -1;
 +}
 +
-+int
-+raw1394_channel_modify (raw1394handle_t handle,
-+			unsigned int channel,
-+			enum raw1394_modify_mode mode)
++void raw1394_iso_stop(raw1394handle_t handle)
 +{
-+        quadlet_t buffer, compare, swap, bit;
-+        nodeaddr_t addr;
-+        int result;
-+        
-+	if (channel >= 64)
-+		return -1;
-+	addr = CSR_REGISTER_BASE +
-+		CSR_CHANNELS_AVAILABLE_HI + 4 * (channel / 32);
-+	/* Read currently available channels from IRM. */
-+        result = raw1394_read(handle, raw1394_get_irm_id (handle), addr, 
-+			      sizeof buffer, &buffer);
-+        if (result < 0)
-+                return -1;
-+        
-+	/* IEEE numbers bits from MSB (0) to LSB (31). */
-+        bit = 1 << (31 - (channel & 31));
-+        compare = ntohl(buffer);
-+	switch (mode) {
-+	case RAW1394_MODIFY_ALLOC:
-+                if ((compare & bit) == 0)
-+                        return -1;
-+                swap = buffer & ~bit;
-+		break;
++	struct fw_cdev_stop_iso stop_iso;
 +
-+        case RAW1394_MODIFY_FREE:
-+                if ((buffer & bit) != 0)
-+                        return -1;
-+                swap = buffer | bit;
-+		break;
++	stop_iso.handle = 0;
++	ioctl(handle->iso.fd, FW_CDEV_IOC_STOP_ISO);
 +
-+	default:
-+		return -1;
-+        }
-+  
-+        result = raw1394_lock (handle, raw1394_get_irm_id (handle), addr,
-+			       RAW1394_EXTCODE_COMPARE_SWAP,
-+			       htonl(swap), htonl(compare), &buffer);
++	handle->iso.head = handle->iso.buffer;
++	handle->iso.tail = handle->iso.buffer;
++	handle->iso.first_payload = handle->iso.buffer;
++	handle->iso.packet_phase = 0;
++	handle->iso.packet_count = 0;
++}
 +
-+        if (result < 0 || ntohl(buffer) != compare)
-+                return -1;
-+  
-+        return 0;
++void raw1394_iso_shutdown(raw1394handle_t handle)
++{
++	munmap(handle->iso.buffer,
++	       handle->iso.buf_packets * handle->iso.max_packet_size);
++	close(handle->iso.fd);
++	free(handle->iso.packets);
 +}
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 29b250e..5be1b6f 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
+diff -Naurp libraw1394-1.3.0.orig/Makefile.am libraw1394-1.3.0/Makefile.am
+--- libraw1394-1.3.0.orig/Makefile.am	2004-11-05 19:26:44.000000000 -0500
++++ libraw1394-1.3.0/Makefile.am	2007-10-18 22:18:46.000000000 -0400
+@@ -1,6 +1,7 @@
+ # process this file with automake to create a Makefile.in
+ 
+-SUBDIRS = src tools doc debian
++SUBDIRS = $(LIB_SUBDIR) tools doc debian
++DIST_SUBDIRS = src juju
+ 
+ pkgconfigdir = @libdir@/pkgconfig
+ pkgconfig_DATA = libraw1394.pc
+diff -Naurp libraw1394-1.3.0.orig/tools/Makefile.am libraw1394-1.3.0/tools/Makefile.am
+--- libraw1394-1.3.0.orig/tools/Makefile.am	2004-11-05 19:26:44.000000000 -0500
++++ libraw1394-1.3.0/tools/Makefile.am	2007-10-18 22:18:46.000000000 -0400
 @@ -2,4 +2,4 @@ MAINTAINERCLEANFILES = Makefile.in
  
  # testlibraw
  bin_PROGRAMS = testlibraw sendiso dumpiso
 -LDADD = ../src/libraw1394.la
 +LDADD = ../$(LIB_SUBDIR)/libraw1394.la
-diff --git a/tools/testlibraw.c b/tools/testlibraw.c
-index 5f73bd9..2f02a6d 100644
---- a/tools/testlibraw.c
-+++ b/tools/testlibraw.c
+diff -Naurp libraw1394-1.3.0.orig/tools/testlibraw.c libraw1394-1.3.0/tools/testlibraw.c
+--- libraw1394-1.3.0.orig/tools/testlibraw.c	2004-01-31 15:26:03.000000000 -0500
++++ libraw1394-1.3.0/tools/testlibraw.c	2007-10-18 22:18:46.000000000 -0400
 @@ -1,4 +1,5 @@
 -/*
 +/*						-*- c-basic-offset: 8 -*-
@@ -2225,7 +2214,7 @@
  
  const char not_compatible[] = "\
  This libraw1394 does not work with your version of Linux. You need a different\n\
-@@ -45,12 +47,18 @@ int my_tag_handler(raw1394handle_t handle, unsigned long tag,
+@@ -45,12 +47,18 @@ int my_tag_handler(raw1394handle_t handl
          return 0;
  }
  
@@ -2244,7 +2233,7 @@
          while (length) {
                  printf(" %02x", *data);
                  data++;
-@@ -62,6 +70,47 @@ int my_fcp_handler(raw1394handle_t handle, nodeid_t nodeid, int response,
+@@ -62,6 +70,47 @@ int my_fcp_handler(raw1394handle_t handl
          return 0;
  }
  


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libraw1394.spec	29 Aug 2007 04:42:37 -0000	1.35
+++ libraw1394.spec	19 Oct 2007 13:36:16 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
-Version:        1.2.1
-Release:        10%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Oct 18 2007 Jarod Wilson <jwilson at redhat.com> - 1.3.0-1
+- libraw1394 v1.3.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.1-10
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Mar 2007 23:09:25 -0000	1.9
+++ sources	19 Oct 2007 13:36:16 -0000	1.10
@@ -1 +1 @@
-e6210ff05b7f4ec0401ad3d11f493e1a  libraw1394-1.2.1.tar.gz
+c5d9ab62bd25dba96af010b3471e816a  libraw1394-1.3.0.tar.gz


--- libraw1394-underquoted.patch DELETED ---

More information about the fedora-extras-commits mailing list