bump versions, build fixes, and doc updates
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@140 53a565d1-3bb7-0310-b661-cf11e63c67ab
This commit is contained in:
parent
6b2bee6aca
commit
ff3c421f8d
|
@ -0,0 +1,14 @@
|
||||||
|
This project does not use a ChangeLog file.
|
||||||
|
|
||||||
|
The source code of this project is managed by the Subversion revision
|
||||||
|
control system (http://subversion.tigris.org), a very nice replacement
|
||||||
|
for the venerable CVS. One of the many nice features of Subversion is
|
||||||
|
the 'log' command, which will give you the equivalent of a GNU style
|
||||||
|
ChangeLog file.
|
||||||
|
|
||||||
|
To view the Subversion log for this project you must have a Subversion
|
||||||
|
client installed. Type on the command line
|
||||||
|
|
||||||
|
$ svn://svn.linux1394.org/libraw1394/trunk
|
||||||
|
|
||||||
|
to view the log.
|
11
Makefile.am
11
Makefile.am
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
SUBDIRS = src tools doc debian
|
SUBDIRS = src tools doc debian
|
||||||
|
|
||||||
aclocaldir = @datadir@/aclocal
|
|
||||||
aclocal_DATA = libraw1394.m4
|
|
||||||
|
|
||||||
pkgconfigdir = @libdir@/pkgconfig
|
pkgconfigdir = @libdir@/pkgconfig
|
||||||
pkgconfig_DATA = libraw1394.pc
|
pkgconfig_DATA = libraw1394.pc
|
||||||
|
|
||||||
EXTRA_DIST = libraw1394.m4 libraw1394.pc
|
EXTRA_DIST = libraw1394.pc libraw1394.spec
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in stamp-h.in \
|
||||||
|
depcomp install-sh missing mkinstalldirs config.guess ltmain.sh
|
||||||
|
|
||||||
doc: psdoc pdfdoc htmldoc
|
doc: psdoc pdfdoc htmldoc
|
||||||
|
|
||||||
|
@ -45,3 +45,6 @@ install-exec-hook:
|
||||||
echo "********************************************"; \
|
echo "********************************************"; \
|
||||||
echo; \
|
echo; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dist-hook:
|
||||||
|
svn log >$(distdir)/ChangeLog
|
||||||
|
|
15
NEWS
15
NEWS
|
@ -1,3 +1,18 @@
|
||||||
|
Version 1.1.0:
|
||||||
|
- added ability to specify the isochronous receive mode in the new
|
||||||
|
rawiso (raw1394_iso_*) API. Therefore, the signature of
|
||||||
|
raw1394_iso_recv_init() changed, and likewise, the libtool/.so version
|
||||||
|
numbers changed to reflect a new interface that is not backwards compatible!
|
||||||
|
- added raw1394_arm_set_buf() and raw1394_arm_get_buf() functions.
|
||||||
|
- new, consistent versioning scheme. 1.0.0 was reported by pkg-config in 0.10
|
||||||
|
series; hence, 1.1.0 in this release.
|
||||||
|
- removed outdated, bogus "linking required only" version symbols in
|
||||||
|
version.c - use pkg-config now.
|
||||||
|
- dropped libraw1394.m4 - use pkg-config now.
|
||||||
|
- incremented the raw1394 kernel API protocol version to 5 due to features
|
||||||
|
introduced in v0.10.
|
||||||
|
- added RPM spec file.
|
||||||
|
|
||||||
Version 0.10:
|
Version 0.10:
|
||||||
|
|
||||||
- merged in the rawiso branch
|
- merged in the rawiso branch
|
||||||
|
|
32
README
32
README
|
@ -30,8 +30,7 @@ files.
|
||||||
|
|
||||||
Finally there is something, in the doc subdirectory. The file is
|
Finally there is something, in the doc subdirectory. The file is
|
||||||
libraw1394.sgml (it's Docbook format), and there are preformatted PostScript and
|
libraw1394.sgml (it's Docbook format), and there are preformatted PostScript and
|
||||||
HTML available. This documentation is not complete yet! I hopefully will have
|
HTML available. This documentation is not complete yet.
|
||||||
a libraw1394 0.9.1 out soon with finished documentation.
|
|
||||||
|
|
||||||
|
|
||||||
4. Multithreading
|
4. Multithreading
|
||||||
|
@ -42,28 +41,23 @@ operating on the same handle would royally mess up the kernel-user protocol.
|
||||||
Simply use separate handles for each thread in which you need to use libraw1394.
|
Simply use separate handles for each thread in which you need to use libraw1394.
|
||||||
|
|
||||||
|
|
||||||
5. Autoconf macro
|
5. Pkg-config
|
||||||
|
|
||||||
Along with the library an autoconf macro gets installed (in
|
The library comes with a pkg-config .pc file, so you can check for
|
||||||
$prefix/share/aclocal). It is called the following way:
|
libraw1394 and its version in your configure script. For example, here is how
|
||||||
|
to use the autoconf macro:
|
||||||
|
|
||||||
AC_LIB_RAW1394(MINIMUMVERSION[,ACTION_IF_FOUND[,ACTION_IF_NOT_FOUND]])
|
PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.1.0)
|
||||||
|
|
||||||
Versions prior to 0.9 can not be checked and appear as "not found".
|
This macro sets the variables LIBRAW1394_CFLAGS and LIBRAW1394_LIBS. You
|
||||||
This macro sets the variables LIBRAW1394_CPPFLAGS, LIBRAW1394_CFLAGS and
|
have to include those into your build variables so that the build process
|
||||||
LIBRAW1394_LIBS. You have to include those into your build variables so that
|
correctly links with libraw1394.
|
||||||
the build process correctly links with libraw1394.
|
|
||||||
|
|
||||||
|
|
||||||
6. Maintainer
|
6. Maintainer
|
||||||
|
|
||||||
Maintainer of libraw1394 is currently Andreas Bombe. Send suggestions,
|
Maintainers of libraw1394 are currently Ben Collins and Dan Dennedy. Send
|
||||||
bug reports and fixes to andreas.bombe@munich.netsurf.de. See the file AUTHORS
|
suggestions, bug reports and fixes to linux1394-devel@lists.sourceforge.net.
|
||||||
for a complete list of contributors to libraw1394.
|
See the file AUTHORS for a complete list of contributors to libraw1394.
|
||||||
|
|
||||||
You can get updates through this project's homepage on SourceForge, see
|
Visit http://www.linux1394.org/ for more information or to see what is new.
|
||||||
http://sourceforge.net/project/?group_id=2514 for more information. You can
|
|
||||||
also submit bugs through this page.
|
|
||||||
|
|
||||||
|
|
||||||
2001-05-14 Andreas Bombe
|
|
||||||
|
|
14
configure.ac
14
configure.ac
|
@ -1,11 +1,14 @@
|
||||||
# process this file with autoconf to get a configure script
|
# process this file with autoconf to get a configure script
|
||||||
|
|
||||||
AC_INIT(Makefile.am)
|
AC_INIT(libraw1394, 1.1.0)
|
||||||
AM_INIT_AUTOMAKE(libraw1394, 1.0.0)
|
AC_CONFIG_SRCDIR(src/raw1394.h)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
|
dnl Checking if the NEWS file has been updated to reflect the current version.
|
||||||
|
AM_INIT_AUTOMAKE(check-news)
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AM_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
AC_CHECK_SIZEOF(void *, 8)
|
AC_CHECK_SIZEOF(void *, 8)
|
||||||
|
@ -13,9 +16,9 @@ AC_C_CONST
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
# set the libtool so version numbers
|
# set the libtool so version numbers
|
||||||
lt_major=7
|
lt_major=8
|
||||||
lt_revision=0
|
lt_revision=0
|
||||||
lt_age=2
|
lt_age=0
|
||||||
|
|
||||||
AC_SUBST(lt_major)
|
AC_SUBST(lt_major)
|
||||||
AC_SUBST(lt_revision)
|
AC_SUBST(lt_revision)
|
||||||
|
@ -26,6 +29,7 @@ CFLAGS=${CFLAGS:-"-Wall -O2"}
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
libraw1394.pc
|
libraw1394.pc
|
||||||
|
libraw1394.spec
|
||||||
src/Makefile
|
src/Makefile
|
||||||
tools/Makefile
|
tools/Makefile
|
||||||
doc/Makefile
|
doc/Makefile
|
||||||
|
|
|
@ -9,7 +9,7 @@ man_MANS = testlibraw.1 sendiso.1 dumpiso.1 isodump.5
|
||||||
CLEANFILES = libraw1394.aux libraw1394.dvi libraw1394.log libraw1394.out \
|
CLEANFILES = libraw1394.aux libraw1394.dvi libraw1394.log libraw1394.out \
|
||||||
libraw1394.tex libraw1394.pdf
|
libraw1394.tex libraw1394.pdf
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = libraw1394.ps
|
MAINTAINERCLEANFILES = Makefile.in libraw1394.ps
|
||||||
|
|
||||||
maintainer-clean-local:
|
maintainer-clean-local:
|
||||||
rm -rf libraw1394
|
rm -rf libraw1394
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<bookinfo>
|
<bookinfo>
|
||||||
|
|
||||||
<title>libraw1394</title>
|
<title>libraw1394</title>
|
||||||
<subtitle>version 0.9</subtitle>
|
<subtitle>version 1.0.0</subtitle>
|
||||||
|
|
||||||
<copyright>
|
<copyright>
|
||||||
<year>2001</year>
|
<year>2001</year>
|
||||||
|
@ -319,6 +319,7 @@
|
||||||
be different nodes, so automatic behaviour would be very undesirable in
|
be different nodes, so automatic behaviour would be very undesirable in
|
||||||
these cases.
|
these cases.
|
||||||
</para>
|
</para>
|
||||||
|
</sect1>
|
||||||
|
|
||||||
</chapter>
|
</chapter>
|
||||||
|
|
||||||
|
@ -694,7 +695,8 @@
|
||||||
<para>
|
<para>
|
||||||
<symbol>speed</symbol> is the isochronous speed at which you
|
<symbol>speed</symbol> is the isochronous speed at which you
|
||||||
wish to operate. Possible values are
|
wish to operate. Possible values are
|
||||||
<symbol>RAW1394_ISO_SPEED_100</symbol> through
|
<symbol>RAW1394_ISO_SPEED_100</symbol>,
|
||||||
|
<symbol>RAW1394_ISO_SPEED_200</symbol>, and
|
||||||
<symbol>RAW1394_ISO_SPEED_400</symbol>.
|
<symbol>RAW1394_ISO_SPEED_400</symbol>.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
@ -706,6 +708,11 @@
|
||||||
that should be suitable for most applications.
|
that should be suitable for most applications.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
<para>
|
||||||
|
<symbol>mode</symbol> for <function>raw1394_iso_recv_init()</function>
|
||||||
|
sets whether to use packet-per-buffer or buffer-fill receive mode.
|
||||||
|
</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
If <function>raw1394_iso_xmit/recv_init()</function> retuns
|
If <function>raw1394_iso_xmit/recv_init()</function> retuns
|
||||||
successfully, then you may start isochronous operations. You
|
successfully, then you may start isochronous operations. You
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
%define prefix /usr
|
||||||
|
|
||||||
|
Name: @PACKAGE@
|
||||||
|
Version: @VERSION@
|
||||||
|
Release: 1
|
||||||
|
Copyright: LGPL
|
||||||
|
Group: Libraries
|
||||||
|
Source: http://linux1394.org/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
|
||||||
|
URL: http://linux1394.org
|
||||||
|
BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-root
|
||||||
|
Summary: Streaming library for IEEE1394
|
||||||
|
BuildRequires: openjade
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
|
||||||
|
%description
|
||||||
|
|
||||||
|
The Linux kernel's IEEE 1394 subsystem provides access to the raw 1394
|
||||||
|
bus through the raw1394 module. This includes the standard 1394
|
||||||
|
transactions (read, write, lock) on the active side, isochronous
|
||||||
|
stream receiving and sending and dumps of data written to the
|
||||||
|
FCP_COMMAND and FCP_RESPONSE registers. raw1394 uses a character
|
||||||
|
device to communicate to user programs using a special protocol.
|
||||||
|
|
||||||
|
libraw1394 was created with the intent to hide that protocol from
|
||||||
|
applications so that
|
||||||
|
|
||||||
|
- the protocol has to be implemented correctly only once.
|
||||||
|
|
||||||
|
- all work can be done using easy to understand functions instead of
|
||||||
|
handling a complicated command structure.
|
||||||
|
|
||||||
|
- only libraw1394 has to be changed when raw1394's interface changes.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development libs for libraw1394
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Development libraries needed to build applications against libraw1394
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup
|
||||||
|
|
||||||
|
%build
|
||||||
|
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
|
||||||
|
make
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
make prefix=$RPM_BUILD_ROOT%{prefix} install
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-, root, root)
|
||||||
|
|
||||||
|
%doc AUTHORS COPYING.LIB NEWS README
|
||||||
|
%{prefix}/lib/libraw1394.so.*
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-, root, root)
|
||||||
|
|
||||||
|
%{prefix}/bin/*
|
||||||
|
%{prefix}/lib/*.so
|
||||||
|
%{prefix}/lib/*a
|
||||||
|
%{prefix}/include/*
|
||||||
|
%{prefix}/man/*
|
||||||
|
%{prefix}/lib/pkgconfig/libraw1394.pc
|
|
@ -1,3 +1,4 @@
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
# the libraw1394 itself
|
# the libraw1394 itself
|
||||||
|
|
||||||
|
@ -15,7 +16,8 @@ libraw1394_la_SOURCES = \
|
||||||
arm.c \
|
arm.c \
|
||||||
version.c \
|
version.c \
|
||||||
kernel-raw1394.h \
|
kernel-raw1394.h \
|
||||||
raw1394_private.h
|
raw1394_private.h \
|
||||||
|
ieee1394-ioctl.h
|
||||||
|
|
||||||
# headers to be installed
|
# headers to be installed
|
||||||
pkginclude_HEADERS = raw1394.h csr.h ieee1394.h
|
pkginclude_HEADERS = raw1394.h csr.h ieee1394.h
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
/* header for the raw1394 API that is exported to user-space */
|
/* header for the raw1394 API that is exported to user-space */
|
||||||
|
|
||||||
#define RAW1394_KERNELAPI_VERSION 4
|
#define RAW1394_KERNELAPI_VERSION 5
|
||||||
|
|
||||||
/* state: opened */
|
/* state: opened */
|
||||||
#define RAW1394_REQ_INITIALIZE 1
|
#define RAW1394_REQ_INITIALIZE 1
|
||||||
|
|
|
@ -10,11 +10,6 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
/* Variables to find version by linking (avoid need for test program) */
|
|
||||||
|
|
||||||
char __libraw1394_version_0_9;
|
|
||||||
char __libraw1394_version_0_9_0;
|
|
||||||
|
|
||||||
/* This function is to be used by the autoconf macro to find the lib version */
|
/* This function is to be used by the autoconf macro to find the lib version */
|
||||||
const char *raw1394_get_libversion()
|
const char *raw1394_get_libversion()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
# testlibraw
|
# testlibraw
|
||||||
bin_PROGRAMS = testlibraw sendiso dumpiso
|
bin_PROGRAMS = testlibraw sendiso dumpiso
|
||||||
|
|
Reference in New Issue